diff --git a/Manifest b/Manifest
index af2050606543..0b8df8911ef2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29454 BLAKE2B 3168b6b2d42cdfb5e424d17d8b3068b95298e6a3ba29194ad21d935f0e78f05fad7486724d9271cb7c1cd4f30d51001f628bc70ef29f3e08ae64e270de9efc7a SHA512 c369e91bc19f6859290d2fe878490bdf62abe18fefc2a1634f984f820bbcbbfd9c6b16ed10ef4e331ea4936f305264db595644381740b78909547224556c46f2
-TIMESTAMP 2020-10-08T13:38:40Z
+MANIFEST Manifest.files.gz 29451 BLAKE2B 397ce3633be40ac1343c3b27d52e18e98735e861c37474cebd9516ac193f401b7e09d4dd4875d3e4121338d8fa0f33ff22fd402c63927e2d57ebafc133cb67f8 SHA512 905ce4e8ec03c0e3e7568178baf26818793aa1eb7d3c59471594722e4081dae10c7b2fbd734b2770455d274ce3ecf020faed43018cd8b347ca6e4206b3d7288f
+TIMESTAMP 2020-10-12T05:08:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9/FmBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+D5NpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/KA//YjwfRph+J2HiUk8kcD6D2kvrQl6b2c23gc9dcMXY4lnLYDqwRhpx1NL2
-4BouTeuwPPpyx5QE+2jZ1hV57PNfubZO2Rls5wuXWG/EDh+V15pMGfhuCmuMbgbP
-VCwl51MZ9X/drWChg7Ft1cfm9ifQbZOAAxIepy9O/G5q8xT2aDyKflHHiQm0HmKA
-GrV4VJ7D5b+zTLP+ZqYwWpyOJF3e57fSRCCCJD0GobyfMRKe6e5T7oB9ktZvBbcF
-zT/gZnN6o7/eQ8d6FugEp81pzNXtC0vFG4x3nNCMM2nUT+EBw0foSIp9DkDkcPY8
-Sslb5vK186JU6TggN8ZnH3eLL6WI0IvvFSl5/QZPmw8P5hxGXMIizM5YFsTCx2Kr
-dBMZ/BR7zJ01uxID/1KqMb/7D1Bvnd6BgVfvIYW3KPyON/I34i+ETnn78GLVexXq
-WTPApuoJ68zR0tQcxyLstM4XC/H+qgnWhp5skdTDlU7FYldueXYnGP3oNpHtYJdD
-5KDoZvdsFp9bXR4QxCky2ZpI6P8Vi+zqJqna6hmn72j8Lf/ilTWbY5fAzMt7EOm7
-TGGGOBTfFC7GGYNyrWjUiERaoVmg65lFG6idtkMsy+fOUuRln37YQz7ktpxcRrcs
-jQPCY3hAuW3dTMBB1rm1I4wFr+lt4pgsUmSYHjVKK0rXwi7e9ig=
-=uI8o
+klB7yw/9EHjAlgdct42zva2v8towRaTMEIS6sbzwYTLAiwlkxe4gNtnYkHUVV+hu
+pxX5JS2o8qRQGdAZD2oyCUya3URKgUgv0vASk6YiF4Zy7v+D8OADBbJmtQChyuu9
+1SL83tmvbXsLt5EAqpLd8XgVy8kTZntjPKq4939TVAPkqaKR/HMCg6B38W99jZ9o
+7Wss2guT36FoiMB0PcS7/Rj8HDRCknyTt+YFnr9CelFmK2iIMq8DcUnNSBQXH7VZ
+A8iJhtoPsqFgJpzkoxVkUeH+edg3Oqi8E3Dh0JTCJchC0Y15YRff2fUDV/KFE3En
+y1BoKFH00PQrsUmEuAqu3TSOtSVz3UsGweLzEpLQ/ptDYvOkiWjgHuTQMtC0Xdgf
+kwVmMFhzn45rsnaVbGbidApwRRWD6Ggz35iLptTsgQpz+m22VUnuQOm3kuDouHVB
+oPOrEhLyiH8W2ly96s4QZaFU7dXAOjamc6zZIXctrazD79wBr/7SYB0AipFTe/bK
+xqpgUB70SWZcymyepsu1ODzrh1EoGtSOq9aPidXog/74QM9ugqUslHSxtVMX/St2
+IgcTPxgS6QoBZG9SC0TzvEcBypysZOqXSuofXSgOJ7kGW7UxKpLJT5gXANdzbDMv
+GgyKByVzXMYIpLN76A0C/1VyUYboNClK7FJS5nGUhzxKOJAePfQ=
+=xryV
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0af2d882d229..cc5fcad55986 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 9dbe15d837ac..88617774436b 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/jabber/Manifest b/acct-group/jabber/Manifest
new file mode 100644
index 000000000000..6612e4f0ff6d
--- /dev/null
+++ b/acct-group/jabber/Manifest
@@ -0,0 +1,2 @@
+EBUILD jabber-0.ebuild 204 BLAKE2B 3b477347e8d0c5726444c22c267f304266eea9f83d605d25b72d414e78d6ad5bd3d7f4d52ddcbe07ffc040a3920cccb9cebae86c25247c34fbf6ce2c5a60f2d8 SHA512 55bcc9090deabb801ffbfc5ef721b4fa285fe3ab2ff52b455b24d071a6c06de95f28f9d0749c266f0fc5045f963855848c70882f483607e11f566c4c5e8005c6
+MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/acct-group/jabber/jabber-0.ebuild b/acct-group/jabber/jabber-0.ebuild
new file mode 100644
index 000000000000..506bd4f43bc4
--- /dev/null
+++ b/acct-group/jabber/jabber-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for various jabber services"
+
+ACCT_GROUP_ID="379"
diff --git a/acct-group/jabber/metadata.xml b/acct-group/jabber/metadata.xml
new file mode 100644
index 000000000000..3e3880cf1051
--- /dev/null
+++ b/acct-group/jabber/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>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/sks/Manifest b/acct-group/sks/Manifest
new file mode 100644
index 000000000000..e52b00c005da
--- /dev/null
+++ b/acct-group/sks/Manifest
@@ -0,0 +1,2 @@
+EBUILD sks-0.ebuild 192 BLAKE2B cde6513c6f7e065059acc3a29b9f755e39c2de842503109a0a71e4b54e991ba0ba6ee851008b25f58a1addcb183b08b80a346577b5e624341f6d414dd1391a61 SHA512 0488ed39591f3e880616d7fdb1cf052cc456d0131ed9c45c9cf942ebe30fa88e373f89b3847811a51ceb1870f068e21239e661713f9066b73838de3236487a8c
+MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
diff --git a/acct-group/sks/metadata.xml b/acct-group/sks/metadata.xml
new file mode 100644
index 000000000000..b372191c798e
--- /dev/null
+++ b/acct-group/sks/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-group/sks/sks-0.ebuild b/acct-group/sks/sks-0.ebuild
new file mode 100644
index 000000000000..0304197a7063
--- /dev/null
+++ b/acct-group/sks/sks-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 SKS OpenPGP keyserver"
+ACCT_GROUP_ID=370
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index bd9af259c146..ccf6b854d1fe 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/jabber/Manifest b/acct-user/jabber/Manifest
new file mode 100644
index 000000000000..c099b37cde5f
--- /dev/null
+++ b/acct-user/jabber/Manifest
@@ -0,0 +1,2 @@
+EBUILD jabber-0.ebuild 251 BLAKE2B 297fc86bf7d982c60c5626d09dc423ad15534b94b129c8af64a7862d756d53a016a9196184351a9687ecd6e325cd467f8e728e8f11ff9dbf71b4f65ae83185eb SHA512 bb4df967f554cc1fe1986d43555a47f9054de27df01d752dd555697db43795ae5cbe24b9ac77dd98543dec13b40605d031f3d8cf8994ada9836b6a2440a5c9de
+MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/acct-user/jabber/jabber-0.ebuild b/acct-user/jabber/jabber-0.ebuild
new file mode 100644
index 000000000000..1755616ce8bd
--- /dev/null
+++ b/acct-user/jabber/jabber-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for various jabber services"
+
+ACCT_USER_GROUPS=( "jabber" )
+ACCT_USER_ID="379"
+
+acct-user_add_deps
diff --git a/acct-user/jabber/metadata.xml b/acct-user/jabber/metadata.xml
new file mode 100644
index 000000000000..3e3880cf1051
--- /dev/null
+++ b/acct-user/jabber/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>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/sks/Manifest b/acct-user/sks/Manifest
new file mode 100644
index 000000000000..2182e2b2b08a
--- /dev/null
+++ b/acct-user/sks/Manifest
@@ -0,0 +1,2 @@
+EBUILD sks-0.ebuild 238 BLAKE2B fbb07018220034f399ee5e4b9ebac259187c3dc46f701f5f0face54805d36c138822b257fbdfcfbae0dfd00c571e2d7e3f70f65a16c525a1e87913b6b6948090 SHA512 96c7193a38df4c6ccaf8739a4951e0c3df39690605d93b4d597346fdd66bc8dc8d215183194d399229a91f6275b381f71dead2e5aecd06dfe9e940cdf98dea93
+MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
diff --git a/acct-user/sks/metadata.xml b/acct-user/sks/metadata.xml
new file mode 100644
index 000000000000..b372191c798e
--- /dev/null
+++ b/acct-user/sks/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/sks/sks-0.ebuild b/acct-user/sks/sks-0.ebuild
new file mode 100644
index 000000000000..5f78df813304
--- /dev/null
+++ b/acct-user/sks/sks-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 the SKS OpenPGP keyserver"
+ACCT_USER_ID=370
+ACCT_USER_GROUPS=( sks )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5e9f223df3ba..e9e9931474bf 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 5fad7f71b031..5d1ef0991637 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.18.0.tar.gz 4625622 BLAKE2B 618aec5cec7a41f06963d728c627f043f08ba39695691154118261a6fb71bac93cdb07b039e74e05a464227dca4da66c17c4c319553894f2d46af6203a36a038 SHA512 862dd138a6b6cbf9471206a07cf4447df113a77f44523e72e89a1f87362086fa168ded51d43c32408946b8cf2d6cb9668ff29818494a2eb6d94b0ef7d3bf4420
-EBUILD exo-1.18.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+DIST exo-1.19.0.tar.gz 4624195 BLAKE2B 49b1e39ac7a9893620b9694d088a5d8681602c51f25288f9ace5ee7ea5f213626e9c5a3817f8e26a0608446c79e175db98a83bca270a9d6d6914f57ccc8e4478 SHA512 acd0b11b5f858288601f32254647e0d2d79f06a79b5b4fe7d6dc72b5f6040b5e52d88648d5eb574bbec7cb47e80358c368369d569255773048ee4e54f4d14dea
+EBUILD exo-1.19.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.18.0.ebuild b/app-admin/exo/exo-1.19.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.18.0.ebuild
rename to app-admin/exo/exo-1.19.0.ebuild
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index ddbdac998aa5..d226cf5ab8b4 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,4 +1,3 @@
-AUX mysql_check.patch 937 BLAKE2B 26cfacf66fdc336c8ed3dec23776c30797bac1382b40fe0955f9640b314b3f1e9b035b677f3d8f0aa6ba706a135f759be2d7ae9505dcc654f176638da77a97f2 SHA512 3de16b396e85f658cf10b775795a0ea1adaf609dd26900d6cb27c055a2402b820c8b8c7bf80696bc3186c8435c6ad71b05f593b8f055b237915a06168c60761b
 AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d5f6a1c68415bd877551dbef03c62afbe66cde528fc4a2b80c3ca5faa92a3e97d2824a0e77b54add21e4a8092f6022b3e4c273 SHA512 1aa092351d317c373416a98ca6bbab19a070e43d0d4b82fe6dd1ac5a7cbb67741247ca2655e905a682ef5527fbf139c70a469a960be1dfdaa05c643a9749a4e9
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
diff --git a/app-admin/sagan/files/mysql_check.patch b/app-admin/sagan/files/mysql_check.patch
deleted file mode 100644
index 37f7d61fa0c8..000000000000
--- a/app-admin/sagan/files/mysql_check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.in b/configure.ac
-rename from configure.in
-rename to configure.ac
---- a/configure.in
-+++ b/configure.ac
-@@ -215,13 +215,17 @@
- AC_CHECK_LIB(pthread, main,,AC_MSG_ERROR(Sagan needs pthreads!))
- AC_CHECK_LIB(m, main,,AC_MSG_ERROR(Sagan needs libm!))
- 
-+save_LIBS=$LIBS
- if test "$MYSQL" = "yes"; then
- 	AC_MSG_RESULT([------- MySQL support is enabled -------])
-+	AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
- 	AC_CHECK_HEADER([mysql/mysql.h])
- 	AC_CHECK_HEADER([mysql/errmsg.h])
--	AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!
--If you're not interested in MySQL support use the --disable-mysql flag.))
--	fi
-+	LIBS=$(mysql_config --libs)
-+	AC_CHECK_LIB(mysqlclient, main,,AC_MSG_ERROR(The MySQL library libmysqlclient is missing!))
-+fi
-+LIBS="$save_LIBS $LIBS"
-+
- 
- if test "$POSTGRES" = "yes"; then
-        AC_MSG_RESULT([------- PostgreSQL support is enabled -------])
diff --git a/app-admin/selint/Manifest b/app-admin/selint/Manifest
new file mode 100644
index 000000000000..60bbde488feb
--- /dev/null
+++ b/app-admin/selint/Manifest
@@ -0,0 +1,4 @@
+DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
+EBUILD selint-1.1.0.ebuild 775 BLAKE2B f916b886def9adc27661fe2d8aa7c3e84dd1d88436f815b103f8237f7e152f742b8b2c8669ca3e980dd1e8d664b6bdcc4626ea8023f91d68413c30aa0f3b16c9 SHA512 965a44725002b30d4b546685738f4bb113ab212a323f376f16b6405752b9bdd43f349abc6dbb045371ca7f699a6afbae8b05997de8342e9a225d78b3ef45fc54
+EBUILD selint-9999.ebuild 775 BLAKE2B f916b886def9adc27661fe2d8aa7c3e84dd1d88436f815b103f8237f7e152f742b8b2c8669ca3e980dd1e8d664b6bdcc4626ea8023f91d68413c30aa0f3b16c9 SHA512 965a44725002b30d4b546685738f4bb113ab212a323f376f16b6405752b9bdd43f349abc6dbb045371ca7f699a6afbae8b05997de8342e9a225d78b3ef45fc54
+MISC metadata.xml 335 BLAKE2B ab88b7d7fedc27d0ba41b77fc133a0ad8b42aa295bb5b64c5bb4924d8081cb1ac3480b07d7c8a04ff8da1c49f47983e33a63cef3de08baac4cb448d656ec6cb9 SHA512 e94ae02402e90d9475fd328454223fa95714c3292877a9cc31e98c393f59dde7ddd9be34afe8b2f2d318105794ca3faa7617166d123259d147115619b14d7d12
diff --git a/app-admin/selint/metadata.xml b/app-admin/selint/metadata.xml
new file mode 100644
index 000000000000..80f8686d2a8d
--- /dev/null
+++ b/app-admin/selint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">TresysTechnology/selint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/selint/selint-1.1.0.ebuild b/app-admin/selint/selint-1.1.0.ebuild
new file mode 100644
index 000000000000..f79040712259
--- /dev/null
+++ b/app-admin/selint/selint-1.1.0.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="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/confuse
+	dev-libs/uthash"
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with test check)
+}
diff --git a/app-admin/selint/selint-9999.ebuild b/app-admin/selint/selint-9999.ebuild
new file mode 100644
index 000000000000..f79040712259
--- /dev/null
+++ b/app-admin/selint/selint-9999.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="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/confuse
+	dev-libs/uthash"
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with test check)
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 7b26cf9c425b..704b4669bcf2 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -15,7 +15,7 @@ DIST vault-1.5.2-webui.tar.xz 1242056 BLAKE2B 7ec3bf3c30170bad5e09168bd75ebccf56
 DIST vault-1.5.2.tar.gz 35118624 BLAKE2B 96e9f3070ffea0d1c513004ad02558363a5c51da2e8211e664fadefc004cf65c8da6489c3a95573a9a1712ece9355966298efc122b350f9c6df79f1fd9cc2ec3 SHA512 be2c5eb530687fe199762195960fc497badbae933d57ac2861f88c05991e967e2512a5de90e3ce9ce14a094a25da18eb482da59360b6d6de594e91d75bff09c6
 EBUILD vault-1.4.2-r1.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
 EBUILD vault-1.4.3.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.4.5.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
+EBUILD vault-1.4.5.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
 EBUILD vault-1.5.0.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
 EBUILD vault-1.5.2.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.5.ebuild b/app-admin/vault/vault-1.4.5.ebuild
index d7f0e36a12fb..671178b25133 100644
--- a/app-admin/vault/vault-1.4.5.ebuild
+++ b/app-admin/vault/vault-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+webui"
 
 BDEPEND="dev-go/gox"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 41b0b80b3c61..112f8f640dea 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 58b4c2a44411..01d5334b0191 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,5 +1,4 @@
 AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
-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.ebuild 1063 BLAKE2B c3c26ee7b9a2793bed7b3f1beafbabe30a73b61bd5fcddf604668c4a88cf46fca08774fed7b0e3c592b4f72f9d9fc20b7b25d00614cb725cab7aea51a3ed3c79 SHA512 455ea431161a116e62f3ebb1cdd6547e418cd43d60588c47f0dfca520fd6ea0bb884103a3f5d314a2556d8a7d92d2e659cde734fac478a545c7aeace83e21c32
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
deleted file mode 100644
index 0ce62e7a77fe..000000000000
--- a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-https://bugs.launchpad.net/pbzip2/+bug/1524909
-https://bugs.gentoo.org/567952
-
-
-=== modified file 'pbzip2.cpp'
---- pbzip2.cpp	2014-12-21 10:20:27 +0000
-+++ pbzip2.cpp	2015-12-11 00:14:31 +0000
-@@ -2083,6 +2083,17 @@
- 	return 0;
- }
- 
-+void close_streams(FILE *stream, FILE *zStream)
-+{
-+	if (stream != NULL)
-+		fflush(stream);
-+
-+	if (zStream != NULL && zStream != stdin)
-+		fclose(zStream);
-+	if (stream != NULL && stream != stdout)
-+		fclose(stream);
-+}
-+
- /*
-  *********************************************************
-  */
-@@ -2125,9 +2136,7 @@
- 	// check file stream for errors
- 	if (ferror(zStream))
- 	{
--		if (zStream != stdin)
--			fclose(zStream);
--
-+		close_streams(stream, zStream);
- 		handle_error(EF_EXIT, -1,
- 				"pbzip2: *ERROR: Problem with input stream of file [%s]!  Aborting...\n", InFilename);
- 		return -1;
-@@ -2155,9 +2164,7 @@
- 	// check file stream for errors
- 	if (ferror(stream))
- 	{
--		if (stream != stdout)
--			fclose(stream);
--		
-+		close_streams(stream, zStream);
- 		handle_error(EF_EXIT, -1,
- 				"pbzip2: *ERROR: Problem with output stream of file [%s]!  Aborting...\n", InFilename);
- 		return -1;
-@@ -2169,10 +2176,7 @@
- 		if (syncGetTerminateFlag() != 0)
- 		{
- 			fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n");
--			if (zStream != stdin)
--				fclose(zStream);
--			if (stream != stdout)
--				fclose(stream);
-+			close_streams(stream, zStream);
- 			return -1;
- 		}
- 
-@@ -2180,11 +2184,8 @@
- 		if (bzf == NULL || bzerr != BZ_OK)
- 		{
- 			ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--			if (zStream != stdin)
--				fclose(zStream);
--			if (stream != stdout)
--				fclose(stream);
--			
-+			close_streams(stream, zStream);
-+	
- 			if (ret != 0)
- 			{
- 				syncSetTerminateFlag(1);
-@@ -2200,10 +2201,7 @@
- 			if (syncGetTerminateFlag() != 0)
- 			{
- 				fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n");
--				if (zStream != stdin)
--					fclose(zStream);
--				if (stream != stdout)
--					fclose(stream);
-+				close_streams(stream, zStream);
- 				return -1;
- 			}
- 
-@@ -2225,11 +2223,8 @@
- 						if (ferror(zStream))
- 						{
- 							ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--							if (zStream != stdin)
--								fclose(zStream);
--							if (stream != stdout)
--								fclose(stream);
--							
-+							close_streams(stream, zStream);
-+
- 							if (ret != 0)
- 							{
- 								syncSetTerminateFlag(1);
-@@ -2242,11 +2237,8 @@
- 						if (ferror(stream))
- 						{
- 							ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--							if (zStream != stdin)
--								fclose(zStream);
--							if (stream != stdout)
--								fclose(stream);
--							
-+							close_streams(stream, zStream);
-+
- 							if (ret != 0)
- 							{
- 								syncSetTerminateFlag(1);
-@@ -2263,11 +2255,8 @@
- 			if (ferror(stream))
- 			{
- 				ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--				if (zStream != stdin)
--					fclose(zStream);
--				if (stream != stdout)
--					fclose(stream);
--				
-+				close_streams(stream, zStream);
-+
- 				if (ret != 0)
- 				{
- 					syncSetTerminateFlag(1);
-@@ -2278,11 +2267,8 @@
- 		if (bzerr != BZ_STREAM_END)
- 		{
- 			ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--			if (zStream != stdin)
--				fclose(zStream);
--			if (stream != stdout)
--				fclose(stream);
--			
-+			close_streams(stream, zStream);
-+
- 			if (ret != 0)
- 			{
- 				syncSetTerminateFlag(1);
-
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index c1bc1f00c3b1..6aadc1ba526b 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 5593a76ffdee..de71147912fb 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,6 +1,8 @@
 DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
 DIST borgbackup-1.1.13.tar.gz 3754457 BLAKE2B 3d3dce66ad685fbde53cb78e288b4edc53af449ed54379e5f0b9ab3b10d8cf43ae983de5abeccb1874fbf1283f3e2796ac35ff9de349905d03d0b0c560f4fa93 SHA512 2480dba6c842659a248361b35b478120e50df3525b8f07d89dac4e78369bb1dad2679b9efa6a4d6f38637759666095dc2dcbb7750edccd97972e2c8980a51b84
+DIST borgbackup-1.1.14.tar.gz 3769460 BLAKE2B b5a7025d9f7f0764d6532e9e0fd867b3e4c8bac3c584f7a83331a5e7ec39fda14f3f82465e9bf483596453b7cd96bffac3f273ba6171ed109e8a83fb4a1d766e SHA512 2aae851d38ec2431cd09f9390b3afa41ec44c2891a3698b01f036cebc5b64d7b7f328d7c95bf30fc29016b4bd2d2ada2613f895091e22148f3d4861f4facd35f
 EBUILD borgbackup-1.1.11-r2.ebuild 937 BLAKE2B db7291e3b72e8d0bf447a05a6af19dbdb45f4e0e28ba43bc627dfffdc465ae21cee78cbe5a34f479332fb569e3824f9e076c683dbac709097bd742d8873e8d41 SHA512 b9c15bdb08e00811c83db2abae18e59a0918f71d91c84b7403e7395ee8a4fde513cdeeea6004009ab5a86830b0a8aa93395c5018385a06f001070debeace25fc
 EBUILD borgbackup-1.1.13.ebuild 946 BLAKE2B 6ac67de6db5d118ebd0840449cd4e3eaa443590a9a36335738b93ba8e195cd075c628e25df86b6dd0d368a17d874e1ad091d356fb5a81e34046b83eb624fb7e3 SHA512 483ea58e9a0fdf94f7af9e44c8084ddcbc62fe63a3a80b1ba43ae595925ec9950e0c882cc68a37ba48bf11b3d8f17022b674e53ba151fa53c1b91d98f85b89dd
-EBUILD borgbackup-9999.ebuild 941 BLAKE2B b266fbe7d58428289fe1623f93ef8f45d536809fcd3502b8dfdb3cdd01675bc006b3f68bb4cc8549eaa4c42eb3bc6fb0fb4cf9ff043adf267324460648bd2e04 SHA512 155e3b33d23aac747c9143b78839bd50a45250b62a3480d710cd6375ac271d03123e1cedcd15a1ffc463ef5556a5189ec2f95a5ee0fce061083ac6e2cc526aef
+EBUILD borgbackup-1.1.14.ebuild 948 BLAKE2B d4665d6abec1ac65340e303cd953222160f680f18a9f2330c2e361d2b1f8ddd6864ad1f5785172ac065d93be3bd6b77bda3338b886091d6d3f3ebe7c2b7ab7c2 SHA512 5bc1dccda50fdc0fa760723483ea136a4f54c3c778e3d33ca1380d1f15f45b4921933dffddf7e72e89b4a1673fcd82e0e7e245a298b10155528346696c03ab65
+EBUILD borgbackup-9999.ebuild 948 BLAKE2B d4665d6abec1ac65340e303cd953222160f680f18a9f2330c2e361d2b1f8ddd6864ad1f5785172ac065d93be3bd6b77bda3338b886091d6d3f3ebe7c2b7ab7c2 SHA512 5bc1dccda50fdc0fa760723483ea136a4f54c3c778e3d33ca1380d1f15f45b4921933dffddf7e72e89b4a1673fcd82e0e7e245a298b10155528346696c03ab65
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.14.ebuild b/app-backup/borgbackup/borgbackup-1.1.14.ebuild
new file mode 100644
index 000000000000..6b2cd5162b06
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.14.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,8} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index 72c65b1dd1b1..6b2cd5162b06 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 19ac2bf1fa45..091614d3aed9 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,7 +1,650 @@
-DIST restic-0.9.4.tar.gz 26211163 BLAKE2B 950a8da8217500a910f0e5966787b668417f1168e81365ecda70469ef42c24fed876e97b6a44ed9dda89c07760db4678d791960d78760d68c8f1846c827cf340 SHA512 8e75a1da6ee9a364c2bf53ce8f9b014549e7065eae349dc6baf68b0e8a8e9736f83c0495b822aac87480751f448bd42da34c440290b5f0967aea7becda5c448b
-DIST restic-0.9.5.tar.gz 26933971 BLAKE2B 7e6cb87c7ce0f860ed884a631b791d0dc44e770ffabf298f20c60197b32961a2a78380e2933ce3851215ec2e32bee95da67566bf7d2d30c3bb0dddda2c6ca804 SHA512 2541b4d70d23d28360c4398427d65ed08a5eea8c171b93be7b7d54baa7b06099f5473ff2fbe3d6b3d6691592300062ba1b240cc03772868d2a0adb1217c8a85f
+DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod 158 BLAKE2B 2b8e2dc6a4055bfa30dcc2df66c47140ac85a3b998210ae97cac41cf2a0f13125fda57c580b08f48377ac58be6a192af8cf4387ca9d3a010b012ab5fc468a172 SHA512 570386c94cfce7255778442222ff746186dc7e8ce1471deaec672f7efa157f2069b493a30b9e700dfce68d48c29eb95e8a373a5300e14fe01e58c37cf29478c5
+DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip 236558 BLAKE2B 1426f4d517d149ad1b04b50345d7dd1a16592e8eb7e774ef00ba7d4829904c410f772c4480f4c2055093c390ad0db623c88a254ca6116895ed97a62a0d1b545e SHA512 8ea9fccff666a16c4e4328d715c3cb90bdbc745357bb19e5df3c495af8b6f6eef2ded330f43f4e8759fc2f027a20f483bc9fa472a1c0914c64f9d745f9c210de
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad786a741c1429b44d6764bd9d9ba58139fc5fb88c0264a7e908699ee35667f4e827cbc59733f7fbb8b38837b495d4c23c2d10b1da114 SHA512 b6dd5fa24e928bad836e791a19a0d707c755d6c2b75c8f60f42a9e0410e91034373b01baa61104c24bf1565adade99656948c75be08cec2f945bb8bde91046d3
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.66.0.mod 762 BLAKE2B 6cd0adb26a6a74730f2a0f12bfd713363c527fcc20625c352dafcf8fa02838a8431ae9dacb1fb885836fa795e8bc6fd49dccf4762bcb05939dfe655d0c8f7cec SHA512 20f30e3a4cd5a6cb85e46468ced10252e1b179b736548ae9fa427b4f1f6c740f19a18943ebfa00bc287883cbfef8b87d69ba93e9d712d7b5667a4f84c92d9d9f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.66.0.zip 1642235 BLAKE2B 2c366d8d4e9ba3ed6c4e607552b7c02f69bd5f5fa0bfb04ca030900f6c58d3c17854e044c912918cd80976eeb49240b9fe3f1ca36869e2c838440ec480e5a70f SHA512 1a6df4a8f61306dc45b314cd50713cdd14513fe7ce052f25f5adfe884356de7a226293057c66da27b9fb85e426024d91f9ae358128d7c8fa17e0a0edf368e1bb
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.zip 44173351 BLAKE2B fb9d5f7efeb080b536a1b341d64922dbdde9ed24af9e4da3fdd093ef0d30c3499816d7db63befe327d9d18d388baac51edd56453cd3baf5f2ee75a37dff0aa1a SHA512 7c112509e2657f28893e3cb5b10a4bcb7abdc591ec0466c0e98500576b0f3ecbf85601f884a65738ee39d1fe6497ec1473bf907ad4be97254c56884ed4a10e5b
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.mod 366 BLAKE2B 8a9a8c78cb145dd6354012bd50cbdc7dd1962f40cd4afc7c4fac6687d86e3215417285bc0066516b1069779223901ee06a02af3f76d4a9f542058e9fc044908e SHA512 ed9fdc09ad48b14fc60746662ef2dc2c80b52be111cb75addd28960ab79ab06cd748d7074bc330647042ed6a9c3d8546b1c903e99eb072e5c5d9465f24c195e4
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.zip 107802 BLAKE2B 1a75dce291d0515157ed415749cb0f98134d4d825f761785a74dd8e2484b7756d953bee3e773b7cf97e4a9fd5a52055ac6eb3dc6bad8c1044b11f46a133b9ff1 SHA512 abad01310779bbf449663150b76edb4bb049afaacb455c77ee3af1010e8662485bda431da633bff24c9a9d45994d7618d59a165579c93b5ea769f7c7394ef2b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.mod 376 BLAKE2B c253fab694ca80ff126b627e21c99664b9707dbab0086a87253b627165d8dc63abca656b6592cf15432b2726b2640c095417b45e8ad677c327e460e70ea983f8 SHA512 99fc883cce6e127149af8daba32c4126fb2fb3680f62d63d3a4ec60cd35662f840a929f30009d425fd5dc5363a93e867aaf481f15e4ee878c4892986906b08cb
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.zip 44350 BLAKE2B 86462d434c0978cbc19a5e96ba5cc473140636dba3cbb87ff230898a463a8cfd698c0fd82de7a2a9146152687bf5b9877bbdd61befcd08bc27f0d20520a1b8fd SHA512 34d32b61114185a5aa91630870702ac0207b078f4391438426371a3cf4d8cf5f20b5d075f46572ba8b8535dc92e9fb1d6a08697bd006e612d7c649e3de412105
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip 10521 BLAKE2B 0b4ff7f99d953966ccf4f17cc32b3f0875bf7087ea5caf7bbeaece451fc8cb9fc4285e5d79d2880165e70f738edffe709efc54a32367a3c666d2a1b383b139c7 SHA512 45e35c16a3e2d0ba3e765f85e80ed2d8ac65c227bc260df910f0959a8642bf0bafd1ba20a2dcf0b69fc6a371bb4a4c8026e54bf15628119d68df4d063756bc3e
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.8.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.8.zip 16587 BLAKE2B 9e1884ff4a5e3ab56f759c91486b6fa7d03c62ba85e5b92ea42196633ecc4dc678ec283c2e7cd70aaef56aa0a8258617ae3c1e4e0b082441da8d808e827d79fc SHA512 d6019d167ee4d74ef6e7327933145d264260c5919623ea18a616833c914c372fbf0ed1107170fa0d777380bd272c48fdf351583c8381f1fa4b4ef86094f80168
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb SHA512 e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f SHA512 fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip 27506 BLAKE2B 0c2accaecec1942bcb9febbe1986e283e3e84e82731a847711fe33031b84122a239561bb6bf7c35015b4bf3c53b77879d44a52ab1b184c5ed37ce33c8a418b32 SHA512 f445307fe15f2abdb2e8c0be22f1c180716411d413b8d27d1b46f00e5ccc49b963a7bc675021e03831fede8470b3c0b384d0cf0f4736256114dde204f5a56611
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.mod 41 BLAKE2B 5cbd04089a8e8bfc9160418d13c56b0b8c27a09683996fd774175d58a92acf93d950270e62d6a09a0c8833ecdf84f37b4ed6db20c84d59a889a4f6ff8459f4b9 SHA512 401309da9a151298f70c02ca391c984005076b49af59d181c86854b80284099ddadc37c0a57c087d5d871b3d3b60f17f1463e11a09677fec54e1e5e0fc19dc77
+DIST github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.zip 9072 BLAKE2B f21acdf1a09d8a15c025ba7448c936b93a924c258b529a7fbaeed48fe9bfa4e2bcccff6c96967fddbf8ccf58b9bdda7ab8b199ec564a23ee69a3234a61101701 SHA512 71c5c7ea03171d356a97bff27342885a9b1c179deb56fc103124502fe8072ae229420417fb35591b161093a25b2129832992f5ed4e7391af80fae0380d7082c1
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+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%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200905233945-acf8798be1f7.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip 270515 BLAKE2B 57ee358bad0560a7e8d8d67ef66a09c0dc0698d950d749d031c9bb7af11ba47e6ae8fcf33eb2d931b703f9da579822beb5b51c41c98ed832318c59293f28b620 SHA512 a78028c7f115b7d0347feefdfd368d470da75a14e92d94a705316d3bd5299bba7e3ad6e7774c512270062058085c627796473b66cc4076a5373eaee77f256b93
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod 33 BLAKE2B 529c89dc43822871a3108f93bd29db8bccc63d1ee1c44b0d1c3da6cf966bdef90f7960878ed4ae8e6a4407189bcab08b70b960f224f8ba57db7ff118458777ce SHA512 81a0934c2626af125a116aa22457e47f16487546b4367a1e2b160144b4e2244723986e83914e365543e7f265ca2a953112f934627ce03aa39568f2c8f0c0124f
+DIST github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.zip 11096 BLAKE2B 6d445f9adf6b2c47bfce8f99ae00f6796fbeade35b9199a075c13730a81cdfa953822697dcd253f18a6c61c3881b9d28f6c0c083b8c81bbf1f1e63c546eae341 SHA512 19410ac99a4e4b0e57576b4d4ebf662a5a254109874802366122142a8044e2cc3cfc45d9a6d6df38776924b11dd0ee4d2979868fff0b579a050571055ffc1a5b
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip 364501 BLAKE2B c1ee7b5fc9b4e08d49fecb7dc017293e83d535e25ee098b3336dc5e6be4ebfe475cf6231a78d5a8135d79f5a5feac44a658b24f78b1cf27a1cc8ea5846c6fde8 SHA512 8f63bfa6ae4f589b512e1126600d53a121e932944e25e1b8cf315214304b473c86b1f9d5cbaebe9c112ac397b9a88a217a04204eb12368910e3ba1ceeb823da6
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip 377696 BLAKE2B e61d2572e080ddf8195c86101ba7995c38c124b4eaa918edc9b082448ea0f1ca44b6fca9788277aad332f7786577f6fe52e6c9d4b702c6773a7cecac7ef9f2c4 SHA512 4e191b6dce1ec399df8ed24ec2fd6756f2ec048741005256f076af6b127d43753f3ca0cda89c4f50bd0555b8a830d4994ddfe7cbf00d6e3fef905fbc782667a8
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod 26 BLAKE2B cb393cd37dc2b7c07fc316b588fac0f245ee33a37ff3d4ca0df67ce952976463df9a79d600a37d5cbd3f596c0135c2c0330aba871cc941cea13325eb24e6e56d SHA512 c151e8d0c5002b25d399fe4a7420e5735cca46dc6f3bd18837f110f5a72659406a3b92d7f870898c97f58b6f42364d4c97e9457491a0534ce456ec46d15b1697
+DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip 5552 BLAKE2B db12ce748ecb80b3417133273f1ddc61efb8898b55fe4f387bb9b08800bba65623128557f7e939470116b96b0ee1dff0b2496e264616e1c0e3a5ba1cbe367be6 SHA512 1133134d79de4e0b45085c13c228358b77e0a01b77c39bb9d1b0af668aea816cfc9fd1efd9a325b75b65543ec7d71fceaf8c6d8190801ccfc4ff41bee9db8bc8
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
+DIST github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.mod 31 BLAKE2B 014f9a0fb3e3122acb3ab88f5ead6b4711706d1660941d0a2ef29b85e18cfb86bf3483d2628c6fefa8ea1be4505860d4ac0c6d65ae59a408ef642c70f386a907 SHA512 4baa6bd9b0f883c4f6736285d7a884567a0d8c71b60bcd0e34250502c4067f72905ea6da57ba57da705eac0509a8fa16a91c273686375102997e196775426e00
+DIST github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.zip 116220 BLAKE2B a01ccb210bf33122e613bec46758707effba0049f3ca589fe8d7cc923eccf6109b0734eaf36ed8fc39a77a99aa465bf0830c91119c18bd4e84b47fcea5f16bb9 SHA512 a64a7574c1197710eda20da590752120b9297136b5285beb7bf3de1f63858df31e2294769a1f26df68fd2c814df33e3da06c90709f11ffec300c841250c99d9d
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
+DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod 518 BLAKE2B cab9e78c6c835ffe72bb26db0b47da1b364d93c1bc450ceef0d25fc7ba39e1cc5330d6e38dc955c0237e04c781e968569697ebe81867030407b7bc6efaab5e96 SHA512 d0e4dcf05a6ef0bae5c79290669ed2bb6d5ba6d1a2f99b03fd95f966197ba013da352f35a62348f315793f77d6ae1a23e5de7c2f69f6bacef4ac516aca8dfae8
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.zip 388879 BLAKE2B 97d2cdf5100314a456fd292e040e9d4071bbf3f64794dfc27b2cb0d5dff1360575f78dc459e098a71665fff1d3809c0e841bf99b0fe50f5dd4f68c9d52b35552 SHA512 e07e47f7f3cfb442ba28bef49030622c4393a11e9f848ed527e9d07378aeca3669560523e871c503fa5465341a5c80688e60b9206cc2874254897f2cf320a6f0
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 6840 BLAKE2B fd31c7c067d62fa45add54abba9b29b205bd525e389b37eaced2f3c99ecd1a748a9a248e32c44820d4003cec7b598b3786163af26a6142ec789b246a6025c979 SHA512 3351800fe88326135f6f9b401d8d6ee9ceb83a5a30865d103dba4d22198a48751e79d9b5a8a964705107049924ab9bef128186a5796b6cde33d89a3a921f6b9d
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 27732 BLAKE2B e81d64b0ad8f66484eef94d0b8aa352e9923aa3122ece6736536720e03416e05aee4f6d0e0445edc2f1918e0e67330df4e12796af81984c546b04c20b4ce5250 SHA512 4ed6c37c3f6341a596770a186bdca2255456bbbc646231e007dbde73a56eee253a9d00a6b2673eba421193e8a4ba7d8b8bcaf8057bdeb110ac6b56ed0e35b8b6
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip 77749 BLAKE2B eaa632604b6808cdd0e6f7c864183f8d8cf0423a1e8ef7a9b6906cebcd55a4e6312a44d46b998a6f3ffdf4dfa7c84b13a50c2adddcbd6cb5205f7f3400dfbecc SHA512 b26f93046b971097b675fcc6ee4c8a53598e95625f7d71556787384bfb4b60706b88dfbb4071472611467e0a8b2cf09af490129be0c28d48f2bbf6042b7e1636
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.mod 39 BLAKE2B 13940069e364e153d754ba4bc646c6db1e86eb406426da6b3d3811af19cbeab526f5df8a80f29d63db1a97b87d1adde6c69b0d49a772d8899beffd66199c2efd SHA512 4ba06f5709a52eba5f8b27767a236de58418d2d077fd1efd4d293073f62894a6f40f7b7196118b8034d68b3c06727993d1670ddba65b0da758f9632142ead4a4
+DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.zip 7696 BLAKE2B 45d6b37c83b2bac5eb479182aaf2521f66a6f5c56c36a1df552476f86066f18dd63322a57501cad452589a200872609ad5d6eb21676b4cf4356948bca6d0d50f SHA512 f8079aa329ca64b668aed8ce32688476dc0e195bfe072d3760b35247de8263b4849d3226bfa0ddd810a9c4fea3d2f3c73e3cc500df9e99a04436d7100383e103
+DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.mod 196 BLAKE2B 5310b14121988af87addd50d9cc967f241ca2b4ad8d2fff02bb83d2c48ea2175e5936c57b6b3a914bc90b4c3389e0fa0ce3c0dbfb9a7b64317ebb7f8903f84d8 SHA512 79f45999c8796926bc0cac25f8ef1d8d18332e0d78560bd3bdbb75d604b984c2afdf6daab419aa5dc3f162385a71cf222921641de9bddfaeca9e967ff7f26362
+DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.zip 102562 BLAKE2B 7af4b74ddf5b0b3320ef9a1f89e8b62d7e608c958dacda7ad99b167dded61273e680164d36f9fee79c9b8d7ed1dab9388a65fc7462ba21e70d0dd7d76fdf64bc SHA512 55e68a1d17cdfe27d4b4e646edef4da2b319c68a434d8773d88e0e9d3136431f1b00cd9a16f3d5fb7ecba0e2b96bda1a5daa264a80168a7dfbc255634186c73a
+DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.mod 89 BLAKE2B bc24827e1c30919d56b20ce1e28f75c671c2ae3374c9a9469e0ffdb80ec4685faa49bee1cf61a747454c98e391b7494db798d007d21b7771406e30972a9a96d7 SHA512 96d5a2b7780184c01e76f3b7cf15695ab893cb2a4a8f818f549ce1510568cec468fbf5bbfc9fe42eee6577821ea3a2bd8165e4aac3af9c9d9c0b41ecb0fa4ad8
+DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.zip 12246 BLAKE2B d16692824b5db5c6cec62e092d08609a96c05903e5286095124855cec2eb07e5cc7ad70973c76a246b1207dd420ec450e80e1bf6f9f7929f60c8faa258b70496 SHA512 15b8c5edf9db6c97b8e7ec7e0f42e764d784179c6ce9533e074abcc81784b8e27b53b48641dd2a6f45f5d423ba1239cc9a8977124dfbad708714cedc4159105f
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.mod 41 BLAKE2B 635482c790e9101a386e9e3028c89e99f3d0b1eba0e800b632cc191a825b8230fb56a54a3058c677da7d46fdfed913bc9e576949dd362ab991c618270624d2cf SHA512 bf753e065c75df14cdeec99345b0e3dc7d5b486114574cfc74af35debf40770d04648870524b25ce1f9bff150ea878064fce612bcfdcf666a0309674ea0d8b98
+DIST github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.zip 17284 BLAKE2B 83bfd528e532b0044330bf347db54e7501879297dcba8911a10c9d702dbb59fb7fc88adab8b66f87d0375c51721b481c8788fa45fd2fef901c38e4c70c3fd58d SHA512 716bbba13fd0189f3f942ffec26f5445c8f7088b958b427ed1d895950a9758c7a1ab62b91c369750173bc0f6b6db7ff94b538259ead75ce535648e317ce659bb
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip 16598 BLAKE2B a24ac9b6c7787b9593508fb394cfba29c5dcce040cbf7f78891ff521f00773bbcb189c12cd24500510ed6b89a4c906ae7eb6dd0361a3a7c0c964a6819d8aaf27 SHA512 a694940f17372097d987b0585df417a71a5ce9883aed9f5fc1222dfac32d08f804ecae1001a9241ccabe2a4c5bfeea588cedac078afd6ac3188bd4e907376db5
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod 301 BLAKE2B 8898fe7003c9143aa51d94430241d950aa22446ba5b7fd087844593db1c99701dcbc9cb2dde3356d22867e72c654bb3e0b30ff2d9c376cb3ef434f70e788ea97 SHA512 7c1f73f33624409363131d5765917cdc40a8666c1d462d72a7206ce4cca74c9fe61738df4f4a48265a9d89faa0b04c3aa49b0e87d8a37ac4f53310fd04913bd9
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.mod 52 BLAKE2B bc9a5ea80a8ced1b4cf2ff279ae7260bb389fad5c465bfecf69420494e69dfb90b377a6c3002e6d23af1bd9a61b5462f6d7c7923756b372f2ef4b27eda8bc585 SHA512 667071e39d96fcfe16538893a848000823a045e83b02adc404f89d6dbbac7d70eaf1f7163247f16eab577b926b528279e5d1bda525ac8d274a431ecdd16ddb1b
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.zip 118177 BLAKE2B 45a098fd2cbf72625bbb7be3b4a78dbdc7a03a851fd7dc8bb4f112478f78da706e7efd722c13674cdb0ae1fcad0e9c79442c7cf96030038353838dd814087182 SHA512 274917c0ed7df04d3a0a8ccfd50a59e45d930d8e41df9dc47c5edbae245b1d9af629dcf343a89cde954e197f72642a6b2ce6041a48835abaaaa2aff564ddb6b4
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 10334 BLAKE2B dc4e7a5b7ff1179feed6341345c4a811b5c4e14bde5af612b9db64902f810e788fbb6ca224b3678dfee03e894fb1cecb5c3269f13b36ea5d52fd4dd8b8a28fe0 SHA512 33a0601227477c0fb56907b633936ee96c46bf0f8c0a9140facfc61e839f62e167e90b76fad14d4b0124b6066376eed464d0f76e08f0d308634c33eb6fd171d4
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.mod 41 BLAKE2B 378ab9c63802f76983c723f6eeac15d66879448bb4f5356a2c3946c0a8364b28254740e767c1e93f4ef184e281da6b492ec80303408f2a8a195e91b41523d41c SHA512 03629fc253c30ee850ded4bf4704da2fb8f9225038cb061eca49948215df7f924d85bb9b31c9d5726015d08e4817be6754f80c7db1186ad306853a208efc06af
+DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip 3754 BLAKE2B 55e0026b79ac8c2b9aa9871194b3722732b37c67b61c8cda2ea865b2a7d051d6012042480e91e9ebadcd638192ebdd42f9be2e1c0e938327ecf70c5614103bd0 SHA512 8163ab76d5b8212659f38a6b63c5d7868f05588456ff04aa9dcd63394e637ebe2c7448c2082beb881e6d2816dbfe29520a723ec4d5afb7113f74f4b621012a3a
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.4.zip 303399 BLAKE2B 86c43ff5f92434a5f549a1d7e1a4e9a64075cc5ba35a3b2bee58bdd3e264ea53c6bf5372e597e01f6ed8b2179b40c9aeba691cd165b7e26464e4f58b7f304759 SHA512 33a8ca783794ac23e1300971bd6d4fe5b41b8a444c6ed5a83669134d523565c5e58289ee2cb5938a87c1e9d257b3f756f17949d1010107e769fae6961bd521f0
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.zip 1812457 BLAKE2B 301ccd6d9c4644e1c0ec83af208d89f6c7e4922442c0fa4af8c9897fd2a7442bd5370b929bba223190825ec2dffa799b472c9dbda4c151c0c8a851f6330146d2 SHA512 62c0407bb1a1952482b94ebf2f4810403d56d7466062dc65b33cc26c28282806247c63737de547657d1bf58cdb45fe3b59566c4e93b5b759122a3b3d93ebdbf5
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.zip 1416913 BLAKE2B 7e1a22b66a657eccb07b704a7e3b4baf9ddb2cf1b3556d82ae292c724474a0d80904cea46322a931aa152c7ae577f6a68fd66561497f3e60f8d4bbd477e4bf00 SHA512 7cfe8f334afe0a96a3a10e49a516bed3c6e2fb9237a2c34e4bcce3e6bd5031982a06aadc2a4d6d9fc02838c09e97d1d5b4065b9ab90c3f474eabf7a27f62b7dd
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.zip 95731 BLAKE2B e67596980557613a1a596dbe39b8346663e4a31a8c3aeb2d24773811aee1e3457db6cf0d91c568c59b6907b3c5c0cea61d5e803ba89743075dccfda4fc89a42e SHA512 3765ad17beebf3dfe97d8095a64b8eba3e1ac19f5b1efa24daf5e155a6a51fbbd4241923ef3a4c3e8dd51c11965ffa09370dbf8300028d15d02f6a4d0f2f03d1
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 24878 BLAKE2B b405b445c49834f5b9e5ee82326dcd5f4807963a38d29b851fdd1e914d2695fc5066e17066288e539818ddc52f83c209325d9318d1e4e76f9a2a9a1859f82ff8 SHA512 1f94b8b8c8e4aed577fba2cb65403424cd649c2c437c115d52e08338194f447a4939fb39d73237c2906ea15a4b5089642abdd0bc6ad8a34c8b8e6f097cb43fdc
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 24746 BLAKE2B 743f3b4641f002cdfec6805ead87d196b43a4de1ec59c788f8516f4bc78ef2d58fc8f0cc34a52e8762f39f0845470dfe4e50f269036576d021d65a5f30aaf08a SHA512 f7622fbf44dcdf894cd397edc8399e38b734cdfc6a6ef4f8e81af9408c9d912a1b96544e713c42237fb3116e70678755e829da8f5f628bc1cbf6767921cd380e
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip 27028 BLAKE2B 1148f5197f3701698ea33c6185b918fdada2b3f55d401dfb90d33731dfe80b53bfdd891df3c4fa572606cd88963de20d9b44f5296946d80aa0daedbdf6b658a7 SHA512 a93111e63671ef38bdf0ae2bd9209d6b3d7dc9ad138077d3bc22dad12f0657982667b7e88fc9a4162b0f6765184172957b05797a29a2d614c975df00b12c4aba
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181021155630-eda9bb28ed51.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.zip 1699831 BLAKE2B 66aec13709b2599fcb618806b62a9fe8a9678d320b11df7eee7c217c2eeb7f009d26385895a5165f398ae89051c065d745865f32e6d91e18828d3ac610968f5b SHA512 f8e187d488cd1e6721ccf6f3139c1e09f65e82973f3f08ccad2e84d37a5f83783fbbfe40ab7e270b8f7eabe802c3eb28aa2f291f0296651ffbe752a277ffba84
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.zip 1910695 BLAKE2B 316571a5971606dba4acc980849d499d719bbdac688f86844468e462af5357e1f488509491d0f233d615348c4c4c8af685ce24b0c8dd585c4b4101d7637a1e99 SHA512 217a6b72ebe4d132ffa67cf34be0081325eb684ebb611544fcc8d91d00413351cbdc493a21fc6310290f64bb9af0e0a72c98f119a74405bb153734ab51fc4095
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200918174421-af09f7315aff.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200918174421-af09f7315aff.zip 1487473 BLAKE2B 5520941d313c169722c07e80f955255e3044cc1ab7673f0338bd72fb7ebea19c2e89921d627893491e022e153dedf4662e1bfb5ce0a31cd0823e37e5ddcff94e SHA512 3ad6e18105497bb6752ba522b4ebbda844e125ea7e71fa19d9c3eebd2d0ac7bbd2058cdf79d8858f06700c8202009b8caeb57f8bead94426addab3e3a120f14a
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip 6872962 BLAKE2B 60b7225842e40bb0fa279caaf787b3095eb04b0d245b5c098a7612048c61db7ccb64930a380872bc2eac5d49314a51dc482af03d728c864abea2f0a0a87027f4 SHA512 84dc45aa00cda5d6da40b3c063001f7bf62d96b6c21a8a83f2e507c979afc30cb12fda860082500c467815912c15f84639c5f9480521e3d88187b36cded5d46f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200828161849-5deb26317202.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod 270 BLAKE2B a160bf39c4d5efcdab43134808910d37ca9029684c921d91d4dea4e264bf24b592db0f063029f1c0b50e6dc8e1822394503b7acba305a82330371bf9cb5f2017 SHA512 9124d96cde52e0dee04886ef164f35a03a7c05b11398d3667cf0d28f84aac0bb5b44a0f52343033d62886ff62728cbdfa045e5f865c1d96203844f3986f95957
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200915173823-2db8f0ff891c.mod 270 BLAKE2B b41915c3832f7da9591429edd55565a9db62232673a9788e81d877f70dd574c14a77db730e1b27d25db1cffcb60dc7de926fc39fade1123b3072ac35e848b2cf SHA512 3f901620a7f769ec147d5b7af39969c5992990c0fde2ba8eb8b1d513dec5dd1804d7ddfc49e80911152a24fd837ef008d210af54585485bed8136dcec5b6c863
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod 582 BLAKE2B cc82a660be4095a67922226ab37e8331301128d10332fe60fab27f17e1556b90031bf0c11dd53401fb0805632711296b561c1a7526d93545eaccb92c3ca5506a SHA512 930fb5295538f738db5258811eb8cb03e35f916a882cf271ef5175f0ea0d8fe905d040f5974b34cc9594b008f03fa7f4653ef7bcf5160d8498e18af0bc54d9af
+DIST google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod 582 BLAKE2B 9551c78d14cf644fc943fc5fd7446eb42482bcb793f5f20db40e61f44178a306ce9aa8d49fddc9e36fff3cd0874d4c7b84b2a2a2139f32e915c938f9c6cd5af5 SHA512 936dc2fb686660be7aa7982ff5b224ac0dabb22d3bceb27287453a8dff62d846b81316588db4f7cbbd9bd172faee0eea6f2a55a8bf0e0ccc7af6414808ca4c02
+DIST google.golang.org%2Fapi%2F@v%2Fv0.31.0.mod 582 BLAKE2B 431479fd5159e7d6966e23b1ae21d9355dec06ad86309249bb9928778c8b093cf24f79d59c1ca70661baa4844be5d53be06bc1df99fd9eb6502ba86fc059a317 SHA512 f97097a1ecb035e94ef73ef984d22e3428dea418c6231d5f8127d4f6d14cb91bb0c3f04aa7d5e0c1032a5cd3f995210d67a73939317c5c810bc921419930b3d7
+DIST google.golang.org%2Fapi%2F@v%2Fv0.32.0.mod 582 BLAKE2B c48eded2a495e3b15d0e72fe82347bf3ea517ee9fc06011b1f3b7a634fab445fdabc88391b802cb0d2376bf322c9dbdb135c2125ac8a95f4f225cd16a1e5aff5 SHA512 7182d531a7ead6167213f15a305e853f1c8cfc92189f4390a0572c735b7c1100584b7572b7b1fe44eb5539ac846a3e5fc66bc2f2c841e5110ee9ae5e5886c063
+DIST google.golang.org%2Fapi%2F@v%2Fv0.32.0.zip 17298803 BLAKE2B dc89463a273703288c537bd8cd2c093b0de76b744e42a6456ae70648ea9b02485356f7afdd9a1f16f284854b34f6221c0e051c6cbad0646a2aef4ca708ca3a62 SHA512 f5b65aaaf52669bdaebfde96b97fbbd6eca46baf3c1517557b8f743bbd7418218dac5863ef891018fa4c15f6b91d38bfd2f299d6eff18808a4fd0e9343a46de2
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 391093 BLAKE2B 7e103e9c4be5d953371d0ea553272b8edd9fb180a32708f44b5f97b232498686ab311980d3a01bca53773d8c312307197819223c748adb5b027eeefe60b60efd SHA512 0c4f225732f14c6d205a572b8e289aefa480286a0fe5fa2c6e75e4aaf7443f42fb21866b11e227619cde683c0ca7835adef792178724b25ba9ab035efbe1bb67
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip 408275 BLAKE2B d9469c2686d9899f2a61eb606d7f8d79637eba5d108ae077be3f2bb5b8fe7240378aac0660317597d46bf8aead251506ac0119488cbd54cba59921517b3fa726 SHA512 ae7510a820f4d2a46354c2c987c362ce70f782eaea0ff3a0a627e9cb4b08e07d6a1f29d24fac5be6a8784a7cf3e82708b427c022682377efc2b8872326e6635a
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip 417793 BLAKE2B 7219518f67d83fad94a863f889af4c3a28a48b60fced31f33a3026c00bccfb6319060c5ff4712fed598824b5bf1448b0981fc21a6755855e91ce53b4026db062 SHA512 26520c7bbc5ec3c02dc86e5882ffae74b040f0600aa99832cb08cead5d3cd5c21a32d6df332c2c74a76b6c2a684141720b4fce874a07241412bc01837784b115
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.zip 6571736 BLAKE2B 4928279caa037245a7de73a8f34e71d25eab95d899a5c5e6037a5e09342ffff805106aa2c0976ed313d8e60981311874049a8934c94f49ed41fbe51c79a573d1 SHA512 f5ffe2bab6d812221463d0654f6e381be65a5fb6ec06acbce52ad47bb828d18c842f1129f509363f08d07a93c3f637797bab76c4937e3b30d636b4c6363f3372
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200831141814-d751682dd103.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200914193844-75d14daec038.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200918140846-d0d605568037.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200918140846-d0d605568037.zip 20275391 BLAKE2B 0156ad85f5e76ed52ad5446e4f68e45b23a3b89ff726c66ddbe14f723fcefe322b15ec0ea624d6bff5079f3bfbaa9478c9badaedccf26e72ce1541bd64abeef9 SHA512 c99025a86489c06c21e4b0d26be4afb71faeabb15d9c5a913919d1bd2cd6566862311b38733752df0d1fe68274245ebcb45b33463cf88e76f356846a0801e25a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.zip 992863 BLAKE2B e00a0362cf9f38b4c54f7486bc4d5450eed26b467c81964c9ef6a22d4b4ab03e01c96047fff1c0382b34c0e6ff5135f517d1af006577e5d334018ec42c016ddd SHA512 7e5523677bb7628a35630fde4a46914ea0bf1215ae4d408ad0f2ab5192c57ca7a797128a658f9e19dfc1f67af18ec08ebdcf74f04acb0817eb3c846d622304f6
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.zip 1281799 BLAKE2B e042675d71575c94ac6f5df8624945684c521da68ca349f8a495bb0080df2745bd30bcbb1fc70a1055bfa5206a9959f5aa711df7298ad942f02da3cd07eec0cd SHA512 f3b6a13aa0512cb6051301d5e7e55e058bebcfae521be7d9946f88952953ffe1e2d2932811314af8312ed9aff2eb8470a6b1db7925cfd55cf40f1a3437027d79
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip 41507 BLAKE2B 1717646144575b87f757c60d60954498f6bbd58d166cfbf650fd16c7a96435f9a4ca93f775c47ac54348bf7416356b5a205f4683139aa59b3093c80a5236a93b SHA512 170b91617f7c7f85f2879c22bef923f2816702fe5774592711d1de1483d5f7359456f94a5a89b9f165d2c18d7ff00ce7b8b5c6d639b8647bdd0a8fa37f9f895a
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip 48918 BLAKE2B aca803aaefb327d186b7f703ca85ce70caabd200938d8fdaae4a0c8fb41e73adc0a3a9fafc15483a2e6f13d5854a79a2753b8a67a3e33b39a351016856297bd4 SHA512 653c33136dadca777b3c9863cf7fd3f71d6fd51346cd1b812f30c901298728aeeceb03b48a87becca5eb3e980ca2b26ca374cb713d92d017e4d8e8873f3a6c98
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.zip 66158 BLAKE2B e31714f3619087671b14a1f70de452269367e6448dda0ee5ece4c9133bad4d0f4cd0f08aaa99ebb1f015fee345ba4aefe553794f6cb2a2e980c834e492801975 SHA512 2617d5a5253b38dbebddfebc4587034a24a2cc18ca20f76aba448b874dac25543d854d929954a1d01a2d94c5e5f58fe103a8cf51064b9e12a4133e1683946cc0
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.mod 24 BLAKE2B acad67a6abcfad5d1990a7cd064e4632364a5c53cc97127a9609b7ba9c177e13c999e5b177bfe09439d839840e3f78e714cddfe5da29464b31f62ee5ca9bc2fd SHA512 77ab89f696781c59ac23d221a8432d0a42d7132426c31d382ea030558040a3067b8ec025600e61a9093498a7a4ddf583d98907dfd6f6235a690dbe0395f24c9e
+DIST gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.zip 9441 BLAKE2B af5cc82d185828d21be00dad9ae43e27f43f243e72d1e03fca86050c892e085b21328731882171c7a66f1008dcb2bd031d005b34ce7679555ebb75bb53008845 SHA512 a2a8cc3b8b6d71a59937e9fabb0ad50a18dad38e658ce15ba32a1bad06c1319be3ab26a89ff0e64179f73c71f5b073dce5ce0eb73713efcfa070bb4c3f620a88
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip 77767 BLAKE2B d77644df22edfcda7d99d4a4a23a1fd1154fa21489dc36b9a8f9ffc45e341d8d793faae76d4d3d32290766c7b13cea30d17efaa7e8e74786ead90b0605f70967 SHA512 bc935858e1d5c341c7d53c41bdf6f856976a469c8f54f017e41e8be742064ce9980cc6881353e022f854d6e19096a37f5ff62bf7b01019b0425a0c03dc6fe14a
+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
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST restic-0.10.0.tar.gz 23683545 BLAKE2B 9c68311b63c29027e2bd0b92ac3c731fe6674b343542a5458c25eee9ea85b6a0dc4d084da2d07ad7228c3b2750944d32e1ef56220aac9c3e7d0a504ebcb245b2 SHA512 122e4ed956749c9c759775a996dae3c8be3934617d2566847f49931b3e25c68e38b202d3ac73ceb403b42e9397af1de766d018a4b851a474f93351701d3b784b
 DIST restic-0.9.6.tar.gz 27008812 BLAKE2B 4c8982800d39bcd4c29067f2bad15df44b92758b009f5831efb16d211ea28cbb8cda94b9f6cc41a685942145fcfb71c59d0aa10fcb4bd1cd22d15ca812af4fd0 SHA512 f6f7797dc17644e8f0217d81f7194e8e6416f6e740bad0eb11bcf83ab72d1729025e59fd1b81eb9d57bdd60e98b3324026ddb2325c654eb1b51f8f30ed247089
-EBUILD restic-0.9.4.ebuild 1230 BLAKE2B 29b8fe9c77bbb950cca765d86a020060ef091f48e4ad11d135955937041a1bb3a5ccca854d2f6869d181101cd040274e4f79143435edd53808838611e72b9154 SHA512 b9781a325fd40210b995f0d244e1c0c64febdb6e7147e1eac360000150281a80ed58f8e791ce75def867bc0906cbe6c8187c6b8f451558784c32415604c0836d
-EBUILD restic-0.9.5.ebuild 1229 BLAKE2B 65568ebd28d6493522ae60b5e45026e81479bfd3cc4a562f047ecad19fef5d8459ac558230e52cf2d6678da9e02066b686e221ab0251744ea3e90bf4552d90dc SHA512 b95d92d8a36b4aebefec3c1078120def3176bc74fb04a91e0e03826690913b5116e4354b596e2c9545924eb653091abf1d6a4d65cbd2f25f82c3507d51561201
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
+DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
+EBUILD restic-0.10.0.ebuild 35641 BLAKE2B 0bdbd340dea718f2c578836c16a3d506adab585b182bb86534f4bb9dbfeea4917741bcda5833bb2ae0063b3153061d0324cd4b47a1d6e9b88b2a206887c8ef11 SHA512 5c35e93e10c5caf0761861ca4fc15229b6da8a03500c97d4fa6b8e5cdbcaf95573b8953f3235f50e1f3c27489db1b01eaada0b3c91e8563baeaded13265d1410
 EBUILD restic-0.9.6.ebuild 1226 BLAKE2B af64f0a98e5c83af579e7cc3a19ede902d8ee1b59dca501d8aa82aa50963ea88ae44880db8f785e6752c827d3519e166fcc05952ed66e5d879f070f397aa584e SHA512 4395352f8078364725eaba342fca9281c4144679392c3d8939bccd9f7ed73987304c502b56f9836c988a174722b65fdb28904b6801fea75a61c13042fda1d05b
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.10.0.ebuild b/app-backup/restic/restic-0.10.0.ebuild
new file mode 100644
index 000000000000..25933c107c28
--- /dev/null
+++ b/app-backup/restic/restic-0.10.0.ebuild
@@ -0,0 +1,701 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512"
+	"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod"
+	"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"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.66.0"
+	"cloud.google.com/go v0.66.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v46.1.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v46.1.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.6"
+	"github.com/Azure/go-autorest/autorest v0.11.6/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.4"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.4/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.8"
+	"github.com/OneOfOne/xxhash v1.2.8/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/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/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-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/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9/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/dchest/siphash v1.2.1"
+	"github.com/dchest/siphash v1.2.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/dnaeon/go-vcr v1.0.1"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elithrar/simple-scrypt v1.3.0"
+	"github.com/elithrar/simple-scrypt v1.3.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/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-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/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"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/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/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"
+	"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.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00"
+	"github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod"
+	"github.com/gorilla/websocket v1.4.0/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"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/ratelimit v1.0.1"
+	"github.com/juju/ratelimit v1.0.1/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/cpuid v1.2.3"
+	"github.com/klauspost/cpuid v1.2.3/go.mod"
+	"github.com/klauspost/cpuid v1.3.1"
+	"github.com/klauspost/cpuid v1.3.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/fs v0.1.0"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/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/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/kurin/blazer v0.5.3"
+	"github.com/kurin/blazer v0.5.3/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/minio/md5-simd v1.1.0"
+	"github.com/minio/md5-simd v1.1.0/go.mod"
+	"github.com/minio/minio-go/v6 v6.0.57"
+	"github.com/minio/minio-go/v6 v6.0.57/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421"
+	"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-20180701023420-4b7aa43c6742"
+	"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/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/ncw/swift v1.0.52"
+	"github.com/ncw/swift v1.0.52/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.5.0"
+	"github.com/pkg/profile v1.5.0/go.mod"
+	"github.com/pkg/sftp v1.12.0"
+	"github.com/pkg/sftp v1.12.0/go.mod"
+	"github.com/pkg/xattr v0.4.1"
+	"github.com/pkg/xattr v0.4.1/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/client_model v0.0.0-20190812154241-14fe0d1b01d4/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/restic/chunker v0.4.0"
+	"github.com/restic/chunker v0.4.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.5.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v1.2.0"
+	"github.com/smartystreets/assertions v1.2.0/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"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.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/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c"
+	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod"
+	"github.com/ugorji/go v1.1.4/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"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4"
+	"go.opencensus.io v0.22.4/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-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f"
+	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/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/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/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-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-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
+	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+	"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/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f"
+	"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"
+	"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-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/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-20181021155630-eda9bb28ed51/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-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/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/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200918174421-af09f7315aff"
+	"golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/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/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-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-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.31.0/go.mod"
+	"google.golang.org/api v0.32.0"
+	"google.golang.org/api v0.32.0/go.mod"
+	"google.golang.org/appengine v1.1.0"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0"
+	"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/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6"
+	"google.golang.org/appengine v1.6.6/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"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod"
+	"google.golang.org/genproto v0.0.0-20200918140846-d0d605568037"
+	"google.golang.org/genproto v0.0.0-20200918140846-d0d605568037/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.32.0"
+	"google.golang.org/grpc v1.32.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"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/check.v1 v1.0.0-20200902074654-038fdea0a05b"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/ini.v1 v1.61.0"
+	"gopkg.in/ini.v1 v1.61.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637"
+	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+#S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+	)
+
+	go build "${mygoargs[@]}" -o restic ./cmd/restic || die
+}
+
+src_test() {
+	go test -timeout 30m -v -work -x ./cmd/... ./internal/... || die
+}
+
+src_install() {
+	dobin restic
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/restic/restic-0.9.4.ebuild b/app-backup/restic/restic-0.9.4.ebuild
deleted file mode 100644
index 61ca3985ea6a..000000000000
--- a/app-backup/restic/restic-0.9.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 golang-vcs-snapshot
-
-DESCRIPTION="A backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGO_PN="github.com/restic/restic"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT+=" !test? ( test )"
-
-RDEPEND="sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	local mygoargs=(
-		-v
-		-work
-		-x
-		-tags release
-		-ldflags "-X main.version=${PV}"
-		-asmflags "-trimpath=${S}"
-		-gcflags "-trimpath=${S}"
-		-o restic ${EGO_PN}/cmd/restic
-	)
-
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build "${mygoargs[@]}" || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
-}
-
-src_install() {
-	dobin restic
-
-	newbashcomp doc/bash-completion.sh "${PN}"
-
-	insinto /usr/share/zsh/site-functions
-	newins doc/zsh-completion.zsh _restic
-
-	doman doc/man/*
-	dodoc doc/*.rst
-}
diff --git a/app-backup/restic/restic-0.9.5.ebuild b/app-backup/restic/restic-0.9.5.ebuild
deleted file mode 100644
index 9c9a6edff6c4..000000000000
--- a/app-backup/restic/restic-0.9.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 golang-vcs-snapshot
-
-DESCRIPTION="A backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGO_PN="github.com/restic/restic"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	local mygoargs=(
-		-v
-		-work
-		-x
-		-tags release
-		-ldflags "-X main.version=${PV}"
-		-asmflags "-trimpath=${S}"
-		-gcflags "-trimpath=${S}"
-		-o restic ${EGO_PN}/cmd/restic
-	)
-
-	GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build "${mygoargs[@]}" || die
-}
-
-src_test() {
-	GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
-}
-
-src_install() {
-	dobin restic
-
-	newbashcomp doc/bash-completion.sh "${PN}"
-
-	insinto /usr/share/zsh/site-functions
-	newins doc/zsh-completion.zsh _restic
-
-	doman doc/man/*
-	dodoc doc/*.rst
-}
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index c3cc4b870749..b30e2eeda419 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -4,8 +4,7 @@ AUX dsmc.service 184 BLAKE2B a6a14302b32cdfdd9d1460b2d686a9a828d1cdd3c19dc53f8f5
 AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a165b98dec9466323d1ec8ffad894c5d165fd994a99e7a52ca22bb6b81597e93001f22be2af641da6a9 SHA512 b69166e9e004d81a7f43551e5f1189c3a545afc67e5029009e9693fbed20a247f922975fec695542f0a3afd7c0c5a4ee6c026678de4812b00488afc45699699a
 AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
-DIST 7.1.8.0-TIV-TSMBAC-LinuxX86.tar 221849600 BLAKE2B a57d15885c802925e92afca45bfd25c1aa56c33329f03d3de89f00dd139239da3b835ef514dd8d881e76e04e84656d3d630b8e8e44fe8ef331c3f2c5d6acf816 SHA512 68dce2463554b7bd6100d5bf6a617316a04898b747fcaec182c9c4870c34bceb16eea47d073c587c7184945a3cef0f6c98d9a59364589a4745fd1fdc195e3af9
 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
-EBUILD tsm-7.1.8.0-r1.ebuild 7363 BLAKE2B 726ffedb11eadfb2fc21bb2c37fdad9652ff772991f53b1a17e6a14d14f1fe66ccfead965de39da1ecdb0b6fb3d1c4865ae47cceaf25d1b91905000964a3ac99 SHA512 7663d42123a4797b202289b362e14bb209b42873e8f68392a6f6fe465319fb2e232e3ed434d100d1979a659d1587983c5da5a3ab1404349b6582ff769346d5ca
-EBUILD tsm-8.1.6.0.ebuild 7427 BLAKE2B 822269ed5fe46c8da6201bd9fb674575aa4e3700ed438fa4ad4d2fd043a75630df0cfd291a9f684accd822f8f1ad30c43576f2e85cf6cdd58903581fa342548c SHA512 b402c233a8b13775639e80bbb9535b7339ea82b56257b8adcdf73a342b952666b62702101130441862bc3a6bef13f08355b37999f6e714dc15a6bf905a478f34
+EBUILD tsm-8.1.6.0-r1.ebuild 7429 BLAKE2B 727e0fe53cd8fddcde4336531a191cb7dc026bcdaa09d8cc33f9bdca8de0b9ae870a5b9aae529dd140ba77c7e02521c66daa5ff0ed9b4fe2e329036a37146e0a SHA512 52bed6adb701a86608d0228013b609c491b0aa6c75cae494626ff7a609ae17c55d8e7af4d6e5eddb55f8e434ca689d2d37b95fde73c409aa6ab2e742c756274a
+EBUILD tsm-8.1.6.0.ebuild 7426 BLAKE2B 5fe14950099f1bfeb0dea59abf012e33782fcebf5006007812fc87d39124fa429ea78aed05859bda74d70d8765c079fed11f2410def1c939868b79288a58e05e SHA512 4128b6769eb1709f8aacb794b5fe016b5ac102d4823dea50cdbf532d34e2f10d9caa31f096ff0e01ce5850f61d0815b8103096cdf7a0fd02358808f5dbc0bb3e
 MISC metadata.xml 398 BLAKE2B 78fb8e9d30a09caddcc2006326db44bbb2c12b83e174f8af3263d738a1ae958922297d910225137a0f9056f50f76086aeb5ee37e342a1302fb060159f1c50c99 SHA512 d232b0705cc9e5ec35eca0f5c2492b5211cc083db2f825268055b1097017f60967d2e12d61083173593a3c9387f6879584abc2cbe58da69c32fb2ff6d2e83903
diff --git a/app-backup/tsm/tsm-7.1.8.0-r1.ebuild b/app-backup/tsm/tsm-7.1.8.0-r1.ebuild
deleted file mode 100644
index 58c58485a2bf..000000000000
--- a/app-backup/tsm/tsm-7.1.8.0-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
-
-DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
-HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
-
-MY_PV_MAJOR=$(get_major_version)
-MY_PV_MINOR=$(get_version_component_range 2)
-MY_PV_TINY=$(get_version_component_range 3)
-MY_PV_PATCH=$(get_version_component_range 4)
-
-MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
-MY_PVR_ALLDOTS=${PV}
-
-if [[ ${MY_PV_PATCH} == 0 ]]; then
-	MY_RELEASE_PATH=maintenance
-else
-	MY_RELEASE_PATH=patches
-fi
-BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
-BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
-BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
-SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
-SRC_URI="${BASE_URI}${SRC_TAR}"
-
-RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
-LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
-	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
-	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
-	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
-
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="acl java +tsm-cit +tsm-hw"
-QA_PREBUILT="*"
-
-# not available (yet?)
-#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
-#	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
-MY_LANG_PV="${MY_PVR_ALLDOTS}-"
-for lang in ${MY_LANGS}; do
-	IUSE="${IUSE} l10n_${lang%:*}"
-	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
-${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
-${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
-done
-unset lang
-
-DEPEND="
-	acct-group/tsm
-"
-RDEPEND="
-	acct-group/tsm
-	dev-libs/expat
-	dev-libs/libxml2
-	sys-fs/fuse:0
-	acl? ( sys-apps/acl )
-	java? ( >=virtual/jre-1.7 )
-"
-
-S="${WORKDIR}/bacli"
-
-pkg_setup() {
-	DOC_CONTENTS="
-		Note that you have to be root to be able to use the Tivoli Storage Manager
-		client. The dsmtca trusted agent binary does not exist anymore.
-
-		For information on how to give other users access, please see the following
-		URLs:
-		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin
-		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca
-	"
-}
-
-src_unpack() {
-	local rpm rpms lang
-	mkdir bacli || die
-	cd bacli || die
-	unpack ${SRC_TAR}
-
-	cd "${S}"
-	for rpm in *.rpm; do
-		case ${rpm} in
-			TIVsm-APIcit.*|TIVsm-BAcit.*)
-				use tsm-cit && rpms="${rpms} ./${rpm}"
-				;;
-			TIVsm-BAhdw.*)
-				use tsm-hw && rpms="${rpms} ./${rpm}"
-				;;
-			TIVsm-JBB.*|*-filepath-*)
-				# "journal based backup" for all filesystems
-				# requires a kernel module.
-				# "Linux Filepath source code" available
-				# by request from vendor
-				;;
-			*)
-				rpms="${rpms} ./${rpm}"
-				;;
-		esac
-	done
-	for rpm in ${A}; do
-		case ${rpm} in
-			*.rpm)
-				rpms="${rpms} ${rpm}"
-				;;
-		esac
-	done
-
-	rpm_unpack ${rpms}
-
-	# Avoid strange error messages caused by read-only files
-	chmod -R u+w "${S}" || die
-}
-
-src_install() {
-	cp -a opt "${D}" || die
-	cp -a usr "${D}" || die
-
-	# The RPM files contain postinstall scripts which can be extracted
-	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
-	# Below we try to mimic the behaviour of these scripts.
-	# We don't deal with SELinux compliance (yet), though.
-	local RPM_INSTALL_PREFIX CLIENTDIR i
-	RPM_INSTALL_PREFIX=/opt
-	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
-
-	# Create links for messages; this is spread over several postin scripts.
-	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
-	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
-	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
-	#done
-
-	# Mimic TIVsm-API64 postinstall script
-	for i in libgpfs.so libdmapi.so; do
-		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
-	done
-
-	# The TIVsm-BA postinstall script only does messages and ancient upgrades
-
-	# The gscrypt64 postinstall script only deals with s390[x] SELinux
-	# and the symlink for the iccs library which we handle in the loop below.
-
-	# Move stuff from /usr/local to /opt, #452332
-	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
-	rmdir "${D}"/usr/local || die
-
-	# Mimic gskssl64 postinstall script
-	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
-		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
-			/usr/lib64/libgsk8${i}_64.so
-	done
-	for i in capicmd ver; do
-		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
-	done
-
-	# Done with the postinstall scripts as the RPMs contain them.
-	# Now on to some more Gentoo-specific installation.
-
-	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
-
-	# Avoid "QA Notice: Found an absolute symlink in a library directory"
-	local target
-	find "${D}"usr/lib* -lname '/*' | while read i; do
-		target=$(readlink "${i}")
-		rm -v "${i}" || die
-		dosym "../..${target}" "${i#${D}}"
-	done
-
-	keepdir /var/log/tsm
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/tsm.logrotate" tsm
-
-	keepdir /etc/tivoli
-
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
-	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
-
-	# Added the hostname to be more friendly, the admin will need to edit this file anyway
-	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
-	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
-	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
-
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
-	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
-
-	# Setup the env
-	dodir /etc/env.d
-	ENV_FILE="${D}/etc/env.d/80tivoli"
-	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
-	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
-	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
-
-	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-
-	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
-	newinitd "${FILESDIR}/dsmc.init.d" dsmc
-	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
-
-	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
-	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
-
-	systemd_dounit "${FILESDIR}/dsmc.service"
-	systemd_dounit "${FILESDIR}/dsmcad.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local i dirs
-	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
-		if [[ ! -e $i ]]; then
-			touch $i || die
-			chown :tsm $i || die
-			chmod 0660 $i || die
-		fi
-	done
-
-	# Bug #375041: the log directory itself should not be world writable.
-	# Have to do this in postinst due to bug #141619
-	chown root:tsm /var/log/tsm || die
-	chmod 0750 /var/log/tsm || die
-
-	# Bug 508052: directories used to be too restrictive, have to widen perms.
-	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
-	chown root:root "${dirs[@]}" || die
-	chmod 0755 "${dirs[@]}" || die
-
-	FORCE_PRINT_ELOG=1
-	DISABLE_AUTOFORMATTING=1
-	readme.gentoo_print_elog
-}
diff --git a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
new file mode 100644
index 000000000000..34225aedc4c4
--- /dev/null
+++ b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
+
+DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
+HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="acl java +tsm-cit +tsm-hw"
+QA_PREBUILT="*"
+
+# not available (yet?)
+#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
+#	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} l10n_${lang%:*}"
+	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND="
+	acct-group/tsm
+"
+RDEPEND="
+	acct-group/tsm
+	dev-libs/expat
+	dev-libs/libxml2
+	sys-fs/fuse:0
+	acl? ( sys-apps/acl )
+	java? ( >=virtual/jre-1.7 )
+"
+
+S="${WORKDIR}/bacli"
+
+pkg_setup() {
+	DOC_CONTENTS="
+		Note that you have to be root to be able to use the Tivoli Storage Manager
+		client. The dsmtca trusted agent binary does not exist anymore.
+
+		For information on how to give other users access, please see the following
+		URLs:
+		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin
+		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca
+	"
+}
+
+src_unpack() {
+	local rpm rpms lang
+	mkdir bacli || die
+	cd bacli || die
+	unpack ${SRC_TAR}
+
+	cd "${S}"
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm-cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm-hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_install() {
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# Create links for messages; this is spread over several postin scripts.
+	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	#done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# The TIVsm-BA postinstall script only does messages and ancient upgrades
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux
+	# and the symlink for the iccs library which we handle in the loop below.
+
+	# Move stuff from /usr/local to /opt, #452332
+	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
+	rmdir "${D}"/usr/local || die
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	# echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
+	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
+
+	systemd_dounit "${FILESDIR}/dsmc.service"
+	systemd_dounit "${FILESDIR}/dsmcad.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local i dirs
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+
+	# Bug 508052: directories used to be too restrictive, have to widen perms.
+	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
+	chown root:root "${dirs[@]}" || die
+	chmod 0755 "${dirs[@]}" || die
+
+	FORCE_PRINT_ELOG=1
+	DISABLE_AUTOFORMATTING=1
+	readme.gentoo_print_elog
+}
diff --git a/app-backup/tsm/tsm-8.1.6.0.ebuild b/app-backup/tsm/tsm-8.1.6.0.ebuild
index 6671f616235f..f84a86e3d25a 100644
--- a/app-backup/tsm/tsm-8.1.6.0.ebuild
+++ b/app-backup/tsm/tsm-8.1.6.0.ebuild
@@ -34,7 +34,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="acl java +tsm-cit +tsm-hw"
 QA_PREBUILT="*"
 
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 6b052d77df7d..7ba2adde582c 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 64e6dc96fd51..0d43ba23807b 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
-EBUILD dolphin-plugins-mountiso-20.08.1.ebuild 1556 BLAKE2B 721be636cb7b3d6e034b7051457753a0bc9d79b3abd64051ee5241599fd781baa3d1481cb34328dd8a7235089c64787beb92fd276d437f568f548102b8870a1c SHA512 81f7fadd6a9e28c4028ee319ae4419ca2652052b2a493618252be7345170af8f1677928c3b6787cd0b034588e3a037998a15ee486f90c4b0953b876d58e532f9
+DIST dolphin-plugins-20.08.2.tar.xz 229440 BLAKE2B 53d8c1c16a9ba5abcb3164cd4d30769506c4dfaaab148eed070185b17d00fc5583b5dbb28b163794e187da8e0d64435d904fb8ffc99e8625b8096bd96dbd94ab SHA512 c854c3a7c918c9a8be1da41d9d4f8039b9c8e38ba4782ae064ea688fed51966b9749ce009b2f96bcac0f92dbe36e5f826a45265eb29e3f2ec4740902485099d7
+EBUILD dolphin-plugins-mountiso-20.08.2.ebuild 1556 BLAKE2B 721be636cb7b3d6e034b7051457753a0bc9d79b3abd64051ee5241599fd781baa3d1481cb34328dd8a7235089c64787beb92fd276d437f568f548102b8870a1c SHA512 81f7fadd6a9e28c4028ee319ae4419ca2652052b2a493618252be7345170af8f1677928c3b6787cd0b034588e3a037998a15ee486f90c4b0953b876d58e532f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.1.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.2.ebuild
similarity index 100%
rename from app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.1.ebuild
rename to app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.2.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d67086a2190b..6c33aff85053 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 222b1c55576c..3d8451592d9f 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD acme-1.7.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
-EBUILD acme-1.8.0.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
+EBUILD acme-1.8.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
 EBUILD acme-1.9.0.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
 EBUILD acme-9999.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.7.0.ebuild b/app-crypt/acme/acme-1.7.0.ebuild
deleted file mode 100644
index da638d5ba966..000000000000
--- a/app-crypt/acme/acme-1.7.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=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.8.0.ebuild b/app-crypt/acme/acme-1.8.0.ebuild
index 9c58fbb71ad7..da638d5ba966 100644
--- a/app-crypt/acme/acme-1.8.0.ebuild
+++ b/app-crypt/acme/acme-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acmebot/Manifest b/app-crypt/acmebot/Manifest
deleted file mode 100644
index f227dfa50f96..000000000000
--- a/app-crypt/acmebot/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST acmebot-2.3.0.tar.gz 64841 BLAKE2B 92bfb9a58722b9955fe908e2fcb1a3ee593bf87e3fdf3dc9564bcbe291b13c553ad426673c337a59344287da64c4ee5cffc734f8dfb60447f96d6234814f0167 SHA512 3951cc7138eb0b83bd802a2e0a221fa985209ba276028606d887b7d2eff84c35db034f4a3d8a6836b3ac149c6dbfa27b1ea47e864f549f8d88b758b40407c4f4
-DIST acmebot-2.7.0.tar.gz 76385 BLAKE2B 28b0fd81735e2dbff493dbcfe0194d62dea8d233866dcb235bb0efac562d2f3884f53226f979e8cd6050078f59b0b1e6d20d2eeea6d762363526686ef8c5ead1 SHA512 1b8fa21c2dc60a940e2fa13d5d599025088644862c985749d72f4f16ebd4ad48970b7fcf656fb34cf63d3c2ff2cbb157d7446c17a7f9da3cffd8611e499c400e
-EBUILD acmebot-2.3.0-r1.ebuild 1204 BLAKE2B 3e8c2819fbfcf03532e9d3a4e27bab49d1c71b731ed57e1b9670feeb2976e87b9ba996d4d86f44b5e64d83ec6150cdf86ad4797365558875fec738eeb3e85150 SHA512 f55d679599a23d555e295b4ff5d6618c0b6ba8412da22d139bf9502a78509984fda7654eed2c69781e37c02e13482be723469468297697820df68ad221d1467f
-EBUILD acmebot-2.7.0.ebuild 1439 BLAKE2B 0a2d1e8fcd954aeb170d93d89aabdf694fa912bbffeb87e99a554fee0d4d929df906c0de785b8bad53fbc183cf4fa02c703ea5529afe2c29ef08584345bfce1b SHA512 46324c58e46f480cb1b9b7cff47f220df96a40c4c8714769a517e5e8be52d7ccba9c058bcf2944962e1cfcf357ac5b1c06e3b5031abebf2008c59501d57d41b3
-EBUILD acmebot-9999.ebuild 1204 BLAKE2B 3e8c2819fbfcf03532e9d3a4e27bab49d1c71b731ed57e1b9670feeb2976e87b9ba996d4d86f44b5e64d83ec6150cdf86ad4797365558875fec738eeb3e85150 SHA512 f55d679599a23d555e295b4ff5d6618c0b6ba8412da22d139bf9502a78509984fda7654eed2c69781e37c02e13482be723469468297697820df68ad221d1467f
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild b/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
deleted file mode 100644
index d200063e3eb7..000000000000
--- a/app-crypt/acmebot/acmebot-2.3.0-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=7
-PYTHON_COMPAT=(python3_6)
-EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
-[[ $PV == 9999 ]] && _scm=git-r3
-
-inherit ${_scm} python-r1
-
-DESCRIPTION="Certificate manager bot using ACME protocol"
-HOMEPAGE="https://github.com/plinss/acmebot"
-if [[ $PV != 9999 ]]; then
-	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}"
-DEPEND=""
-
-src_install() {
-	python_foreach_impl python_doscript acmebot
-	insinto /etc/logrotate.d
-	doins logrotate.d/acmebot
-	insinto /etc/acmebot
-	doins acmebot.example.json
-	dodoc README.rst
-}
diff --git a/app-crypt/acmebot/acmebot-2.7.0.ebuild b/app-crypt/acmebot/acmebot-2.7.0.ebuild
deleted file mode 100644
index e6b7da902b1b..000000000000
--- a/app-crypt/acmebot/acmebot-2.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{7,8})
-EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
-[[ $PV == 9999 ]] && _scm=git-r3
-
-inherit ${_scm} python-single-r1
-
-DESCRIPTION="Certificate manager bot using ACME protocol"
-HOMEPAGE="https://github.com/plinss/acmebot"
-if [[ $PV != 9999 ]]; then
-	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-	>=dev-python/appdirs-1.4.3[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pydns-3.1.0:3[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_MULTI_USEDEP}]
-	>=app-crypt/acme-0.25.1[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pyyaml-3.1[${PYTHON_MULTI_USEDEP}]
-	')
-	"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_configure() {
-	:
-}
-src_compile() {
-	:
-}
-
-src_install() {
-	python_doscript acmebot
-	insinto /etc/logrotate.d
-	doins logrotate.d/acmebot
-	insinto /etc/acmebot
-	doins acmebot.example.json
-	dodoc README.rst
-}
diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild
deleted file mode 100644
index d200063e3eb7..000000000000
--- a/app-crypt/acmebot/acmebot-9999.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
-PYTHON_COMPAT=(python3_6)
-EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
-[[ $PV == 9999 ]] && _scm=git-r3
-
-inherit ${_scm} python-r1
-
-DESCRIPTION="Certificate manager bot using ACME protocol"
-HOMEPAGE="https://github.com/plinss/acmebot"
-if [[ $PV != 9999 ]]; then
-	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}"
-DEPEND=""
-
-src_install() {
-	python_foreach_impl python_doscript acmebot
-	insinto /etc/logrotate.d
-	doins logrotate.d/acmebot
-	insinto /etc/acmebot
-	doins acmebot.example.json
-	dodoc README.rst
-}
diff --git a/app-crypt/acmebot/metadata.xml b/app-crypt/acmebot/metadata.xml
deleted file mode 100644
index 79d462e85571..000000000000
--- a/app-crypt/acmebot/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="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 30e7b91613b2..782fc3b6c42b 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD certbot-apache-1.7.0.ebuild 1064 BLAKE2B 3fe58950165fc3d0cb010051a38ee278c111d2d5f4e1880321614c555b8bb79150e1ec41288749c3c3b6c143b1fbbce95b62d3821a98f355a7727c01960a126a SHA512 9ad5d5d19d19ebd9c10e512ed756813425bd950a48abcb67b3a4e90115b1df4704675728a2f50baa0691c0dd72cbeacee541adb048cbb9793f96628aaaa0da72
-EBUILD certbot-apache-1.8.0.ebuild 1066 BLAKE2B 85b4a24a049dad829b34adcb3099692f9d3a921cbfbb043300b2f24456e30f2156d6e4b73a6b9b1c278732d369b0a50396cbc04f68a9178c08360fdd2c8114a5 SHA512 02c617f14fa3d437b9a17aeaa52f90e9bff5a86bf66ceefc89020e162657a6583991478bb107cca638ff3618eb37d49f0884f2aa1f60f1b75c61dfab7c3d908f
+EBUILD certbot-apache-1.8.0.ebuild 1064 BLAKE2B 3fe58950165fc3d0cb010051a38ee278c111d2d5f4e1880321614c555b8bb79150e1ec41288749c3c3b6c143b1fbbce95b62d3821a98f355a7727c01960a126a SHA512 9ad5d5d19d19ebd9c10e512ed756813425bd950a48abcb67b3a4e90115b1df4704675728a2f50baa0691c0dd72cbeacee541adb048cbb9793f96628aaaa0da72
 EBUILD certbot-apache-1.9.0.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
 EBUILD certbot-apache-9999.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
deleted file mode 100644
index 2977a0aff13d..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
+++ /dev/null
@@ -1,38 +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})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
index 3a367b955f0a..2977a0aff13d 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index f9bb47c8a750..d6b5f26ea5ee 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD certbot-nginx-1.7.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
-EBUILD certbot-nginx-1.8.0.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
+EBUILD certbot-nginx-1.8.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
 EBUILD certbot-nginx-1.9.0.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
 EBUILD certbot-nginx-9999.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
deleted file mode 100644
index 51368c8f499e..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.7.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
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
index 383e16073c64..51368c8f499e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 975d762754d2..feb0807ad87e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD certbot-1.7.0.ebuild 1397 BLAKE2B 9d540bc199f74274ba8610e0f6f18b7cf6f89b4fababcc03dcc91564038ee01a802cbf761e9f2357cb2d6b36081fffe0469dd60bf22bc11e86354000901d7e93 SHA512 b0db4c0fb00763060dae8a2d3dc5c1e77ad7e9b57dea6495a98ea8d978c6e02de66a8003f2f8aaad0e9a4aadade8f2ae8dd1e05f1bea35cb06629b9ce8e1b9e4
-EBUILD certbot-1.8.0.ebuild 1399 BLAKE2B 485176a1476bcf681b5b186f39261172264620c1971b3c4a07a1b892b5701b2bb272eb45a7a6a75e35526c9e96b0f313d8b7a35f5a27a77d89e28ec4fda6ea48 SHA512 24b0ff72d8adadff94b13ea32aefe31fe7feb576feba6c23c7df6fe6f097b1be9f4badf48446162bfb29f2354cbca85d6987b3b73b70a08cb1d9a8ac1a58def2
+EBUILD certbot-1.8.0.ebuild 1397 BLAKE2B 9d540bc199f74274ba8610e0f6f18b7cf6f89b4fababcc03dcc91564038ee01a802cbf761e9f2357cb2d6b36081fffe0469dd60bf22bc11e86354000901d7e93 SHA512 b0db4c0fb00763060dae8a2d3dc5c1e77ad7e9b57dea6495a98ea8d978c6e02de66a8003f2f8aaad0e9a4aadade8f2ae8dd1e05f1bea35cb06629b9ce8e1b9e4
 EBUILD certbot-1.9.0.ebuild 1144 BLAKE2B a5fc182ad4c58b23d018d63162641b27381e710d2bd2276ba9f0cdf8dc1a8fb5d222a8f0d6f248c06d70b1687e202e2a938b3176ae152ce22feceb342c7ef9a2 SHA512 6a35d2ce7faed403fb33bd345439371f277ffb2528b37b59f9130a234d4bf0bd166fde6c5e5349903b2cecc991b2deda3f054fb7c011e44094665c3e2901fab9
 EBUILD certbot-9999.ebuild 1144 BLAKE2B a5fc182ad4c58b23d018d63162641b27381e710d2bd2276ba9f0cdf8dc1a8fb5d222a8f0d6f248c06d70b1687e202e2a938b3176ae152ce22feceb342c7ef9a2 SHA512 6a35d2ce7faed403fb33bd345439371f277ffb2528b37b59f9130a234d4bf0bd166fde6c5e5349903b2cecc991b2deda3f054fb7c011e44094665c3e2901fab9
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.7.0.ebuild b/app-crypt/certbot/certbot-1.7.0.ebuild
deleted file mode 100644
index 6f5c706cae23..000000000000
--- a/app-crypt/certbot/certbot-1.7.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
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# required as deps of deps can trigger this too...
-	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
-	distutils-r1_python_prepare_all
-}
diff --git a/app-crypt/certbot/certbot-1.8.0.ebuild b/app-crypt/certbot/certbot-1.8.0.ebuild
index 8496941da96c..6f5c706cae23 100644
--- a/app-crypt/certbot/certbot-1.8.0.ebuild
+++ b/app-crypt/certbot/certbot-1.8.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/openpgp-keys-miniupnp/Manifest b/app-crypt/openpgp-keys-miniupnp/Manifest
new file mode 100644
index 000000000000..acd5476d102e
--- /dev/null
+++ b/app-crypt/openpgp-keys-miniupnp/Manifest
@@ -0,0 +1,4 @@
+DIST A31ACAAF.asc 3139 BLAKE2B 4574c3f37965fafa4e2d703276a585d1f17b0da862042620681bac591062b3b70c52cbe5481da543d3c3193a640c06e9d86c3cef1568ae3a3f62901a6ad200ab SHA512 ecad52850fdcc7c21bab81917b3cea85c48b751534427d3db5750c43cbce73916ec4879e4f5535d4b87b7eca927ad249e384c5597702a0052afa89c23c5719b9
+DIST A5C0863C.asc 3098 BLAKE2B fdbc8629fd462b9cc72c568b0af5607951055abc03a1e344e4c1b411fb87bfa285c2e29d2781f9e9b02ec0bc63eacf55e5dc19198056a417ba3358dba445cc0c SHA512 adebff655374dbc8a045f9ab148f9fc343b043e80cb7e4e14c66aa56bfb2f0f5521e294c7600ca708893efc84679f788116d82ef5818370f1425f03dea0a77b9
+EBUILD openpgp-keys-miniupnp-20201006.ebuild 573 BLAKE2B 6f4cc75f4781def1e922bb970c337eccc7335165d7d5bccbd67d26b4a2fd2a6d3771f3088c2b651a0e531aca3fb6303d451657c1332b019666530efee7b36b43 SHA512 1c18c481a8736141dd0b77df9375a5caf36b8d0829fc840e94c5e3a148dc7b69175967e63c89d633cd77f0d86239435b7b21a0172cf2c29b6ffe28d2832f3dbd
+MISC metadata.xml 271 BLAKE2B 21ff27fce9fb36fa286e0cb5324edaf0721e2315d14456c837330d40dabd66369da85b94fc33169ae0caf233d634dd6fd2c29c37c0a78e38307e4adc134381ae SHA512 fa6aa60030292b6236a4b68b26095c3eea1b8dc1decc2be6b36ebb33979c52c39915e6169bfb54ad6f3a8380b1decc23d62f079b134484d97587ab64aa2e1663
diff --git a/app-crypt/openpgp-keys-miniupnp/metadata.xml b/app-crypt/openpgp-keys-miniupnp/metadata.xml
new file mode 100644
index 000000000000..5a5a3aaf4299
--- /dev/null
+++ b/app-crypt/openpgp-keys-miniupnp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild b/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
new file mode 100644
index 000000000000..4b07eeca6024
--- /dev/null
+++ b/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign miniupnp* packages"
+HOMEPAGE="http://miniupnp.free.fr/files/"
+SRC_URI="
+	http://miniupnp.free.fr/A31ACAAF.asc
+	http://miniupnp.free.fr/A5C0863C.asc
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - miniupnp.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index a0db801b8460..b1e8d2368669 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -1,5 +1,3 @@
-AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e497b066218e82d2dc13f80c473c25361dc85098ee15e5f14530334e47c33fe7cc9b2349ffb1aaba7abe4fdd33bfdde05ed9191c39 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b
-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 sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
diff --git a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
deleted file mode 100644
index dfe183e66cd2..000000000000
--- a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 21e984fa9d93a760cc03f5d9d13d023809227df2 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Thu, 11 Apr 2013 21:12:17 -0700
-Subject: image.c: clear image variable
-
-Not zeroing the image after talloc occasionally leads to a segfault because
-the programme thinks it has a signature when in reality it just has a junk
-pointer and segfaults.
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- src/image.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/image.c b/src/image.c
-index cc55791..10eba0e 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -401,6 +401,7 @@ struct image *image_load(const char *filename)
- 		return NULL;
- 	}
- 
-+	memset(image, 0, sizeof(*image));
- 	rc = fileio_read_file(image, filename, &image->buf, &image->size);
- 	if (rc)
- 		goto err;
--- 
-1.8.2.1
-
diff --git a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
deleted file mode 100644
index f42c69616d13..000000000000
--- a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e58a528ef57e53008222f238cce7c326a14572e2 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Mon, 30 Sep 2013 19:25:37 -0700
-Subject: [PATCH 4/4] Fix for multi-sign
-
-The new Tianocore multi-sign code fails now for images signed with
-sbsigntools.  The reason is that we don't actually align the signature table,
-we just slap it straight after the binary data.  Unfortunately, the new
-multi-signature code checks that our alignment offsets are correct and fails
-the signature for this reason.  Fix by adding junk to the end of the image to
-align the signature section.
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- src/image.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/image.c b/src/image.c
-index 10eba0e..519e288 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -385,7 +385,13 @@ static int image_find_regions(struct image *image)
- 
- 	/* record the size of non-signature data */
- 	r = &image->checksum_regions[image->n_checksum_regions - 1];
--	image->data_size = (r->data - (void *)image->buf) + r->size;
-+	/*
-+	 * The new Tianocore multisign does a stricter check of the signatures
-+	 * in particular, the signature table must start at an aligned offset
-+	 * fix this by adding bytes to the end of the text section (which must
-+	 * be included in the hash)
-+	 */
-+	image->data_size = align_up((r->data - (void *)image->buf) + r->size, 8);
- 
- 	return 0;
- }
--- 
-1.8.4
-
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index c9fbbaacf219..9613bab89d50 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-1.3.0.tgz 380332 BLAKE2B 4bb2c5b911cd25e80444e7dd6381692a3ddd3dcd3a5f4bcda14c8cc4169f332f2c617175bfd222f03d8e48a3eefd9d01b2d7c3fd6b712b3266b2cc75bee8396b SHA512 199f58adb5231f1ad585dbe8f64d6c54920cee201bd7703bcfc7e64917bf8647f9e35b3835b78c41210fd9af5223a79938f2495e4b48e6a62bfe8721d82492c2
 DIST scrypt-1.3.1.tgz 394516 BLAKE2B 91faa22dc317927b92abe26c5e15cd52c409722716076c7cc502a0c6e4e84ceaaf60222b3ef141c6a209f36084df2d7f45d8f19482aa035c3e2442513c4283d9 SHA512 c76c29463d2a4db6b62283daca80bc4124a6272f37f983d472d44251b98da702f1edb16ad15058a8d0ea320c23bc1486892ab25d367d37ec77c38a55ad7e69fe
 EBUILD scrypt-1.3.0.ebuild 365 BLAKE2B aee5437ba9e2c13c9f4f12413b0eabd8f6e546aef97a2d1dc71003ec972561e70d3bd7a63450c80682c36f4fb326165acf9d970b5d6c0425f21401191a694ea4 SHA512 d4bfe2fccf9dfecdc5b2fdb9eb845645e58ceb4833a85f5a3a8ca696b6deaead5bc66f9e1954f260a517fefd93294d262e83f9686e742be7bf9a1fde029d6d8b
-EBUILD scrypt-1.3.1.ebuild 453 BLAKE2B bd3356b596c7a690785da352e49b6727a81b50c117b53ed95a6fe7b2e4ae73407701150a07e8ea8494f46a6f14fe9349ff99cd779c3d486425a627bf7b73ccf1 SHA512 de2bf3a94eb0a20696b401505d42027ee9200f41e65c9246862bed5cee01e0157244ba88cb651f48ff831e01f89d5607b453de0cbadd9f3df10a1e133a21ed9a
+EBUILD scrypt-1.3.1.ebuild 451 BLAKE2B 85576d7a479c5b1381d947e13cd0b923861799aeaa734c5f0b850befbdb35285dea06ffa359d020da3b4129a48a5b87f0d1a34ecd5f91c1e616b1f86ea023540 SHA512 e3beb1513d2bd91f8e9718682b30567c3f2719e67187ce547fb1a9a9c3c3e1537cdf0354f3f549614db674f2968511693af5e03c155e9c6e825b5a0678f00460
 MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/app-crypt/scrypt/scrypt-1.3.1.ebuild b/app-crypt/scrypt/scrypt-1.3.1.ebuild
index 4631e15dceb7..fd30ce906416 100644
--- a/app-crypt/scrypt/scrypt-1.3.1.ebuild
+++ b/app-crypt/scrypt/scrypt-1.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.tarsnap.com/scrypt/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( FORMAT )
 
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index be3e35ae7877..65d04dd84933 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -3,9 +3,9 @@ AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAK
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
 AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945
 DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
-DIST tpm2-tss-2.4.2.tar.gz 1461987 BLAKE2B 7d37818ba91c4128862206d5179dcde2c5149b5b00807b242a0b4311531ad2da9e8ad435a6b46872aab5eb91777012010a352ba0f478737740175e0353275643 SHA512 db31d216abcefdad76f5d9ff2995c99c552400392a4dec800b962fa1fa3ac83effacca831602a9b7f814045c996a1bb066802c5373b54233aa24ddafd636c27e
-DIST tpm2-tss-3.0.0.tar.gz 1509288 BLAKE2B 23c46ba6c9ea2b61703556d3aab5b4e75b1a0242a688c44e8c254a4defd8258e100a933598755373ffec9db3ca0ab9d35e6a290a73851c2a456449e04bd8313a SHA512 ba54904f2cd8cbcca85ce4d4ac5c8650da6ab076e8d8d142e1b7ee75c5e9a645520f1a5ac8ffe5269deceba84762c9074b131296e8b2d4c684ddc335a828d7a8
+DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27
+DIST tpm2-tss-3.0.1.tar.gz 1488285 BLAKE2B 2ccf123a2e0ff6355d8022402fb2e12932565f345b4b2c9ac68249b5de3ea5851256c38057323b19cb84dfd2ea5b63292b8b8f1bd4d9576d27bd57a35f0250f1 SHA512 206830fecea22c4974a16b5e76599b3c22e077a448f15e2707b260eba6832b2089f9d7c12d3e42daf314cdfbd83309b2b623a7abeb1409234f1930a835365529
 EBUILD tpm2-tss-2.4.1.ebuild 1773 BLAKE2B 0b8ad6d1eb92cae0c57fa37a28b3415427cf0a6310aa120e4224dce23c433e8f9dfd8b1005717d4c8e1672c3e59a8c1ce6119e67327cc23bdb999069eb464373 SHA512 a609ca5ff1c17ce961335d0eaabd53a11a7c9d9090f83004bfe336dfa2e85b04d09937e26336f26be044c258668adc8fbab568f2d3dd45670abaebd7b77b8ca7
-EBUILD tpm2-tss-2.4.2.ebuild 1703 BLAKE2B 853fb221ab9c00a9f13ec06e57047595ebe611625d2ff405a29fb79b53a11d9546e3ae910e46f5a5ac1afdd8f3a314eb64bd7453f9e1e8ae629e1f0971e14ac8 SHA512 075ff834e07e11c8df2fadce856441bb45f1e30c47c46f839e5e6b5487edb4bb87ad1b27be239b0261ab4e6a583a611bdf69493e5e890388b0d813ed14d2bd2f
-EBUILD tpm2-tss-3.0.0.ebuild 1700 BLAKE2B 757cfe421b8efdadddc692c87d022a4cc9b2cb81b8f164853a0452007b41e6507275e2d6843e9893accdb12cdbf013f8a4c378454535fc5bb2d22a3c7b372615 SHA512 4c8002a932997356daf5cf3ac4aefc26baf5bb3624a8369ba4ff09a81092c6516ca40037e002016f65e5f9361a1a5fe6c8e32db95266c4ab0d5915aaf9fbea0c
+EBUILD tpm2-tss-2.4.3.ebuild 1710 BLAKE2B 2f0dac5e5f10d5d489957974846d59dbcc20ab3f2c07196b82fd3caed4a5def36089f9488775007dd8f5044592141651be79f5a6200063435a0c81eff05802f4 SHA512 760d62872a36a47b246b861bbc59210d5f22ebd45a20f965966d276a7e610950596f03cfe527fb8ffc589df3a06f3e02da1d23b2f204c62b8df0a1e5486ab640
+EBUILD tpm2-tss-3.0.1.ebuild 1707 BLAKE2B 626a69acd6697ba963ba6e06af5513ad95ad3cee11baf0c56280ccbb757cbd7199d34cc5c224a24cb079806f69fa02bea182f88742d415fdab125799d99155d1 SHA512 4aa9f47e60606101b65177d3c2c3db54daf50c95f52f0bf2fc13a7a765c6915a9fd74f24f70cecf2381913788cd36c7a962269ab70c2741f9478232ebd0d957e
 MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
deleted file mode 100644
index 6f62e2098b94..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
-		fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? (
-		dev-libs/json-c
-		net-misc/curl
-	)
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-tcti-mssim \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex gcrypt gcrypt ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d" \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
new file mode 100644
index 000000000000..031d80ebfaa2
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +fapi gcrypt +openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( gcrypt openssl )
+		fapi? ( openssl !gcrypt )"
+
+RDEPEND="acct-group/tss
+	acct-user/tss
+	fapi? (
+		dev-libs/json-c
+		net-misc/curl
+	)
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable fapi) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-tcti-mssim \
+		--disable-defaultflags \
+		--disable-weakcrypto \
+		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-runstatedir=/run \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60- \
+		--with-sysusersdir="/usr/lib/sysusers.d" \
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild
deleted file mode 100644
index b746508251c2..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.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 autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc +fapi  +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? ( dev-libs/json-c
-		net-misc/curl )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-tcti-mssim \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d" \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild
new file mode 100644
index 000000000000..c6148898feee
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +fapi  +openssl mbedtls static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( mbedtls openssl )
+		fapi? ( openssl !mbedtls )"
+
+RDEPEND="acct-group/tss
+	acct-user/tss
+	fapi? ( dev-libs/json-c
+		net-misc/curl )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable fapi) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-tcti-mssim \
+		--disable-defaultflags \
+		--disable-weakcrypto \
+		--with-crypto="$(usex mbedtls mbed ossl)" \
+		--with-runstatedir=/run \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60- \
+		--with-sysusersdir="/usr/lib/sysusers.d" \
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 098ebf7a3769..cf4342a1fd84 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index d8c038c63302..776075393d47 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,8 +1,5 @@
-DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
-DIST kicad-doc-5.1.5.tar.gz 75372826 BLAKE2B 89e9f57009446ee7e6560f97c8e4de61250faa337ff9777d6d73f879bf3fb4575d7df878a2fe78cde48fe3884fdb5be69f9b807731232480550e6b214191cfa5 SHA512 52d06d67df25cf67fb2507a788f414bf3f83569d9cefe0763b9f65e014c1f863bdc3cc6a0d1fb843bd89129118bab117a8c9f83eef4e475bfb4fa853822b2fe5
 DIST kicad-doc-5.1.6.tar.bz2 74202367 BLAKE2B b4d4ff704bf59c7663469f5c4a314a44f1762f8ae5a9fb3abb1a2e8eb54c5dd843f3d095d7e60d0ae541d9e51241fa35ae28c56a495cd0c7e0874d5b1a473296 SHA512 6fae707154aa662689c5da03696d30ebc7442a6d2706cb14d470e91675d0f77c3eb9dd716d29b1eccde5cb0ff39a582a497be2d65d5e34e40defe2fdf97093e0
-EBUILD kicad-doc-4.0.7-r1.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
-EBUILD kicad-doc-4.0.7.ebuild 1187 BLAKE2B 44eb1d3012c24f431f255b4203109398c3cbb4de0e068c81bad2034c866b9f00b8bf91e9941e8dbe23857359d72e9948d561cbc66dcfb1d8162da23f08950ff4 SHA512 9d36ba68ac9dcc0be7ea28832a424288e46b2226bda91d2b13318323789b8479eee913f5a793fda3ef47bec6877cbabccac607c1c5d648a4621df82faab39405
-EBUILD kicad-doc-5.1.5.ebuild 1436 BLAKE2B 2ad02a03a17f1b524e44d8a56e40274fcc6addb51c2af39fdd945bf4a5926d7ed26fd6d4db5f34e33621d44f3efd8e0c14aca15f2c28b6a0525ec29247b103d1 SHA512 58550533ff06de493ba5a0eb3b627784fcc8cdabe4e9cb77192e89b697bd9684cea29dff163be107b19d2360b33093c450694e8e1743bec5a73cee33593eb4c3
-EBUILD kicad-doc-5.1.6.ebuild 1516 BLAKE2B 162ddd8371768af6f2ad7169bbe9b4e876825491815c2e64eacca9b8a779bdee162f683b8194599ead145e563f87b109b88103a7823a8f98663d69c77bdf70d6 SHA512 ee8142eed747aa610dea3388af7c2ea0b3cb51578373379079c596a9e84bebeb980779b62a2a6fe0d9bb3cf44f6889504d64dd981961226dd5faa93ee7022d62
+DIST kicad-doc-5.1.7.tar.bz2 74202031 BLAKE2B caa6f6403fe984230cbb1d0b0a75355621f9e371976774e66aac2216994249397082ef8699f0adced0696344a256edd5d47c42ce8d789ebf624d702008f0600a SHA512 72dcfdf3d943dc73bb4f30c9dc9f0cfe7a0c3f8749a04b04624c47e2b69f6be29627e2768d008980ae9ac691aa56c97529edc15741c72e261e4c2c6f3e7b32b4
+EBUILD kicad-doc-5.1.6.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
+EBUILD kicad-doc-5.1.7.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
deleted file mode 100644
index 5d54fc34345d..000000000000
--- a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html +pdf"
-LANGS="ca de en es fr id it ja pl"
-for lang in ${LANGS}; do
-	LUSE+=" l10n_${lang}"
-done
-IUSE+=${LUSE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
-unset lang
-unset LUSE
-
-DEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_ca? ( dev-texlive/texlive-langspanish )
-	l10n_de? ( dev-texlive/texlive-langgerman )
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_es? ( dev-texlive/texlive-langspanish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
deleted file mode 100644
index 13732e326c4a..000000000000
--- a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="html +pdf"
-LANGS="en fr it ja nl pl"
-for lang in ${LANGS}; do
-	LUSE+=" l10n_${lang}"
-done
-IUSE+=${LUSE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
-unset lang
-unset LUSE
-
-DEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_nl? ( dev-texlive/texlive-langeuropean )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.5.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.5.ebuild
deleted file mode 100644
index edf35c290db3..000000000000
--- a/app-doc/kicad-doc/kicad-doc-5.1.5.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 cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html +pdf"
-LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
-IUSE+=${LANG_USE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
-unset LANG_USE
-
-BDEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_ca? ( dev-texlive/texlive-langspanish )
-	l10n_de? ( dev-texlive/texlive-langgerman )
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_es? ( dev-texlive/texlive-langspanish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ru? ( dev-texlive/texlive-langcyrillic )
-	l10n_zh? ( dev-texlive/texlive-langchinese )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
-	)
-	cmake_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
index 6f1823b17c90..1578ee1b2ef6 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
@@ -6,8 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://docs.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad-pcb.org/"
 SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
new file mode 100644
index 000000000000..1578ee1b2ef6
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad-pcb.org/"
+SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html +pdf"
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+BDEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
+	)
+	cmake_src_configure
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index fa942da61c9e..61c65d4674da 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 740691f6ca51..a4d15812449b 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
 DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
-DIST lua-mode-20151025_p20200513.tar.gz 37281 BLAKE2B 1ec7cd53c12dc7b5bff49e11c51104b7ce6e9a8649ef10dcad670bba8b0772de3c7d9e51d8a3f6683eabe14cc290ff3978325c0531390625553f2fa00b2505e7 SHA512 9ee50bc1bccb6bff0e00ead1bc563bd69bfd1269aa1d038d05c973918ac0aeb802c6fdf98c0bd3e333e004246d0f323fc255075be1a6040c6cd0c6863568b6c2
+DIST lua-mode-20201010.tar.gz 42458 BLAKE2B 7bdfd35a8cb2bd1abea477fc408ee1d36c482310764d95acc0e0032a316bba005c15be9b5b862f249d72a7f6bdb30e71d951182023686f5914f4ec5272eb03f1 SHA512 7df283c4a6445979b4ceb1e398d1b48e8967d2f631f33be3f58171758ceb613ea8a4c7a466975bbe77d2a361b70dc9f30b7a244be34a87de0e6434b61088a6a4
 EBUILD lua-mode-20151025.ebuild 645 BLAKE2B 8d28cea4ab2c1b25b701e5199b1d6ed0afd956e6a1ff4b98857e2a3a52cb5b91142ef414d849de45aef81679ef786087286c452d01e5cb85568a1b8635df5163 SHA512 87453327fbcf94ab575d8069ed39dfbf6a68da8f1e44ade717ee8760d524b847bae4c8b5e016855d855cb647f1b76c6f7c1778b3fef2c0d9272bf3a6e3d4e04f
-EBUILD lua-mode-20151025_p20200513.ebuild 703 BLAKE2B 81761bc72f3c1092d95c3e1a2a508d0962984ac499ab49e7af3c947fd389e59fa3cccb3ba159778e4c3cb0303bc20046a115939f749cbdbea07f99df0871d637 SHA512 f7f35be72964119606450cf4e2c0203913d65eab1717078e7b4ac6dd0daa2028213cf32748f8fdc3a5a33dae9b8c5cbb1c0380be5a4fda88484f0b187833a64f
+EBUILD lua-mode-20201010.ebuild 635 BLAKE2B 9eed19de0de92061aef1df19d4ed77a1df038c117f2375d5ae2d5b491b16d4b53fbdd6a65a9469f3f61b516bc44637fd78576b145e8bd58b7ccd6c4aa2753099 SHA512 5d1039ad77959ba3b1f017495ab94dfbc9ab15886142ce330817e0e558ed02f61bd2a9ee2fd75814b1786e4a7b9108d02fa68dd8353ac68e39f7cedafad98691
 MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
diff --git a/app-emacs/lua-mode/lua-mode-20151025_p20200513.ebuild b/app-emacs/lua-mode/lua-mode-20151025_p20200513.ebuild
deleted file mode 100644
index 0b4b6dfd0816..000000000000
--- a/app-emacs/lua-mode/lua-mode-20151025_p20200513.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 elisp
-
-COMMIT="35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c"
-DESCRIPTION="An Emacs major mode for editing Lua scripts"
-HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport
-	http://immerrr.github.io/lua-mode/"
-SRC_URI="https://github.com/immerrr/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-RESTRICT="test"		# tests require cask which isn't packaged yet
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README README.md TODO"
diff --git a/app-emacs/lua-mode/lua-mode-20201010.ebuild b/app-emacs/lua-mode/lua-mode-20201010.ebuild
new file mode 100644
index 000000000000..67c43c781975
--- /dev/null
+++ b/app-emacs/lua-mode/lua-mode-20201010.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Lua scripts"
+HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport
+	http://immerrr.github.io/lua-mode/"
+SRC_URI="https://github.com/immerrr/${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"
+RESTRICT="test"		# tests require cask which isn't packaged yet
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README README.md TODO"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2b8c6bdbe50a..95dd0f1dd046 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 19e75902d6f8..ec8eea92f7e3 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,6 +1,5 @@
+AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795
 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3
-DIST fuse-1.5.6.tar.gz 1634711 BLAKE2B a581c106c668f0342b4a3b4ebbc0e92e750806e59d067798e23da02284cbb9a17cf580c5b6369144863fbf64b12326ea2982e4d83e87354d62ff51926e3293de SHA512 84312e4f83883b36d06f2b96ded1bfc71675cba71a0848f4cbb5a233a1d1c06466013d2655d759397f32d6d67d6ba26b2b6a5041796cb9143cd0b354a88fd589
 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
-EBUILD fuse-1.5.6.ebuild 1823 BLAKE2B 9b00e74118e6e8070dd6893accd12cb68ed63c0abb7e7a1c263d28122f791926ed757222a7aba6cdd6904a931936ce27f44d524348cca6eb72efffb47f15cef7 SHA512 a49b5e820de1a3a67b05b1f9385a0e12a3cbd150f83f637adfc0b1555d7083210b17aaa08e7954053a4f241edf711efaa299982e52dc9075852341043a571c65
-EBUILD fuse-1.5.7.ebuild 1823 BLAKE2B 9b00e74118e6e8070dd6893accd12cb68ed63c0abb7e7a1c263d28122f791926ed757222a7aba6cdd6904a931936ce27f44d524348cca6eb72efffb47f15cef7 SHA512 a49b5e820de1a3a67b05b1f9385a0e12a3cbd150f83f637adfc0b1555d7083210b17aaa08e7954053a4f241edf711efaa299982e52dc9075852341043a571c65
+EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b
 MISC metadata.xml 801 BLAKE2B 0a1504d02b423a72ad2d087489f9a0808dd2fb60643dc5c4a90625ce888cb6e9469195c919a3f9827bc0731afdf3ba739c2649692070c9d468a391e77eb9117a SHA512 dcb8d6a43cea89804e932e07dedf7d0fa3cabaf31aaa697f062e6e22a24c3c49e12a918e0cfd353d814ce1973c643b08f27710f95e696736bba2f174fbda76d5
diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch
new file mode 100644
index 000000000000..8a8e9d7d1758
--- /dev/null
+++ b/app-emulation/fuse/files/multiple-definition.patch
@@ -0,0 +1,13 @@
+diff -Naur fuse-1.5.7/ui/widget/widget.c fuse-1.5.7-patched/ui/widget/widget.c
+--- fuse-1.5.7/ui/widget/widget.c	2018-08-06 15:36:04.000000000 +0200
++++ fuse-1.5.7-patched/ui/widget/widget.c	2020-09-20 15:27:42.045382588 +0200
+@@ -90,9 +90,6 @@
+ 
+ static widget_recurse_t widget_return[10]; /* The stack to recurse on */
+ 
+-/* The settings used whilst playing with an options dialog box */
+-settings_info widget_options_settings;
+-
+ static int widget_read_font( const char *filename )
+ {
+   utils_file file;
diff --git a/app-emulation/fuse/fuse-1.5.6.ebuild b/app-emulation/fuse/fuse-1.5.6.ebuild
deleted file mode 100644
index ffc3cfaeb973..000000000000
--- a/app-emulation/fuse/fuse-1.5.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://fuse-emulator.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml"
-
-# Only one UI back-end can be enabled at a time
-REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )"
-
-RDEPEND="
-	>=app-emulation/libspectrum-1.4.4
-	dev-libs/glib:2
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	backend-sdl? ( media-libs/libsdl )
-	backend-svga? ( media-libs/svgalib )
-	backend-X? ( x11-libs/libX11 x11-libs/libXext )
-	!backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
-	gpm? ( sys-libs/gpm )
-	joystick? ( media-libs/libjsw )
-	png? ( media-libs/libpng:0= sys-libs/zlib )
-	xml? ( dev-libs/libxml2:2 )"
-DEPEND="${RDEPEND}
-	backend-fbcon? ( virtual/linux-sources )
-	dev-lang/perl
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/remove-local-prefix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--without-win32
-		$(use_with alsa)
-		$(use_with ao libao)
-		$(use_with gpm)
-		$(use_with joystick)
-		$(use_enable joystick ui-joystick)
-		$(use_enable memlimit smallmem)
-		$(use_with png)
-		$(use_with xml libxml2)
-	)
-
-	if use backend-sdl; then
-		myconf+=("--with-sdl")
-	elif use backend-X; then
-		myconf+=("--without-gtk")
-	elif use backend-svga; then
-		myconf+=("--with-svgalib")
-	elif use backend-fbcon; then
-		myconf+=("--with-fb")
-	else
-		myconf+=("--with-gtk")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild
index ffc3cfaeb973..063ecf27471a 100644
--- a/app-emulation/fuse/fuse-1.5.7.ebuild
+++ b/app-emulation/fuse/fuse-1.5.7.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	backend-X? ( x11-libs/libX11 x11-libs/libXext )
 	!backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
 	gpm? ( sys-libs/gpm )
-	joystick? ( media-libs/libjsw )
+	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
 	png? ( media-libs/libpng:0= sys-libs/zlib )
 	xml? ( dev-libs/libxml2:2 )"
 DEPEND="${RDEPEND}
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README THANKS )
 
 PATCHES=(
+	"${FILESDIR}"/multiple-definition.patch
 	"${FILESDIR}"/remove-local-prefix.patch
 )
 
@@ -53,7 +54,6 @@ src_configure() {
 		$(use_with ao libao)
 		$(use_with gpm)
 		$(use_with joystick)
-		$(use_enable joystick ui-joystick)
 		$(use_enable memlimit smallmem)
 		$(use_with png)
 		$(use_with xml libxml2)
@@ -71,6 +71,8 @@ src_configure() {
 		myconf+=("--with-gtk")
 	fi
 
+	use joystick && myconf+=( $(use_enable backend-sdl ui-joystick) )
+
 	econf "${myconf[@]}"
 }
 
diff --git a/app-emulation/pcem/Manifest b/app-emulation/pcem/Manifest
index 39fdb6a7cf4a..343def6946bf 100644
--- a/app-emulation/pcem/Manifest
+++ b/app-emulation/pcem/Manifest
@@ -1,4 +1,4 @@
 AUX pcem-15-respect-cflags.patch 300 BLAKE2B 4531829e43d43501fe889b34381fc056ffa2734ca499686558cf39ef245f3808e6488c32d6938487d018175ab8a370a28e491cc957406ea6e430a9afff44dae2 SHA512 7800d9056fc1ab4b38f97a6021da7288b990ab9c562846be1ae4ec6636c888fd444c635076f070c50f39681202995a41575823a225c77017d389638feaf1a93c
 DIST PCemV16Linux.tar.gz 1859892 BLAKE2B e388031e661b9320cc783e6400bdb7c191a2f946d9c207d9a58daa9270115b32ed55ac6a0b87227b51d10168e7d161bb03811eb83f5405ed1a71f7bfc6fd8aa5 SHA512 97d33ae1c4b59f281abe553ed4297c0d6c3956cf32b44474bfd5773700dd5c4ea6c209c679b9add5d4a7cba61748ee9794afa3c59af3230fa2a15812e13fd1c5
-EBUILD pcem-16.ebuild 1615 BLAKE2B e9141f45d86ba205df78881ecb97cfbffe38d110d217721c9a85a39f2925aa43d80bf84d8a50cd330cc12237cd27764ea419db4d8b581cc2c4971175c8e4529b SHA512 b728aec270e313973fd2ce461c0524557c37d26e9b1392f8f74f9938723368b0ec37cd79d56fd70794454da000c1abb9f96f0a4d4d9de6893e4beb814b2daa95
+EBUILD pcem-16-r1.ebuild 1620 BLAKE2B 0aac57f5c98959c93cee2fac629ca7ad735276aff00bc83a6f3691a70bb6c1a765dd414808346c7bce1882280df35661308ceeb3a038bb8753ef5a32516a7a8b SHA512 9ef650db24e40a9d203b550d8e92fe00b736277dc468dc69b3281134003662170461fde07772996055fdabca78a3bdf54f7e20d21dda4d8b11012f0dbbcfa211
 MISC metadata.xml 857 BLAKE2B c678e4578dca5c14416690cf8a421d4d1d8887237a4600580aad48d1d4ea6b641cc3c1f47c6c00be44344b760aa87c2b9bbded7625e0ccaedd0c8c2cb14dd057 SHA512 e610d16662365ae271fab8a2364e5781ba4be7a841d36759bc4e319b7f87a589c02131aeea83f194eabf940c0c4439459127468c0a65a72e3e2e91c74c0d409d
diff --git a/app-emulation/pcem/pcem-16-r1.ebuild b/app-emulation/pcem/pcem-16-r1.ebuild
new file mode 100644
index 000000000000..42c969775c84
--- /dev/null
+++ b/app-emulation/pcem/pcem-16-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop wxwidgets
+
+WX_GTK_VER="3.0-gtk3"
+
+DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
+HOMEPAGE="
+	https://pcem-emulator.co.uk/
+	https://github.com/sarah-walker-pcem/pcem/
+"
+SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="alsa networking"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	media-libs/libsdl2
+	media-libs/openal
+	x11-libs/wxGTK:${WX_GTK_VER}[tiff,X]
+"
+
+DEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-15-respect-cflags.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Does not compile with -fno-common.
+	# See https://pcem-emulator.co.uk/phpBB3/viewtopic.php?f=3&t=3443
+	append-cflags -fcommon
+
+	local myeconfargs=(
+		--enable-release-build
+		$(use_enable alsa)
+		$(use_enable networking)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/pcem
+	doins -r configs nvr roms
+
+	newicon src/icons/32x32/motherboard.png pcem.png
+	make_desktop_entry "pcem" "PCem" pcem "Development;Utility"
+
+	dodoc readme.txt
+}
+
+pkg_postinst() {
+	elog "In order to use PCem, you will need some roms for various emulated systems."
+	elog "You can either install globally for all users or locally for yourself."
+	elog ""
+	elog "To install globally, put your ROM files into '${ROOT}/usr/share/pcem/roms/<system>'."
+	elog "To install locally, put your ROM files into '~/.pcem/roms/<system>'."
+}
diff --git a/app-emulation/pcem/pcem-16.ebuild b/app-emulation/pcem/pcem-16.ebuild
deleted file mode 100644
index 605cd74eded3..000000000000
--- a/app-emulation/pcem/pcem-16.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 autotools desktop wxwidgets
-
-WX_GTK_VER="3.0"
-
-DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
-HOMEPAGE="
-	https://pcem-emulator.co.uk/
-	https://github.com/sarah-walker-pcem/pcem/
-"
-SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="alsa networking"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsdl2
-	media-libs/openal
-	x11-libs/wxGTK:${WX_GTK_VER}[tiff,X]
-"
-
-DEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-15-respect-cflags.patch" )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Does not compile with -fno-common.
-	# See https://pcem-emulator.co.uk/phpBB3/viewtopic.php?f=3&t=3443
-	append-cflags -fcommon
-
-	local myeconfargs=(
-		--enable-release-build
-		$(use_enable alsa)
-		$(use_enable networking)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/pcem
-	doins -r configs nvr roms
-
-	newicon src/icons/32x32/motherboard.png pcem.png
-	make_desktop_entry "pcem" "PCem" pcem "Development;Utility"
-
-	dodoc readme.txt
-}
-
-pkg_postinst() {
-	elog "In order to use PCem, you will need some roms for various emulated systems."
-	elog "You can either install globally for all users or locally for yourself."
-	elog ""
-	elog "To install globally, put your ROM files into '${ROOT}/usr/share/pcem/roms/<system>'."
-	elog "To install locally, put your ROM files into '~/.pcem/roms/<system>'."
-}
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index c3e7125baaa8..5cb6a4c203bd 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -12,6 +12,7 @@ DIST wine-mono-4.9.3.msi 95017472 BLAKE2B bf054bcff51e986ddb95788fdd1925ee13efe6
 DIST wine-mono-4.9.4.msi 95266304 BLAKE2B fb9c81f8ac8fca104f766d62b02c8751b5b7b91740cb43942477c7bdcac382eafeb5fc9c3fe78191b19d81bc5f06dd5c33db7ecfbdaba5e6be69ed39a6827706 SHA512 d52a2cc1137eac87acdaecbb7a81b3d618cad9ad3d7bca5b29940b7432923bfc1497ec21501a05797ef52c6588bb9c5e312df5c02ede8448d1fe1f2880557fc9
 DIST wine-mono-5.0.0-x86.msi 79537664 BLAKE2B f5a4185a7a63a1c1966d871d4c8d5bae07d3bbbc3153f20847c3919ac87be5644e15b45764286483641d9ce19176f79c7c7544e543fad62032ef5302a66ea8ea SHA512 8f83122d4b552b3a3d8b000abbd19b7a72edf45e52fa63a9220228240d8e4c014531bb265d062a38f6924fae07dd45420a5c7566f99e0c471e116fb80906c08c
 DIST wine-mono-5.1.0-x86.msi 84094976 BLAKE2B 25b044696f46810a843c17117f61532de3d4922f202e5acc2106b67f99eda6d359a799dd53ac4801380e81fdb5929c29e09a4923df99bf104b462ac77c682f29 SHA512 c4013307ba43121346f11881a30ff83d4921e0563a1ad3ff1adc34373f7bda5d5f6ad8c46bafe11c13ca372075333562864e073fe944428225b01fb885f9532f
+DIST wine-mono-5.1.1-x86.msi 84130304 BLAKE2B 05a5344b59249a758443cf91670eaef71d9ad3a3024b11442a8d3512ba54356439d503629fa799e2454975f47c0eaf6ff9e25ed61b020f29efceacc78347d578 SHA512 c518b93a470cc897abaf1dba18cc773dca0df62a28d35f32f2ddbe39b4de616c0307545bea5dc3ca87a01fd96b47feb3e1d8c3778106304b9cc08ebb3d1d665f
 EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
 EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
 EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
@@ -26,4 +27,5 @@ EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851
 EBUILD wine-mono-4.9.4.ebuild 501 BLAKE2B 291fc02c8a792407a6e727ae5ac2a211201fa00761a5dc613cda2bd231524f187897e39725c08114316bceee53676998c2a5b4669da56919da665af5f5643c9a SHA512 710d387c1d7dce22f8a832bf7f090aa4cd9992e6622133a7cb187f2b13a7de0a88b0afc45d53882094a475de56ba5e0e4b631d778d61186686e76f9a4380cdf5
 EBUILD wine-mono-5.0.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
 EBUILD wine-mono-5.1.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
+EBUILD wine-mono-5.1.1.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-5.1.1.ebuild b/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
new file mode 100644
index 000000000000..30b33158592b
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	doins "${DISTDIR}/${P}-x86.msi"
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 459d0861d1d5..2bca8dcacb41 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.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-5.19.tar.xz 24201860 BLAKE2B 34233747a58e2cf6c9b6b328cb8c0af5707479e02d20365da07d039163757c6557d25ec8136933fd9bd5a7aeb360d96e44c41c34fffb26a23f9e3ea137f03120 SHA512 b91eb1cb1225ac8abe26f5c5dd74fb376e6489b460035c70e6c7890595086e99273497741b6a736ef4884ae7bacc44482d2e3e8ba7e8d85c78c571bd4b133d8a
 DIST wine-staging-5.16.tar.gz 9830408 BLAKE2B 0c4fd5e9942f4b5a666b21cb2ab3fdb059bca5762fd622b69358fd5df7f5c770681a3cbe6f9a0433e83f3be95b69808d95ed5f76df86b9713dcedb72a398966e SHA512 62e103dd5b591bc1066b91299a95c318bf1588f273f8380c1ac43d5367b695055a1684b8cc6473255a0b449b21a483ff4e87adc3ae332d0fb520023340fff79f
 DIST wine-staging-5.17.tar.gz 10342408 BLAKE2B aa8f864560eb476a4c2011e588df9b24410e4e4a8d6c8d81b5ff63208b3b4474870ae8bd718ba22cdb14b920b52aeac54274710bdb1b4dd427b7c7b0e8e9d14b SHA512 38c9860c8109e29026dd773a6448c9ac6faa373c0dfc04011a5f0b22be69c66dd6bdba95cb28bfb8e3656a53d726f2ffc0bae74bce4d437c4fe5a532e75a19ec
 DIST wine-staging-5.18.tar.gz 10357038 BLAKE2B 07df0de55d1bfa36d3492498a48d8f1402dffa161f3b02f3326185d524bea9a2f0893b85a70650797bf1b74c06f5814ddc09cb184a5977cfacb968921020aee1 SHA512 75911ac4d5aaf6cfef41aa487290369d714f153b1fba2279daca75d6c5cbc7e7de9d3f8ef55eb7c311a05b86a212163e2b81ff685c1527fb0e90f223ec23dcab
-EBUILD wine-staging-5.15.ebuild 20510 BLAKE2B 3af262cc7b538088e2ff34679e1f3acbb72569f5f2bc0a2dd7d77f6102c9c4bf6560092a9bc52e78fc9b8e73d4589afe37d1945a4d83f20e160710d9e5d0807d SHA512 7f6f53332e0e91107f77fb0271a3b2381b28f37eb40eb8bda0acdb3f74f08c31fcf1846c534e38b648d6be8d8fe61935cce23e4da1a6dc6f346922d9235b0887
+DIST wine-staging-5.19.tar.gz 10348478 BLAKE2B 4c23d3f488fc7dcbd98abea0593767401711ac0ed533cba144e82fd38f1349ba557aeedf6faac898de107d2b55ba41030cde111272f63ebb7ba25952bf9824d9 SHA512 4335ce48437641bbfd8b882cc92cd2970493586f4ac6501ffb94a0f2dcd38ec632d6afabf71d2c1ab1806a5cf594c2988f94a86c508fcd24a7d42078c662add9
 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-5.18.ebuild 20436 BLAKE2B 522ef18a86d633267119e239986bd2fba09eedad6358fb5f441dde3d05ad95af673bb29940e45b17b90415650f7b6e6da6d6c66fa4a1a746c48ef5373b18723f SHA512 37e945cdd14814105bf8d395ea2a36c0e845352bfa11deda2226db61c42706113ca849c11f230b5607dc81cf694be583542026b9b5c9d23463c5dc009bd2b92f
-EBUILD wine-staging-9999.ebuild 20361 BLAKE2B 456f7127858924ffaebe4039771b105d44538030f43275e6aa74605a858a57640fcb24a8932d218db2a1d27fc62071608203ff2239832ee806efc07113c9aff4 SHA512 68cafcfb0a7a52e0a19049bef1e1740012d9ea84e7c4d9a9b53653312bb8257c4d71bafbeafd9ee7051799f266d0b8a8830214aa89945e3c025c75be74a32c28
+EBUILD wine-staging-5.19.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
+EBUILD wine-staging-9999.ebuild 20361 BLAKE2B cf403a7d946df4b6305629416b63de3b4323c0446cf1632fbc28cfef70f88addcc872ab50b4f6bc9a74fbb06aa4fcfeef0a8081fe08df923df8fbd9ba0e3cf19 SHA512 802182b3aa248eef762bf84e316b583f2e06eba9f62e6feb61243e99f65cab43ad12a6771b6629aae3b11f710a0066b3d65cc834a8f90e8aa2e9f06fe1ba841d
 MISC metadata.xml 3813 BLAKE2B de077c2b962c962401ae0922aa8a244f08db7a5f0773d8d1466497dd3d2cd6e8b60186c5025f0806b49238266117035986df25c9c939fb9d9ec98ac7af5ebbf4 SHA512 edac5258e3d47f8c0285eb382cb5209996630bd65722c864a2b548dad09d72073d1c3e797fdda0f0cbf46bb87abbc5cbf1020fec2984b08c164d019a90fc4902
diff --git a/app-emulation/wine-staging/wine-staging-5.15.ebuild b/app-emulation/wine-staging/wine-staging-5.15.ebuild
deleted file mode 100644
index 47944101d56f..000000000000
--- a/app-emulation/wine-staging/wine-staging-5.15.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}"
-STAGING_COMMIT="150ce22fa21ffa040816e725ead34ed1de516bd8"
-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-${STAGING_COMMIT}"
-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/${STAGING_COMMIT}.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.19.ebuild b/app-emulation/wine-staging/wine-staging-5.19.ebuild
new file mode 100644
index 000000000000..9c6e2a76fa30
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-5.19.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.1 )
+	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 19d8082c2129..11363b6b82bf 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!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 )
+	mono? ( app-emulation/wine-mono:5.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index fb56879f1a22..ca28fee68998 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.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-5.19.tar.xz 24201860 BLAKE2B 34233747a58e2cf6c9b6b328cb8c0af5707479e02d20365da07d039163757c6557d25ec8136933fd9bd5a7aeb360d96e44c41c34fffb26a23f9e3ea137f03120 SHA512 b91eb1cb1225ac8abe26f5c5dd74fb376e6489b460035c70e6c7890595086e99273497741b6a736ef4884ae7bacc44482d2e3e8ba7e8d85c78c571bd4b133d8a
 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.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-5.18.ebuild 17601 BLAKE2B efd932ad64172c60f13c39edb835e50f9ab3f1df117099292746b58830c5f55dd286f1ec461f2884ddb6ae247071590bdcc3a5e0e288af2384c02a41081ae643 SHA512 dd8c204bf708d837979d16ae85496494e01bc788f3194e7ca38c2e649a3c0c8d4062feca86deef942ef03ca614b4cb5af33527593af9873a702d221bce01af7b
-EBUILD wine-vanilla-9999.ebuild 17601 BLAKE2B efd932ad64172c60f13c39edb835e50f9ab3f1df117099292746b58830c5f55dd286f1ec461f2884ddb6ae247071590bdcc3a5e0e288af2384c02a41081ae643 SHA512 dd8c204bf708d837979d16ae85496494e01bc788f3194e7ca38c2e649a3c0c8d4062feca86deef942ef03ca614b4cb5af33527593af9873a702d221bce01af7b
+EBUILD wine-vanilla-5.19.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
+EBUILD wine-vanilla-9999.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
 MISC metadata.xml 3141 BLAKE2B 07e1e174d2acc8cb6e5b2767daa8b70490f75102e95f17d8b55e416aa50c4cc47c163cf7b0d95140bab074213b490fdd0f1297703369d413d7c00486800b8232 SHA512 d5eec710aebe9ae4eab2bb4e9c14079884c60882f1cec1b3e42bcb95008acb29e26ce633b55518bd5bab4c581e1194bdb104f0e630c683360994bfd666b059e4
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild
deleted file mode 100644
index fed13ca5bb03..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.15.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.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
new file mode 100644
index 000000000000..226b93efb90f
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.19.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.1 )
+	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 f411a705130e..226b93efb90f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!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 )
+	mono? ( app-emulation/wine-mono:5.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index dbb064dbae5b..00a05e66cdc2 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -28,6 +28,6 @@ DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64d
 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.13.1-r4.ebuild 15979 BLAKE2B b0091fe5dd1c16cb23d6f47c7647ae9fb9c132eafefcc6b667029de914dbf902e95888e37936b29faf881e838cb5025a01a0701b8a9ae260ae29413d86140dd5 SHA512 35cfa71ae09d7214f3f4acc590cb32cb17693cf2ef7113655168f713650920553c2082dd134be14b18d2e87a7ae268d1336da9ef366c64cbeb76aa472e901610
+EBUILD xen-tools-4.13.1-r4.ebuild 15978 BLAKE2B 70b29eee0506785f134ba0cacfb0b437e7d1b70b612c7610af80217a8227411138f477d822b7a1fd6d5579d443e829634cf7e54c43b6dea7302e39e94368c9da SHA512 5f98b8656a8217ffad89fe04c16746c9fc5ba32eeb6ef87bea238e6b20a1f7bcd1fe1783d9fb4ca80f7d4aca0d8120acab066a0d79fbc35aa92df573056d2793
 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
index 0ae21dfdfea3..db9aab75f88c 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=3
 	SECURITY_VER=28
 	# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 76ab23eabc43..a95e40ad46e4 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -6,6 +6,6 @@ DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577d
 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.13.1-r4.ebuild 4445 BLAKE2B 309a956271494090acd7f1d687fe1056f95c34a50ada3dfbee165fe1f3a935aa3a7c92e13d778a425bd587497879170efa73b65c8029ab08cb4716da13cf641b SHA512 f2efcbd096cdd92246a5d8c4d877b7ec17c84ae27f6822c3f62ba43087cb975a395a30753eeb920f6339bd5c1c9c64d2d50e254f9cb10d8db898df87c43c275d
+EBUILD xen-4.13.1-r4.ebuild 4444 BLAKE2B 8f20aa6cd1f182a8c6b9f56c267409879777bff7d90d270650225b514f20cc225b0b0444ae12e24de1cfd3a5aa7bd4f35923fc95e879a286974949e0842d640e SHA512 52765d87c31bcd4b8319e484257b569d03c4f9dfd25b75313b660e7f6583ca05815ac0b1eeea81e11f28a64c16698a7c7aa2e2e0422aa455dc461321e1004258
 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
index 5bde79cb7c82..5e92a5f18903 100644
--- a/app-emulation/xen/xen-4.13.1-r4.ebuild
+++ b/app-emulation/xen/xen-4.13.1-r4.ebuild
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=3
 	SECURITY_VER=
 	GENTOO_VER=
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 7753ffee818b..e692f46e98a7 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 9a02e4be84ee..20480dd9dbff 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
-EBUILD ibus-1.5.22.ebuild 4115 BLAKE2B 2ec77d1d248e15dcbbafcc957643fe0988cfceedc60e120b9ded7d8cc1cc03fd26484d92d7d8c4abeec95de185cf0945e31d04a8c12c7d5d10ceecff050e8312 SHA512 5b470de75de14aa7dd45064fa7730d8b3b7d4180c623d31ac8313cc5e4920ecea4054163753f29fe042ecfb39c1505a3a9b1acbcdbddbbe19e505e64c451d6a4
+EBUILD ibus-1.5.22.ebuild 4143 BLAKE2B a3c44e85e5c76e7f4ab564de3d48ef834e91081bf2b5f2b82212a2f155653b786f5f32f55e692ebd05a8f8b860ea7d62341bb109ef262b359f66358c4ef24d67 SHA512 39189e93d230bbf5d695e2c0ae944b681c33132ac33dc81d0cf2c286bed31997deeb77ee27276398f5817d75045854e372d8c28ccd157f2cf9fba0561cd466b5
 MISC metadata.xml 865 BLAKE2B bbf090f2a0102b1a5672dfd051cb4240b923b60146900e4c966a5d3da33ee795140820f5d2865dec984c90db6fc98e4cfe010f20e26f376cf98e929dca2516b6 SHA512 4c7ad9414350dba19fc3c0846c3197d0bb2f8cfe653242c547db9fedaa014329cfd39a2d086c7954b1377aaaee762dd3f4063ec071ef36dc748bf3dbadf85e77
diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 5eae573dbe96..f7c9f747cdd6 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.48"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 776b4ca2a5b7..dfdbeaba02f2 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -4,6 +4,6 @@ DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c940
 DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
 EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf
-EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1585 BLAKE2B 910ce94a0b0595f95ee479a186241c3d3d8d5ba8abca47e9bf9dc33ef1df3d9fd48c02d2a1d3d7cc04d9253ed2f71a52d06c91e9a50dd3bdf400d834c9f80509 SHA512 1fd476776703c7669bd187fea471c25c4471f74e897720de92454b5a18831826385b1846ce70990a871cfdbc8ae8e5d5c2674c060777b51f64be0658d08f9698
+EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1583 BLAKE2B ac1195146760061c65d51de3306192d173c3bf76eede636ff3a5bf0324df9f3523498d1e89b98049fbfd1c50e453b371cc6cb587885e84492f492282102c6f8a SHA512 8dffec68e4e1c84d517c4646e6cd4b93fe06d92176bbceaf26be60198f0106e77c226fe9acddec004be030c76685f83ba30f305501913f35d3c71cc3a07cb26b
 EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3
 MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index 9c87c79773ce..0013ae876aea 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="|| ( CDDL LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 
 BDEPEND="dev-lang/perl
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f7d8ad6a55fd..bc3cb55c54df 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 05f3286b3f1a..13d80ad29c88 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
-EBUILD dtach-0.9.ebuild 455 BLAKE2B add548fb913ea05c1e4635d0f8462dd42df7ce2f10efa99ca747c9f3a04d876951791c8dd0b5c047977a17ec963e671d12e8869d776d3a4fec345f93254bd98e SHA512 a37d33f53634879c3ab1f04a72b2cbb473164a273d8c0b62dd14647c36122b51173a58e8623638b281e4d4a6feff5f70c23f66405128633fb9a7ce43a29f6334
+EBUILD dtach-0.9.ebuild 454 BLAKE2B 16f990d75606aca3bcfee47a510a3fe88694d13bc084411909b5f41cd5c7b16c0d8882409342671e23c256098878cc9ff5ea4c4e4222e78344cb13da62a9663c SHA512 a1332ed9d6d2bd7425297654b3d2a7dda9acb512f4af262e78318bd14a02416e949e268d2f04d62e54f55103ef435b7725263b0eedd9aa4e31b3d318ff0f39e6
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index e6fd332e1549..bf55cf7d2474 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-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=""
 
 src_install() {
diff --git a/app-misc/fr24feed/Manifest b/app-misc/fr24feed/Manifest
index 4fa16893c61f..6fd65dacc230 100644
--- a/app-misc/fr24feed/Manifest
+++ b/app-misc/fr24feed/Manifest
@@ -1,10 +1,7 @@
 AUX fr24feed.confd 182 BLAKE2B 10edd368975b775273a7269da6d554c4321b910f1383a9892a0b9ec2c24d776b1f679e541ad3d59a2e3fb76560341ed88debb01ad037f548663ad993c5894fbf SHA512 c614df857f630dc1bea0d7174ae7a26fceda73d6e793609c90d23478e4bb947b45e09f6f17873c22b8888b33bc738d6128466ee09fe4ea885ddc6c31f5188e25
 AUX fr24feed.ini 15 BLAKE2B bb6e818c0ee430ca84bbc59688a6087fa50095521d7c7e8cd799d5bd2b0f7607c056dc826b0d71571f709afd35fbd4808cd54480b4bcb0ec68c024c333ae04f2 SHA512 b3b9f0597a74f29da5c0308c9acd0d42a0d70165aa3ef53f03c7412dbe69a8d7472111c9ab273c93aa7ef06f9146555f4b3255d2bcbc2b3b356db867998bc186
 AUX fr24feed.initd 618 BLAKE2B 5e7a6cf2160be2cce8f5779b2fd6613a2cc4d8e754a8538cf5d6ff39e434ed97b5763ec76ed97a1cfd1e36e3d9884b63604e770368668cfa1ad9f0599f08e928 SHA512 8bc686237a15206569aea00a68e3f6bbf97036915c23781a122831b43ac3045e12b440f565d862b25ff3b453fc17cd32a026cafc7e4409aca6dfef0514901528
-DIST fr24feed_1.0.24-5_amd64.tgz 3943670 BLAKE2B d8d7b031872c1220f2f6ba5843d0c457279d393ae78dc947fe5cbc81e5ee1d4bf629ecddee093020ed3e01937fcecd9f225dcfd5c55fc47e7a31a23007122a18 SHA512 9ed5391e7faf1ab3352b95d6eaab8cccd77f0759e4852c3e0283a930d8f7dff2f38c59eb00639a2be0c6decd9f4db49fcdefb6b3de3533b8453a02f66224d503
-DIST fr24feed_1.0.24-5_i386.tgz 3645172 BLAKE2B 074d6535d09ab77baa9d954bcd9c87c3099b6938ad57ab67f16b14a6a8f865868eb3d82b49eeb6559a6929f8cb28f3591563f007490dd45782b4452cf2da12f2 SHA512 05d9a7ad64e047d3b2934d6421d1fcfb8aa6eb955739f9fa58726d2e45cb7141fad73ea1943ce01a071077a8155e07672acade75ce9068d5c932b0b24ff2b194
 DIST fr24feed_1.0.25-3_amd64.tgz 4036311 BLAKE2B 9212bad79534e989aa7d12ff3f283c328603cad79cd7908c526bd1170cbf00b8c41e2effa6db703e1f967113042fd439e15c39c2b8a4de8a58e5819afa273718 SHA512 6d0e687dd8d9a104de0db003764db3771003e516bc48e1aa2f39fce7db80f01f5e14b318063f29122706f769d6c0db24b811b386e9c2e9e48e45e59b03bcd0ef
 DIST fr24feed_1.0.25-3_i386.tgz 3746108 BLAKE2B 3ccd586441c3441e3cec5723bd9de1723ec0fa7d5ab3cf04805661dc303d3ab670b084fcd6198574573511395162b86432bcf026c000ae280018bc831ec2c548 SHA512 22a10cb097c507c15e8aff20bf453d1c96459b0b0538009970fce0abbead0f0a1397c2af0d1c1e1040f247019f1eeaa80e5760c93e26500fe189f66861c20a72
-EBUILD fr24feed-1.0.24_p5.ebuild 979 BLAKE2B ec3090882bc5f9af684826856a94c90d634676c587a893e579c6cc0763676846cdd49754292575edb525ffc420faab0f18fa3ede14d5e34778dc7799bd072332 SHA512 d9cecd78456987747bfcdf4191d7f3fa9afa8d1afd0dfea678cbbd0adb5d7bc34d6a0e72ab289c9bf03d7fa606ad9b4470457583c366da4416b3ed4ad6404f14
-EBUILD fr24feed-1.0.25_p3.ebuild 980 BLAKE2B 4cb6746de169bcc3b2a35a3ad7da2e04fae60c9829ae42bd930c37dda21f7dec8fe9859ed8fd4fef696fc6e8642f856f0071a124873ae0d7e9d0c5746e21b121 SHA512 de0fc89cf2fdbaf1fb3ea794498448a3070896638bc8fc30dfc4e7ad36715815cee343f1c93a088456dbc2312dcb22826f6482ea6325f26d690a6f123c1f9260
+EBUILD fr24feed-1.0.25_p3.ebuild 979 BLAKE2B ec3090882bc5f9af684826856a94c90d634676c587a893e579c6cc0763676846cdd49754292575edb525ffc420faab0f18fa3ede14d5e34778dc7799bd072332 SHA512 d9cecd78456987747bfcdf4191d7f3fa9afa8d1afd0dfea678cbbd0adb5d7bc34d6a0e72ab289c9bf03d7fa606ad9b4470457583c366da4416b3ed4ad6404f14
 MISC metadata.xml 891 BLAKE2B 7f5e04b5c9a20ce764f8440658b14d3f125f92e90c57188456cfed899aa1b13086edbb322aa71dcae9d28a92c4044a7d7043304bd21646090fcc761f4b8c9583 SHA512 fb6aac498a44f91af213696ca370eb63f0fd19e221f53de9b1e16563f9bea2d8c32ed1f8aafe395dc606fcf1a406156f184f50529d5645bc40be507d831b5414
diff --git a/app-misc/fr24feed/fr24feed-1.0.24_p5.ebuild b/app-misc/fr24feed/fr24feed-1.0.24_p5.ebuild
deleted file mode 100644
index 2559deca7f1e..000000000000
--- a/app-misc/fr24feed/fr24feed-1.0.24_p5.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
-
-MY_PV="${PV/-/_}"
-MY_PV="${MY_PV/_p/-}"
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="Flightradar24 data sharing software"
-HOMEPAGE="https://www.flightradar24.com/share-your-data"
-SRC_URI="
-	amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/${MY_P}_amd64.tgz )
-	x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/${MY_P}_i386.tgz )
-"
-
-LICENSE="Flightradar24"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="
-	net-wireless/dump1090
-	virtual/libusb:1
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/bin/fr24feed"
-
-src_install() {
-	dobin fr24feed_$(usex amd64 'amd64' 'i386')/fr24feed
-
-	insinto /etc
-	doins "${FILESDIR}"/fr24feed.ini
-
-	newinitd "${FILESDIR}"/fr24feed.initd fr24feed
-	newconfd "${FILESDIR}"/fr24feed.confd fr24feed
-}
-
-pkg_postinst() {
-	elog "Please run '/usr/bin/fr24feed --signup', to register yourself as a data feeder."
-}
diff --git a/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild b/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
index 4420fa39d54b..2559deca7f1e 100644
--- a/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
+++ b/app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Flightradar24"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	net-wireless/dump1090
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index bef8ae8f2e7c..55e380fa5da8 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,6 +1,4 @@
 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-r2.ebuild 2260 BLAKE2B 7a960a69fa4e1156fe07487207a1ab91fc8b6f324bd5d7803906d6eede089dae5bc22cabef9352ccc44a70319897f7008901cb86c261e9fad3c099ed00e66acf SHA512 dcc3c86ebca122bb90743961e4c8cca049124520b98b2511e37858e008fd5ab7dd34da76d9797763d76242f2a6cdf8ba8d6563fe41eccbdffeb03ce8a01140ea
-EBUILD graphlcd-base-2.0.0-r1.ebuild 2254 BLAKE2B 02e1a55e0dbb10c9410c53e815f38d3f5eb304e235f8c9e18245f7e08f0cbfe97fa911972b3dc378c9b5fa7bccbed87c55bda33dd4fa0b7d51d1dba5892d47d6 SHA512 a2d5bdcd1da309dd732a2cf7a584c24006293414165f97b9e34ef7adbbf1d54fe54d447968ff9f625552a4b78077966802c241335cd37082f928455fa7b4f04e
+EBUILD graphlcd-base-2.0.0-r1.ebuild 2253 BLAKE2B 0e83b669cc0dd70229486acfa64f924e15db37101ec7f93e4a6b8f52367a18e1c2e6cb3f160950e51c38632febc30027b4cb908dc77b92580089bcfee50733d9 SHA512 15f511771840a9ffe67d73370bf69aa1eb4bf5132149dd7648a49e7914b83a8bbad79898e59625fed5be84620bcf06bfd2f44c51cef4c5d3ffab7a3c1f1e453c
 MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
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
deleted file mode 100644
index 8dab507a5d16..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.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[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
index 29bfc8160e7b..ccc4b2335727 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index b4916b061a47..6230df6c70f8 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -2,15 +2,9 @@ AUX LCDd.initd 310 BLAKE2B 415321c1b8c80016f21e283339e21c6adbbb92dbf99649846044f
 AUX LCDd.service 166 BLAKE2B ef3d9a7af9e8e8d8bb54e11110dbcb44c968cbc8fec63529f86dbb0a027154997d12e927405ca228a5740fcadc7518448c640ddbe5f38eabee1b7698b17b3035 SHA512 d09829efb26c9b8ca01f6cd07f704d55d05b3328866c169251683b1343ec37e569f95ad14b3b51e2d832ea7b0d3eba5579cec02decb86504016e535a61d7ea46
 AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e72204777f50d7dc962a519ab06ef0bc9b1c91b36cd726b67679e7a94d2edbd28bd524ecccf6d20f6a53de SHA512 f8bf380b2e452e830cc3805f297d06c4cdf623db91eff310da2b20cd87cd87ef850c1c7e5b843044333167fa8724acb8de8d65752328ec4144b486d0bed6bfce
 AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
-AUX lcdproc-0.5.9-fix-fno-common-build.patch 1751 BLAKE2B 4132254e240ec6e2268174c977332bf8ce31b4da28f6e09279d3afa7774051dab5c87b368366f1050da23337152384e1a2d1a116940b4d45cde61fed6083ffd7 SHA512 2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f
-AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc06f0e4ec6493fe61d678d5b0cc252764ecbc1906c102f2347e18a10432bd390b19d990a270423e8054690283b17174a8297a08 SHA512 75c42f716175751c07b5385f87c2d378229c59cb7ef5adb517b23d3c032373627f9d6173987251c5d3c259764dbaa2ad167d8769bdcb2afa1b1387ff1926a316
-AUX lcdproc-0.5.9-respect-users-ldflags.patch 646 BLAKE2B 6b0bbf237fe3f3e8a4392f35d8ae9299d53697268b0964aa9db9b40463c39c5f23f850d654332f07612aad6a644d7088293b393d8978ca2304327f197be340d4 SHA512 2169f4a7ce56a0a1da847fcb7a55c068d97d985969e0e96e25711ff6bf7e6617e917e29706882e2485cf7be71452713e0577ea2e0435da61a7ec9d26bf3fed52
 AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75f5306ed26a5447289618575c26873bf5335c94286c36dc0444b2ef8b74dd7087b0a3d2529602c25de680ff534df303e094a90f258f8bd SHA512 d5922c61274b420dc3138c5345868924ab7562f7aaa267068c925b4c36b74309ce8132103e265cdfc5b84cb6f3d6f5bea7036c617e14e7a22aa32c360202014e
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
-DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 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 6216 BLAKE2B fa6d956b3b177553c8bfb6dd49e08c9f392b9b54a59eab3ef1e1a1aa9107e22c9bcfdefc9911b040b9253e62540712bef033caec032f02e547210bf0805a19c2 SHA512 e887bf2b5c11a34178162f868817234bedd298cc62a2df6680b62e0379c8ebfc6420ffc03007e17edb2fc5c8af966518cb111d7c8b85168ae1b7371aea854569
+EBUILD lcdproc-0.5.9_p20200721.ebuild 6265 BLAKE2B af1bcfb8adef86ae9ed86a8da82f8735ff199b7b5b3ae1b22c4fed1360ef2a616e03f66140e910fee2b1b6201ef382134075018bbedaab4b6110251655082537 SHA512 46879d75a8ce5018bcb36ec0ce181a806223430dbc207485518654ab76d1af5958441eb2bc9990f3155d35b619cbd4eed0cb1b0d3abd1a9820721d822c0f4f3c
 MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch
deleted file mode 100644
index 2dc472f5d22a..000000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Sun, 2 Feb 2020 18:48:07 +0100
-Subject: [PATCH] Fix compilation with GCC >= 10.x
-
-Starting with GCC >= 10.x, -fno-common is used as default
-instead of -fcommon. This patch fixes the compilation.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- clients/lcdproc/iface.c | 1 +
- clients/lcdproc/iface.h | 2 --
- clients/lcdproc/main.c  | 2 ++
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
-index 40e50cb7..45be5b97 100644
---- a/clients/lcdproc/iface.c
-+++ b/clients/lcdproc/iface.c
-@@ -32,6 +32,7 @@
- #define UNSET_INT -1
- #define UNSET_STR "\01"
- 
-+IfaceInfo iface[MAX_INTERFACES];        /* interface info */
- 
- static int iface_count = 0;	/* number of interfaces */
- static char unit_label[10] = "B";	/* default unit label is Bytes */
-diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
-index cc6dbaaf..ee188f38 100644
---- a/clients/lcdproc/iface.h
-+++ b/clients/lcdproc/iface.h
-@@ -18,8 +18,6 @@
- /** max number of interfaces in multi-interface mode */
- #define MAX_INTERFACES 3
- 
--IfaceInfo iface[MAX_INTERFACES];	/* interface info */
--
- /** Update screen content */
- int iface_screen(int rep, int display, int *flags_ptr);
- /** read interface stats from /proc/net/dev */
-diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
-index 01b02baf..7c7a4215 100644
---- a/clients/lcdproc/main.c
-+++ b/clients/lcdproc/main.c
-@@ -53,6 +53,8 @@
- # include "eyebox.h"
- #endif
- 
-+extern IfaceInfo iface[MAX_INTERFACES];        /* interface info */
-+
- /* The following 8 variables are defined 'external' in main.h! */
- int Quit = 0;
- int sock = -1;
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
deleted file mode 100644
index 763038d14ab5..000000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/server/drivers/Makefile.am	2017-01-22 23:18:54.000000000 +0100
-+++ b/server/drivers/Makefile.am	2018-10-04 22:48:50.302344274 +0200
-@@ -47,11 +47,11 @@
- futaba_LDADD =       @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
- g15_LDADD =          @LIBG15@
- glcd_LDADD =         libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
--glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o
-+glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
- glcdlib_LDADD =      @LIBGLCD@
- glk_LDADD =          libbignum.a
- hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
--hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
-+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
- i2500vfd_LDADD =     @LIBFTDI_LIBS@
- imon_LDADD =         libLCD.a libbignum.a
- imonlcd_LDADD =      libLCD.a
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch
deleted file mode 100644
index 8b48d0044108..000000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 28cca1d998fc9a74f16ea00e61c3eaa34017db7c Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Mon, 11 May 2020 23:43:57 +0200
-Subject: [PATCH] Include AM_PROG_AR to use systems AR
-
-If AM_PROG_AR is not included,
-the 'ar' command is directly called.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 98a2fb1c..53f7bf50 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,6 +73,7 @@ AC_PROG_CC_STDC
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-+AM_PROG_AR
- AM_PROG_CC_C_O
- AC_PATH_PROG([XMLTO], [xmlto], [no])
- 
diff --git a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
deleted file mode 100644
index e3149731d121..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
-HOMEPAGE="http://www.lcdproc.org/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook
-"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
-REQUIRED_USE="
-	ethlcd? ( lcd_devices_hd44780 )
-	freetype? ( lcd_devices_glcd )
-	png? ( lcd_devices_glcd )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - svga: It needs media-libs/svgalib, which is masked and obsolete.
-IUSE_LCD_DEVICES=(
-	bayrad CFontz CFontzPacket curses CwLnx ea65
-	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
-	icp_a106 imon imonlcd IOWarrior irman irtrans
-	joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
-	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
-	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
-	sdeclcd sed1330 sed1520 serialPOS serialVFD
-	shuttleVFD sli stv5730 SureElec t6963 text
-	tyan ula200 vlsys_m428 xosd yard2LCD
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE="${LCD_DEVICE,,}"
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	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:=
-	)
-"
-
-RDEPEND="${DEPEND_LCD_DEVICES}"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/xmlto
-	)
-	freetype? ( media-libs/freetype:2= )
-	nfs? ( net-fs/nfs-utils )
-	png? ( media-libs/libpng:0= )
-	samba? ( net-fs/samba )
-"
-
-DOCS=( "CREDITS.md" "TODO" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-fno-common-build.patch"
-	"${FILESDIR}/${P}-fix-parallel-make.patch"
-	"${FILESDIR}/${P}-respect-users-ldflags.patch"
-	"${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Copy missing docbook or the buildung of the lcdproc-user docbook will fail
-	cp "${DISTDIR}"/linux_input.docbook "${S}"/docs/lcdproc-user/drivers/linux_input.docbook || die
-}
-
-src_prepare() {
-	default
-
-	# Fix path for modules
-	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	local enable_ftdi="--disable-libftdi"
-	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
-		enable_ftdi="--enable-libftdi"
-	fi
-
-	local enable_hid="--disable-libhid"
-	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
-		enable_hid="--enable-libhid"
-	fi
-
-	local enable_png="--disable-libpng"
-	use lcd_devices_glcd && enable_png=""
-
-	local enable_usb0="--disable-libusb"
-	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
-		enable_usb0="--enable-libusb"
-	fi
-
-	local enable_usb1="--disable-libusb-1-0"
-	if use lcd_devices_futaba || use lcd_devices_picolcd; then
-		enable_usb1="--enable-libusb-1-0"
-	fi
-
-	local enable_x11="--disable-libX11"
-	use lcd_devices_glcd && enable_x11="--enable-libX11"
-
-	local myeconfargs=(
-		--enable-drivers="${myeconfargs_lcd_devices#,}"
-		$(use_enable debug)
-		$(use_enable doc doxygen)
-		$(use_enable doc dot)
-		$(use_enable doc html-dox)
-		$(use_enable doc latex-dox)
-		$(use_enable ethlcd)
-		$(use_enable extra-charmaps)
-		$(use_enable freetype)
-		$(use_enable menu lcdproc-menus)
-		$(use_enable nfs stat-nfs)
-		$(use_enable samba stat-smbfs)
-		$(use_enable test-menu testmenus)
-		${enable_ftdi}
-		${enable_hid}
-		${enable_png}
-		${enable_usb0}
-		${enable_usb1}
-		${enable_x11}
-		--with-lcdport="13666"
-		--with-pidfile-dir="/run"
-		--without-included-getopt
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake dox
-
-		local docbook
-		for docbook in lcdproc-user lcdproc-dev; do
-			cd "${S}"/docs/"${docbook}" || die
-			xmlto html "${docbook}".docbook || die
-		done
-	fi
-}
-
-src_install() {
-	default
-
-	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
-	rm -f "${ED%/}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
-	insinto /usr/share/lcdproc/clients
-	doins clients/examples/*.pl clients/metar/*.pl
-
-	newinitd "${FILESDIR}"/LCDd.initd LCDd
-	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
-	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
-
-	systemd_dounit "${FILESDIR}"/LCDd.service
-	systemd_dounit "${FILESDIR}"/lcdexec.service
-	systemd_dounit "${FILESDIR}"/lcdproc.service
-
-	if use doc; then
-		dodoc -r docs/html
-
-		local docbook
-		for docbook in lcdproc-user lcdproc-dev; do
-			docinto "${docbook}"
-			dodoc docs/"${docbook}"/*.html
-		done
-	fi
-}
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
index d17bcd7a2d1d..85a8e7263990 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"
@@ -43,6 +43,7 @@ for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
 	IUSE+=" lcd_devices_${LCD_DEVICE} "
 	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
 done
+IUSE="${IUSE/lcd_devices_glcd/+lcd_devices_glcd}"
 REQUIRED_USE+=" ) "
 unset LCD_DEVICE
 
diff --git a/app-misc/mswinurl_launcher/Manifest b/app-misc/mswinurl_launcher/Manifest
deleted file mode 100644
index f45ac62df47c..000000000000
--- a/app-misc/mswinurl_launcher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mswinurl_launcher-1.0.tar.gz 1289 BLAKE2B b705fac43259c6b80d1d1182dd82165fccb2e41c01874021712db09d50f26d1bdfd65e9854a8d184dae7a25d778880f66825f5b4df3596954d1481c42675216d SHA512 60435b78dc88ff3e6f780ef42a975eaedc2f515168ba1c6c3fc8b38f87ea5ad4d70d975825877233bae1c5f9c6a521d1c12d301683c9e3e705d18c6c26ce4f86
-EBUILD mswinurl_launcher-1.0.ebuild 1262 BLAKE2B fac9adc2187c8ae38de8c6e8357a358dc3fba424d30683226baa3e422006e14a02a8b0fad1291c23c3ef827cc0e1a0a2f9c8c816f4e064e0fb5cf2a4c818d67e SHA512 c02406dd4dda8e19de8fa8eeec5788aff4b225197be20333a011347ef4fcae305ceddb0cef91892c769fd36126ac6a93f54d91138f4fb49561adbf2221317466
-MISC metadata.xml 424 BLAKE2B 9e50878d39a0109d5094ed04786e7033053f4ae58717052baba00d2de6a1a0091be92609283896414b61be3c05419507be804f839674cde5588cba9c4317ee55 SHA512 1b140f4cee7cea8c31036eb2232f1c8a859b1ee6e783b47be1c091ff0b5a8c8498470e691e977abb6eebaebf61def9dd4a8836686a573be42608101e07983f18
diff --git a/app-misc/mswinurl_launcher/metadata.xml b/app-misc/mswinurl_launcher/metadata.xml
deleted file mode 100644
index c57658328f07..000000000000
--- a/app-misc/mswinurl_launcher/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>axs@gentoo.org</email>
-</maintainer>
-<longdescription>
-This is a simple launcher script and .desktop entry to associate MS Windows *.URL (text/x-uri) 
-files on linux DEs so that they will open in the configured default web browser.</longdescription>
-</pkgmetadata>
diff --git a/app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild b/app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild
deleted file mode 100644
index 2faf9f6a54d6..000000000000
--- a/app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime python-r1
-
-GIST_STRING="77635-a46707715aa2e112d2ea5ec26771030ff5e7eb64"
-
-DESCRIPTION="Launcher and desktop association for MS Windows *.URL (text/x-uri) files"
-HOMEPAGE="https://gist.github.com/endolith/77635"
-SRC_URI="https://gist.github.com/endolith/${GIST_STRING/-//archive/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils"
-
-S="${WORKDIR}"/$GIST_STRING
-
-src_install() {
-	dobin ${PN}.py
-	python_replicate_script "${ED%/}"/usr/bin/${PN}.py
-
-	cat <<DESKTOP_EOF >"${T}"/${PN}.desktop
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=MS Windows URL file launcher
-Comment=Python script to parse and launch .url files (html links) from MS Windows
-NoDisplay=true
-Terminal=false
-TryExec=mswinurl_launcher.py
-Exec=mswinurl_launcher.py %F
-Icon=text-html
-MimeType=text/x-uri;
-DESKTOP_EOF
-	domenu "${T}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-misc/mtail/Manifest b/app-misc/mtail/Manifest
deleted file mode 100644
index 94037b51bfa5..000000000000
--- a/app-misc/mtail/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX mtail-1.1.1-remove-blanks.patch 1850 BLAKE2B dfaffe1b7dbbe54c1db30a7e0ce9c3c50f51397d5c8dc1e5a64d32441907593e58e65ca84d5697043509342a99d86d628f131cfbe7d0617a207b30afc0b177bb SHA512 64720ec0253dfc88e58b0392bcb4c1eb2f367547d034f60722dc19b0093d5da3d40e847c69203080cd19126ab67f7fad3c2dccc7e6cc74f56c1d50f3dee805a4
-DIST mtail-1.1.1.tgz 9124 BLAKE2B 804ec168eb5dc5408ffd91fc80a6f080b0575dfb58bc667a3ff3d657cea955a4a697ff3f99470e86e59387e0bb2275cd2a0a6e5ee97bc88f28df4424a4c012b8 SHA512 987816ce5d12996192c881be1ac5a28c3457757e981ab35e657fb226c3980a22091c9fc85f68c13eb1c01939e08e492814b6a03c9b1f4f4bc1878c4f13ec8a0e
-DIST mtail-1.2.0.tgz 10798 BLAKE2B ea822f5430ff67fdc153db5c7d79ecb40f0f9025434eef216e13789ffedf79c00ac3fae1f161805d4ee247f993ab984ffb2e44cb94817e06401ec48820a8272c SHA512 f63686a6b93788ec4e72f5dc59bbd0c5bc5c51cba0812cc894b5bd1af497fd0931f0d5834c0feb5c72a057d3f387e379de6fcd8e3a09c98fc77e5a76ee8da274
-DIST mtailrc-syslog.sample 1785 BLAKE2B d060e9baf750505a0908bb18533aad72675962be98875e9f1fed3c734a0339589122ebe2774cc585b05dfde61d8877e05a42184c966050e245bb57ed2dfe500b SHA512 d6bbaafa7c599f443c788697087ebef69a8e279b0715fa4e5b770531cbd254a646014fa98e5e5d444c48d23974201d36a856b34507a91e1b6abbb423f7015c75
-EBUILD mtail-1.1.1-r3.ebuild 765 BLAKE2B 08b63c97fe1f9a32b65f137ea07bcb1b5433819e3618b83b22c5f399a142fdadb268153c6df6e4121405dd684836abc6638afc80d3435d12a26fd2c35da7a966 SHA512 4839a05901eac284d0eefead304849d6188e5db65276f89455a340e9105e5cb500688bf0cf1e914f159c5b68e95de427bae1237faa7db3cdb5062bfe886397f2
-EBUILD mtail-1.2.0.ebuild 751 BLAKE2B 33f2720d407a7e3d5e4838b9cc5790aff3cccb5d11fee3b4cbd9b4e14fd44cd743b7038dc14c8647162296e55756e4faa4dec6f244801493685e086f90c016b0 SHA512 a1123a941be4071be97b408ac4c4cd11d85d1041fbbc54d81c92bd8c4c34435dc22ffc0651228558acc1675397c77d6acbfcb34eac8b410f386309126fc49917
-MISC metadata.xml 642 BLAKE2B 405817cdcf7d643b775f88848ad91930dcf712d65f5c53582ac41656f7d92095bed83add109070888134c074118c54d7ff79359a20d97d0e1459095923e12185 SHA512 7de4bfd79c4dbd929950e191faf4ff6ab90426a0f604fddbdcbaf65d21d21d9a5ec7fb382dc95751ccda8e463bd189dbc07b4d29d92c9dab90e7eb955ace8e19
diff --git a/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch b/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch
deleted file mode 100644
index 9645e263deda..000000000000
--- a/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mtail.orig	2003-11-07 19:02:34.000000000 +0000
-+++ mtail	2003-11-07 19:19:18.000000000 +0000
-@@ -46,6 +46,7 @@
- verbose = 0
- silent = 0
- active = 0
-+remove_blanks = 0
- 
- # sets up the interrupt handler, calls processargs(), sets up and starts the
- # tailers.
-@@ -119,6 +120,8 @@
-             if line[len(line)-1] == '\n':
-                 line = line[:len(line)-1]
-             line = filter(line)
-+            if remove_blanks and not line:
-+                continue
-             lock.acquire()
-             try:
-                 if (multiple or verbose) and (not silent) \
-@@ -138,12 +141,14 @@
-     global verbose
-     global silent
-     global config_file
-+    global remove_blanks
-     filenames = []
-     lines = None
-     follow = 0
-     try:
-         opts, pargs = getopt.getopt(sys.argv[1:], 'fn:?hvq', ["follow",
--            "lines=", "help", "verbose", "quiet", "silent", "config="])
-+            "lines=", "help", "verbose", "quiet", "silent", "config=",
-+            "remove-blanks"])
-     except getopt.error:
-         print 'unrecognized option!'
-         print
-@@ -163,6 +168,8 @@
-             silent = 1
-         elif opt[0] in ['--config']:
-             config_file = opt[1]
-+        elif opt[0] in ['--remove-blanks']:
-+            remove_blanks = 1
-     if lines == None:
-         lines = 10
-     for filename in pargs:
-@@ -186,6 +193,7 @@
-     print '      -v, --verbose          always output headers giving file names'
-     print '      -q, --quiet, --silent  never output headers giving file names'
-     print '      --config=FILE          use config file FILE instead of ~/.mtailrc'
-+    print '      --remove-blanks        do not display blank lines'
-     print
-     print 'with more than one filename, mtail will precede each chunk from'
-     print 'each with a header giving the file name. if no filenames are given'
diff --git a/app-misc/mtail/metadata.xml b/app-misc/mtail/metadata.xml
deleted file mode 100644
index 1215b29430c5..000000000000
--- a/app-misc/mtail/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		mtail is a small tail workalike that performs output coloring using
-		ansi escape sequences (although the sequences are overridable, so you
-		could cause it to output something else, e.g. html font tags, if you
-		really wanted to). mtail is written in python, is fairly small, and
-		should be relatively platform-independent.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-misc/mtail/mtail-1.1.1-r3.ebuild b/app-misc/mtail/mtail-1.1.1-r3.ebuild
deleted file mode 100644
index 7c30637230ef..000000000000
--- a/app-misc/mtail/mtail-1.1.1-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="Tail workalike, that performs output colourising"
-HOMEPAGE="http://matt.immute.net/src/mtail/"
-SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
-	http://matt.immute.net/src/mtail/mtailrc-syslog.sample"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-blanks.patch
-	python_fix_shebang .
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample
-}
diff --git a/app-misc/mtail/mtail-1.2.0.ebuild b/app-misc/mtail/mtail-1.2.0.ebuild
deleted file mode 100644
index e6a4e3c5e34c..000000000000
--- a/app-misc/mtail/mtail-1.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Tail workalike, that performs output colourising"
-HOMEPAGE="http://matt.immute.net/src/mtail/"
-SRC_URI="
-	http://matt.immute.net/src/mtail/mtail-${PV}.tgz
-	http://matt.immute.net/src/mtail/mtailrc-syslog.sample"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample )
-
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_install() {
-	dobin "${PN}"
-	einstalldocs
-}
diff --git a/app-misc/rioutil/Manifest b/app-misc/rioutil/Manifest
index c16dec9c344d..851806c7299b 100644
--- a/app-misc/rioutil/Manifest
+++ b/app-misc/rioutil/Manifest
@@ -1,4 +1,4 @@
 AUX 75-rio.rules 1452 BLAKE2B d464d692123599291d590c82c872feb99c3c7c2f92ae92c93ef45be63533398167e140d64755da8d8382ba5297bfadb9bb33966c0ab60192982ed9dc9f450f3e SHA512 e9d953045cf4b587eb19f95ef0f429fefb1919d335662455e62334331c99ede3304952e18c52d41f0051eedd4f8148c469c75db9600c70ba954281620f760a65
 DIST rioutil-1.5.4.tar.gz 84592 BLAKE2B 8efb92c3f178960d425c0b4733d061f2aa72767513621e379ecdc6d69509fcd91e38a9becd857e695f534f40ac7eaa3871c582df843f3b7b47298d48c0c18803 SHA512 b64027089a7c0a3b712486e3b2549dae5a8ceff9687a183fd411f6b9d197a97ea22bd7294242b3f9e8522da9ebe7e87dc5bc980633632ce3d4884341ee085a62
-EBUILD rioutil-1.5.4.ebuild 842 BLAKE2B 9d27ebfeab4b502b450defe1aa8d3ef357123fa4dc17f0450d2984f63d202d38d2c5605dca289665227d6856982d913b4c528bbc142336362d2e1ebe8f62dc64 SHA512 8e11fe5223cf75d41ce160259340d9810c66788412d97619dceb1ad2e5ebbcfb348510551c9ef3f4d3fdfb18beba5f2adaf4eb6514e4fe3177407324cd1619e7
+EBUILD rioutil-1.5.4.ebuild 841 BLAKE2B 89ce3e2a3938ded278c06a5a75ed3a32f3531aadb4f47f0bd62da7ff0a5b4aff7ec8272bc4129ea61458e913d3dcc15879c3af8e9c6d6f772895c1fe1eb515ed SHA512 d7db027344da6252a8a1f9be2d3c7c0912a5e4d0a805cc80832620257c839ad5ca528b11c7632bb1cc41b1c5c419b224e8aaa5655830380bce3e3f9586ebec20
 MISC metadata.xml 878 BLAKE2B 90d6de8c3ef6a26b7823c2d6d03c24add333e4033c869c80776831387363f0a127e9a520425390d9081fd6537fd0a1c0b6cfbd2bf9dbb28d63722e54afa11483 SHA512 e087877391095c7883817a9123f3a3dadcfe1c0c4519bb42ec98c62093280fac8ec83011fe2ebf26b5dd8f6b5e460ed6df8db3dd612acd40f831d82a46c37463
diff --git a/app-misc/rioutil/rioutil-1.5.4.ebuild b/app-misc/rioutil/rioutil-1.5.4.ebuild
index a84adc7b03d8..7b05035ea672 100644
--- a/app-misc/rioutil/rioutil-1.5.4.ebuild
+++ b/app-misc/rioutil/rioutil-1.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hjelmn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index db96de40ccce..2377c279240a 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -2,5 +2,5 @@ AUX todo-2.11.0-fix-bash-completion.patch 385 BLAKE2B cfb5b88e8113d45790d9dcc7a0
 DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
 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
+EBUILD todo-2.12.0-r1.ebuild 1765 BLAKE2B 6201f93d04dcfb5625b93c806f2005d5f01cdcf88a61d56854bbb4e9d1c0bc3f75a4707a8d447b3910861dfac8dd52dc578be313fde5a0a9d8f86556fad0e3e3 SHA512 f2cad76d03e34372b16249c13b5b9956ca546edc1dcaa600348db7f4a8e52182eda27b341668477fe3361bd91776a4b128c65f95efe64902611b6b47c0d9d0de
 MISC metadata.xml 561 BLAKE2B 3c375b971f13ae4f52cdb0da0d34a24e95e26f6613ee275763b8e42e08d75aafeed918fbba943046933995596fd7c623fe18699cd05935f56d027f3df2903f0b SHA512 fb34968423ced5a3be1d8f0f4d6ad85ab1c971ce3bbd1251e54c2a839ef9a16c95805f30ff090a2483d93f7d2f48a2ce98d4a99d76ccc3f72004a634597ebf23
diff --git a/app-misc/todo/todo-2.12.0-r1.ebuild b/app-misc/todo/todo-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..623c419ac0a7
--- /dev/null
+++ b/app-misc/todo/todo-2.12.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A CLI-based TODO list manager"
+HOMEPAGE="http://todotxt.org"
+SRC_URI="https://github.com/todotxt/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-shells/bash"
+
+DOCS=( README.md LICENSE todo.cfg )
+
+S="${WORKDIR}/${PN}.txt-cli-${PV}"
+
+src_prepare() {
+	default
+
+	# fix version string
+	sed -i -e "s/@DEV_VERSION@/${PV}/" todo.sh || die
+
+	# TODO_DIR variable is bogus
+	sed -i -e '/export TODO_DIR/d' todo.cfg || die
+	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
+}
+
+src_test() {
+	make test || die "tests failed"
+}
+
+src_install() {
+	dobin "${PN}.sh"
+	newbashcomp "${PN}_completion" "${PN}.sh"
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Before starting todo, make sure to create'
+	einfo 'a .todo directory in your home directory:'
+	einfo '  $ mkdir -p $HOME/.todo'
+	einfo
+	einfo 'and make sure to copy the default todo'
+	einfo 'configuration file in the same location:'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
+	einfo
+	einfo 'Alternatively, you can use XDG directories instead:'
+	einfo '  $ mkdir -p $HOME/.local/share/todo'
+	einfo '  $ mkdir -p $HOME/.config/todo'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.config/todo/config"
+	einfo
+	einfo 'You can then edit this file as you see fit.'
+	einfo 'Enjoy!'
+	einfo
+	ewarn 'The Gentoo-specific todocli and todotxt aliases have been removed.'
+	ewarn 'If you still need them, add the following lines to your ~/.bashrc:'
+	ewarn
+	ewarn 'alias todocli=todo.sh'
+	ewarn 'complete -F _todo todocli'
+}
diff --git a/app-misc/todo/todo-2.12.0.ebuild b/app-misc/todo/todo-2.12.0.ebuild
deleted file mode 100644
index d1dcad07e588..000000000000
--- a/app-misc/todo/todo-2.12.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=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A CLI-based TODO list manager"
-HOMEPAGE="http://todotxt.org"
-SRC_URI="https://github.com/todotxt/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-shells/bash"
-
-DOCS=( README.md LICENSE todo.cfg )
-
-S="${WORKDIR}/${PN}.txt-cli-${PV}"
-
-src_prepare() {
-	default
-
-	# fix version string
-	sed -i -e "s/@DEV_VERSION@/${PV}/" todo.sh || die
-
-	# TODO_DIR variable is bogus
-	sed -i -e '/export TODO_DIR/d' todo.cfg || die
-	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
-}
-
-src_test() {
-	make test || die "tests failed"
-}
-
-src_install() {
-	dobin "${PN}.sh"
-	dosym "${PN}.sh" "/usr/bin/${PN}cli"
-	dosym "${PN}.sh" "/usr/bin/${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}.sh"
-	bashcomp_alias "${PN}.sh" "${PN}cli" "${PN}txt"
-	einstalldocs
-}
-
-pkg_postinst() {
-	einfo
-	einfo 'Before starting todo, make sure to create'
-	einfo 'a .todo directory in your home directory:'
-	einfo '  $ mkdir -p $HOME/.todo'
-	einfo
-	einfo 'and make sure to copy the default todo'
-	einfo 'configuration file in the same location:'
-	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
-	einfo
-	einfo 'Alternatively, you can use XDG directories instead:'
-	einfo '  $ mkdir -p $HOME/.local/share/todo'
-	einfo '  $ mkdir -p $HOME/.config/todo'
-	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.config/todo/config"
-	einfo
-	einfo 'You can then edit this file as you see fit.'
-	einfo 'Enjoy!'
-	einfo
-}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 6ffc9a272d21..1f044b00af93 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/sobexsrv/Manifest b/app-mobilephone/sobexsrv/Manifest
index 8d655024196c..5b67efff69f0 100644
--- a/app-mobilephone/sobexsrv/Manifest
+++ b/app-mobilephone/sobexsrv/Manifest
@@ -3,6 +3,5 @@ AUX init.d_sobexsrv 1471 BLAKE2B eaf115c6303ede41dbeeaa60561082ac07b9d908f391eb4
 AUX sobexsrv-1.0.1-openobex16.patch 1346 BLAKE2B ec63105eb6db6fd959044134fd66b8b3018093a5efec4b6b6b63c45d9bcca84c678addc56bfefaad0fca1696c148107513a1640473cb37f5320c2fab9a623ded SHA512 a1db1a916c0c2f6f237a4434bf1f11b0b6f540ad62fa9687d886e4ff97f6bb916be7763a24bdc56bf8fd3334ead426e0ed2003c0208c3c743f49b13b2bf8ab2a
 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 1512 BLAKE2B 189f9c6e408476e55c7d2b5134dbb0bd480cd88098006c8baa4e9f5a84e7fca281e7ec2c1bb8ebdfa619f0f42bb9eae752d294436aee513c8fd42db0d5496ce6 SHA512 bd7f5443552b5d05f9073a5574cfb91e8025a5003357f242e646286f168f7c74256ec284793420b2c4b55e1cff55715b294c2f339f01be28975798425a008ccf
 MISC metadata.xml 920 BLAKE2B ac1ea1fc1f85d7dd43c548d89ef3473bb5b78f2e3ab4275c28db702865e492261db1ab908496661ebda406771d7d8080e9057bed865b703b9920ee86b48c8b34 SHA512 30b149f3e197dc0a45cd27a618a0dcc6c9968dae44576c47dd6ebdedda06d5fed8b03ae1e0f94133804551366a90a97614d5d5eca334dbdabd4398278645aab9
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild
deleted file mode 100644
index 442f57871b07..000000000000
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs user
-
-MY_P="${P/_pre/pre}"
-
-DESCRIPTION="Scripting/Secure OBEX Server (for BlueZ Linux)"
-SRC_URI="http://www.mulliner.org/bluetooth/${MY_P}.tar.gz
-		 https://dev.gentoo.org/~joker/${P}-fix64.patch"
-HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk"
-
-DEPEND="
-	>=dev-libs/openobex-1.7.2-r1
-	net-wireless/bluez
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	gtk? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.2
-	)"
-REQUIRED_USE="
-	gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${DISTDIR}/${P}"-fix64.patch
-	"${FILESDIR}/${P}"-openobex16.patch
-)
-
-pkg_setup() {
-	use gtk && python-single-r1_pkg_setup
-
-	enewgroup sobexsrv
-	enewuser sobexsrv -1 -1 /var/spool/sobexsrv sobexsrv
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:/usr/man/man8:/usr/share/man/man8:' \
-		-e 's/install: all/install:/' \
-	    -i Makefile || die
-
-	sed -e 's/^CFLAGS =/CFLAGS +=/' \
-	    -e 's/^CC =/CC ?=/' \
-	    -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS) $(CFLAGS)/' \
-	    -i src/Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	emake -C src
-}
-
-src_install() {
-	default
-	dodoc AUTHOR CONFIG SECURITY THANKS
-
-	if use gtk; then
-		python_doscript "${D}/usr/bin/sobexsrv_handler"
-		newdoc "${S}/scripts/test" sobexsrv_handler.sample_script
-	else
-		rm "${D}/usr/bin/sobexsrv_handler" || die
-	fi
-
-	newinitd "${FILESDIR}/init.d_sobexsrv" sobexsrv
-	newconfd "${FILESDIR}/conf.d_sobexsrv" sobexsrv
-
-	keepdir /var/spool/sobexsrv
-	fowners sobexsrv:sobexsrv /var/spool/sobexsrv
-}
-
-pkg_postinst() {
-	elog
-	elog "/usr/bin/sobexsrv is *NOT* installed set-uid root by"
-	elog "default. suid is required for the chroot option (-R)."
-	elog
-	elog "Execute the following commands to enable suid:"
-	elog
-	elog "chown root:sobexsrv /usr/bin/sobexsrv"
-	elog "chmod 4710 /usr/bin/sobexsrv"
-	elog
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 54626d42169e..5f9fd8470edf 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index a7b1f7ae8e69..26dccba94bcb 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,7 +1,4 @@
 AUX moneydance-bin 567 BLAKE2B 4a1f80df1e5e20c08ba95168b680f8e0cdd7413fdc7991b12d40048dde6465db8c4d3a18c7b3f70bb829a2f5d2002258a8e6ccefcc64afbf419633ff948f3e15 SHA512 344e05050f28ea61264899b62f3e14844371ef452b0b84c6146abdecd2b9fc1230102bf2685b6c0649e014048c82ecd5dd7ce3117e65a9a22a2737eb39f4ca9a
-DIST moneydance-2017.10-amd64.tar.gz 132116528 BLAKE2B f5ba44a89944657c6c1380226dc512729825b084783e6d70dd7b2b731411294c7333bae858b2be3d5321e5145230257b325dc2b72a22744a877673c1c934d854 SHA512 175ff470b5fb5c3851eae708cc641777d7bdf1ede40366ccf5a135d6c813c08d9ce32665a2307c3aefa63eeb2206ad0874cb989aa998415abb86184a2b114ce8
-DIST moneydance-2017.10-x86.tar.gz 134860964 BLAKE2B 92181a6c6a81063377823b0fd9ed652036cf1f633c2cab57f19d1dbb18a2542361fc2bafab8852c11b941a24532f662351ea2d05bc928818db24a4cf3cae7112 SHA512 18d9d4ce7b0b65566ac81fea66ba34d66173559ca90ac166cc9b90631400845ae1c9d92ae781a618cacc57cd4f630f079736101d29b66d9c6cee7d32c7c15c22
-DIST moneydance-2020.0.1919-amd64.tar.gz 146128581 BLAKE2B a7c2bfd940b4203beeaaeefd018746920f26c6902a9b942f7498fbd1184a5c5d5363d2b46238119b8dcbd963c1b584ab66f1101825ac1f31157a4907938557dc SHA512 c67b284f610fe14809bf1382371fba72e792f938e12ef1b8ee032b161a2547cad3579d5b0d41644566b37f35591d42d77a4fdc3515bb95da772054ac10c083f6
-EBUILD moneydance-2017.10.ebuild 1503 BLAKE2B 26cde10e7460a69484a3449f288e0a2f55925a55a7e8144650e563a00ed8395c9c95680034878af75195e858389bf30954bc7cfc679ada7a10f2f7081d61412e SHA512 207e71aa55a9f194c5f23d04c6626687c34d5717a80c64a30590623e5396912fd26e874bad4f29b63627800806ab8a3af0685be4854d9cfa27536c270427a268
-EBUILD moneydance-2020.0.1919.ebuild 1358 BLAKE2B 65b96d03b4ed568ef7911a7b5eddc44c8d5f5ffba76f4b91b7586430103d0937038660ee4fbe0717d70c6191da6507779a8c22b50e7a3fcf23ba1f6331285dab SHA512 96360ab6569e72334087c2c2a28df425fcd4c74abcec1b3eb6f44a759f2c32c56c7d081e6081a209f669645df33e816a0ff238c3ad7db998c34ba61e61b13fca
+DIST moneydance-2020.2.1929-amd64.tar.gz 146171665 BLAKE2B b211265f3b6f51aa07a8d3fcd4945dd76a5a6775722fd938782bc53f5b920e13d1acf721f822bc64fde790ab8449d975be0f6e954b80049583278649e2487e91 SHA512 7017b06c50f9814005aaefb522f4e2b6f0011af08bb0daced7fa7d64a0f4a39cb81a01d62d72e9d06062529d5e4056811ab0129fb54bad52a83a99fccb0a546b
+EBUILD moneydance-2020.2.1929.ebuild 1075 BLAKE2B 3c9b00c967a7305e87383cb8a1ba4b3e17370d2ea293621522f88b58672d7eef0b38764473163c33df826702b3fc268e2b5f090e9b4723f162820243d2ffd064 SHA512 6441f8aa1d06179493e11c053520b98691231c53dcc74415743dc43f265886c2cf1880d407c4e58f20443a281a3601d8ebeca655ea90e14a366723faf9413d1c
 MISC metadata.xml 482 BLAKE2B 1ecfa1f0e8d8f5d67c8b60ddbcae821ac1ea776e984a3db7c0480e7e16872ef29c562bfd2963252ebc9f23b208ae70a1d9391fd5ae592074a2d4bcbbde637b78 SHA512 5b4c0c6b163ddce368d7f64e64550f988fd0b302024a50e4f07b5f13826e9fc7407109d4b04129fb01d62cd1f1d69de3d4814ce0e0fb1b744455ac2e2bf725d2
diff --git a/app-office/moneydance/moneydance-2017.10.ebuild b/app-office/moneydance/moneydance-2017.10.ebuild
deleted file mode 100644
index 831f6ba08560..000000000000
--- a/app-office/moneydance/moneydance-2017.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eapi7-ver gnome2-utils java-pkg-2
-
-MY_PN="Moneydance"
-MY_PV="$(ver_cut 1)"
-
-DESCRIPTION="A cross-platform personal finance application"
-HOMEPAGE="https://moneydance.com/"
-SRC_URI="
-	amd64? ( https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz -> ${P}-amd64.tar.gz )
-	x86? ( https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_x86.tar.gz -> ${P}-x86.tar.gz )
-"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/${MY_PN}"
-
-RESTRICT="bindist fetch mirror"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_$(usex amd64 amd64 x86).tar.gz -> ${P}-$(usex amd64 amd64 x86).tar.gz"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_prepare() {
-	default
-
-	# Modify .desktop file, to fix QA errors
-	sed -e 's/Application;//g' -e 's/.png//g' -i resources/moneydance.desktop || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	java-pkg_dojar jars/*.jar
-	java-pkg_dolauncher moneydance --main "Moneydance" --java_args "-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx1024m"
-
-	doicon resources/*.png
-	domenu resources/moneydance.desktop
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-office/moneydance/moneydance-2020.0.1919.ebuild b/app-office/moneydance/moneydance-2020.0.1919.ebuild
deleted file mode 100644
index 0e4d364fca1f..000000000000
--- a/app-office/moneydance/moneydance-2020.0.1919.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 xdg-utils
-
-MY_PN="Moneydance"
-MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
-
-DESCRIPTION="A cross-platform personal finance application"
-HOMEPAGE="https://moneydance.com/"
-SRC_URI="https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz -> ${P}-amd64.tar.gz"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="|| (
-		>=dev-java/openjdk-bin-11.0
-		>=dev-java/openjdk-11.0
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-RESTRICT="bindist fetch mirror"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz"
-	elog "and place it in your DISTDIR directory."
-	elog ""
-	elog "Please keep in mind, that you have to rename the download to ${P}-amd64.tar.gz."
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	java-pkg_dojar lib/*.jar
-
-	newbin "${FILESDIR}/moneydance-bin" moneydance
-
-	local iconsizes="32 128 512"
-	for iconsize in ${iconsizes}; do
-		newicon -s ${iconsize} resources/moneydance_icon${iconsize}.png moneydance.png
-	done
-
-	make_desktop_entry "moneydance" "Moneydance" moneydance Office
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-office/moneydance/moneydance-2020.2.1929.ebuild b/app-office/moneydance/moneydance-2020.2.1929.ebuild
new file mode 100644
index 000000000000..6917a58332e4
--- /dev/null
+++ b/app-office/moneydance/moneydance-2020.2.1929.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 xdg-utils
+
+MY_PN="Moneydance"
+MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
+
+DESCRIPTION="A cross-platform personal finance application"
+HOMEPAGE="https://moneydance.com/"
+SRC_URI="https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz -> ${P}-amd64.tar.gz"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="|| (
+		>=dev-java/openjdk-bin-11.0
+		>=dev-java/openjdk-11.0
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+RESTRICT="bindist mirror"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+
+	newbin "${FILESDIR}/moneydance-bin" moneydance
+
+	local iconsizes="32 128 512"
+	for iconsize in ${iconsizes}; do
+		newicon -s ${iconsize} resources/moneydance_icon${iconsize}.png moneydance.png
+	done
+
+	make_desktop_entry "moneydance" "Moneydance" moneydance Office
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 695188832aa5..94a02072e9f5 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 6084a64fe4e9..e41c06e7e540 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,5 +1,3 @@
-DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb942cd8f66443b8e55bea1340bab801176ccfcbbe41e762bab4e318e17dae6bfaaa9d98656b276838d782b94ef9c2bf0fc SHA512 dc64754ca3a2b5956b6ad017dbf987de6a45fd227a498c00f677c4c85ad6e3e02cdfb9b22b413ad10d077e509e47b0dd8d6116fc2ca03dd3e9f74e465c4e2527
 DIST emerge-delta-webrsync-3.7.6 24117 BLAKE2B 05bc77b6454e057247f225404cbf6f7b8fac8b54b19137434a4df028d5b6e8330ee853f4fa0f94a6c56e97ea088c7eac3f486c0013059b475f1ff36c858ad0a3 SHA512 85e5c2b5fffe952f6642507dd9dfd960725e86f385a5fc0ac289c5fcfe4666f0a50efdf7621342f8ae29f7623b8431f697ea33afe0fe2d6a837c820feefccae8
-EBUILD emerge-delta-webrsync-3.7.5.ebuild 1100 BLAKE2B 2718003fa19a72f893c4cc411da9403cf01fccd64b42c014d7d0fda048de0b1a272c8c8676187a1a5dd847819eb5c6f31a2f4f8db3dcbb47f6b9e7936ff1835a SHA512 332ac5a442e175991a02599c98055e5fa7c44b990e3db539f4e17c8bd5d36bbf77f0ce479a3f14ee0e2039b01300581cc976d60577abb01c5ee42c82243fade8
 EBUILD emerge-delta-webrsync-3.7.6.ebuild 1100 BLAKE2B eb9919b9a415e2e326bb5ea077e8d58435dd791ca5ccf79ded6062e63df6c3fdbda3af533779249f95e11f97e1c8c96a3523493ebc6b4025f66cc6d737bce2cd SHA512 76c501eb8b1692d1dce2305ee50b43626ce018cc50d328f30facb3b9ca410cc2d229efa6f839f3eb7d2b3c12484b19ded326db61645a0aca3633ac6697f7b762
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
deleted file mode 100644
index 43d5e557ab7c..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.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
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=b8c070708bbc6d0db544d4b04b530d6d03d39bb5 -> ${P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	>=sys-apps/portage-2.1.10
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 4bf1b9426988..21a33b652378 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,3 +1,4 @@
+AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
 DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
@@ -5,6 +6,6 @@ DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384
 EBUILD gentoolkit-0.4.6.ebuild 2289 BLAKE2B c405f76dc529c42474e0e160df1669f036bbe1000b29ea188a777808c7530f280cfd770a27bb5414e7dfdcdcc36bccc2add5ec4c6bd0aaf9ef004948b7f83837 SHA512 67ef3bc311e4ea96e6c940d7f413fe8b05b03d0d3412cb3b75fb0f2a8a180d72f10f35991eb3ef012ee0b5b176d230007ea1a7e254883f57c9f91c4cc48b6397
 EBUILD gentoolkit-0.4.7.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
 EBUILD gentoolkit-0.4.8.ebuild 2297 BLAKE2B 10d21be291c5222f70be925db74d50698d305cc591ff174842ad384a158f06d76e8b11e606bfe773970c2925ce7e15f0b2665a600bac98ae0642030aadff72b6 SHA512 6af0f28b49cde8aeba62e4f4a7d4d536609d38ec14c4d378b2e71deaca4a1b0442ba9f0b9d9dad853e7bba6d8ed7b3e099a1e7d723bbcbed7be2caa14fd0e30e
-EBUILD gentoolkit-0.5.0.ebuild 2273 BLAKE2B d59e3d2d25a67235febb5d7d2358777d04b2f537042d6c1fa4034785bebc333284809b3211e71f96b984815a757b747254336fc8f672147b534b361464864860 SHA512 440652ad1abeef23c9fc96b483261032e5a752ee1fed3cc53cf210a1ad57096db6957bba059559c39cfe9f42cb34a4437641886435496f04b366395b12c77d44
+EBUILD gentoolkit-0.5.0-r1.ebuild 2327 BLAKE2B b0f1b414bb653d1f6cf2ba20af60de58a222b661b67a94751d4878fe4e120e33eebacfa01131619d5b3591b53c9f2e5484019328c796c7ca39c535c60952f638 SHA512 79418dbb6d9adac94d379e4cccce3f121a1f05c51c7fd82109ddc52a8aa2b1cf2f58328862af2597ec5961e6a63e418f055f968d570816084f5024dd25208ecb
 EBUILD gentoolkit-9999.ebuild 2057 BLAKE2B 3435a6c40993571c81a7e7e5479712b37b89bbd9b5e8e5e242ba512398bfb9271bba257c8eb75e7ea5c0a8a1ec7e62ce44853d32b05549a86c14ae8b1199eb9d SHA512 7d6313ff0848fe2266b4bc5edec9f743cf1c2680afe50774316c7734d254f290bae71b46ff1581ead22d8a34075b6ab86f637ef0566af71fc7b76ea1934b0783
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
new file mode 100644
index 000000000000..6a50db9ca669
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
@@ -0,0 +1,43 @@
+# https://github.com/gentoo/gentoolkit/pull/11
+# https://bugs.gentoo.org/747034
+diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
+index 22c249e..c3dba98 100644
+--- a/pym/gentoolkit/metadata.py
++++ b/pym/gentoolkit/metadata.py
+@@ -73,8 +73,7 @@ class _Maintainer(object):
+ 		self.description = None
+ 		self.restrict = node.get('restrict')
+ 		self.status = node.get('status')
+-		maint_attrs = node.getchildren()
+-		for attr in maint_attrs:
++		for attr in node.iter():
+ 			setattr(self, attr.tag, attr.text)
+ 
+ 	def __repr__(self):
+@@ -101,7 +100,7 @@ class _Useflag(object):
+ 		_desc = ''
+ 		if node.text:
+ 			_desc = node.text
+-		for child in node.getchildren():
++		for child in node.iter():
+ 			_desc += child.text if child.text else ''
+ 			_desc += child.tail if child.tail else ''
+ 		# This takes care of tabs and newlines left from the file
+@@ -213,7 +212,7 @@ class MetaData(object):
+ 		if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'):
+ 			return None
+ 
+-		for node in self._herdstree.getiterator('herd'):
++		for node in self._herdstree.iter('herd'):
+ 			if node.findtext('name') == herd:
+ 				return node.findtext('email')
+ 
+@@ -283,7 +282,7 @@ class MetaData(object):
+ 			return self._useflags
+ 
+ 		self._useflags = []
+-		for node in self._xml_tree.getiterator('flag'):
++		for node in self._xml_tree.iter('flag'):
+ 			self._useflags.append(_Useflag(node))
+ 
+ 		return self._useflags
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..18ac36af8767
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
@@ -0,0 +1,75 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+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"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+distutils_enable_tests setup.py
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.0-python3_9.patch)
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
+
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
deleted file mode 100644
index efc5e8be7d40..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
+++ /dev/null
@@ -1,73 +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,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT}"/var/cache
-	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index cd021a1cb57d..da345372b645 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 14a1ef5fe4cc..f3a6985bbc17 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,5 +1,7 @@
 DIST loksh-6.7.2.tar.xz 209520 BLAKE2B 37635721b4ed99b3a8ffd0bc6806e29e96c68618db32d8aad32e8cafb2c669ff44e0228588631478c189fb804a790245a66abe700bd78d06f3fdbd3baaa03778 SHA512 0008905c97c0d65ab246c05ddcd733925cdf2e35bc0eb09dd4301718236cab3f2682bee250e3630f3f9d801c1e20ee2db71194ac01f9ea4c2c8ff437328f5d08
 DIST loksh-6.7.4.tar.xz 210008 BLAKE2B 80fd4ffa1a45f0c8775540832996278f41078850d6c9ccca8f2a1db5e2de0bb5663d11fa28c26e9b523fc6d9fbc9e1db7cfb93035ceef1bc2040e8f2083691da SHA512 d0c4aa3cb0b48d85c667a7d2e1a9c28c1533c43b3a8804806120f646a711499c96165e0e1ed7f285cd8da0d21e7ef80535b071066cc804c11cdf67e1a5e5918e
+DIST loksh-6.7.5.tar.xz 209928 BLAKE2B 76f00cba08d425e7b0605a7a8b66f8ff6f7626a277bf5308877a8d61d6e65c2c7a68867beae8244aa42cf76e7f942dac46780432f76f63a6e007f3d772fbda78 SHA512 20f203afcc4b582e89c825852428a33f74232cb71708b7153b6f3a78d692766cfd67b8993c38e58a223b0e95caf2a487eea6bdda321ad056bf475b21d47f97f1
 EBUILD loksh-6.7.2.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
 EBUILD loksh-6.7.4.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
+EBUILD loksh-6.7.5.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
 MISC metadata.xml 451 BLAKE2B 358525d8923486354e84e6c007b7507c5b4461645bb8f457ac0408b66118ffe4649dc4d5d3397cabc5657a18cb98f96989dbe491bdd48346d56f3306e004f4bd SHA512 a2f6689a29cdb417e4f050887b82eca1c7546b0aa708e3496974a78129c0755a203a402023d627af989eff9d513eb130013d7754a81d3695e50ccb496b72583b
diff --git a/app-shells/loksh/loksh-6.7.5.ebuild b/app-shells/loksh/loksh-6.7.5.ebuild
new file mode 100644
index 000000000000..ca44f5e3fd4f
--- /dev/null
+++ b/app-shells/loksh/loksh-6.7.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Linux port of OpenBSD's ksh"
+HOMEPAGE="https://github.com/dimkr/loksh"
+SRC_URI="https://github.com/dimkr/${PN}/releases/download/${PV}/src.tar.xz -> ${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+
+RDEPEND="
+	${DEPEND}
+	!app-shells/ksh
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
+}
+
+src_configure() {
+	# we want it as /bin/ksh
+	meson_src_configure --bindir=../bin
+}
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 09e9aaaa1006..86b981ee16c4 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,5 +1,3 @@
-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 760 BLAKE2B f42451c8e5f1bf953ef42d36a75c383d04b2286917568677664233471e79b11c57a3fd8752b5e33576ec1d743ea3a86c6bf6ae0ae8fae5c9d424af2a28f2cc1b SHA512 4115e6b4d9b2a2ea6eb0966cdc8d6639dc9ae9b7d861547d29ff91e62f9d63c8d7c76f4d49e410ea5a796ace7e9035538d563b22f36afaf1c8cfc6ec3787589b
+EBUILD quoter-4.2.ebuild 759 BLAKE2B 46db09fbc3854265f1cba391a41b8cc5b1bbe193235e282d4a7c7da37cf9f41d248791278d0cec2d875ac2e1b339ef3a6c743531f6aed4b5c051a3555780c13d SHA512 f4c05519ff13f23a96a842a394f1ef10d16ca891914c95f384b1cef3889ed3ce58b5e426129e9482745ba746f3afac11ab0ca52f8a74449c3504de8fd5e63779
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
deleted file mode 100644
index 8807c9311811..000000000000
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
-HOMEPAGE="https://github.com/vaeth/quoter/"
-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"
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	rm -f "${ED}"/usr/bin/quoter_pipe.sh || die
-	insinto /usr/share/${PN}
-	doins bin/quoter_pipe.sh
-}
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index 88f395fbbcf9..e598e12f30ef 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-text/Manifest.gz b/app-text/Manifest.gz
index 649d1533b0f9..5198fad8a0fe 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index a592662f3d24..7e8e000ae7f7 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
+DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
 EBUILD ansifilter-2.16.ebuild 1016 BLAKE2B 8889822a7d5f469e114971fd0aad097e64ac3b237528d2abec01b36621899220cc015b8193d4eb32cc87e8a049d7cf3c523c0733513b4ce2c978f0aec2c68b78 SHA512 83548025ab5e6384bbbaa3d88bf1a2377b64b17ea9a5bf000a3dda8ba33370f5834210c39a4bad0a93b0bfcd536d9c714b585f15541f838c6c0a962b389e0c56
+EBUILD ansifilter-2.17.ebuild 1102 BLAKE2B 6432c3d646564274ed88c32fb9a1f9eab9185754f3bb60ee5c928a5f1ace7b0e92404346096ddba9d3f2e63521cf647c9c673a83a27fbabea30fb0ece8b444e4 SHA512 1a552b1e6433a722f84afddb993b0217a5f553f8737791501563b335661cae25d805ce9ce19fc115175e5182dd3f9dc18fc736ec966e8db763449b58406fa4c7
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.17.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
new file mode 100644
index 000000000000..105e431f1147
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog.adoc README.adoc  )
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+
+	sed -e "s/-O2//" -i src/makefile || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CXX="$(tc-getCXX)"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	if use qt5 ; then
+		dobin src/qt-gui/${PN}-gui
+		insinto /usr/share/applications
+		doins ${PN}.desktop
+	fi
+
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 19bcae067352..d6c586902968 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,13 +1,7 @@
 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-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
 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
-EBUILD ghostscript-gpl-9.53.3.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
+EBUILD ghostscript-gpl-9.53.3-r1.ebuild 4988 BLAKE2B 09da0e389870ac200e4410bc1eeecd373e58ac8b1004a1b904f03b4c5a9303177303db30c298dabb224b5b6318c7b9200e6234497e6e482ee0395074abb7a665 SHA512 3ed17ab5b2d92e793c9d8552771b73b746da8ca159d70b2aeb399dfde3c05370f335a1610ecda4a97ce8128cc8834f50f0571c961acd51957e8331aed15b870b
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.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
-
-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/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.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
-
-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/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.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
-
-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/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild
new file mode 100644
index 000000000000..9e5d5486db8c
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild
@@ -0,0 +1,190 @@
+# 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/freetype-2.10.3
+	>=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/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.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
-
-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/gocr/Manifest b/app-text/gocr/Manifest
index 29676f42a313..124330622898 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,3 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
-EBUILD gocr-0.50.ebuild 1187 BLAKE2B 8fc8244c4832d59401f834a69f0faa463f39b25d18c7680aa4607e3a1a04fd5ec51839b3bb6b6d66b920b7c55510c43a02929190816099aac5ca1df68e1fa74f SHA512 f4f039654b015388cee8893d55b5fba24675ee0b238fa0e1a102ec19c001ed9f41efca2c881ba27999d3491db1fff0f7c8dc578719f5c4c751c0d47c45337fc4
+EBUILD gocr-0.50.ebuild 1194 BLAKE2B f2d7b20dc9437bc249deb9c752c516e366245b7f5fc3aaa26ba428bb360cc81b9298412e5be996ad9fb16e3a54f7389564b0e65f6c929a4a0c9328b78e197867 SHA512 8ce80abb20a31d902076ae3408812cbabe6a7911301959a542e639cdfeffdd51940d8a54aab5da71a035fabf7a8e0ce4a7fe27568c623a361e0dda0573eb41a0
 MISC metadata.xml 241 BLAKE2B 0ddb3befa9aa8922cec51c1c82d2927a12fa35eab2474330dd53794dabb7dd58859fc35f02e7b5067111bb9838592f9976fe3ff343aae7f521cdc034cf165a4b SHA512 c0dbe231483dc9dfc42dfe465aa2202145bae8a1ac5794ef9a9f02f687275c525a7826740e3b35fee93ba856ff2a78b214956b02cece209f6322ee3311cbf0ec
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
index a8e6c3baca7b..3517d1e07a87 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc scanner tk"
 
 DEPEND="
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 3fc68e043d49..a4d16eb8c75f 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,6 @@
 DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
+DIST krop-0.6.0.tar.gz 48331 BLAKE2B ca6a00a410ed4e18a401fab3a21bc49c86f73165f68b192ab83c8fad74111ba9a9941f464a2646faa5a3317bbb45cdc89bed19c901999c0b11db353ac2997a65 SHA512 51a988e4fcb65d11cc26cf5b0c808e79097a66ef8ec4751a6c051289cd77b3328ebc8ecd9829adc466f87330beb8bc715d290cc20be415a7b8f179378b7bcb4f
 EBUILD krop-0.5.1-r1.ebuild 890 BLAKE2B 2a22e3e81c0c6d8154275fb8265a7dd2aab8e5528fc3e1dcd2bdd77e37f314b86e5dfa93577434fa56ffd8467c35a05a37914cffc747061fc46a43ca7e5d27c1 SHA512 6cab7d003e17681c842c2755887ac648cd7d90bcb46f557d18d6dc4c605a22d7584ff2af93eac336e8a8d316aa55b5d286272a792a9edb617301766b38b367c1
-EBUILD krop-9999.ebuild 891 BLAKE2B 560fb4ab2aa90d452dfe4a2f86666e50ab35e50501e9146c016d8c251d831e90f7ec089859f5ad1bab32d6698fcf8b62797453b2c36402660ee26e1009b181ce SHA512 71c2fe9b14063cd71200575a03b1a358703f1f5f33b351c496521dcc3660321a33fbd07a930dc64ef0c7270c489c54bb3b043903a89a9fd9c51e15e25324133c
+EBUILD krop-0.6.0.ebuild 947 BLAKE2B b179310ce8c3df53b833081a4d7e0798d9c95ebef78e65f518467589ca86ddc73581ec91278df2a3ee0482b535436326ecca9015b1ba307c7ce230691955382c SHA512 9d01edf0eda212529af80075a0609aa4e936d6ced2392441907d5a975fd51af5d76ecf82c20abf56db6741b1afe5fad7385284188d6f3c5db305a0b900def386
+EBUILD krop-9999.ebuild 947 BLAKE2B b179310ce8c3df53b833081a4d7e0798d9c95ebef78e65f518467589ca86ddc73581ec91278df2a3ee0482b535436326ecca9015b1ba307c7ce230691955382c SHA512 9d01edf0eda212529af80075a0609aa4e936d6ced2392441907d5a975fd51af5d76ecf82c20abf56db6741b1afe5fad7385284188d6f3c5db305a0b900def386
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.6.0.ebuild b/app-text/krop/krop-0.6.0.ebuild
new file mode 100644
index 000000000000..3f7134934cdd
--- /dev/null
+++ b/app-text/krop/krop-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# 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 desktop distutils-r1 xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
+else
+	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 5dbe780b3d81..3f7134934cdd 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit desktop distutils-r1 xdg-utils
 
@@ -10,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
 else
-	SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index f8286b0970d4..e62f14d2d2ce 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,3 +1,3 @@
 DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c
-EBUILD restview-2.9.2.ebuild 731 BLAKE2B 7a264d5de70348454f438fa3d753309aebad61764f2d28c628e7db2143ba2ab7b7c43bd7e28648dee2fa5b567db28a99c8895ea727390bee18dd7ddbaf829206 SHA512 1d70c44a8be0bbaa62da6a8cca1079ce1c417f6f51db250d8cbd7a3c895ce48adee1f7c330645d0a1cdf202bc1f37511b02bb678e9e49f0ec6b5a186cf618a5b
+EBUILD restview-2.9.2.ebuild 724 BLAKE2B d2ff6b227558f697a3bf9ee415c6f26f3cc2ecb5d8e04861563cfe4c92e01e2a90dbc6169b99d3c001c1d34b244ef70bc58aa2d2d240b2638bbc4550df27295f SHA512 56973ec9f6d012b549cfc33db3f1b7bcf2bb5e13f4a5f299c4ecdd425f80e5498cc2f9f5e744460c7642e72dc98c379f7f49dcf798bc0b861e464de31bed442e
 MISC metadata.xml 243 BLAKE2B 60e9636de2cbdae69a508d7f370662af030d8cebb04ac02967c0c9a274c2d066314c0add0ca28c98674d215c8bd3b1209a2c9bb916a538f171243df00c865e2c SHA512 773c027b6753265835a85d22ded35a3a46ff7c0341d9d802639d0fa796c4211ee46f8810785662ce05c3dee74489c0fa08be6ee50248c2a84b4de839b8f8cf23
diff --git a/app-text/restview/restview-2.9.2.ebuild b/app-text/restview/restview-2.9.2.ebuild
index e8fc0287a8f2..65da061a477c 100644
--- a/app-text/restview/restview-2.9.2.ebuild
+++ b/app-text/restview/restview-2.9.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,7 +18,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/readme_renderer[${PYTHON_USEDEP}]
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
deleted file mode 100644
index e6f4c4f799f9..000000000000
--- a/app-text/silvercity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SilverCity-0.9.7.tar.gz 278396 BLAKE2B 30419ee4d2cafe56cbfc1b73a3b188214c58e29a154810bed9b837d9fdc6709f7691c1662cc1da0a5eb1b326a430f958d66bb5629ae2f3a3afe2442f2e11957d SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0
-EBUILD silvercity-0.9.7-r1.ebuild 913 BLAKE2B 5ced5eab8dc1732efca681bbb2ad654a7ac5cde137fe25fb8e402b982ba0274b994485a6a26f4c55d898126e7af3db83549f62e6247fd0a975bdea68ccd90b79 SHA512 f5e69707bdbd9fb7a8acbc30c440c64a88f4f34c81920d4733cef02954edae1bfce17c1a08fa9c4471aad2c43bdbcf274828bea474513d355439cbfb6be726ce
-MISC metadata.xml 330 BLAKE2B dc1e089aa92ecf442d42c3a1dce93b9735a2c58a5fb6488c6825110125e2292c94e6bc0fa6471a56b58e72e6a130162dc77dff3f548f70e470ba628d21b6ff07 SHA512 6ae025cf1a3a56a19a6fbf436c293fe57365e87d11386797f94fd680bd0d044c8c13860670e070af9c1cad7c0a5f6bd4c29468ac5177456d20196844482676bd
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
deleted file mode 100644
index 624b33e3a10e..000000000000
--- a/app-text/silvercity/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>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">silvercity</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/silvercity/silvercity-0.9.7-r1.ebuild b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
deleted file mode 100644
index 29e26f3f30bf..000000000000
--- a/app-text/silvercity/silvercity-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_PN="SilverCity"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A lexical analyser for many languages"
-HOMEPAGE="http://silvercity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Fix line endings.
-	find -type f -exec sed -e 's/\r$//' -i {} + || die "sed failed"
-
-	# Fix permissions.
-	chmod -x CSS/default.css || die "chmod failed"
-
-	# Fix shebang.
-	sed -e 's:#!/usr/home/sweetapp/bin/python:#!/usr/bin/env python:' \
-		-i PySilverCity/Scripts/cgi-styler-form.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index d7d49492f2ac..c0288a5e359e 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,3 +1,5 @@
 DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
-EBUILD txt2tags-3.3.ebuild 514 BLAKE2B 9c8f5e2adaa6362cb62ceddefb156e69a04bb26fe0568477d228f6c1134027caa909fe4d5ce9c78e2a18ce4bff076790225d8489f9c0883ce71cfe6321d3e471 SHA512 c03da7aa20627b69eb300f0ee465dacaa9d7caedfef925908bea9a310a346e4beea68f81fa76951fdd9b1a82e371b154128071ca25854141757993402a5b501c
+DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
+EBUILD txt2tags-3.3.ebuild 542 BLAKE2B 2c4d3d8baf02068f7e616cff10f714cf9075620f876a3801db2f767cb2bc9a10565847607482e19cc19e918c3bdbd942004ba914f80e36356498fd808a4bb4d2 SHA512 4b5c17e1d3ca3ca848e7f87c28984c322f747291d5762aa865559c7b5be594a1b053d75fdb6999b7216b9f51330bd76f5a4cb67c41308daa0ce42279c0876a21
+EBUILD txt2tags-3.7.ebuild 541 BLAKE2B 0fa081196b5c005f4df20d707d424c768f14c25cd2d81bcd36f7e0c83838f76b0b8e5e27e46cd8579592e405d41ad34655e515ef94d46af2b30c9084a57d0c92 SHA512 27b61c88b23dbf8d1b957bfbbe5e2eb32a71e6012d3ce12f7abe8b3da99bd039b249ce9431f2e00b35a60f41cc940ec4c6e417c98cd712711bb563269c2a8e71
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
index 48eab7803a3d..83374fa38499 100644
--- a/app-text/txt2tags/txt2tags-3.3.ebuild
+++ b/app-text/txt2tags/txt2tags-3.3.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
 DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
 HOMEPAGE="https://txt2tags.org"
-SRC_URI="https://github.com/jendrikseipp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jendrikseipp/txt2tags/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE=""
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
new file mode 100644
index 000000000000..38feaf39ef12
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -0,0 +1,17 @@
+# 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="Generate marked up documents (HTML, etc.)from a plain text file with markup"
+HOMEPAGE="https://txt2tags.org"
+SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index cc558a5f1924..5179169bf16e 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,4 +1,4 @@
 AUX xlsx2csv-0.7.6-tests.patch 2180 BLAKE2B 173aa4d2650b86648a7b0897a86f49650acffd1603cb6af4f8fa603d70bc902b23cd280cba0453176e477907e7e93447693ff8ec28b531213c1aa690e9288d7b SHA512 7374e315fbe73532e91278eea825d0171642f4d4d5c412e904932c67ecde0b71291c37d8f5cf8908449663435a587f11e10f409bc82128ef9388be0c002da22e
 DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
-EBUILD xlsx2csv-0.7.6.ebuild 656 BLAKE2B b0661c464f21e5b7e702a4087a0b4f0b5255ca08266804f674172561b61c8f8ecffee70cedbac15b0e899e25c769488815df18ee182346144263e9f571caacd2 SHA512 f192bf1195caf81a7452dff12654921124068cf0138f7b4788727c3ddf5844cc8fdd95770f05bbc027eb62399b6ae6b3c4d45c0a9d97a239661b8ff9a2855fb7
+EBUILD xlsx2csv-0.7.6.ebuild 684 BLAKE2B a7e2894b84601bc84d2850a963117ba8f7ea8420eb760131e2dcf6cfdd8c878fa1605c1221632ee307f4756bfe0904377620199c2f46b4ad9808a227a9782f6e SHA512 9f27f16cdb026a4823478188c06cb34624200b2b7a33a21af2f0ee4c27c8209e09714530ce80dedab33963320324e60ad8faaca69ecc133d366123d7a55c323e
 MISC metadata.xml 301 BLAKE2B b6bbde41ddb21a05cbfaf8a75bbc5e0d2eb24ce3b62bb93966e7712811cbda3cd258d351f584253d1e831806e2c26fc499092311d2c2d36fa0a8f7323e0b85e0 SHA512 bd16895b82a69676daacc8cf9f4c196423b61600a7dc9ffe8b8d3962cb0a06e46bee7e38a4c692c368a93879be4a83d7d70ce1fb82db6ef4bec25d21a86203c8
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index 804e56281aff..bb4698b812d2 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 7813200f2850..406f8d8c270d 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,5 @@
 DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
+DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
 EBUILD xmldiff-2.3.ebuild 636 BLAKE2B 2624f1ede10d236dd47d79c9a1773001d5246ea5363271d1b6823ad49ce7836fa2f117877c45c1ab8f5799422b27376d6906ff5fc900eef501395ff29c0ea9f0 SHA512 31e29d00d330a3c198e7a0daab2ddae51d0604352df01e350bcec40eb4b0e0b1bd6d7bf39b7937229012fc3d9850b0f14b93e74408eca616f1575bcf3994c510
+EBUILD xmldiff-2.4.ebuild 642 BLAKE2B 1668b52a63100ea22ee659dd08bdc5cb7ab26d974fb3bf01c7c2c81f90ba0e39ceefa844804324a68ce80d26cf96d9766ab7339d8965851fcc050c993c2f160b SHA512 74318d14ef0931a3e470200bb5c190f7a2bc30b1a41bb662ed51f52bcfe60dee6dcd4c56e5eab7bc8cbd3d4964119a97d558df7a99d9295003f16051430e4ae9
 MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
diff --git a/app-text/xmldiff/xmldiff-2.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild
new file mode 100644
index 000000000000..c1261561d3c4
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-2.4.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_{7,8,9} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="https://github.com/Shoobx/xmldiff"
+SRC_URI="https://github.com/Shoobx/xmldiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+DOCS=( CHANGES.rst README.rst )
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 93867f5f6ff8..a1c7bf64966d 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,5 +1,6 @@
 AUX xournalpp-1.0.17-translations.patch 716 BLAKE2B df50ccfdf86069f08b29168af42955d80b363db5d271bd0c97f07cdc626995922471186cd83f7860f0eecbf8e53982639e23a5a2b817310f6d3d12e529577c45 SHA512 83ae3ff7ae1dd4933f063c9e35a38684eeb6638fbc9ec52b863bd1499d2fe958b7565e8609060d9ba8388eb6c89e046b8908c0fd7387981154cf86da3b574184
+AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e
 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
-EBUILD xournalpp-1.0.18-r1.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
+EBUILD xournalpp-1.0.18-r1.ebuild 911 BLAKE2B a00d8ba904bfa33a5323d8dc8a80c457886263e08240e364423f99b26b4278e4d6f54532207e7a33a122b8b7bd9b7dac2083697e4f756277bf616824b88cb2ab SHA512 019fabd488c5418652583c15aa0e06f13a3d68eec69b4dce656ca27c5d464201307c31c45c501e96ef86021de8b6ca8e93e386dc5abc56d61fee2e5c6e84110f
 EBUILD xournalpp-9999.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch
new file mode 100644
index 000000000000..120e86ff586f
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch
@@ -0,0 +1,15 @@
+diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
+index b2029d68..2e1d68ba 100644
+--- a/src/xoj-preview-extractor/CMakeLists.txt
++++ b/src/xoj-preview-extractor/CMakeLists.txt
+@@ -36,10 +36,6 @@ target_link_libraries (xournal-thumbnailer
+ 
+ set (THUMBNAILER_BIN "xournal-thumbnailer")
+ 
+-add_custom_command (TARGET xournal-thumbnailer POST_BUILD
+-  COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+-)
+-
+ ## Install ##
+ 
+ install (TARGETS xournal-thumbnailer
diff --git a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
index 7057d336d41d..f04ebe22737e 100644
--- a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
+++ b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
@@ -40,6 +40,10 @@ BDEPEND="
 	sys-apps/lsb-release
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-nostrip.patch" # bug 745255
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
 }
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index d57ef2b4895a..883d53a82c70 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
deleted file mode 100644
index 9ec55caa998a..000000000000
--- a/app-vim/conque/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST conque_2.3.tar.gz 52195 BLAKE2B 31546d8e0797525cd05a4663f3598a11cbb5dd7dcc6fabf181d277e2cab88593e1458f5e646688e9e46a8d01952eb1383f358454200d59634c40920b93b7db9e SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89
-EBUILD conque-2.3-r1.ebuild 681 BLAKE2B 061eaa78420d76e40c66bdb3c6b965059848dc73d0f47fc5a2ef44034d5d5b16b6d4b088aa73b2ba09ea487310863ad519050da32ff9e25f7ba07c74ae89cd35 SHA512 f096075a3886716e361377dd70b25298e02d7efc14e749e66730ec4c2e496eae0ec38db34bbc0f722574e085ea9e94e21e95b91011136c3ceb007951b0f282ee
-MISC metadata.xml 325 BLAKE2B d9e43a221c8ce8ec5a6cdfbed4c1d76cbebc9922587a1414a9bd09a14dbe1462ce2bad738ca2fa74e21686e20dc1c05a6dac2faf91abe29beb4ccc046e2014c1 SHA512 6bbcbd15af2e070d8b377cb9ce8d267b4321c895375a874d77cc85f6d9ec5aee8787415f3799b93801aa748d10a15e64968dab7ace10d9f19d48c252d2b2e4a3
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
deleted file mode 100644
index c4d72f0ec19a..000000000000
--- a/app-vim/conque/conque-2.3-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"
-PYTHON_COMPAT=( python3_6 )
-VIM_PLUGIN_VIM_VERSION="7.1"
-
-inherit python-single-r1 vim-plugin
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
-HOMEPAGE="https://code.google.com/p/conque/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-VIM_PLUGIN_HELPFILES="ConqueTerm"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/metadata.xml b/app-vim/conque/metadata.xml
deleted file mode 100644
index 6fa1407c232d..000000000000
--- a/app-vim/conque/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>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">conque</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index beb8d79fbddf..a418f8489e14 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index cf151905bda2..9d1c9236dab4 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,6 +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 abseil-cpp-20200923.1.tar.gz 1783899 BLAKE2B 2f9f07bdfd5fe5b70bd470446cf00a3f6ce7790a60bf5063120fb00e78c73f19ddb7843bb57079c64a9542953b121dbac6cf0cef88617effc6e74344711142bd SHA512 1fb484f66218a2296e9f648ed98a5d09e591eb680ea1912cce44be22ea8051a0d0e27ab30f5df1ec22311c11768d4d998bbdfc62a1ef6c0088e254dd19c71f7b
 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
+EBUILD abseil-cpp-20200923.1.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.1.ebuild
similarity index 100%
rename from dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
rename to dev-cpp/abseil-cpp/abseil-cpp-20200923.1.ebuild
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 36f2c82cd260..b0ef2ebb3666 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,6 +1,8 @@
 AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c7980fa0e5372db69465ccf964e7294213ae459e200a39f2721849df94a8433febcfb225813af3b43bc204b0edd3d64c SHA512 b8c4701f22c483078fb7d25df60c8f002f47573ec434a309b1a3739aecc1c51f79852b06f46c1ed9ae4cbec0e7d70aaabd06bc59e561c19d81b05388d3cedc61
 DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
+DIST eigen-3.3.8.tar.gz 2141903 BLAKE2B c33e699ba08338e7b9b215c9466e161229164ed3c466ce3d760c6917749af33c0414c3bc4bbdd216e3466e69ece8a38ca8beb78b7e0f1609894df6bb4a7fcca3 SHA512 5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355
 EBUILD eigen-3.3.7-r1.ebuild 2254 BLAKE2B 6c995f2ae16a005a2992f34f2373db06690616175649f3f1750fcfb0f3875676a40a742f2504fe32ce127b1bb8090d44ec0983bab595d81af7d2edb05cd064a5 SHA512 03f623ff907403db989cb2941dedd0cda5534bed87b7c405383774d344e45695bec3011212b9d8a56c9752bf788a404ab2268b14ce854506dd206da9386b23f0
 EBUILD eigen-3.3.7.ebuild 2432 BLAKE2B 2312d5d606907923882c74f4842128d95f9fa25eff68ab7217a58131c2fab11f42d8e1658129f29a7dbc68d3ab42510f6289ff1fe9ec7987596f691aebb67fd6 SHA512 e411a3a4c08776dc667d2145e52b23225d88b6bc9e6b36e664392fc26bd34195fcfcf2b54d0b20dec4ad8597f6e262d4dd7671513ab3581b10d0a16ed2713701
+EBUILD eigen-3.3.8.ebuild 2220 BLAKE2B f0eacab62de5ea5993e8f1b014a09b7938d17ab0a0a8300cf54d0a17f61bb7320f990e5dbcf3ffb1bb2bffcd2800b9ca3d5d253fb3a15fae3a59a77572d00ab6 SHA512 47db2f69941fbd2eee6add42efaf97346507500bf037f823249130924362e4bc434a1d07b74485da3ccff93b1bff3e516086c7682c52e0f692694f011ce2ac98
 MISC metadata.xml 945 BLAKE2B 11864f5eb57e7a8ecfa9d1869536fbfbd9fcb24bc965edad51ec5013bea87a48d63c1b6427b5bffe26191de7e24b950a1c7ad1f0a801fed6b77a41bad4786334 SHA512 99fe52d30c344b957a76a7f6add1dd4251c606f47befa6f517fa50cbd8ba1ef325e66051ff799093cef8281bf1099709e86d3f3a896b078267c665ad68063203
diff --git a/dev-cpp/eigen/eigen-3.3.8.ebuild b/dev-cpp/eigen/eigen-3.3.8.ebuild
new file mode 100644
index 000000000000..fbc5c610b0ed
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.3.8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="test"
+inherit cmake cuda fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
+SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( virtual/pkgconfig )
+"
+DEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc[sparse]
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		sci-libs/umfpack
+		virtual/opengl
+	)
+"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cmake_comment_add_subdirectory demos
+
+	if ! use test; then
+		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
+			-i CMakeLists.txt || die
+	fi
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKEPACKAGE_INSTALL_DIR=$(get_libdir)/cmake/${PN}${SLOT}
+	)
+	use test && mycmakeargs+=(
+		-DEIGEN_TEST_CXX11=ON
+		-DEIGEN_TEST_NOQT=ON
+		-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+		-DEIGEN_TEST_CUDA=$(usex cuda)
+		-DEIGEN_TEST_OPENMP=$(usex openmp)
+		-DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
+		-DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+	if use test; then
+		cmake_src_compile blas
+		cmake_src_compile buildtests
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 71e56ff9bf92..d57ceb450822 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,8 +1,5 @@
 AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
-AUX gtest-1.9.0_pre20190607-increase-clone-stack-size.patch 565 BLAKE2B 6960b5318aa450f9309811f7cd412a652203404dbfb0cec7a2e308f3dc5ae1cf6a1225caff4a60d9e70468339e19e95abf50b5aa29cabde5960eb4f1f2571714 SHA512 7a9f65e93feca436791541378d1c5b740b3c111724c4075ff1f23ac616ece50aa7beb35f143df39c93184754331666b294fbab39cad189a8da1c3290846933b3
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
-DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
 EBUILD gtest-1.10.0_p20200702.ebuild 1839 BLAKE2B 4b900f5e4865408539433463deed2e4dc739ea17a94402cbf9eb272363add96b15f3f57fec010c4a52128c346c6e554f87b3bcf4e04c02fc9b5596ab973c1710 SHA512 ab8f37341aafcc92498414a8d9370dc3d927d6dac69a733b86fbc2aa57d6ee3f4630e9aeb8b18a6c3e0192bc1b8ad1ba646bb80838159fde70017bce44832cdf
-EBUILD gtest-1.9.0_pre20190607.ebuild 1758 BLAKE2B ade6b31a300fdcdc0cc43524640fc82740595b2b8be848848c77c9395dd609068192faf910d5dfb85e951f83847bacb1837c05d5e4b081595f6c3c2a1da18fdb SHA512 11a96924838187431e8e5a9713dc4885932edbfd912bc1d7291f6f55aae591d803526a20aa43d94b626920a4592bacdb7fb98ff54469f16b990f38edfc89cdf3
 EBUILD gtest-9999.ebuild 1707 BLAKE2B e3b986cad521ba806e07677e999571d792fe79151e0e8e81093749d51c49908165be06118b47b6ddf58e890aafaca69cd470f4a116aeac868b8ad2c7ef499a8b SHA512 67227afb86efd0d8f51a9e52ea7032bf149f9e2ecdef282db1951f7dd269f404ffe6875a453ed83115ed0674bf13bd02b870c726f6d64e5cf314868d7bbb5c5c
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
deleted file mode 100644
index 38d515a48ddb..000000000000
--- a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/692464
-
---- a/googletest/src/gtest-death-test.cc
-+++ b/googletest/src/gtest-death-test.cc
-@@ -1070,7 +1070,7 @@
- 
-   if (!use_fork) {
-     static const bool stack_grows_down = StackGrowsDown();
--    const auto stack_size = static_cast<size_t>(getpagesize());
-+    const auto stack_size = static_cast<size_t>(getpagesize()* 10);
-     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-     void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
-                              MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
deleted file mode 100644
index 9aa2139201bd..000000000000
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.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
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_ECLASS=cmake
-GOOGLETEST_COMMIT=da10da05c262af0a9e8fa91789a272a3dec67655
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/googletest"
-else
-	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		MY_PV=release-${PV}
-	else
-		MY_PV=${GOOGLETEST_COMMIT}
-	fi
-	SRC_URI="https://github.com/google/googletest/archive/${MY_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"
-	S="${WORKDIR}"/googletest-${MY_PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
-		googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GMOCK=ON
-		-DINSTALL_GTEST=ON
-
-		# tests
-		-Dgmock_build_tests=$(usex test)
-		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use doc; then
-		docinto googletest
-		dodoc -r googletest/docs/.
-		docinto googlemock
-		dodoc -r googlemock/docs/.
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc googletest/samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index b9686ef64ac3..22308c5b2bc7 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -2,7 +2,10 @@ AUX nlohmann_json-3.7.3-gcc-10.patch 4668 BLAKE2B 6c70c34ce5df904ed641d021c8584c
 DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
 DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
 DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
+DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
+DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
 EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
 EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
 EBUILD nlohmann_json-3.7.3.ebuild 858 BLAKE2B 852622cec3d775387e1a63bd1c7fdec647d5aebb7d672dd90f780e04cfd3c254f76a56363d4b955277b80aa48dd99e8e044680735fa5a3ff05b575f64e2cdc8f SHA512 4a9435489e2fb3840ef663a915004056d3faa0ea2b6bc24d9d77d74e5c7ccdf2700a1a568938a27e7bc071bb5a9068165369e8f51d20b6217151c578c146ea55
+EBUILD nlohmann_json-3.9.1.ebuild 1376 BLAKE2B 52886e24cef1c141a90d681b56b0248dd796b8b4baa44e30e4c98d17ea5a13a65df2f9a420b68f444db3925f0317d9ec8eda500dfa8e65c96d2836c90785b186 SHA512 93b90c5980ca4bff9b97c2c86d10e4069ed1d6a378e0199ced2efd7619dd7278136c963776fc19a34b18070411baf31e0d62d8fd0bd0b5193739fb965fd44e8c
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
new file mode 100644
index 000000000000..691afb13f9c1
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> ${P}-testdata.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DJSON_MultipleHeaders=ON
+	)
+
+	if use test ; then
+		# Define test data directory here to avoid unused var QA warning
+		# #747826
+		mycmakeargs+=(
+			-DJSON_BuildTests=ON
+			-DJSON_TestDataDirectory="${S}/json_test_data"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && emake -C doc
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+
+	# Skip certain tests needing git per upstream
+	# https://github.com/nlohmann/json/issues/2189
+	local myctestargs=(
+		"-LE git_required"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-cpp/robin-map/Manifest b/dev-cpp/robin-map/Manifest
new file mode 100644
index 000000000000..6570daaa26a8
--- /dev/null
+++ b/dev-cpp/robin-map/Manifest
@@ -0,0 +1,4 @@
+DIST robin-map-0.6.3.tar.gz 64506 BLAKE2B 46a2b5b47346016695db0c49f73cfbf8530b7db0a31527030eb00f3b6f0695325ab6fe16de1e60d6b1d0793818bdd1e31e50117f2e2e4c50154f65b38ac66d84 SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b
+EBUILD robin-map-0.6.3.ebuild 504 BLAKE2B fafe5db735e95537d9885600e4a2c760ed5070c769079411ea422c892bef4b06033f50456b855e662760a2d71eabdc8ee3b1f9f1e9dc5f0785893b34b1187877 SHA512 42dc895fc411aaeca3854220783c544dcb691c54590af7d5c7562fc44cde6e19a86d10c3ceb942ea2a34eef36115e513fd318867592ae0c9d8302d0ec912216a
+EBUILD robin-map-9999.ebuild 504 BLAKE2B fafe5db735e95537d9885600e4a2c760ed5070c769079411ea422c892bef4b06033f50456b855e662760a2d71eabdc8ee3b1f9f1e9dc5f0785893b34b1187877 SHA512 42dc895fc411aaeca3854220783c544dcb691c54590af7d5c7562fc44cde6e19a86d10c3ceb942ea2a34eef36115e513fd318867592ae0c9d8302d0ec912216a
+MISC metadata.xml 368 BLAKE2B de2351d3b1e732b8c5a5e17afdc6b0a540ed78ff6404cf3faac0e51fd44678b352b9a0df4aabf11bc49a31b00333e941525b4a873576676a6e46be87fe4b59bb SHA512 ecc9d3212da03cae0ff6b48bc78dde27d40769faaa48bc66c86a13fc88d80fd7a89bdb4137e911c0ad06bb12c40220e9427fb8460fb95eb1beae0fc8af8d2a0e
diff --git a/dev-cpp/robin-map/metadata.xml b/dev-cpp/robin-map/metadata.xml
new file mode 100644
index 000000000000..8238cc0570ce
--- /dev/null
+++ b/dev-cpp/robin-map/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@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-cpp/robin-map/robin-map-0.6.3.ebuild b/dev-cpp/robin-map/robin-map-0.6.3.ebuild
new file mode 100644
index 000000000000..99255a6ea187
--- /dev/null
+++ b/dev-cpp/robin-map/robin-map-0.6.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ fast hash map and hash set using robin hood hashing"
+HOMEPAGE="https://github.com/Tessil/robin-map"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
+else
+	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
diff --git a/dev-cpp/robin-map/robin-map-9999.ebuild b/dev-cpp/robin-map/robin-map-9999.ebuild
new file mode 100644
index 000000000000..99255a6ea187
--- /dev/null
+++ b/dev-cpp/robin-map/robin-map-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ fast hash map and hash set using robin hood hashing"
+HOMEPAGE="https://github.com/Tessil/robin-map"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
+else
+	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index add410c15268..7f90e039e1b7 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 63a9178225c8..5f201583e95a 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -10,8 +10,8 @@ DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e
 DIST percona-server-8.0.19-10.tar.gz 490703179 BLAKE2B 731e9498c4934eb53451c202e8b1de93618190d9b6334b761428ab223756d515d958db77515517e6b5db3ba6cd908c8b238c18b63f4c73b256ec251f8b161ff3 SHA512 39aa805474c6655980e70c97e0d2c0f21ae16e2c1e2e9c7e1d615f46320f1615620368fbdfc24f5d1784aae856090856c3ccda3d6f09ed86c6c9ffe3197be90e
 DIST percona-server-8.0.19.10-patches-01.tar.xz 8288 BLAKE2B 2f79c538ac1512b052210439a27b71491917cb9eab08ac3a3b21c188458c2989f0c998d973b8dd654a7d7606acd70ccf374f1e2f5e0088d0c6b96a794dc4c4a5 SHA512 43313797ec405be82f15745185bfab25fda093045f981a8caa8a019522e432415e4b3cca4ca5ffb735d102f98b3c2fccafccbd4695bd2d1f011707f709fcc2b3
 DIST percona-server-8.0.20-11.tar.gz 494288758 BLAKE2B 202f0cbd7395a6b8ae367ed96d1b6d2c6ae2a56ba6d85e8aad55a6b36a6966a0c3285836dc829e1583a46e28fd2903540e520f6347b1e8c18d99b08f58daef8b SHA512 cf8aa999bd0205bded526838246d023eae5dfadeec1aaf0be99565def5a1cdcc8041bcff90ba6a49f5e903e4f436d416181a9f134555d5c71b7cf44d2ba58a6d
-DIST percona-server-8.0.20.11-patches-01.tar.xz 8668 BLAKE2B 1f598c1b381de3efe8b8605d915b0b63d04214ba4f6e51ce154a020f3e2c4d76a3b4e96b4c9c958c6949b4bdf8cc2b754875049beccdafc99b3a3ad8abf0b315 SHA512 4ca0f58bf1cbf6e7a5a33b46efa5250c28226fa7f23c1327bda050e7de3ec0f16dc46c1cd1c481d50f8b167a4c07653db8a3daf44e8f3f96bbb0aa8f8f66d5b2
+DIST percona-server-8.0.20.11-patches-02.tar.xz 8876 BLAKE2B 34cb3cd0c6d6fb8b2fca98efa53e6e163e4f6b251f629e40169018c328da5319a77ecceec92c925019d13a4ba2dba8c96a23dccf8ba8a3aa95452d4dc9278ffa SHA512 372885f22e7e37bcd63f382d4b064d99b6f826cd2d053148fcdfa1c7f062f51531d5366c198976797f9a3349539e59f5ba96187dc79fdf00365c618b0f83b7c2
 EBUILD percona-server-5.7.27.30-r1.ebuild 37272 BLAKE2B 637049d8fcae905ad4cb4d41651e53fcc0980cf307602879e8d5f0d6bcf0505ff0a9c38a7450f539db0106f4ed406f96e1e212bd2f34eb2510bb137714cd69fd SHA512 feda2f9ccb3b58a03577126aabe0483c3217ce5e0618028d442c98aa2ace7ba527dd10aafde2f679ddabe9f86c65648ea445081d78eb360d02e42cb072733425
 EBUILD percona-server-8.0.19.10-r1.ebuild 39009 BLAKE2B d7ff1b52a7e04d3158461494503cf2af8f3bf7775fbeb9d91e58a3cd85094d093aef085522af221e3b6037ec958cf4ffafbbdaf808343b8a23f5b1be40e82750 SHA512 4ffb5d0e7611cd5b388cc5846d12d2eb020325d99a14c10e42c204425360f6d5109352ea8d6dad8926fadba84df810fb10a8f21179ebd79c0e1e0b18e4c3c3e4
-EBUILD percona-server-8.0.20.11-r1.ebuild 40211 BLAKE2B d3ab946880a0ef1b96a93e740af4c10ab615df6aaea3b9655f7afd894e5ddf1e7fbfe5a1b7ef64567a9fddf52c9fc107b7ff68dd7b44a14e31f6a72fcbc8723b SHA512 df0eba7a543aec9bde21b1329c976442cc86989b838602d7beca1b9d2d0f1b91cbf6f1a778743e52c46ac44f48f01231f77956224688cfbb0878e9530cc3ed7d
+EBUILD percona-server-8.0.20.11-r2.ebuild 40249 BLAKE2B ae3233ecc31893529f5d59128e3f39bee9509a46d98a2ec8ca2766ed74af5e5625168e0095fc25852f7fa927fa9e36191d2be1d6ec975eebf3cc771dabf8ec62 SHA512 0831b745e259bcff131e1778f7fa25826198eed091238dfe1f3728a9c940b74582308fe787dd6bbef95568a1fbbb9e5ff7c641476763e3a2d71eee340224542c
 MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2
diff --git a/dev-db/percona-server/percona-server-8.0.20.11-r1.ebuild b/dev-db/percona-server/percona-server-8.0.20.11-r1.ebuild
deleted file mode 100644
index dd3addaa154d..000000000000
--- a/dev-db/percona-server/percona-server-8.0.20.11-r1.ebuild
+++ /dev/null
@@ -1,1214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake flag-o-matic linux-info \
-	multiprocessing prefix toolchain-funcs check-reqs
-
-MY_BOOST_VERSION="1.70.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-Server"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
-
-# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.20.11-patches-01.tar.xz"
-
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
-	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
-	${PATCH_SET}
-"
-
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server"
-DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling
-	rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-0_p131:=
-	sys-libs/ncurses:0=
-	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=
-		>=dev-libs/protobuf-3.8:=
-		net-libs/libtirpc:=
-		net-misc/curl:=
-		cjk? ( app-text/mecab:= )
-		ldap? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap
-		)
-		jemalloc? ( dev-libs/jemalloc:0= )
-		kernel_linux? (
-			dev-libs/libaio:0=
-			sys-process/procps:0=
-		)
-		numa? ( sys-process/numactl )
-		pam? ( sys-libs/pam:0= )
-		tcmalloc? ( dev-util/google-perftools:0= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	virtual/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/JSON
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
-	!dev-db/percona-server:0
-	!dev-db/percona-server:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-CHECKREQS_DISK_BUILD="9G"
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use server ; then
-			CHECKREQS_DISK_BUILD="3G"
-
-			if has test $FEATURES ; then
-				CHECKREQS_DISK_BUILD="9G"
-			fi
-
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		CHECKREQS_DISK_BUILD="3G"
-
-		if has test ${FEATURES} ; then
-			CHECKREQS_DISK_BUILD="9G"
-
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-
-			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
-				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-
-			if use latin1 ; then
-				# Upstream only supports tests with default charset
-				die "Testing with USE=latin1 is not supported."
-			fi
-		fi
-
-		if use kernel_linux ; then
-			if use numa ; then
-				linux-info_get_any_version
-
-				local CONFIG_CHECK="~NUMA"
-
-				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-				check_extra_config
-			fi
-		fi
-
-		use server && check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/mysql-patches
-
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	if use tcmalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling. We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITH_CURL=system
-		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if is-flagq -fno-lto ; then
-		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	elif is-flagq -flto ; then
-		einfo "LTO forced via {C,CXX,F,FC}FLAGS"
-		myconf+=( -DWITH_LTO=ON )
-	else
-		# Disable automagic
-		myconf+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_AUTHENTICATION_LDAP=$(usex ldap system OFF)
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			-DWITH_PROTOBUF=system
-			-DWITH_NUMA=$(usex numa ON OFF)
-			-DWITH_PAM=$(usex pam)
-		)
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
-			-DWITH_TOKUDB=$(usex tokudb 1 0)
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='perl server' \
-# FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Run CTest (test-units)
-	cmake_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
-			# are known to hit timeout when system is busy.
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			einfo "${info_msg}"
-			unset info_msg
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def"
-
-	local -a disabled_tests
-	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
-	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "group_replication.gr_ssl_options2;0;Sporadic failing test" )
-	disabled_tests+=( "innodb.percona_changed_page_bmp_flush;6807;False positive on Gentoo (PS)" )
-	disabled_tests+=( "innodb.percona_changed_page_bmp_log_resize;0;Sporadic failing test" )
-	disabled_tests+=( "innodb.percona_log_encrypt_failure;0;Requires proper keyring setup" )
-	disabled_tests+=( "innodb.percona_log_encrypt_change_mk;6039;False positive on Gentoo (PS)" )
-	disabled_tests+=( "innodb.percona_log_encrypt_change_rk;6805;False positive on Gentoo (PS)" )
-	disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
-	disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
-	disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
-	disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
-	disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
-	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.with_recursive;6804;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
-	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
-	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
-	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
-	disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
-
-	# Known test failures due to expired SSL certificates -- fixed in 8.0.22
-	disabled_tests+=( "auth_sec.admin_ssl_crl_crlpath;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "auth_sec.admin_ssl_crl;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "auth_sec.server_withssl_client_withssl;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_crl_clients_valid;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_crl;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_crl_crlpath;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_ca;100055;Fixed in 8.0.22" )
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# no need to force dep app-arch/zip for one test
-		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
-	fi
-
-	local test_ds
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_ds test_infos_str test_infos_arr
-
-	if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
-		local impossible_test
-		for impossible_test in \
-			encryption.default_table_encryption_var \
-			keyring_vault.innodb_online_alter_encryption \
-			keyring_vault.innodb_row_log_encryption \
-			keyring_vault.install_keyring_vault \
-			keyring_vault.keyring_udf \
-			keyring_vault.keyring_vault_config \
-			keyring_vault.keyring_vault_config_qa \
-			keyring_vault.keyring_vault_timeout \
-			keyring_vault.key_rotation_qa \
-			keyring_vault.rpl_key_rotation \
-			keyring_vault.table_encrypt_2 \
-			keyring_vault.table_encrypt_2_directory \
-			keyring_vault.table_encrypt_2_keyring \
-			keyring_vault.table_encrypt_5 \
-			keyring_vault.table_encrypt_5_directory \
-			keyring_vault.table_encrypt_kill \
-			keyring_vault.temp_table_encrypt_keyring_vault \
-		; do
-			_disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
-		done
-	fi
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild b/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
new file mode 100644
index 000000000000..e75b78da1705
--- /dev/null
+++ b/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
@@ -0,0 +1,1216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake flag-o-matic linux-info \
+	multiprocessing prefix toolchain-funcs check-reqs
+
+MY_BOOST_VERSION="1.70.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-Server"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.20.11-patches-02.tar.xz"
+
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+	${PATCH_SET}
+"
+
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server"
+DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="8.0"
+IUSE="cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling
+	rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!test? ( test ) libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	cjk? ( server )
+	jemalloc? ( server )
+	numa? ( server )
+	profiling? ( server )
+	router? ( server )
+	tcmalloc? ( server )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=app-arch/lz4-0_p131:=
+	app-arch/zstd:=
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	server? (
+		dev-libs/icu:=
+		dev-libs/libevent:=
+		>=dev-libs/protobuf-3.8:=
+		net-libs/libtirpc:=
+		net-misc/curl:=
+		cjk? ( app-text/mecab:= )
+		ldap? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap
+		)
+		jemalloc? ( dev-libs/jemalloc:0= )
+		kernel_linux? (
+			dev-libs/libaio:0=
+			sys-process/procps:0=
+		)
+		numa? ( sys-process/numactl )
+		pam? ( sys-libs/pam:0= )
+		tcmalloc? ( dev-util/google-perftools:0= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	virtual/yacc
+	server? ( net-libs/rpcsvc-proto )
+	test? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/JSON
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
+	!dev-db/percona-server:0
+	!dev-db/percona-server:5.7
+	selinux? ( sec-policy/selinux-mysql )
+	!prefix? (
+		acct-group/mysql acct-user/mysql
+		dev-db/mysql-init-scripts
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+CHECKREQS_DISK_BUILD="9G"
+
+mysql_init_vars() {
+	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_DATADIR="${MY_LOCALSTATEDIR}"
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use server ; then
+			CHECKREQS_DISK_BUILD="3G"
+
+			if has test $FEATURES ; then
+				CHECKREQS_DISK_BUILD="9G"
+			fi
+
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		CHECKREQS_DISK_BUILD="3G"
+
+		if has test ${FEATURES} ; then
+			CHECKREQS_DISK_BUILD="9G"
+
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+
+			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
+			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
+				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
+
+			if use latin1 ; then
+				# Upstream only supports tests with default charset
+				die "Testing with USE=latin1 is not supported."
+			fi
+		fi
+
+		if use kernel_linux ; then
+			if use numa ; then
+				linux-info_get_any_version
+
+				local CONFIG_CHECK="~NUMA"
+
+				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+				check_extra_config
+			fi
+		fi
+
+		use server && check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mysql-patches
+
+	# Avoid rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	if use tcmalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	# Remove man pages for client-lib tools we don't install
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		# Using bundled editline to get CTRL+C working
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_SSL=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# The build forces this to be defined when cross-compiling. We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+		-DWITH_CURL=system
+		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+		-DWITH_ROUTER=$(usex router ON OFF)
+	)
+
+	if is-flagq -fno-lto ; then
+		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+		mycmakeargs+=( -DWITH_LTO=OFF )
+	elif is-flagq -flto ; then
+		einfo "LTO forced via {C,CXX,F,FC}FLAGS"
+		myconf+=( -DWITH_LTO=ON )
+	else
+		# Disable automagic
+		myconf+=( -DWITH_LTO=OFF )
+	fi
+
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+
+	mycmakeargs+=(
+		-DWITH_ICU=system
+		-DWITH_LZ4=system
+		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
+		-DWITH_RAPIDJSON=bundled
+		-DWITH_ZSTD=system
+	)
+
+	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+		ewarn "Tests will probably fail!"
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+	elif use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8mb4
+			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
+		)
+	fi
+
+	if use server ; then
+		mycmakeargs+=(
+			-DWITH_AUTHENTICATION_LDAP=$(usex ldap system OFF)
+			-DWITH_EXTRA_CHARSETS=all
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_LIBEVENT=system
+			-DWITH_PROTOBUF=system
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DWITH_PAM=$(usex pam)
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
+			-DWITH_TOKUDB=$(usex tokudb 1 0)
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='perl server' \
+# FEATURES='test userpriv' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" &>/dev/null || die
+
+	touch "${T}/disabled.def"
+
+	local -a disabled_tests
+	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
+	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "group_replication.gr_ssl_options2;0;Sporadic failing test" )
+	disabled_tests+=( "innodb.percona_changed_page_bmp_flush;6807;False positive on Gentoo (PS)" )
+	disabled_tests+=( "innodb.percona_changed_page_bmp_log_resize;0;Sporadic failing test" )
+	disabled_tests+=( "innodb.percona_log_encrypt_failure;0;Requires proper keyring setup" )
+	disabled_tests+=( "innodb.percona_log_encrypt_change_mk;6039;False positive on Gentoo (PS)" )
+	disabled_tests+=( "innodb.percona_log_encrypt_change_rk;6805;False positive on Gentoo (PS)" )
+	disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
+	disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
+	disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
+	disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
+	disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
+	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.with_recursive;6804;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
+	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
+	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
+	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
+	disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
+
+	# Known test failures due to expired SSL certificates -- fixed in 8.0.22
+	disabled_tests+=( "auth_sec.admin_ssl_crl_crlpath;100055;Fixed in 8.0.22" )
+	disabled_tests+=( "auth_sec.admin_ssl_crl;100055;Fixed in 8.0.22" )
+	disabled_tests+=( "auth_sec.server_withssl_client_withssl;100055;Fixed in 8.0.22" )
+	disabled_tests+=( "main.ssl_crl_clients_valid;100055;Fixed in 8.0.22" )
+	disabled_tests+=( "main.ssl_crl;100055;Fixed in 8.0.22" )
+	disabled_tests+=( "main.ssl_crl_crlpath;100055;Fixed in 8.0.22" )
+	disabled_tests+=( "main.ssl_ca;100055;Fixed in 8.0.22" )
+
+	if ! hash zip 1>/dev/null 2>&1 ; then
+		# no need to force dep app-arch/zip for one test
+		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
+	fi
+
+	local test_ds
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_ds test_infos_str test_infos_arr
+
+	if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
+		local impossible_test
+		for impossible_test in \
+			encryption.default_table_encryption_var \
+			keyring_vault.innodb_online_alter_encryption \
+			keyring_vault.innodb_row_log_encryption \
+			keyring_vault.install_keyring_vault \
+			keyring_vault.keyring_udf \
+			keyring_vault.keyring_vault_config \
+			keyring_vault.keyring_vault_config_qa \
+			keyring_vault.keyring_vault_timeout \
+			keyring_vault.key_rotation_qa \
+			keyring_vault.rpl_key_rotation \
+			keyring_vault.table_encrypt_2 \
+			keyring_vault.table_encrypt_2_directory \
+			keyring_vault.table_encrypt_2_keyring \
+			keyring_vault.table_encrypt_5 \
+			keyring_vault.table_encrypt_5_directory \
+			keyring_vault.table_encrypt_kill \
+			keyring_vault.temp_table_encrypt_keyring_vault \
+		; do
+			_disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
+		done
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	mycnf_src="my.cnf-8.0.distro-server"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok" || die
+
+	if use prefix ; then
+		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8mb4|latin1|g" \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	eprefixify "${TMPDIR}/my.cnf.ok"
+
+	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+
+	if use router ; then
+		rm -rf \
+			"${ED}/usr/LICENSE.router" \
+			"${ED}/usr/README.router" \
+			"${ED}/usr/run" \
+			"${ED}/usr/var" \
+			|| die
+	fi
+
+	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	# NOTE: $MY_LOGDIR contains $EPREFIX by default
+	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
+
+	# Note about configuration change
+	einfo
+	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo
+		elog "You might want to run:"
+		elog "  \"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+	else
+		einfo
+		elog "Upgrade process for ${PN}-8.x has changed. Please read"
+		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
+		einfo
+	fi
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
+	if [[ -z "${mysql_install_log}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysql_install_log}" || die
+		chown ${MYSQL_USER} "${mysql_install_log}" || die
+	fi
+
+	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
+	if [[ -z "${mysqld_logfile}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysqld_logfile}" || die
+		chown ${MYSQL_USER} "${mysqld_logfile}" || die
+	fi
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	local -a config_files
+
+	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
+	fi
+
+	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
+	fi
+
+	if [[ ${#config_files[@]} -gt 0 ]] ; then
+		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
+			local user_answer
+
+			echo
+			einfo "Please select default authentication plugin (enter number or plugin name):"
+			einfo "1) caching_sha2_password [MySQL 8.0 default]"
+			einfo "2) mysql_native_password [MySQL 5.7 default]"
+			einfo
+			einfo "For details see:"
+			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
+			read -p "    >" user_answer
+			echo
+
+			case "${user_answer}" in
+				1|caching_sha2_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
+					;;
+				2|mysql_native_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
+					;;
+				'')
+					die "No authentication plugin selected!"
+					;;
+				*)
+					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
+					;;
+			esac
+
+			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
+
+			unset user_answer
+		fi
+
+		local cfg_option cfg_option_tabs cfg_section
+		for config_file in "${config_files[@]}" ; do
+			cfg_option="default-authentication-plugin"
+			cfg_section="mysqld"
+			cfg_option_tabs="\t\t"
+			if [[ "${config_file}" == *client.cnf ]] ; then
+				cfg_option="default-auth"
+				cfg_section="client"
+				cfg_option_tabs="\t\t\t\t"
+			fi
+
+			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
+				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
+					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
+			else
+				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
+					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
+			fi
+		done
+		unset cfg_option cfg_option_tabs cfg_section
+	fi
+	unset config_files config_file
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
+	[[ -z "${tz_sql}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--initialize-insecure"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	rm "${tz_sql}" || die
+
+	local x=${RANDOM}
+	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
+	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index d4d60332a7b2..5cb3d5952a2a 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,5 +1,7 @@
 AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
+DIST sqldeveloper-20.2.0.175.1842-no-jre.zip 433127943 BLAKE2B da410245ce2fe62b6f5d533f0d170069cb031cae6abcb294fbb1ccb537814f37260482d00d4c752de33d3cea3b4613929a8c8049c4ea813913666d9950a02875 SHA512 1ac9c29b57efae26a5ec8925c25c6500b2e625852d6bfb4b10afae95d6d1b3e4f7b4df34eb847f6f458009b82c4659f1bbad3bb7ba0632850ed97b096014f4ce
 DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
+EBUILD sqldeveloper-20.2.0.175.1842.ebuild 2659 BLAKE2B 29c616d3e225f917ee66f4a217346fd80a6329627f4826bfe08a32c3e03e12ebe28cbded0383eaaaacb8e24b382538f677090c2e8151728b1bd0d83b9e4171b1 SHA512 08e44520ebca5e9eac49fb8a293ce744abcf50a7792513eaa5e4d889d414e8671d5c85e2870d07a419e1dc0dc48242d816af2199cb57e3f43541729d38437b6f
 EBUILD sqldeveloper-4.2.0.17.089.1709.ebuild 3200 BLAKE2B 72022780aad23a4d907b1911447162bee87f5e7d9d68ac0577f3451b2db06931eb12437559752f7970fe4f9348bac470baaf2bd92445d39e6d48411c87235385 SHA512 db084a3aaadd441174b4175c70af7b08833979362ea5093ffdd16a3ebefca440511d6592322b4fc9b641abdc10c3bbf7a67b82766811983c5aaa6baa4f0cdd29
 MISC metadata.xml 261 BLAKE2B 9772344d77d5ee748886120e69eb80ebc3df85fe5a371772e32b139a0ee39fc8f2758d0f576abca035f2f5ea4124777d44b7d921e56593cbcb819eaf313fd5c6 SHA512 2a60e17b95fab939ca49a24940840277dcd64fd0fa43ad981c933f6f3af3b2eed56ff710f57f6d41fc19877e6e99d4489e8121d9a64d0447ad1348a4a744f613
diff --git a/dev-db/sqldeveloper/sqldeveloper-20.2.0.175.1842.ebuild b/dev-db/sqldeveloper/sqldeveloper-20.2.0.175.1842.ebuild
new file mode 100644
index 000000000000..942c47b19df1
--- /dev/null
+++ b/dev-db/sqldeveloper/sqldeveloper-20.2.0.175.1842.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2
+
+DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
+HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
+SRC_URI="${P}-no-jre.zip"
+
+RESTRICT="fetch"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="mssql mysql postgres sybase"
+
+RDEPEND="mssql? ( dev-java/jtds:1.3 )
+	mysql? ( dev-java/jdbc-mysql:0 )
+	postgres? ( dev-java/jdbc-postgresql:0 )
+	sybase? ( dev-java/jtds:1.3 )
+	>=dev-java/openjdk-8:*[javafx]
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+QA_PREBUILT="
+	opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
+"
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "	${HOMEPAGE}"
+	eerror "and download"
+	eerror "	Oracle SQL Developer for other platforms"
+	eerror "		${SRC_URI}"
+	eerror "and move it to /var/cache/distfiles"
+}
+
+src_prepare() {
+	default
+	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} + || die
+	sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die
+
+	rm -r netbeans/platform/modules/lib/i386 || die
+
+	# they both use jtds, enabling one of them also enables the other one
+	if use mssql && ! use sybase; then
+		einfo "You requested MSSQL support, this also enables Sybase support."
+	fi
+	if use sybase && ! use mssql; then
+		einfo "You requested Sybase support, this also enables MSSQL support."
+	fi
+
+	if use mssql || use sybase; then
+		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die
+	fi
+
+	if use mysql; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die
+	fi
+
+	if use postgres; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-postgresql)" >> sqldeveloper/bin/sqldeveloper.conf || die
+	fi
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},module{,s},netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}}
+
+	newbin "${FILESDIR}"/${PN}-r1 ${PN}
+
+	newicon icon.png ${PN}-32x32.png
+	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32
+
+	# This is normally called automatically by java-pkg_dojar, which
+	# hasn't been used above. We need to create package.env to help the
+	# launcher select the correct VM.
+	java-pkg_do_write_
+}
+
+pkg_postinst() {
+	echo
+	einfo "If you want to use the TNS connection type you need to set up the"
+	einfo "TNS_ADMIN environment variable to point to the directory your"
+	einfo "tnsnames.ora resides in."
+	echo
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 1d49a77dc9b4..a18565b87df8 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 11470 BLAKE2B ac890f71b285cb9b6ba27af16638f569eaf9cb414732785f8c600d5a7ad71e7fe7c9c15139db241ec2455600a225c00747ca6276a308b7e939e2fb3b564c1385 SHA512 50dd066f04dd600c2b5267ffb0245dde42853a7d42b850688723eb95eeff8503707fb25ed280735e467da45e3788756aed9cf8d67529adb02e290b529c334ebb
+EBUILD sqlite-3.33.0.ebuild 11469 BLAKE2B 444a4ee89e2229700aeab30831a586394bfe4fe06bc2002c551069d6dfc632602afce1760f2d9e34ddba94f6d4d13d9db8498cc19262e65b30b590b788285c4e SHA512 974283ca1708c9be89bb50f845ab38db79a59cd84c42817d4a502ddf3a5f60714b62388f3a5132c363e50c580a1007883dd6c06c6334c6119c49b0fc204b4935
 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 ff5c335143da..aa8b7bfaa56e 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-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 2da217c8cf5e..bae9cd3ae6eb 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index fe18124cfcaa..12d495e2a9f9 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,4 +1,5 @@
 DIST esptool-2.8.tar.gz 5399875 BLAKE2B c2c27dc44cec1921f2d800347682bb198be76f7a122fd6a0c9964fb189350980557aa85bd6cb8fb2d63c8c7ccdd18e1860b65ca85c8777145ec1da07da886be1 SHA512 14528197e760779f3bf50e2a44d477979675dd42451fa405e2ae87502158b21f999fb94561980c9eb0634d2d1fd3729779b78266403de858ed1d32e8d29604cc
 EBUILD esptool-2.8-r1.ebuild 1148 BLAKE2B 1ffe134f67498ebf26389522948edb65a2e8e06ebc63f796c48a7517fe31605ed3fa2bdde1300b1cc666ee3d27f0d95cae2fa43af96eddacbfa53bf9461c27cd SHA512 58bdaf97160f5a6a3c58c2a26108d44da8d3d4e72bc6fc16367a1721ad65279805bc9bc7640ef544ade7016fff1d00fcc1d56068ca4f0c21177c658699259d00
+EBUILD esptool-2.8-r2.ebuild 1061 BLAKE2B a537369c361e8bf8430f66866f25db3a81fe5e9b0bbe284ee046adc586a7a673711e9b67be1e2ab9cd2a891441999908bd5f0b39f411248a9ce67d5cbcf74fae SHA512 1c98e91cd08381bd4f7da0f17344ccf363c79ebd4e1c42e6d5df0e2ce7c82d85766e7d937cb4b2a8dd70db0dc5e1bbb24e425f084a2357fd4ea723f28a48f71c
 EBUILD esptool-2.8.ebuild 932 BLAKE2B 7d44a50eb5afacb3789d7a77e643c0ceca943897c4deb9b023cb5b39e9cd8547db866e9bc76ad80f2f6605611b25fe74ab59ffbe5605eccf6d21a6ee3d9e66b5 SHA512 d009ce38349452e01a062b3c042422c950e65bb6c0dab35979d9efd8428a552e250857527bae6a992e862578972c130fbcdc5641c493b3c25eb36c30cdcafec4
 MISC metadata.xml 473 BLAKE2B 58b09a7777e3c2c04d7932bcfb631a8cbd0322cc81cc35a0871fdc8843f0d3d376b42bb2d7cacd5378f1d7e0f497f0989be1381ee9e8dd3513a899a9ba268199 SHA512 6029394a2639f610b705a820bdc92eab6849087b6964aac46e1aa9a2bd897f06e45919cb32441115081c3ce26097e6a083d9826c43bb7da86b2859855e7f9d67
diff --git a/dev-embedded/esptool/esptool-2.8-r2.ebuild b/dev-embedded/esptool/esptool-2.8-r2.ebuild
new file mode 100644
index 000000000000..e24cd7f15a7d
--- /dev/null
+++ b/dev-embedded/esptool/esptool-2.8-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/ecdsa[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyaes[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyserial-3.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]') )
+"
+
+src_prepare() {
+	rm -rf pyaes/ ecdsa/ || die "unable to remove bundled modules"
+	default
+}
+
+python_test() {
+	${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
+	${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
+}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ba7dfb43c5ba..419fced35005 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index ee69eae76801..23758d0c6e3b 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -1,10 +1,11 @@
 AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d95837795820baf5e0e6a11a03448f57cf761f240d3fa62e2f1ef121ac2e9b48b802edf74905fdf68f6744773f612cbe9 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e
 AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d
+AUX mygui-3.2.2-c++17.patch 824 BLAKE2B d70fb25cffd51ac28aa0d443d0162ed76f11624e311fdbf71f1fd0321670203b9925fb9494586e9f289f9781faee3822073b06ac0ebd61a739350b7fdf38c401 SHA512 cf532e56e9324ac956745639a1a625cd54a494dafe1aa0bb086ce851428d758c71f13c77e415f2e0611b6772335902b225e128f15883c7adfd4d7c11a625c6ed
 AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9
 AUX mygui-3.4.0-build.patch 2492 BLAKE2B 2819c235df3d479d42831fcf2a80a9a2e165b98acc87c7cd3105b5285b0bfa0d0e84ae2c8642d91260096cf2404e9a690812008e92cd5a5167e1dffc89f49809 SHA512 9dc685f71d14e369a8a3fff5e10572817a4d1a943471decb94e3d25133d53c5cc7401f8c360f0bcb1cc1188beb6e1a76521d51cdb88cb1f32eda1715c765da2e
 AUX mygui-3.4.0-underlinking.patch 491 BLAKE2B bc7d2facd04637f4d6b4ca2c2a353a66c16ce781050ecf6f59a461acedaa0dcb6293742bd83214c4e32bdbcda18ae461b9f60e90fd6f450832ba5ef002fb468f SHA512 0cdcd0906b52abc7843ae588d7afd8f1450bcf7162d41efb2af6a3744a64bb6e02ffdcdc6cd3346f72be7f5361a25bf35d937fac983814077deb339ed7b7dbfa
 DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
 DIST mygui-3.4.0.tar.gz 22391483 BLAKE2B 5628cca98625285368b9363acd95e541e1ba7d86fd1d471f687c553d0f0abd9ccb2f47981cf0bb91f44a68489bb7ec3fbcb451734758e2435ab9ef320214465a SHA512 3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487
-EBUILD mygui-3.2.2.ebuild 3733 BLAKE2B 0b356da39fa55bd4b53befe2ee1fda7505e6daa61a49b9af0aa7b85e168dd247f8a731b81c65be6046de0d315fcb9fc0237f8818dba3be0a56c0f89fb62c3a12 SHA512 32609bf5200de72f267d493d99bf23c0baf97005e2d8c126ba3638bd5d08f2a26c2430d4801fca91f529946f5aff98687b58eaf17e173627a5bdad29c20c3da8
+EBUILD mygui-3.2.2.ebuild 3765 BLAKE2B 97e1bbfbb6287fd0963677ed84297bace17efffa5779b0972981d2fe1576d9a43379870275537a097903c4bfe92baa3f32a467b514166992fb5b4feba50bf1bb SHA512 2ea444ba8dd5830b0c423f4c65201557739e8c3759e95924b153518dd634c51c0cd10a6443f31a467b211b24f18b68f304ef7f1af798651b981a08ea1111bea0
 EBUILD mygui-3.4.0.ebuild 3758 BLAKE2B 1d456f5e82b7357ae624b19ef43103d55a30df7ba2c9df856cbe22f5a118842cf183eb5a0ff2eaf4d40f6eef95faa5c4b021905845a158ef30e1f93ce2373144 SHA512 eecc3f87a738021a43fc3d48e34fdc1492fd3de557a0f520fda9437669436813635136e1ba4535a406e636b0f64d6abd3274fc8d70100017649eecdc5daf47f7
 MISC metadata.xml 2012 BLAKE2B 6f3b20aa2f4f557b3499d98b758d4e402903a6f56580062ae9442b38508abe3841584e550bb20cbce31b93a052ef78231c8ba9568dba1d8bb9459a11f32d625a SHA512 05633f451013eff1de94fc2707bf9df21a2b8e6a8466a988f743ec12e04c12e6e81a0fbc4c74c081905ff81ba45f571459d3584a264ae5347e13cc2b4139ff79
diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
new file mode 100644
index 000000000000..1cdf7babeb12
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
@@ -0,0 +1,27 @@
+https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch
+https://bugs.gentoo.org/732778
+
+Part of:
+
+From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001
+From: George Evmenov <george.evmenov@geocv.com>
+Date: Fri, 26 Jun 2015 12:25:26 +0300
+Subject: [PATCH] do not use nullptr define
+
+--- a/MyGUIEngine/include/MyGUI_Prerequest.h
++++ b/MyGUIEngine/include/MyGUI_Prerequest.h
+@@ -19,13 +19,7 @@
+ #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)
+ 
+ #ifndef MYGUI_DONT_REPLACE_NULLPTR
+-#	if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
+-#		ifndef _MANAGED
+-#			ifndef _NATIVE_NULLPTR_SUPPORTED
+-#				define nullptr 0
+-#			endif
+-#		endif
+-#	else
++#	if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED)
+ #		define nullptr 0
+ #	endif
+ #endif
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
index ac582627a70d..dc3766716faf 100644
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ b/dev-games/mygui/mygui-3.2.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=5
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-FHS.patch
+	"${FILESDIR}"/${P}-c++17.patch
 )
 
 pkg_setup() {
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 6c4e5eaf5ef3..83f2045e17f9 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest
index 9f2f523691cf..b09e67f6542c 100644
--- a/dev-haskell/dataenc/Manifest
+++ b/dev-haskell/dataenc/Manifest
@@ -1,3 +1,3 @@
 DIST dataenc-0.14.0.7.tar.gz 12813 BLAKE2B 3f213d73121c7973c706ad0d81d2e0153d7ac9cb242aa8d5b3bcd093dd8611d9476263a4893c43ce95aa642893d8b1b2ac2baf26d0f33c0fa3d64d7d0bb0722d SHA512 82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
-EBUILD dataenc-0.14.0.7.ebuild 1134 BLAKE2B ca5244b216f6a38946ad60671d02b5c0646cae0b643690b5739205e6a6c854613b79acea464ab0d4fb15f9e42a30be27b1c5f40ed6aff77a5359ff16665552ed SHA512 afff54d8a08bbd1c506f000384f351055c4a3467f9769037be9186dd4ac8e769f96fe41a0380da355762fcc0fa6ce1e10e2dad4f0efbe8156381560d44e3e6ad
+EBUILD dataenc-0.14.0.7.ebuild 1144 BLAKE2B 8a96bd6d48179b3ab14e078566eccec675f053798e1180e179741ae280be2d9ea211fec18aac1d605a541dcc9d96e770db352eb42f5918b0bf4a7baefe77b963 SHA512 372a528eb06d0861d0f349e1a0aefe953525e831a8830add09531110ac307c0c8c7c4f0ea97d34f1525165f3a4495767872f5c3a92033ebc156feac80bc2f4ee
 MISC metadata.xml 481 BLAKE2B 3692a18b12132405687d94af86493582c1a0080c549b0c29c8849861b42e42cf807ac37021cbbc59992d7065b469b6a88e6be916d61f11430d1f1a7523d7b3c1 SHA512 195d8c9c9c9080cf2f11c4535237ca3334d055018471dc9974a54c13e95362d79dde8fb556720e781a56ecfa2e5772a48ef45a7d0d270a29958777312768dbaa
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
index 1f99ae213b17..3a89b18c2688 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'base >= 3.0.0 && < 4.8' 'base >= 3.0.0' \
 		'QuickCheck ==2.5.*' 'QuickCheck >=2.5' \
diff --git a/dev-haskell/easy-file/Manifest b/dev-haskell/easy-file/Manifest
index 986fe9d168c4..2ca3a5eb305c 100644
--- a/dev-haskell/easy-file/Manifest
+++ b/dev-haskell/easy-file/Manifest
@@ -1,3 +1,3 @@
-DIST easy-file-0.2.1.tar.gz 12610 BLAKE2B c2b1420563fb4070d927631f51119849d48f6e680506f2df3b84572729819311f3ba8eca3d25110a30f245a61da93edfc53de508411baeeccaf9eae94165bdc1 SHA512 48249b2662384cd766d8a7f66242c1d4c68b5b56a87583fd0363cd075c7fc0d8f013edb45fcab15ceaa8325e4f2fbb6ed920ca873e231c44934d6dae12e6102f
-EBUILD easy-file-0.2.1.ebuild 534 BLAKE2B 2b5668707148ff7c86c3a6642331ec8d6725400ca1f292004570b86df0e595a9aebeaeb13ce2e4ada90bd5ef4fa2734005d4395b0f66189b8b52dd2150619a43 SHA512 44b4bc50566d1b32751e856f091c05a2b9440ae379d1f3efe2c91b047fab684c0aff678e292b7fc793412b3e8fe076c4a1969f1304540c9763f8ea88fe1477a2
-MISC metadata.xml 337 BLAKE2B af91268a2068243974cce885ce4558991080808d59e61528bcf596b925e2eb83cdcef9e0516642a7ba21dd13b6246610e10e2d0c0ed63dbc6acdd03dfefa19bd SHA512 b95c62ae962fbe2e3b0bf32cf8e83a9d54eaee34264b903824ac5d5be0efd4dff1a0840d101d330c613054ef012dc5938c2e7ea8a76b0dec5fb999b23d794246
+DIST easy-file-0.2.2.tar.gz 12667 BLAKE2B 4f018144e10abe237e03bcf73189dfc0fcdb39afe62ca269c398baf9a4d9e10c2f1409307f331b99ca3c51f3b23bfccef6bca823016de01c9a1731bbd295a48f SHA512 12a11afe54175b21382786b9d7aae59ba068a27857a3ceb934023da7d14a5e9a69e4b4210a97b5e64fbcd6a41251a6a8b5608feb8a3bb212077b08148468576e
+EBUILD easy-file-0.2.2.ebuild 534 BLAKE2B 6adc7698031b33ecfe32c5bd1d29b8d0ac0a19d855578b1d719dee6e848bbe480dcfd880305851e4022669f1691aed94dece1ebebb1154d26da785ad2e25074d SHA512 1f3206db6ec03cb1c0a26465e9595cfc137a39a1a80d51f6be2f77849744bda623273fedb5ebb931c18c52d02c83d708e0a3df854368b153d8cd53c4ce042f01
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/easy-file/easy-file-0.2.1.ebuild b/dev-haskell/easy-file/easy-file-0.2.1.ebuild
deleted file mode 100644
index 63d0588abd8b..000000000000
--- a/dev-haskell/easy-file/easy-file-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cross-platform File handling"
-HOMEPAGE="https://github.com/kazu-yamamoto/easy-file"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/easy-file/easy-file-0.2.2.ebuild b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
new file mode 100644
index 000000000000..e396dc548411
--- /dev/null
+++ b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Cross-platform File handling"
+HOMEPAGE="https://github.com/kazu-yamamoto/easy-file"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
index 41c1d03a82ab..b7878815d80d 100644
--- a/dev-haskell/easy-file/metadata.xml
+++ b/dev-haskell/easy-file/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">kazu-yamamoto/easy-file</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
index f169665395df..1663a6ce4104 100644
--- a/dev-haskell/edisoncore/Manifest
+++ b/dev-haskell/edisoncore/Manifest
@@ -1,6 +1,4 @@
 AUX edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
-DIST EdisonCore-1.3.1.1.tar.gz 80699 BLAKE2B e92848bb282d478c84817e0c0c2515b0fcb227b8224b020e8e50df4deb53915ccb7aa172a86eef787aa985efaaffbb42deab0fbb5b8669adf9635129b017fee8 SHA512 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8
 DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
-EBUILD edisoncore-1.3.1.1.ebuild 846 BLAKE2B 4e7926cd4ac89d36681068a4ab4d85ff328825f6e4c72b5e88f91a81ca4bd616a17412e81ce5d237cba8a08075074960baeb6d2a3e4f4abb1c7952435acfceda SHA512 30077a71ea972ec3ad9d42a4fe9ca922a421af50c305bda94367502492b9b18f554a18a97ede76a44c9d15d7e4bf1d0243a7f470c61944bbb2c32875af4e22a9
 EBUILD edisoncore-1.3.2.1-r1.ebuild 985 BLAKE2B b83c04eea598842e812aa02a96379a2cde60983c9ffc2a09ffdc68018db0e66efe1c6b79c36db50f710ffb95db57341af4b818acf2b7cb07cc43309f524c43cc SHA512 f3507b57ebac7f9ae6bdcc141481f8a1e245d2a03b0cd7a9d5d12902730f0da8b3cdfaa6973bcf6f5252006652a47bd3f5e94b6f02d3f7ac870bfb220681c61c
 MISC metadata.xml 604 BLAKE2B 470c5efc02f3d04ba57508b958cfcf4b5cceb00ae59e98b8d35d29eadcca522529f56a4a2f6b0d14424fee9c9fad879f719547557cab168508bf4eb862d5aab9 SHA512 025104263582c6b0f1c6c1016ca8b64094bfffae4c6778996da351bd8febcbe705227cb5eeb516f59211fecf0b1edac6f77eb2dffc2654175952621d678195e4
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
deleted file mode 100644
index 7f38c6d65f14..000000000000
--- a/dev-haskell/edisoncore/edisoncore-1.3.1.1.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.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonCore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/edit-distance/Manifest b/dev-haskell/edit-distance/Manifest
index 544d9772f15b..bdf65696dfad 100644
--- a/dev-haskell/edit-distance/Manifest
+++ b/dev-haskell/edit-distance/Manifest
@@ -1,3 +1,3 @@
 DIST edit-distance-0.2.2.1.tar.gz 13228 BLAKE2B a7e57e19f61497cfa24c1a038e860d2b0d616f4a3528db3c315c12f3bd04554e003009f1b07b2fdd6be7a8387b0205dde4d00da8b0a05f5c4b7ab0c17fca159f SHA512 67d19c9f5712191f88641d32ff0b84aaf05c2acd71cfa81a17675690ac9076b34aff687afa8501f8b22ddcece12a439e053265d14b70dc155b0e08406050fdd7
-EBUILD edit-distance-0.2.2.1-r1.ebuild 830 BLAKE2B 2b53000c774ac5882ca7b68c535d72171541843b5bde33e4b66d8a463f4e81e24d8c4b91f6855e7117eae1de162b4a32f955c281cc176cc8a42d0e0a29ed5660 SHA512 08706ff93b7fe30734b950a49cf904ac157951df9882fc88062eb47473d53314f74a75e853312bd01603397138956635bb0d78adc8e79e7b1dafe505dc69ea73
-MISC metadata.xml 497 BLAKE2B 934f2f3ee39e2f9d8d10b11961e3e97a464843310378f7121d1e96e06d7c75f7aa68e17a97a7009d3af5f23101b79267b2e57e19d281f42c59e88a33ee189d99 SHA512 f84d69e8385d45779047219523a748ff08e61ddf83649f37c0a253688006fbcc09ba72d81b78caa059fd73dc491ec9f96f524fbeae0cf333f86bbb0561df921c
+EBUILD edit-distance-0.2.2.1-r1.ebuild 840 BLAKE2B 2740a3527a971bc273d4d524d1a1b1eb22981e99817b22e113fc7fac5057eb891921906cb62941960a336d1d3f98082a8ff7bc7acbdd0d13ace5bf7515e9ed4c SHA512 5d4caa4cd2591a18939b883e384118f5ad61238e6f5f833601f627266a7f4ffde2de793945169dbb1a29d84178c829eebdd14dda4329170b8978986e798d65f1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index 568102a4434a..30e1b8aee32d 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 test-suite"
 inherit haskell-cabal
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
 }
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
index a2d0a723f92f..b7878815d80d 100644
--- a/dev-haskell/edit-distance/metadata.xml
+++ b/dev-haskell/edit-distance/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">batterseapower/edit-distance</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
index fe9802c11912..d71b3b5fee85 100644
--- a/dev-haskell/email-validate/Manifest
+++ b/dev-haskell/email-validate/Manifest
@@ -1,3 +1,3 @@
-DIST email-validate-2.0.1.tar.gz 7462 BLAKE2B f385a0e585191a1810270397077f5f2b675dacc8ed89eb256e4e1848e40dafe79d037516c2ab0b7f7d5aae42a7d04399b9e9c9a5b12fc1b2eda753a3580de810 SHA512 d5eb0d48c81fa61c5bdecbb1cc35e370afbcb49277091b7358a01518711dfda94ec4074c7462f1efa088cc964408db083481da976d64283868baa130abf7089e
-EBUILD email-validate-2.0.1.ebuild 844 BLAKE2B 0c47ea064f12c8b3d5adc75ef58c5272f8e6a113ff989742505b87bf8e9db2a42920813b5d51dadbc9bda1aeefafc41a0313f927c317f7ac3ff098e8c7f4f6b1 SHA512 757e2382dd7a2bcc5ed2f98ea1171cb742f9b2daff9a100e5d1acf83146f4a4835b6672b3204c3d3fc563f47834aefdcaaed629985626d62cb1460466b98c291
+DIST email-validate-2.3.2.13.tar.gz 9635 BLAKE2B fecdc9017dcb00847662043774920b09e65a24876efdc1248f24b942bbd79b9d6b79640b479bbbf44c2d80349cfc3511b63884f4e3947949346773dbca9c8a06 SHA512 22cf7517ae38aa264198288449946cc7da6bda7f799a652050de9544c9e07c5bbe6bf8c8b53526be227288214bf3144055effd858fb993704942eeda3410ba3d
+EBUILD email-validate-2.3.2.13.ebuild 808 BLAKE2B 0c37d4673b97dc3073d480ccccb38ec786c271ad09278a0f2ff5cc29ea2833124b1b25c337cc6ead3beaffa6f928127c210381370b9eda4714b4cbe742aa6767 SHA512 4dbec3801632ab71e54b85078987e0d29c73800e6bd50788bae731d1d3965fe3f655fdd44ed0504dbce421cd2d6d10ae45bd1a5ae745f1de82ec2970a487144f
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/email-validate/email-validate-2.0.1.ebuild b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
deleted file mode 100644
index f50409f9a818..000000000000
--- a/dev-haskell/email-validate/email-validate-2.0.1.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validating an email address string against RFC 5322"
-HOMEPAGE="http://porg.es/blog/email-address-validation-simpler-faster-more-correct"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4.1
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
new file mode 100644
index 000000000000..18fbf2c80376
--- /dev/null
+++ b/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Email address validation"
+HOMEPAGE="https://github.com/Porges/email-validate-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17
+		>=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/errorcall-eq-instance/Manifest b/dev-haskell/errorcall-eq-instance/Manifest
index 600262fab50c..b9ca33f94a00 100644
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ b/dev-haskell/errorcall-eq-instance/Manifest
@@ -1,3 +1,3 @@
 DIST errorcall-eq-instance-0.3.0.tar.gz 1534 BLAKE2B 6b137de15395742d5c73e1e9f1b06f88109675da701d7d65e40879b844b4ebbe4d8400fec44a12388af3a4ab1dddec30a8365e63eb8f042805ad020a575de325 SHA512 934ee3b3f00d7d32b9aa384a568cfc9c99a3947cb39cdc23495dda21acd0672d6de753b4243f417397738473d091fd14776c21da0dbaa0b40c2b465cde5910a6
-EBUILD errorcall-eq-instance-0.3.0.ebuild 665 BLAKE2B 21fb376a71ac9778191dd03fdd15bea33f8a820c853935a120ff6dc642074066bcc797578cd6a0a3f077aa768d15c9fb6ee3b231a53c980ce0018ba90e511719 SHA512 5c7441bca2880e157fea30c3a4683545dbb2b5de30631d20a166283f751b2c5364293a0a608c633cdca9ce818bdcc8f22cfdb141535446f7dec0102d97eb0925
-MISC metadata.xml 403 BLAKE2B d91f6c24dcbadbd55fc00ce8c51fa9df861b025124d679850dd10e79c9ae8676d2a58c194791743c8c16893be9562674e5e112ea7672b4579d3e2804864205b0 SHA512 2db46308a0fb8d443c6369bb1275709cb975a0900552d0d0752c8bc6e689929d4e666428903aa914129f2cb8f493d379786adbcc38f4813e7b31aebc5cff6277
+EBUILD errorcall-eq-instance-0.3.0.ebuild 665 BLAKE2B 42a2c8c73b4d75a35ce15bef547b1d0cd614299f7e62df9b8ddb797f6a3a233f9dce332858fe5e607fe46b4aa5e87ad0066a127a6c35b6fa187bce25e062abb4 SHA512 c6e2d2ab884191d7fcc927254862dbc2b9993fd5624a519b75dd91708995ec01cacaee9b0468c2e059ec546cbd60dba67f62bc3d4d7ae6862e85c6e302bf2a90
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
index 575eb95d3ba6..e63ef2b19c3e 100644
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
diff --git a/dev-haskell/errorcall-eq-instance/metadata.xml b/dev-haskell/errorcall-eq-instance/metadata.xml
index 0dc85cfde05d..b7878815d80d 100644
--- a/dev-haskell/errorcall-eq-instance/metadata.xml
+++ b/dev-haskell/errorcall-eq-instance/metadata.xml
@@ -5,8 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Prior to @base-4.7.0.0@ there was no @Eq@ instance for
-		@ErrorCall@.  This package provides an orphan instance.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/extensible-exceptions/Manifest b/dev-haskell/extensible-exceptions/Manifest
index a51fefba07aa..96bd7e02a458 100644
--- a/dev-haskell/extensible-exceptions/Manifest
+++ b/dev-haskell/extensible-exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST extensible-exceptions-0.1.1.4.tar.gz 8531 BLAKE2B 2156f9c719737286d720bd52e57172386639c95f559e8e4a257ee7f67e61a9948ab042d8befd72b3aa15993faeed6bd7ef2918553d47e0c819c2a29262289cc2 SHA512 b63bb6b8bc846571db37c23801b711748a10a27a6a6b25035e992013f6705ad9b3ad86e61a7de839c9ac61c26ad3640b9642a8747d6b76a03336834c39e93dca
-EBUILD extensible-exceptions-0.1.1.4.ebuild 683 BLAKE2B d2df9d54e929e526f95a22de679c126e7575249aa480c99eaf28eef200bb7057ee602fa8076eb671ef64343602af3466fd392fa1eacdd2b6db903f7a37f03d6d SHA512 58482fa87e4fa5947ff09d21b25e93512e854178c885c862a8b00f3a1d17e33cfb067aaba64182b7b776134431e9d705d14bce294441c8cc92f1cd2733954de2
+EBUILD extensible-exceptions-0.1.1.4.ebuild 683 BLAKE2B cfe9dbe51342001fdc0779e877160f1e69de3cdbc8485dab7f8a76318fb69ac67c8d0e8be8fa2e2a59688d38fde76f8476ecf496452f38c86d92c2c7d51eb68f SHA512 54162ac0bcd85b82c568976aaa471576f35041339766ba3604cb2f5b5f8340b26a552bb2c1d83560f2429d2620f5c6f71d7bea81809f50dd0a828c57d6f018bc
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index b92a92af0dba..ae922f958a10 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -1,9 +1,9 @@
 # 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,8 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
+	>=dev-haskell/cabal-1.2
+"
 
 CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
diff --git a/dev-haskell/failure/Manifest b/dev-haskell/failure/Manifest
index 1ad76206e1b4..ce4ef5cc7ffc 100644
--- a/dev-haskell/failure/Manifest
+++ b/dev-haskell/failure/Manifest
@@ -1,3 +1,3 @@
 DIST failure-0.2.0.3.tar.gz 1797 BLAKE2B a25a3276cdd8c5f68be61effb2f65a94fe1ebe612e1aecc3d6dd697e998fb60f81d9e07dfe1e5b57c79da7111a442ac648af4bf55128340350eb1acf3e7088be SHA512 ef8c9904d899381a281ee79235054af6bd156d2b2819e70bcd2a122c1c505c10311189f9280c39bd836c0f3ba35bc7536ce83b58a42978616ebd89c64d692c96
-EBUILD failure-0.2.0.3.ebuild 617 BLAKE2B 933e9821b2fa102574d7b6b696ee2d84154d09de5da85760050eca286f5af24a7452738fb8a5935d4f4f103a26a53af4342eff1baf8442812176fd29a6ba4bcf SHA512 86b3750244c98f1ed0cce9afb112d0c59ce41af55295fc032ca903e100a7a205fe257606ee8b2a4cce66baf2a6f5e05a58c4f6a55206ef0501ee7c5f5da85852
+EBUILD failure-0.2.0.3.ebuild 578 BLAKE2B 5f80cb3da95b609f9890446057f1af717592a03b7703a6223af4934244b072120b9de9f7af3ab36d98068f4008637c619756d179b1388657bfb5564779a910e9 SHA512 5646089b51081e523f9dcae3884842cdbe554f7b0e762bc796592bbc31ae045b79323e2619990c3490e2d295e9750cc1c05779fea882443577d9fb8282907bb2
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
index 93077d2a61c2..aab5f36c3771 100644
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ b/dev-haskell/failure/failure-0.2.0.3.ebuild
@@ -1,9 +1,9 @@
 # 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.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,9 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/fdo-notify/Manifest b/dev-haskell/fdo-notify/Manifest
index a2879a51cf20..65d7cc97ba55 100644
--- a/dev-haskell/fdo-notify/Manifest
+++ b/dev-haskell/fdo-notify/Manifest
@@ -1,3 +1,3 @@
 DIST fdo-notify-0.3.1.tar.gz 4882 BLAKE2B 9ebf5bed4b17601b4deabc523e1ad529b95856ff6c0e6e83966fdee0373a37f8432c0fa34a6322157da1b3a93b12d10de2ff97da83c8ab9b2659932050083757 SHA512 d9193899d5eebd7c36e9464571827bd5b560fcc156e89822877b3b67a1f376c7abea9958f7e0aa6f79da06ad5f35a8738ad30a40d447b64ad557ed341054e6b6
-EBUILD fdo-notify-0.3.1.ebuild 579 BLAKE2B 17d90bd17e3512b9b94491507a57b17f0eb2a84c966acaeae39ba34151d6fd09285d28d228c397ba633558e9df004e504557fe8854197ff90a006fe2bbdc5fe1 SHA512 dffa714da506c990b427f9a3b97ceff234751c322ae9e77e916baa29d9e4900a53065d229bc10f60fa58c1a698cf96cc8adfab77c3cece9382eb3e7cf09f83b5
-MISC metadata.xml 452 BLAKE2B f4d0c3fa79053d9a7b444dd7bf4dc37310f5891eba6005c5babefa183f10d5e4328008fe4f15bcdc7eca191fc9d786e258a4a5b1ec6b7e874ecfd031d655108c SHA512 6cbe7ad76497cbd43328a240d6dc2328bc864c302925533b2fecbdcf79908e83f6cfc7906b7bb556e46677c0b7825998fecf7edba24517bbf6c3d0b67ecf8dad
+EBUILD fdo-notify-0.3.1.ebuild 569 BLAKE2B 0cd793a514c3c2d242b33243e3857c3c20ec0f1177d6a40c67aee2be944a4514c3efd81607c054cb2efc6da29e9ea6101faca65e1793fd2b0882fcc8ddad7039 SHA512 bad84f591bfbc7fb137d62af45f0d7230519d95264f22f29ad57809aeeb0e7f98ed350f84bcfb1bcf5669f9483797244cb1058531a2fc6db1d21e82521b953b3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
index 3d94cc7eb01d..4bca228c937b 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -1,15 +1,15 @@
 # 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
 
 DESCRIPTION="Desktop Notifications client"
-HOMEPAGE="https://hackage.haskell.org/package/fdo-notify"
+HOMEPAGE="http://bitbucket.org/taejo/fdo-notify/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -21,5 +21,5 @@ RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.1
+	>=dev-haskell/cabal-1.2
 "
diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml
index cc48e3a1090d..b7878815d80d 100644
--- a/dev-haskell/fdo-notify/metadata.xml
+++ b/dev-haskell/fdo-notify/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A library for issuing notifications using FreeDesktop.org's Desktop
-		Notifications protcol. This protocol is supported by services such
-		as Ubuntu's NotifyOSD.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/filemanip/Manifest b/dev-haskell/filemanip/Manifest
index c9013605d8ea..63d42896eb7c 100644
--- a/dev-haskell/filemanip/Manifest
+++ b/dev-haskell/filemanip/Manifest
@@ -1,3 +1,3 @@
 DIST filemanip-0.3.6.3.tar.gz 10369 BLAKE2B 19f68d3c130ff5d2f40cae100eeee4ae079d86c0d23138e44b7f22d07584c941a8a0ad8cddb04b474a86729872699ac72991a0dcf6c9807377a761570138710c SHA512 5cb6ad4e310c1ae3b038ccfa3154536db73145e4dea4a7be1ae0563ba44565494e378fa8e459f449feac2bcc140f1128b0b3ec915acd2300e73cf012ada85160
-EBUILD filemanip-0.3.6.3.ebuild 611 BLAKE2B 2c7e2cf97d6c95c9887739db5f0c419ae2435bb829abf122f684dbf3478c430222c2e622de7f147949308d17318d2acf7aa50e9907159424b50a4ecbba898b03 SHA512 092677e6e8f9f5da27b53623931de05cec43b1b1e7fea832980052494a36dbec1651b180931992e46df0d2bfa93c6c272a330b67d1fdc24d0550f71798c10f74
-MISC metadata.xml 516 BLAKE2B 61b30369e5a46af92e588ac196e00822cef6919e4cce101a204045280e5311b3e0b2475755e2778a7d2fe7f1ee39852e50e9d54ceb67b9cc8b0fec32cfae566a SHA512 6dc2a8084fd770c5e6da7536c09dcba528b8db906acf39d49ba91bf34cdb3eaca72cc6127d8ff1b9e0d938c27e07382fc4c57b65732829ecf3414c423f7d00b3
+EBUILD filemanip-0.3.6.3.ebuild 616 BLAKE2B 8cbcc714aa109788594b32f7ab52d03adfc2e7728a0c4e8f96484c64d796f23f9c2482994eec6dd31ab57baf248e6f9ec7064e723522afd3063b7ef5fe697450 SHA512 60eed7acf4121d1155b7407529f248da610958efcacc6e957a86815713d60905f57aec4beeed6b6c658c04baa9628705b22f5cca3c55598beb921eb10d815006
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
index 5a2a2c084f9f..bc5f91a4df5e 100644
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.3
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
index 445e6f97d517..b7878815d80d 100644
--- a/dev-haskell/filemanip/metadata.xml
+++ b/dev-haskell/filemanip/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Haskell library for working with files and directories.
-		Includes code for pattern matching, finding files,
-		modifying file contents, and more.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/filemanip</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/findbin/Manifest b/dev-haskell/findbin/Manifest
index 4d53ce756306..495b6b5d6ea1 100644
--- a/dev-haskell/findbin/Manifest
+++ b/dev-haskell/findbin/Manifest
@@ -1,3 +1,3 @@
 DIST FindBin-0.0.5.tar.gz 2277 BLAKE2B e63fb63739f1418d43fabd919276e9b4fe4ba91e2b8d961df232e824443d0f39ab7dc9ef55f4628f22216e312f1d7a8e81a6d8bb9f748fce8ba17ea6880eadf9 SHA512 427eff520ea9b88bc928d4330d4550d1d7d2254512e63cc8afad5f45b94a58cf4758a704db5b8ca4dd33f5bfced6557965192bd41d621a33eecc0c517548fa9a
-EBUILD findbin-0.0.5-r1.ebuild 601 BLAKE2B b6154d3824672c5c771def1e33604d3cd00abda9ae7498841d7326086f904b174a6e39aefbac6a3e5e2fac174ff430659be4856ae53b39dfe0d9b7837e33f271 SHA512 3610b4737d94ab5dd35bd219b0bf5d9b57f580fc3e54bfbf77c511939d8fb336ca190519a3381322c98308d4375ad7c1505f1ab84ad9c33d46cb8cb383b06b54
-MISC metadata.xml 604 BLAKE2B cc6f08be08301d38a1d361d186e345df487482806e3e3686f92f8b078d650524efa4e4c81308e2e19c2ce22d750975e5e39685ef1dde0975223600b2cc725a84 SHA512 b67a98cde7a83d63a13c7b3760866638a35cd115c8157d373d0a38dfe30fa9f52d1204f7fd28abeb62ba3c991fe86438aab8b2c8511eb429fe39c35f3a7a8ae3
+EBUILD findbin-0.0.5-r1.ebuild 603 BLAKE2B 267ce50991e8ed9500f017b9a0a0a5abb58f8ca54b0e70a15096c4cf89b71f38cea69d304575beb97d8e3752ac2428cb4cf566e73967883df30ee066cb66418c SHA512 256a9d8c77607846f2e17bbc336bd71ffb2ac7c3e98e3849f12c7c5778ba45210f7c2cd8636672a1497187c53f718f4b23a569fcf1550cd78a696faf56eff1f8
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
index b946e0abd6f1..10f4eebd39b7 100644
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -20,8 +20,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
+	>=dev-haskell/cabal-1.0
+"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
index 10897c810b1a..b7878815d80d 100644
--- a/dev-haskell/findbin/metadata.xml
+++ b/dev-haskell/findbin/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This module locates the full directory to the running program,
-		to allow the use of paths relative to it.
-		FindBin supports invocation of Haskell programs via "ghci",
-		via "runhaskell/runghc", as well as compiled as an executable.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">audreyt/findbin</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fixed/Manifest b/dev-haskell/fixed/Manifest
index 34ca64ae8024..c14e79153a7b 100644
--- a/dev-haskell/fixed/Manifest
+++ b/dev-haskell/fixed/Manifest
@@ -1,3 +1,3 @@
-DIST fixed-0.2.1.1.tar.gz 4346 BLAKE2B 9821b0a7a14b338f964cce55699fbd31c1802334f6d9b8d0717e1d673d284a503e01b91328bdf307f1429ddbdd8c7a6ec3395bfbe465d6af531bfa5e27daf20b SHA512 99f0410deffbecaf4ffb15543e3fd060cc679b238644490cbb0a608dda9957fc4c0020bce667f6ca25fc02c52fced7e9ca40dabe899ec8649b522fdec75eb9c0
-EBUILD fixed-0.2.1.1.ebuild 545 BLAKE2B 247b20707bc137983bef6d914cc29671f7f89597374a5e14c536bd1346705bcfdbc91687979746ae48730acb30a925492b401b5e02fdfb1af1c6296081e58c59 SHA512 80f2c20029768597ba97060ead32b07ffca683e505dd0a348a49b7d489fd44b4ddc4c31dc2bdfc7f96a594815f484fadc33e0da2c6e2f10d0b31bdf208377047
-MISC metadata.xml 326 BLAKE2B 2129580f78d8f84ec90a0805a5832df795379cdd4efc38afe80147f8f99ca64b9a0e6230d662f0a7b40248f8a4caf79c0b8aa6ad31263fc94ba9d98cc0ecaa86 SHA512 5badeb0662458afb4ac7c384e1b8af7f2de897520f82c80b6e23f4cc72fcbbc5f34500ab3f1447bde178ff1dfc73d29c37288c943fc06330514ceb61a1ee4a27
+DIST fixed-0.3.tar.gz 4384 BLAKE2B 403f0315b45fcd7519d47a34e62b99b77eabc683bbb650b6fc66d3366d6160bbd86cb58723cc309dcce14cc1f96260df8e38ea32876754e528f2d4c66a066e09 SHA512 f7a87aa63105acf33790f022ae1f1d8201febbfeb90f8c14f05c081899614db74adbe8abbfe144fe374316a1f4d9b84bf9b091d3bbc21b0e2c8f2f33376ffefa
+EBUILD fixed-0.3.ebuild 545 BLAKE2B 22d034492ae3b1645b913b61c891bdccfaa52a676c1e836913451bb96b90dd781f7444685353dfbdc81de164be408b47a09d98eadd3bbb290a435694e343329b SHA512 a32c9c25ee4d76e01189a2014b2a17706deeae52446fd2a653bd3c92442038616536f98d027c0494e89d7bd6b95c374635a5b798c055af71d1e9d9a43d024efc
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/fixed/fixed-0.2.1.1.ebuild b/dev-haskell/fixed/fixed-0.2.1.1.ebuild
deleted file mode 100644
index 6276f3ccc33a..000000000000
--- a/dev-haskell/fixed/fixed-0.2.1.1.ebuild
+++ /dev/null
@@ -1,24 +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="Signed 15.16 precision fixed point arithmetic"
-HOMEPAGE="https://github.com/ekmett/fixed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/fixed/fixed-0.3.ebuild b/dev-haskell/fixed/fixed-0.3.ebuild
new file mode 100644
index 000000000000..8fdf2de68e36
--- /dev/null
+++ b/dev-haskell/fixed/fixed-0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Signed 15.16 precision fixed point arithmetic"
+HOMEPAGE="https://github.com/ekmett/fixed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/fixed/metadata.xml b/dev-haskell/fixed/metadata.xml
index 91dabf187f36..b7878815d80d 100644
--- a/dev-haskell/fixed/metadata.xml
+++ b/dev-haskell/fixed/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">ekmett/fixed</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/geniplate/Manifest b/dev-haskell/geniplate/Manifest
index dca11311b03e..1657acb8b12f 100644
--- a/dev-haskell/geniplate/Manifest
+++ b/dev-haskell/geniplate/Manifest
@@ -1,3 +1,3 @@
 DIST geniplate-0.6.0.5.tar.gz 7738 BLAKE2B e60c36ba553034400740c4b42828cb8e333331846ce719243761b9a4f8cd5a9875ee00856bf7cac1f03658392df920b9a41b2295d807f6926db1e80eba333232 SHA512 37127fa364ef0a8c67abbbadc025b932ddc62aaf09e4096548263c140b232b5442889d24f18fbb4ed3ea5eb0643b6afb4634b73471a2ec35b626dcd0c1781987
-EBUILD geniplate-0.6.0.5.ebuild 692 BLAKE2B 55764a7b119da624c44a27c52e4e4cc44b3c17b7553e84b6c6afa36fdb386235773ddb123730956686f697db42deb6924edfc59b810ac357ab9574b29ad0a36d SHA512 af72be1cbd9fb569a2eddbcce99c0b13c7a9d04d70aacc360c33f40187d3f66c85dcab0561de88e36d1b25f9ca1e18ba492fa537445ce62bb3e1a8cb44fa0ec8
+EBUILD geniplate-0.6.0.5.ebuild 686 BLAKE2B 08047ca898043359b88119e9eca1fc3edac66b64fcc9bf467d32329e72cbb231bc8417b415b757756280e30191bc2fbbb793293320ff1d60dcbfc553216b9510 SHA512 9670072c8385e09cd7339cb717504de8aac922bbc0dcedd37440b803b9251f168f404e585faefecd1d148fdf6b39145f3c955d45e03601b6cb836c8b79f379c1
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild b/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
index 466e84d75fa0..a9f1c0ab19fb 100644
--- a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
+++ b/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
@@ -1,9 +1,9 @@
 # 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,13 +18,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'template-haskell < 2.10' 'template-haskell'
 }
diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest
index 39cfcb26c926..3b4b975c7aa8 100644
--- a/dev-haskell/ghc-syb-utils/Manifest
+++ b/dev-haskell/ghc-syb-utils/Manifest
@@ -1,3 +1,3 @@
-DIST ghc-syb-utils-0.2.3.tar.gz 4689 BLAKE2B c1403610fd6e34e97d68a2ad5ca2c74adbdf1e16fa3605a6350469ec20187aa0db90f8fb0484f7c1c60a4440310796c23d017433bad690ad71ac840915085efb SHA512 af311d21396c1f7e98c532b1192d2aad27a942f66f4e09eea4cb0d6c1fe444a49c4e14ce4030504f544c796818a887e1ce6bf828cbd28c69c1123e224793cd32
-EBUILD ghc-syb-utils-0.2.3.ebuild 584 BLAKE2B ef5bc14009a42fbab015c24e6c6c827db0c6653f5e10f43a450d49f79e5ac47e9e172546bfe170e92e65e04fe3e23432261334b7878ab0780420312b9c562159 SHA512 7f4d1c33149dfc7ad85e47e7fe7a119951ca094582027bd6324d901242ef88568a109f48abaea2460d79b5ac2b2232cd309f1d67f73da1f9b8e0679e81ea9a70
-MISC metadata.xml 330 BLAKE2B f402df97dd16528bcd47264d98e2b0fe72a65c59d65baf9efd463caaf8322ea7a8d2dfcc281082bc68fde0d369a6bd25896a2f55848228d266222c5c5b5eafd4 SHA512 60df53bfd8c0580ca6f726cf377d0c3ed96d9b33f4d3c3b31b4bfcd7807eb88d0a72a7d0e6482dfe0d3bb1ebc1e18b5aba19c9d2e500ad33c009d977e0875ee4
+DIST ghc-syb-utils-0.3.0.0.tar.gz 2895 BLAKE2B 26ee12941b9cf2a4295ef2ad2db87f918afaa25fbb781d918955d8c37a63e41295a6c4a62b9ea769803313ccb4fe20704788e0b5804922c18e8193c2abf97868 SHA512 e55cc7e830d34113eae55f89124f836390c6c8a80afce9f1b245aebc35acf1863beb9f7f0388fb22e4d1ee771c332da8f9b36d88fd89080ac50d287b2272aa3b
+EBUILD ghc-syb-utils-0.3.0.0.ebuild 584 BLAKE2B e7da77b316eea4193b488d63bffe1ca8f482772f044a12e4f0c5907725338252457c99079c89408a9b4a781eff7e5e7edc1b32095c17edd488a2790046c414a4 SHA512 1ed72d3c539dde905e95afe92a2c0d95255e064ee42140bf234f73a84e85e98d6ea355896a9ac1320048fb97282cc28e8a44c890e6a40ca153f62f670f7aafba
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
deleted file mode 100644
index 1bc6d6a5b89b..000000000000
--- a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.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
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API"
-HOMEPAGE="https://github.com/nominolo/ghc-syb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild
new file mode 100644
index 000000000000..8f362de4d4fd
--- /dev/null
+++ b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API"
+HOMEPAGE="https://github.com/DanielG/ghc-syb"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
index c0e1747371d6..b7878815d80d 100644
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ b/dev-haskell/ghc-syb-utils/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">nominolo/ghc-syb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
index 4b856a1d9da3..227f13f189e9 100644
--- a/dev-haskell/gnuidn/Manifest
+++ b/dev-haskell/gnuidn/Manifest
@@ -1,3 +1,3 @@
 DIST gnuidn-0.2.2.tar.gz 17534 BLAKE2B e6f152145bc7626dfa9757477970d6cd6066d47350d7ccb25c99ecc8b33406c54634cbf6829ab08c5d8fc7987277e110429899436c7b99d71aafef0ac496dbb7 SHA512 4ac894ba4cc4fb9fd90ccea55fda342cd0dadc863a091d31287b19117ec1e545a23b7fb69db02bbb8ee9eb84856acb51f3ab0d7778f4ca3da290dfcbc7ef27ac
-EBUILD gnuidn-0.2.2-r1.ebuild 690 BLAKE2B 8cce1bef6ecde7a623e482fc48ddc072c60058fd12efcd3db91093c068dfd1b25184ef8593a206a948c0139704017bf6fe04685212e654879f70b917c96a3f24 SHA512 742e880f6bcb12e0a7e23a878d402cfb88af5bc3b5f46791541544a008606487e89cfc5df79887c72a82a8184eeed8e99c01984ce5c9eaf799ccc64bda6a86de
+EBUILD gnuidn-0.2.2-r1.ebuild 690 BLAKE2B f50a57bda1587030e07218142a1fccc40a98388724f2cac18c4d54fb634977b1241f9bc662d1ff13040ecfb9340cd26aaa152089366ad791e6e8ce8eeb2baab9 SHA512 53f4d17aff6abb27464e9236392ade5487a63b7752001bc5faba0adc1d1d0bfc27f24028d37dd8925a584b46829cf148dd4b7e569e0b8ab98b97651d4855bdb8
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
index d5bd3de599cc..93d7582be2c1 100644
--- a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
+++ b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
 inherit haskell-cabal
diff --git a/dev-haskell/gnutls/Manifest b/dev-haskell/gnutls/Manifest
index 0aae0ee40f84..2f9511ab01b5 100644
--- a/dev-haskell/gnutls/Manifest
+++ b/dev-haskell/gnutls/Manifest
@@ -1,3 +1,3 @@
 DIST gnutls-0.2.tar.gz 17272 BLAKE2B 2412f9a5f7a74054317f6f4c54c5813a897976da2e48a534a5a12557f04766dad680638e6f61071e9721d84ec1a4ff02b72dbf531ed392b1be6c0b5280919092 SHA512 9b5e3083fae30e4ac8584c825ed1f1c07b24136ca6d30c627f17d1c7793a515a091919784791b3a5bcd05038d8d43419802e036cefe8525efac9ee3f9ebf9e8b
-EBUILD gnutls-0.2.ebuild 704 BLAKE2B be7b15e6fd1bfdcf7f1f05bddbe260f79d334fd9f2b6b47a0cd8d326efb335560451429f5dd0b53455a039cd22a6939fd4fd8b696143f6fd233abab4adce89cc SHA512 5993cd6723c87f38e8fddc3bee262d518c0bb3f40af08c98c20f5950f1882ec215ba9091868149283eb83c6fc18ccf5b100ef4fba7c8712006cf4e71519a3c18
-MISC metadata.xml 545 BLAKE2B ffac5cf312728e343b1f48d3be0af9bbb6c6737b3c0f82cc752a78b8f22822c1d58bfc28ee3a186d3de51d0af51ddf51ca053b6e0c7eec1e328cbd681b60cf85 SHA512 42bd7ea30a8ad09a9d9b4212430808823dfb4470537bcfb7dc1b63d32008e214ef06ac400485f4268028b3e6bb9b3b8252e073ba13b30294f81d86d721eac692
+EBUILD gnutls-0.2.ebuild 665 BLAKE2B 9c6d8beb87d8a71ddd234ec4d0764e6da97d7903932e6731f1d2d44abe6bdb8c73dd11f8ccd873af1f58dd1076df52a9d1bcf74f27dd316189a84e2058c591f1 SHA512 377af543b25ef0e616af76ab35b7e584b40423cfaef191188ccfbb178ece1d8b096ec4ea53e1fe93808e988cb2185b0b0ac882cd2f34abb87da68e30ce9b396b
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/gnutls/gnutls-0.2.ebuild b/dev-haskell/gnutls/gnutls-0.2.ebuild
index b4f07fc9a556..d685017611ca 100644
--- a/dev-haskell/gnutls/gnutls-0.2.ebuild
+++ b/dev-haskell/gnutls/gnutls-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,11 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 	net-libs/gnutls:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 	virtual/pkgconfig
 "
diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
index 85d7c5520de5..b7878815d80d 100644
--- a/dev-haskell/gnutls/metadata.xml
+++ b/dev-haskell/gnutls/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		You almost certainly don't want to depend on this release.
-		
-		This is a pre-alpha, almost useless release; its only purpose is to enable
-		TLS support in some of my other libraries. More complete bindings for GNU TLS
-		will be released at a later date.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/groupoids/Manifest b/dev-haskell/groupoids/Manifest
index df3c5820a319..a006ca4308cc 100644
--- a/dev-haskell/groupoids/Manifest
+++ b/dev-haskell/groupoids/Manifest
@@ -1,3 +1,3 @@
 DIST groupoids-4.0.tar.gz 2414 BLAKE2B 0576f3c2eb9b5a097805c6db25889a264205029ed67cf9de8769305e4f89b6880ddd1073ba6126eb5340366762e6820d7e759a21be76c34d74db0abab378a266 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289
-EBUILD groupoids-4.0.ebuild 579 BLAKE2B 3b01153f51da8bcc3f9f362e0fe33b8077b2d7b42fc7183e0ae06492fbf432e0fdda9b96ae8cd62938d595ee3b72514f1f10de865abeb6b17126b1606e540cd1 SHA512 3c675f8806030728b5446e7f984a9f16be1ed7909de3b558dde5c79b486acf77ce53a752142e316c5d811fb8bdd627cec8e2bd496573b531d87e45e6838e9503
-MISC metadata.xml 330 BLAKE2B e1c5c856282a3cb002626b2727d3c7201a1f4d75f95d965ec0ef157dddccf19aed646508744adf57ad937b424d22c62916be3d42fe59c71c2de4c281c1eac43a SHA512 28f7b8a676b5a0f63258728c7f65fad55d1be345dc760d804c0d7d15db4d7edd9385c4f9ad6b3081e8aa2553e6616d776c15fa82308d03ca58bfd52231cf1cc6
+EBUILD groupoids-4.0.ebuild 598 BLAKE2B 03839065c154d2119c10323bc14302f552367d9dc467208dc642ef65b829d2071f2e893fce42ca01d3ac92e3a94e6706b57d3089f155d7b4ff4f8a2b489923c6 SHA512 924d6367f4fc5f3e254685a879b588e0f7dd0fac4b4982e5b3dbf37860e1cde9cf91e7dc0fbe0d77e1ffed01a6f798b69d6f1d650bf50023af346ddae0406bec
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/groupoids/groupoids-4.0.ebuild b/dev-haskell/groupoids/groupoids-4.0.ebuild
index 84a72c93f9cb..967646e97878 100644
--- a/dev-haskell/groupoids/groupoids-4.0.ebuild
+++ b/dev-haskell/groupoids/groupoids-4.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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/groupoids/metadata.xml b/dev-haskell/groupoids/metadata.xml
index c729f81dc55b..b7878815d80d 100644
--- a/dev-haskell/groupoids/metadata.xml
+++ b/dev-haskell/groupoids/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">ekmett/groupoids</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/gsasl/Manifest b/dev-haskell/gsasl/Manifest
index b1fc9be88751..0fac41e621aa 100644
--- a/dev-haskell/gsasl/Manifest
+++ b/dev-haskell/gsasl/Manifest
@@ -1,3 +1,3 @@
-DIST gsasl-0.3.6.tar.gz 20170 BLAKE2B b9b4e18a3e19ebccec6889b1767fd415920b23c083fc96c835aa1d3a9e0598c295f794ca897dd97f19a02bfe7d4c1ebe6986f1a27805424d4668d29a1b1d3b2d SHA512 657b3154d32d5c40eca79fa8cc0fd7f2dfce2d5d934f0388e3a16db15d513b18f5a25479b9f71ee164f999de9748f83e63f0334f43ef31def944c987e7186122
-EBUILD gsasl-0.3.6.ebuild 618 BLAKE2B f106429c3750afc5144f5065c4d414fb6ec6e0f3ecc7bce6338ee1ba47765304c452d72d65533c14eacddf13d4b57229e25f23b2d673e7f62f6b1acb7684431c SHA512 8dee6540a4050a8397c3daf95065a12f589e3052144bcb1fb82646617c48ff2a0da153f17a7738b387e9b38c60ecb450ef4de052908ee34f22fd55c73f743c8c
+DIST gsasl-0.3.7.tar.gz 20184 BLAKE2B 77822255e11d8662a8b4316fa0456bb057ad250b2c823c28d79987f336872bba19596c8062cb0870a4222d68e0f862395835f53fda2a4db30c36e46f6fe595ff SHA512 7a3eb2919aee0df650cfeec62fb6cafd4cc49a9af59c54878a737816b6369cf6d63db7e8afc701c44c74ae15a46a707a20a762f7f976f8a8c1803f1f9db59ed7
+EBUILD gsasl-0.3.7.ebuild 616 BLAKE2B 273f4ad3a6e85001159ec02c203a10770c550096c4f7ba17467d9c75d85326c9114a3bbe575e66e916395391c9ec7000f83f33eed8f784912a9cbe50bb130084 SHA512 95b8efc22931904133bbcc19b55eab82445d802f770b8a157aecb906a3c62b46e87b319dca75f675fa6cf8da4ffb4b642c962c18670d222983e5fd3fa53ab364
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/gsasl/gsasl-0.3.6.ebuild b/dev-haskell/gsasl/gsasl-0.3.6.ebuild
deleted file mode 100644
index d17a2682fd88..000000000000
--- a/dev-haskell/gsasl/gsasl-0.3.6.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
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgsasl"
-HOMEPAGE="https://john-millikin.com/software/haskell-gsasl/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/gsasl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gsasl/gsasl-0.3.7.ebuild b/dev-haskell/gsasl/gsasl-0.3.7.ebuild
new file mode 100644
index 000000000000..784abcff2d99
--- /dev/null
+++ b/dev-haskell/gsasl/gsasl-0.3.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings for GNU libgsasl"
+HOMEPAGE="https://git.sr.ht/~singpolyma/gsasl-haskell"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/monad-loops-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	virtual/gsasl
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	virtual/pkgconfig
+"
diff --git a/dev-haskell/hxt-charproperties/Manifest b/dev-haskell/hxt-charproperties/Manifest
index 80a732bf1810..9c47c6175923 100644
--- a/dev-haskell/hxt-charproperties/Manifest
+++ b/dev-haskell/hxt-charproperties/Manifest
@@ -1,3 +1,3 @@
-DIST hxt-charproperties-9.2.0.1.tar.gz 270767 BLAKE2B dce70cb87f1fa09ade7a4b62a3d016a6030f6de13f090195c91c4f14fd0434a2a81742a345caaa0e36b5e62b2ca1e053df56d88abd6f36165646e29da7134bd2 SHA512 518d7c15b43a33432c402b839713e1d29a60d44286ca411bfb3d9a4b955b1181b8ec84615a131db0113280bea7973c70618f4204a32b21e627c452e05a18a7ef
-EBUILD hxt-charproperties-9.2.0.1.ebuild 544 BLAKE2B 0aa18f31fa1d2ef795706c07359d850dab4ef3571706ca4d9e320b54efcb9ace10686c1f53fcff93c4562517018ceae90773e5633cfc1cb1ce9101bce5978255 SHA512 ca29ff1e0bbfd68a8b8c6864f1cbfd547d9f3c9a0ff52eb724753608d9a4e6d6f9870ff67fbca0ba6c552742d084383ab2816ba9f24ed2903e63e4693beeef48
-MISC metadata.xml 581 BLAKE2B f4b8e35776feb9f8b8f694c85414f936eb16ba5cb43d57e018e12f25ebc29f87e8324cd6aec9811e63ec35defec9cf3d3e32918af0077012677551a2329c3954 SHA512 bf36ee1feade57b7b7d4426ef5f38d3773ce0fa36bc7bec3ec1a222d8ada450bdca1d6352be1f006b7e93ecc8108f7535a0e4bc9866715ac7f9b2db96a8c8739
+DIST hxt-charproperties-9.4.0.0.tar.gz 317043 BLAKE2B e8ea482090b0496a1064720e81cab04fa64be51486dedae6b418ea2386b5dc91d0b08af3d57a5c1b52206c6c76ff0b23c380dd03aa0bdfc1e84a80fb2317411b SHA512 8885ceb06e402f2e2e31d616eb605ddf380bec771edf4112fdf6875cbbf03cf1a88b5466e4b74270c7ccf0e1c04e335a3ded6867133a951e1070b7635976fba6
+EBUILD hxt-charproperties-9.4.0.0.ebuild 646 BLAKE2B 40aa645f0292e0d1e588705cd0640311f00be44a00dfcf303ca59e6a95ed3cd52138f4d85aaa20f46023609aa768ef6d923616ada281adf6e35bedf8808e63b3 SHA512 dab6f04144a192c108577028d80071643750ae175da01353d4a0860350afcb2eff16db9d7398adc5683ca34e173b4b67781def0d86e007659267190b65f770f6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
deleted file mode 100644
index d1ce0f15526f..000000000000
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
+++ /dev/null
@@ -1,24 +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="Character properties and classes for XML and Unicode"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
new file mode 100644
index 000000000000..1cf7512f4d2c
--- /dev/null
+++ b/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -profile
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Character properties and classes for XML and Unicode"
+HOMEPAGE="https://github.com/UweSchmidt/hxt"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-profile
+}
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
index 24b0e65dc8d1..b7878815d80d 100644
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ b/dev-haskell/hxt-charproperties/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Character proprties defined by XML and Unicode standards.
-		These modules contain predicates for Unicode blocks and char proprties
-		and character predicates defined by XML.
-		Supported Unicode version is 5.2.0.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hxt-unicode/Manifest b/dev-haskell/hxt-unicode/Manifest
index d7ac0d14ce73..652d87b7dd43 100644
--- a/dev-haskell/hxt-unicode/Manifest
+++ b/dev-haskell/hxt-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST hxt-unicode-9.0.2.4.tar.gz 14010 BLAKE2B cdec42564a1107f1a1d322cb22a1f5b74d2bed6e3aaa04ca2973ccc0d6b02b98c18faa86ce92881ad9229b60d2f29055e4cdaa2a2e7002fdb7b9e25133f35dc3 SHA512 4daab9c754e05e15bb0f32bce4ccc0c581c6d8dd4ca4d4868ca7b756a6e40cc9ae8890fc3c925b63bb419db0354229ca6e61fa96bec048f0c61b3ebb43d212bb
-EBUILD hxt-unicode-9.0.2.4.ebuild 659 BLAKE2B d1910a25b8c6cd301d667b19523f20aeb635bac05cca86628e7a7ce84b627d16aa123e85278dad13cbb0e4d24ed13942f8d3485b3eea5c333f39f8205f772411 SHA512 2d674dd9e1ce9c3051ea387e880109442f4d26472074c0cc3e8d603308d6d871e66378ebf4bc16a7bcf919bbf2be07ab49ac18fb5173b55888273dd13c066329
-MISC metadata.xml 622 BLAKE2B 0cf09176e3b65b91ee8de08aaab63e5af30fddc38a5f1e8ba17558a4299675986cf206f47cce8942e73ef638e0d51cdd1ea722ed02141bcc831d78a20831a3d6 SHA512 243c6959ca0b2ec26f156f54f1fcd264de7c0aabc9a28f47660f3eb2f097229d41cf972ff6b065a74b094f2971155b90ca968d9941aab811a033109992bf3948
+EBUILD hxt-unicode-9.0.2.4.ebuild 664 BLAKE2B 1b7fc3aacd4b0811a943a675d3731119e273fffae8e279292438ecd735fe8081158a1ba9d680f1ce2ba4d29c398132b4757310fe9c1f1140695058818ce04d99 SHA512 25bce34c9c10d3ff403ae41c0b25eadaa0e65273ed158a194025ac96d00d357d77b275995a23a1da4cf88a3408116e1c7601d64a5810b0874108966785e16133
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
index 26e2c4187699..59bc1eeb8078 100644
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
+++ b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.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.3
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
index 73c4decb1fc1..b7878815d80d 100644
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ b/dev-haskell/hxt-unicode/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Unicode encoding and decoding functions for utf8, iso-latin-* and somes other encodings,
-		used in the Haskell XML Toolbox.
-		ISO Latin 1 - 16, utf8, utf16, ASCII are supported. Decoding
-		is done with lasy functions, errors may be detected or ignored.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c3a25ea6ddde..cb0a1beea75d 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 0e6d7602dcfe..d731c8fd4e35 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 1341 BLAKE2B b6e8fa6fe16ee1905aec54602c325f5f4b484be63b9e8e5e6f79827a1aa5121ed2d369b49506dc7d4091000e0c6753391934f634b026aac9c04e7152b7efa486 SHA512 64556678ad3ead8a9b139672db2fe31d934084e48680298212a77dba9e816e88408b1932098dddfc6407bb8f648f411d141687485c72d924bca3bee7adebaac0
+EBUILD bcprov-1.66.ebuild 1340 BLAKE2B b42730a69ac44de04f9e7f006055936f40935a11409f7f6610717637aca7fa265995a604beaf4ae968bfdc3d24a8ac63ca9082f14d7107b20fd13ca4e47701a2 SHA512 7ff6b9d93cab3464478e720cc636bec5da40444bc03867cb4e3642f1c63039f0e1869c3ab1972c1717865c39fc2021c6ec25277f2c6d90aa7aa828c6074014d8
 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 2dad26804214..73e8d4e2db3f 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-lang/Manifest.gz b/dev-lang/Manifest.gz
index 55b9ab7bbf5b..969a74715364 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 1abe3418455d..1ef2a3b1425f 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -2,5 +2,7 @@ AUX elixir-1.10.3-epmd-daemon.patch 512 BLAKE2B c767cf4336214396d953efe568f0302d
 AUX elixir-1.10.3-no-Q.patch 355 BLAKE2B 903e5a7149f6e7f7030a533ae437b0e40b97c82c6baa7f90c1dff37fedf96c2e821e98529007e2300a92b8b3e9284428d91d6ee45888da7d79b18d35dfd89e58 SHA512 21d28b63fee2877337c0df095cfa200ae11ec2f0c76556e971957bb92e2b8e9d811c939b1efa458c633b61d3525f47a8b04d1b6f23df04e50ffb3ed5225f7c18
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 DIST elixir-1.10.4.tar.gz 2331003 BLAKE2B 8cb54bcb16762ae345ad9d36a25c28696fd5bb57cf97c5037c21458671e001cfe51a722287243c6a70fe3cea65c9c219e759c8312fc168e93974ac5f0870b47a SHA512 844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7
+DIST elixir-1.11.0.tar.gz 2389848 BLAKE2B 211b17091ebd47bb0eff3279f171b6dcc9fde98b0670ec842fa4a07fb9e32fba0b04eb5dc7af971df045af01c56af472a7df0ba4734e86c9a2a12715c60f24c0 SHA512 c4d93253098b820e42b7f26aa13e7684c41fd390dba30bb158e897f40fca92b81d54029f987484301f3b71d472faf7c22319759181ab6f0c0c126d2c84d253bd
 EBUILD elixir-1.10.4.ebuild 883 BLAKE2B c8945f6c84ce2ba4ef99b42f5f0f3c262cfb6d743cd418f66113cab8a9a90caf1ddc71441d96b3755e9025974688909d8306b63ded24d871733d263c54df1d56 SHA512 a3581664d0fe5c49bd7c4ed2b6f2fba7c4b402944daf7c79e79acbd7ffbb463c17e559d961f7abd3c54c5ca5e6d23520e379a5712d7d232439b5c878291cb3d7
+EBUILD elixir-1.11.0.ebuild 886 BLAKE2B 5b16a1aa4a73de92f058640cbba02d044eccd23e5b95383abf03ef8a903e4a41337f14c5547638745bc73f304cff946ef7ff4e99186e1607c7a2fbcaa0058e4b SHA512 c74b4b3bc7ea0416a524701ad9e2a02924491fe8e3d92b3e99e133d9504e0a61a339374de62b78837fe3249a076cf3c05fb281c729a279c1bda9b023650e5050
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.11.0.ebuild b/dev-lang/elixir/elixir-1.11.0.ebuild
new file mode 100644
index 000000000000..74f24bfac275
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-lang/erlang-21:0=[ssl]
+"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+DEPEND+="
+	test? ( dev-vcs/git )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 88fba9a2b953..80cbe0b8ab6e 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -4,10 +4,12 @@ DIST execline-2.3.0.4.tar.gz 82774 BLAKE2B a658b538d0a17f15876fe9a822bb7c7e4edba
 DIST execline-2.5.0.1.tar.gz 81854 BLAKE2B a70e8c9c3a739fb32573937c9b5c1fb65c730bea7e7760d81b62ea7666727a29ae9902139f78660891e65ed3e6769fc5d6afcb2fb3e030e0c75d3acb6392fd39 SHA512 9e013a83844fc3f5b28c6aea44b446f550dafe52131facf0d7c0648c9ae62c4a62d895f72cedb010754319c0e298fb4c8396d2c6be019cd6218558934bffaea3
 DIST execline-2.5.1.0.tar.gz 83681 BLAKE2B c07b9b6d1c328bc3a96480e59b67676dde82df9112de6c1bd150509f0e062d289390fa935cebe48bc38a769be53ce7b3ef122bc0bd0172c997a56d28a6a11018 SHA512 461a91d0e790e96233179c89c783bb29d89592def451643265c97259db83056556cd5f231d668e8c460396c35a8792f56b30193171e85488e60e3cb4feb7379c
 DIST execline-2.5.3.0.tar.gz 86575 BLAKE2B fa61ef88a3e2db7e7a051d45e270f40891d46bd2e4349e1569539f964e49f6814c00dcbb496f0185bdd08d43dbf2c038caf5c088ecb54f82a239a85c30a500c6 SHA512 75b584e2365288bb1d05fd67e390fab1b6ccf48cb0a2ccbfb84a7d22ddf6957c9c591ab165542ed180b2ff1ef9ceb2a16cbae569e69c5dd5f20e52be092cff15
+DIST execline-2.6.1.1.tar.gz 92495 BLAKE2B 6b901819e49c424d52ce2d87b6b42aec1595fb97fef7905e93eca2f3ac029a35f826e37e519e2c6ab9e2638f625a446db363f5fbfd5530a93b52c831660b7a11 SHA512 5826abb407742ad8a2cd48c09b966827d129dda420db07c893cd7a27e806441d7b117a0c61fdc0222e527aada976da26e4779a4896fc084cdf6efa8294ffac5b
 EBUILD execline-2.1.1.0.ebuild 1213 BLAKE2B 6fc9dc130bd71bc590e0bf46e763b3936a8c9033fa7b9e267593901470a9a2dc15322c3a18e03fb38676fdd5db0bff0dbd647d1ecc82ece445da23112f7a4ca1 SHA512 788d3961de599828e7acc2159422780edd0c8cf5c0d98aa280d2c4f52eb796b3979dfd9e820ef81007b1c0f7a6252e5805b11c9fbeba5c11b9acc862f4b80bbf
 EBUILD execline-2.3.0.3.ebuild 1295 BLAKE2B 3b7562389a92c2d92bfcf7b7334638cb7bede79a7b1fc21b57c30661b316e1573c1b56476f94292d499d29ce8f8ccf6279c7f9886e92ed54a89bb2e22c452108 SHA512 f3b3659102780e31c0b6cc61505bf6af2bc1b23af11ca98c4ebb5012b3191f333f2eedc77a7644992c317d4fa3668acabe38f99d80356b07c770cc9b6b2c913f
 EBUILD execline-2.3.0.4.ebuild 1295 BLAKE2B 00c156c18fbffd8a09272af21cd1b347f8fcabd9d34f5f17f3d9e5ba76c80fcdddfe00a27df02965892b444269f4d3e1bf9d9f41ff2b7d5f67238a72e828d72f SHA512 5f7324afbf7106800542c548214b9d698ad0d2122590df5ea9f5f34433d2d966f7aca43fda286fcf740605358bf0c8d3d47d160cdd714f70dbfcc66db85e20aa
 EBUILD execline-2.5.0.1.ebuild 1190 BLAKE2B 9a158994fd21364aec75557447d50142d15bc995b5f4097d8d52dc441864caee948717fbffccb134f35f772bc83723ab20d3b4f1bb85a0e737aff182958ea3aa SHA512 00eb25af751c6efd32869019fe3d6370ae5728f911d1c9db7949cdd046f4c5cc9d5d025e044dd68637ed49a80db2641f912a73ef0de9c53383767454cc0022f0
 EBUILD execline-2.5.1.0.ebuild 1080 BLAKE2B 1f45e168287f3415bb446d48d82839b0e9f964cec05b133b5fa348ed56c7a7fd2e401a2792e1bff865f3ab1dedc9f0cac9590d62038deb6669d9ceff0fe5c117 SHA512 851915f49495857e511c28e793f595c3fc4b014c0b63104b9146c4998a6093fee3739d04305483dbc25fff8fe1149e2066d7a93bd764ba4eff7400dddac54858
 EBUILD execline-2.5.3.0.ebuild 1080 BLAKE2B f889a23e2612927cf728152cb257c6ed9909379984a2a4e364b3feaa298b17784b28198bcb1b09d2e318eacaade953f7fdc525a68c954427b1ffc49911213cd1 SHA512 049185ea68bf63531203810b5240a11bc13f90e5cdc6ce5c957cec119b29d43a7c63d00aedefdbf44008bef9f52ae186fcc132ba46f36e464cb70003a159cdbe
+EBUILD execline-2.6.1.1.ebuild 1080 BLAKE2B 233c05de80d913d1b44a72db97d410d470854e722db4d375652cfd33c5c6ac36f8ffe0812a4f08fc7b2b14d63ec1b352ad434890dab7ba6acb833f5f0c4367f4 SHA512 1155d87c404aeaec90b785325ae5789e2f867f860874b7882ed36ed5c7f9e05d9f721e3c377c33abc0a500d5dba072dd021981642fba937487c368b269a94fea
 MISC metadata.xml 478 BLAKE2B ecb74c96759ba274c63367526e88c0b98ecad92f2d5ce436ea41688ba64aa9fd2e8e661449cfc376575ec7aa38030a012ca37cfef22f22149d3b64d26c08c9b4 SHA512 ed6d5e5d2c23cd9e6a6a1ab64db1ffb2b1517e41dc06878918ef907454440c8e84cb8f91acb517bcd45fa1ebc0b990b1089ac3e2158baf1b128ff05efc2c71d0
diff --git a/dev-lang/execline/execline-2.6.1.1.ebuild b/dev-lang/execline/execline-2.6.1.1.ebuild
new file mode 100644
index 000000000000..56df74d7c553
--- /dev/null
+++ b/dev-lang/execline/execline-2.6.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A non-interactive scripting language"
+HOMEPAGE="https://www.skarnet.org/software/execline/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-libs/skalibs-2.9.3.0:=[static-libs?]"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 1e0ef2b00de9..d94522cc1ffe 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,4 +1,4 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
 EBUILD python-exec-2.4.6-r1.ebuild 4377 BLAKE2B 9d0e53dc01475a153a40b9240667491facf3b5b6c04ab2dcda53b9cbc57463e2f334e05f1f609450519f084e9ba85738ae43f3521e23a7f31ab55680fa482d45 SHA512 af7b72f4baf40906112042b6fbd36dbd329cff2c280cb2355e8ed1143d8c2ce9be1ca9f893ae1f6d6a75a3aedd76bf1e01474174e31b01770008270368126cef
-EBUILD python-exec-2.4.6-r2.ebuild 4143 BLAKE2B 987931e43b575216942f5fa0e2561e04bd4337bd5da49d8c62884607f2934c96b7694b8d02cd5adbfca1b1049039047bed3a584e5e3fd357ea5757e5c9b3de07 SHA512 671c62f095aa4d9a6f9d12d2fec55600389f2c30365985ac1b16b2623e2e05d24e629fd9b72c4ad2580fb788e80630fb662586ee290682d4b0fbe1cb03668d32
+EBUILD python-exec-2.4.6-r2.ebuild 4140 BLAKE2B fffa7b6191bfd5302408e5f0f74081e595fdaf1eb87b0f47462e02f2c610b49d9defd12e2b3fd6ca0f5ef1d79f73b3e7680d31b52a89e23b1dbf12cff774bf9a SHA512 50248a289517cfe96f1c767b395036f56bb19dd730feff68065339ffff908bc3c7975888e3414b6c5dd5b8c7eff0876808b2ddffbdd0e5ff075fc195f4aa19ba
 MISC metadata.xml 526 BLAKE2B 0a1affa624a96f8ad1ce8cf2e086186cd48af83a9eafacdc0b7fac2776bfd590a0ae326fd1dc1d5425c2a950d3d328f0098ce62e8d754da7a125053b9dff177e SHA512 c8b9ffc7d7f2d71680c2d1cc24b063cb9338ed4586e2fdf3b6cd8e7fd27d86f5ef18d1de4a4ff9eed8dc8b72f897e9cacabe0ee63bf8cb8f50f1feb4bddeabaa
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
index 9efe3a6bb1ea..9bd729c8519e 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 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"
+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"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 151f0da3b8c0..57c7965d557d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -27,7 +27,7 @@ DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b
 EBUILD python-2.7.18-r1.ebuild 10596 BLAKE2B 2aa1a8152a9fd960de4dbc37e3b959d412855e3901c946783b908feeaf25af6333a5d375a26eef50436b8c5167019c7c7b5e0610787850f73b57ee6a4814fe65 SHA512 cdc9dafd0fadd459a4a8d22c5dc7b89fc125ca13ee3ca45166416acc26628b7f97478b4efd9e976177e209b1e2fa592a5034c79f343096053f4ddd790424f0d7
 EBUILD python-2.7.18-r2.ebuild 10597 BLAKE2B 886e739ab417860610296cbf4ba2dd5dd5d9b634768034fd7025056acaac532a7e7b90af82cc171459faed7fc9c98a5968e0773a5bd0381950fc00c0d6cf8c32 SHA512 5fac224325ec3177de90d8c547c1074634b68d5e337bf7952dbfbdccf10a7ef64b91eae8c793843bfcfd43aa288b067ecc1c79bc238861bffba9a6c3c7da107b
 EBUILD python-2.7.18-r3.ebuild 10605 BLAKE2B 5af92e3c7da419224fb25b8fb124b0457ce3028d0ca1a8a32b25c6ab077f38d2c3548d520c8901f784c2112832e250809b2a9bac40a3add84b72f229c570681b SHA512 65b49ac5c04c86b864652a98cbc3e27f7a9ee0a739538e38ccd150612662a158c94097e44abb0b71be4c1dab51df7dbcc4897e480414decad4c993f12c2ffb3c
-EBUILD python-2.7.18-r4.ebuild 10627 BLAKE2B a3cd819f8e54f06135f310670733f55b250245ab4b5850f5fcd92e471dd06aead6545e63c067ebf967129454745f914a8f8b3fb5e26ab85364c9c17ef5fa9d36 SHA512 6840bd84a4ef46fa90324e5ca2611c099c98fc8cf9c8e2da73e4ada8123d6a4e70d197af7f0d7d7a363a5981b36bb38dce420192306d41304a9a06d3583e11c3
+EBUILD python-2.7.18-r4.ebuild 10624 BLAKE2B 3981c0899d899e4dfbe198618e005bc9190af8cfbc6ca5b85911c717127bfa19ca546e0dcbf7b0317497e7f4d3fd8498e4b153f38468f31f83008c1f39da2067 SHA512 e3aee3d42db1539233a2a543818cd8a733dcb7c2a33a804d7f6b45cd1d087cd1e665e150ef308e61f49e969477fc1d3f8bd55ba5e9117a274e7e9645e65a3f3d
 EBUILD python-3.10.0_alpha1.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
 EBUILD python-3.6.11-r2.ebuild 10610 BLAKE2B d9074e767b11ed420c843665b87c466f0014713221c0db4a026fbd91a39debc69689a1674db8a0c0b80dc3eb8df7bc86fe92972918f4c95ef8a52da2936bf631 SHA512 693795866815e724267877e4f97e14d09eda9f321b5c2b481f54952fcefc0859072ab42306eb03b81bd8b3e0a2d71435367452330caabf6bfebbcd2062d1ced0
 EBUILD python-3.6.12.ebuild 10610 BLAKE2B 727951cf6b52006f8f905d80bf8cae165e4c33ec5c6a423935d8d460c321528b6715d143232ad3f1e8c9ab7be38403df2e303771e08b88ae6e66f3ed37b665d4 SHA512 7b5c033176b6db3002c080cb058ae8bceea6db7bee005c73b8f2197b8acd04f46b698cde949ca88df242b926f23b0551e26f231038813c88e75c131f76da68e3
diff --git a/dev-lang/python/python-2.7.18-r4.ebuild b/dev-lang/python/python-2.7.18-r4.ebuild
index 3dc59779b569..b400ecb72f1a 100644
--- a/dev-lang/python/python-2.7.18-r4.ebuild
+++ b/dev-lang/python/python-2.7.18-r4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index f482ceb26691..abdb6c82a7a0 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -40,7 +40,22 @@ DIST rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz 130200900 BLAKE2B d38a7f13
 DIST rust-1.46.0-s390x-unknown-linux-gnu.tar.xz 134521076 BLAKE2B d3efd71dd7db812736680929185ad5f58a2dbf7d1b8a6f851834dd7b41713fc171dbcdf2472bedc13751bfeed58070d919d2a1138765ab75c0f4bdf817cb6418 SHA512 b6146695225ff6d0516e7bb6bc4620599356bb89b14f429a09d9d7f8715a94e8e218402346d5c9a10eeb54c0bdc40fb179289216b0cb4edd5bdf886f6b69aab4
 DIST rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz 127200200 BLAKE2B 7d755e0622cda99d111490197b21ff4aaeb7b13292804566bc677b7b1d833eaa644b7a801863a1a01e3aa34be28a80344cae69edc57f8c8788884c78e037b750 SHA512 95f5adc2d2137010c7e5ac8a0fc70485250b4f9a909cb8b164b35fffff76ab88e9b09d305bfac37324ed080c5fc7643001d2abec5454ca911dc3513f1af52c88
 DIST rust-1.46.0-x86_64-unknown-linux-musl.tar.xz 142372372 BLAKE2B 7d3672234b61b772e2311127db569b37296bf3a9bf86841fb78c6d20da6a6abfc6c866ba4aa7cc44c12eebb0744fbeb401b491314db9eb481b926792cadcca22 SHA512 e2599c4c10fe9725e63524d89c0be869d43347620b0f6ff1a93cee5e7219f5560c6171d8eda99e5624eba60b9d488bfe0942c23eacdbac2ba42e4cd63f14b7c9
+DIST rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz 136486128 BLAKE2B 872226c232141e25466413d9a998bb021a6f4955dd8ccb5d68f8cca70ea8f7056a6f7b4125134b48a3106331dd3db2e77b32a0083fca3c66a348b77699c49e7a SHA512 7df7045df341f03508f1ad795a9117b39c1f4c4cc778c7fd9d78c42e7da662ce244d018084ac9e80d9409cf8b3b5d1ccc25ef4cb71a2b8727398d30a4e962e19
+DIST rust-1.47.0-arm-unknown-linux-gnueabi.tar.xz 133989400 BLAKE2B 301c17d6f9c048f43d460898ca352e189f7770539431721d178239d5cd64e9e62c05a63482049c18d6fe3fbaa463616d64cf6d82f2bd846576dedc6fc19bd3bd SHA512 db9caa96f142145c3f515730a1aee2fb24c9990f7b9b56e277997975409786904c6490609dfb29712acd9bba077acf36103e4d612bc6c2a74581b40fb50d12ad
+DIST rust-1.47.0-arm-unknown-linux-gnueabihf.tar.xz 133431024 BLAKE2B ab94ee2961ac3060154834d21a47384dd09a55213f1a7082911e0976ab9e572b5b234e175ad068cee0fa9355ef2d85acd7ebfff109565be013f14c32e61a71ff SHA512 fa0643c4b2eb36c2bcf4c786517d27fee4428114b79565e0da3b5626700275e9368ce6a68e93b4eae9881265ecca474cced25d63f352ffe3c8617a725185cd28
+DIST rust-1.47.0-armv7-unknown-linux-gnueabihf.tar.xz 137060904 BLAKE2B 8e6cbd665cdffcdd059dc4278dfb1647d046a96619f784dfe45299a0c29f1af51de4511b87cb8c0d0d166ba76b484f4249819e22275e2c1775c53b2ee5b1ffb5 SHA512 b207ab7c478dce6db4018527888f539938c8e77b5ceccb460b9d52ffee13a2329d225d03a605b60729cae6254129245bdd69730aebb6ec91dd0c83005cf25253
+DIST rust-1.47.0-i686-unknown-linux-gnu.tar.xz 154793612 BLAKE2B a8063a9241fb9fa8b7f9c430d65fd2353d3a1014e51148c9cd1b5686338ccf5170fbde78cb6f95a9d4db5441392ad4e7bf14e5a39418208937cda4019cf4e2e2 SHA512 551204b4edfc1500aa83108c88b845997bb6befba0dd3401e9ae5294ab27960421f1b3130159946b996171c1d46f7532afa0c3ae767a9318985db0bb7c88dba0
+DIST rust-1.47.0-mips-unknown-linux-gnu.tar.xz 122428884 BLAKE2B 10778716e282f9b74ef1a3daeec70ed1bb4f4dcc4a31baeed90c26f398bbe313df58b62469595ced95c73df9aad4739210add4eb3c6f0f94b5fa3dc937967394 SHA512 0e39ef2cd814474c33adc38658cbc2e84879f0208fbb37c1a4bf3719d3cace071606e7b03fd8464ba80f6328cc0a0bd38ec8e7772cc460b5a2d2d8b704042c49
+DIST rust-1.47.0-mips64-unknown-linux-gnuabi64.tar.xz 125553888 BLAKE2B 27c9f5d860025ceff4acb1e40ecfa0ec4c053ac694e4bec3bab41e2a193492afb8b4ac22ca471d3170ebe5c3e0fce628d0bf8060b5831af10bd99d614caaceb6 SHA512 186324da11997a65586930e5f2422c687a6ad817e3e0a5766caadbd51153cd29dd1e0d472586117c654d5db20e0ea2bd4073e05a94f3197bed2403dc325b31d5
+DIST rust-1.47.0-mipsel-unknown-linux-gnu.tar.xz 122801616 BLAKE2B 667712f3441ce63bcfc245801dd580ba8a9a06e0695b9f9a713baa55d8f9b8ca208a02f043918814490166a4c3dd2cb6ffa0d669b9533845f9c241063ee9b9c1 SHA512 8cd441739a25af20298ed25d877f8da4b81969e6f591d45527b94187808b7ce04ef6106785fc050d1318f71fccd00c295f60cdbf8fb79288aac80d92be9e57c4
+DIST rust-1.47.0-powerpc-unknown-linux-gnu.tar.xz 125781632 BLAKE2B 00e966a5ba83702ee36fc2dadd9d058f655d4ea8b3b0072b61d221508ccddb82efae0f5028768a4744b6c439e0f7080db5f727e9f2f7facd7d57964bc332b5a3 SHA512 8a20462ed79f22b868a3e64ba147b32c32eb0b0a149a7a571cc91ffe1ae9fe2d71a244c910817f3c151464f6c417550923a4f02e9dc433670b38502684bf349f
+DIST rust-1.47.0-powerpc64-unknown-linux-gnu.tar.xz 134272040 BLAKE2B c7b4256df6c7a031a53e022ba00999706674e273c041534b75743fee1d366567dcd86fb805ec9997737cff3902641e21269f2a95fef651227cac5da34c947091 SHA512 46fa1c042aebb06db4185fed6ef3bc7772f2a13f2290a20f5499757aae2a05dc984026315be7b5813aac172f52f50565e56aa074d32f6271858590a9ceb9e1c7
+DIST rust-1.47.0-powerpc64le-unknown-linux-gnu.tar.xz 141965604 BLAKE2B b4b7ce862b2201526e6a96249e509faa7bce2d841e571b6dd241c9a82bd9011c92e0918df649ffcce7f3c6c93aa47aa8f66b99e6529b1b3cecbe16622b08e0b2 SHA512 d5c6580861786545f0540cc9591884fb9f2036061bdd451d17cf8bfb427008d365cacd14e5054028c72b83d1d5eb347ab74478a882cbbd7fcc75a7421657561c
+DIST rust-1.47.0-s390x-unknown-linux-gnu.tar.xz 146987276 BLAKE2B 1810e7bfbd235613563677449376167700c33960eb57b100e65058f6a00692316db518f2f4b79b39e414f3892c62bb1ec09b0866ff2221641c4a3056659a1668 SHA512 dd5877b6ff5c310ca6aa23c1cc621e6b0675d4c46f5a06b2a0b107641b604a1a2101109ba8e286267bab1158768c601d5d9a922a8da72486c91755ef465720c0
+DIST rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz 150891572 BLAKE2B 45ff02465ba82ae96de25dd616fa08abb2396be21236d2f66f831effb349f39b047a380b38cb83254f27e56cecdbea8478f4de8ccc0aa23b11de2f11a28f501b SHA512 f695986ab8e67636b0e92ca7ea223984121e3c22788434a6f1062690e7932f6b30c0c302160fef96831f821acedaf8a909bd3d00a9aa873c7200d2b8fa39013f
+DIST rust-1.47.0-x86_64-unknown-linux-musl.tar.xz 166456672 BLAKE2B d6ccfc574a81ae3e9e6a96805e6863009970b5c480f35ee0d582a204b782fe513b9c6c7094d1adea509de1a3097a8a0524ac00c2186b968f70f390615904eb5a SHA512 f71b162635955ecd8a6ec322818be69c788c18d4e923d84d901916648f2eb58573b1f97b460209294ee64198e76566b78e472f9cbca8665c59444adfc5ae603c
 EBUILD rust-bin-1.44.1.ebuild 6060 BLAKE2B ec0546b78049ea25f6909ea4e4c76f297a028334e9599329a6fe71e93fc10b48e12b8d50662bdfd223662a1862a1bd58ef4e1d2950143d92fce19106eb3ce745 SHA512 da053f0fa91307e58d359572aa332de7a44306c5bd7b8b6abb281eb90ca2fcaef11cc931529255628ff6683333db00e2c4a5078b1747cb8dfcc43b89443a31a0
 EBUILD rust-bin-1.45.2.ebuild 6060 BLAKE2B ec0546b78049ea25f6909ea4e4c76f297a028334e9599329a6fe71e93fc10b48e12b8d50662bdfd223662a1862a1bd58ef4e1d2950143d92fce19106eb3ce745 SHA512 da053f0fa91307e58d359572aa332de7a44306c5bd7b8b6abb281eb90ca2fcaef11cc931529255628ff6683333db00e2c4a5078b1747cb8dfcc43b89443a31a0
-EBUILD rust-bin-1.46.0.ebuild 6063 BLAKE2B 954c20fb6e2e81839d50342859037e92502cb17531e04aeaea299272ea756088fc3ab1af85e6bf4e02f804f1e34eb7370afd4386b3b25d3ae0298146e5332d87 SHA512 7e097b098256172530562dd1b178c42b67a13449f5059daaa08bb5e9c0eae4634d810bcaf60fb1e1249954e2065854cb242b7555e207b58967a6ceec21c16979
+EBUILD rust-bin-1.46.0.ebuild 6060 BLAKE2B ec0546b78049ea25f6909ea4e4c76f297a028334e9599329a6fe71e93fc10b48e12b8d50662bdfd223662a1862a1bd58ef4e1d2950143d92fce19106eb3ce745 SHA512 da053f0fa91307e58d359572aa332de7a44306c5bd7b8b6abb281eb90ca2fcaef11cc931529255628ff6683333db00e2c4a5078b1747cb8dfcc43b89443a31a0
+EBUILD rust-bin-1.47.0.ebuild 6151 BLAKE2B 3ec8890493d9e1f540b6bc1320d3d3816f471ae15d310c4c5c5b35561408a776ac3c938afbb06d9d754d02dc0ce3c11849a37977b0cb79c7a86f3d080e73e3ab SHA512 962f726c29105fd9eac6d484445e08578d7cae6333cbbc9cef62e997ad03753f5a26e80e109c96d1ca304d1f458cd51f33f75235ce8956bca44a9fcd2cebf952
 MISC metadata.xml 489 BLAKE2B b9c157f91a878ec1196183173bb339e9beb832e9b002cd72ac5b0fc8a64e7d7b27d165f79bf34eb1debfa69c2381b5b9a74a9b52cefc9efdfe41c93ed72ecd9a SHA512 814c53f00547b8a2b12cab136c95222480ab34b1cec307029e66c7d712e1e00eb2a725ccdfe73d7f1b154b362867c7150caef3609daba20f8d4c2496c47f6b09
diff --git a/dev-lang/rust-bin/rust-bin-1.46.0.ebuild b/dev-lang/rust-bin/rust-bin-1.46.0.ebuild
index 7dd0604d2455..83070baf70e6 100644
--- a/dev-lang/rust-bin/rust-bin-1.46.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.46.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="clippy cpu_flags_x86_sse2 doc rls rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.47.0.ebuild b/dev-lang/rust-bin/rust-bin-1.47.0.ebuild
new file mode 100644
index 000000000000..eb0379a10b65
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.47.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 rust-toolchain toolchain-funcs multilib-minimal
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc rls rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/*-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/bin/*
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rls && components="${components},rls-preview,${analysis}"
+	use rustfmt && components="${components},rustfmt-preview"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+	local rustgdbgui=rust-gdbgui-bin-${PV}
+	local rustlldb=rust-lldb-bin-${PV}
+
+	mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die
+	mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die
+	mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die
+	mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die
+	mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die
+
+	dosym "${rustc}" "/opt/${P}/bin/rustc"
+	dosym "${rustdoc}" "/opt/${P}/bin/rustdoc"
+	dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb"
+	dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui"
+	dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb"
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+	dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}"
+	dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+
+	local cargo=cargo-bin-${PV}
+	mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die
+	dosym "${cargo}" "/opt/${P}/bin/cargo"
+	dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+
+	if use clippy; then
+		local clippy_driver=clippy-driver-bin-${PV}
+		local cargo_clippy=cargo-clippy-bin-${PV}
+		mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die
+		mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die
+		dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver"
+		dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy"
+		dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
+		dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
+	fi
+	if use rls; then
+		local rls=rls-bin-${PV}
+		mv "${ED}/opt/${P}/bin/rls" "${ED}/opt/${P}/bin/${rls}" || die
+
+		dosym "${rls}" "/opt/${P}/bin/rls"
+		dosym "../../opt/${P}/bin/${rls}" "/usr/bin/${rls}"
+	fi
+	if use rustfmt; then
+		local rustfmt=rustfmt-bin-${PV}
+		local cargo_fmt=cargo-fmt-bin-${PV}
+		mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die
+		mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die
+		dosym "${rustfmt}" "/opt/${P}/bin/rustfmt"
+		dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt"
+		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+	fi
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/opt/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/share/doc/rust
+	EOF
+	echo /usr/bin/cargo >> "${T}/provider-${P}"
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if use elibc_musl; then
+		ewarn "${PN} on *-musl targets is configured with crt-static"
+		ewarn ""
+		ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
+		ewarn "to use it with portage, otherwise you may see failures like"
+		ewarn "error: cannot produce proc-macro for serde_derive as the target "
+		ewarn "x86_64-unknown-linux-musl does not support these crate types"
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index fcd8e3e25059..47709b66684a 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,5 +1,8 @@
 AUX 0012-Ignore-broken-and-non-applicable-tests.patch 3387 BLAKE2B 6809f3d5c2cf5698d516ccd74dbbf66cc4265200f75567fa197743672895ddee418367751ac3d99a263ff3417ed89718cd3602c609d0dfac7ba2fd5ac18dce76 SHA512 0c41c238dc0b5a7130398d8c1d6bb6987c9bff704c89875830e9d6ad28d49d9b300c1fe7c982ef9be9a92ed0057f6fc04a604d189d1aec2dc2b014d6d50a7d8d
 AUX 1.44.0-libressl.patch 8969 BLAKE2B 1ae707140a93fd76ec825e0e8c49f1408cda5a3b290a07c974d8ba8ba9b82e230bc2a4864cdecc744425d77ded819690da9328af2f648c636e8fd9ba3f0bb131 SHA512 81421ce6a0eb89bb51ff6a95be79159fce18be51c341f29aaf9d18e9b4aa1d3324e0c3472f72881c94a053b6dc4490c16b5ca2ac9cece0ea2d01051e3ed28a56
+AUX 1.46.0-don-t-create-prefix-at-time-of-check.patch 1322 BLAKE2B 2355cb6da8f2ecef611d7f7d1b82f6ebed6c5d3b579fcdd34024413d8156605db1134ae5d3b6fbdb15e33b063dd8e827580a32065f7b6ddf65c5063f0c73d9ab SHA512 95f883b6638a10bae3ab88864a8d8f0a4463c62db94f9e138edf0f0b1c2378432c766f8d7222fdd0d00950752b222e22b1b7edb856c7e9104878a3ddf8af44d2
+AUX 1.47.0-ignore-broken-and-non-applicable-tests.patch 2862 BLAKE2B 96363bfcaf3634185160d54f475711409c5af1e31b8deb3f1cb8650629eed6f4db6b8d758b84055c9ebe2983a213485f9d4d6de4f551ea1e3d122f7c3baad77e SHA512 4a2c7eab2d3930ba6d8bc042f52c993683a3e21bf023ae609bfb4db65df8c5750ce94264d6ee9196e4dfd3b3e204f10c70d6f3a2e752d0b373fee4ada4c5fe53
+AUX gentoo-musl-target-specs.patch 6500 BLAKE2B 07fe556fa39789a7b2ad0f3cb2e3885dd2a234216abb1e6a6aec4653b0d5da2ca9b29f2c2b5ac3ad95cde65203722c90079169dd46719f04a7c3cf5cffb7d8cb SHA512 55678d07fd7834e85da6ede69ee71115f5af92919deda122b5aac8be73c4d92f437e790f6dc8a566b0b738f07a0d6e0c738d4b5c8cec004b86de206b8d939c8f
 DIST rust-1.43.1-aarch64-unknown-linux-gnu.tar.xz 104148868 BLAKE2B ac5db9eb58c502253d001e0c93aef867bc584d045960a1d3c2caf6772a7c1f4fbad7da579d7c72b3376804f61f1332a54e9fc7099ba5f4a65f7e5435df28894a SHA512 b54fad5493344d2370bd77110f0ffb0231f41ab8aa9707e9303304957c5d9067dc83089432eb175605b78dc771dfcf7abfcce63d7fecdbb759dd224c17d12da0
 DIST rust-1.43.1-arm-unknown-linux-gnueabi.tar.xz 104779424 BLAKE2B 63c05d7403970bd4a237a6b690bcb8e78f310816a953af43da8d258a74102cd560c8674656c2036b1f391dc964ba6d2be2736bc10686c2365cc332b5c76a5502 SHA512 ea2eae6da6c757c07cf9631c706365c743c58f28b514444763ea70fed4c8fcefc5c36d55136afffc2f5e0d25e9b1fdf3243cb9def7e0f57e37b5a4783d44a61b
 DIST rust-1.43.1-arm-unknown-linux-gnueabihf.tar.xz 103569032 BLAKE2B fc94eeb777a72fcb1b2821b5d10bb9eaca535d76e8caee3d06aed989107460e00146516c5be5714e9739c49d5170809fc132624f9a035afba146db883346c57a SHA512 1c523dafceb29f916a192261f673048c8f781453bcee237e0e333d694d7d7b71735544906f2edea9e0a8a48fc66a478645ae8ae865a171f4f9a94f0d8e6800c1
@@ -42,10 +45,26 @@ DIST rust-1.45.1-powerpc64le-unknown-linux-gnu.tar.xz 119234164 BLAKE2B 4148957f
 DIST rust-1.45.1-s390x-unknown-linux-gnu.tar.xz 124758156 BLAKE2B ff62e14d5ae9f7213ebc24d694317ff292cb0d7d2a67f0ca284cddd2b9f594547b01a6c647780d47989d4405072f377d37fc03933431a3df804e37bc1248e803 SHA512 278411c6308eaa4d732ff4c0f448d808a5ee74dae5f3eaf04773ccf65c9bc5963153f62346d30de0f577dd6da89c55bed280c2fb0e50d2075e3c30a3649fc4e8
 DIST rust-1.45.1-x86_64-unknown-linux-gnu.tar.xz 117764080 BLAKE2B cafe6e4f7c28112879089d75703a1b1ce7c0cf9b5ab5beeb4ddf343f7bc93e8704bc105ba0bd95f1df6d62439f206d8f4ae9090330af857ec0a249540eb63122 SHA512 13ee5ff7cae29440e32fb140404ff01414d66f0ea8d79777fb1586541de1ee6ef8e12f9249c35374501460a2352f7d0f6035b5bdc2f0daa91d772a157657ec0b
 DIST rust-1.45.1-x86_64-unknown-linux-musl.tar.xz 123820216 BLAKE2B 1afe48589e5eec15d8fdb31d52b2ada49688e78a311298d421a8b2d4c0cc6a708223e5976518d66506584dc2adc63651b62b8c1fc3c3ccfaff80e2ef7ade5078 SHA512 39875878acfeb05d7b72bab2dea51063a523fa7ad136d582ba28603df7f8b1c3360e5838e5f9b08f396969e52bb1fc672fa4c08cf5f8ffc39128af129b6b17a6
+DIST rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz 127384736 BLAKE2B a1efd25cf429a309a454ef5db38c68d642920e859ef6effbe88ace7f3c4050ae7e9cf10d2f5b70405475ffcbbbc80338e3a5e4b3cb632c555e31a0ebc1b76cd4 SHA512 53e5d8afadaa9505286dce4acbb911126d17bc7bf45ea4685070ff07be7f6c7860e543a7686eeac695e7e3e127ca38ba2f09b73467fbf5f92d0b2195467c51f2
+DIST rust-1.46.0-arm-unknown-linux-gnueabi.tar.xz 121741008 BLAKE2B d277cb19c9f9641f216eba9ddb8bdb0a1bf70b7376e82798dad3116ff6d976c6ec8f6442831ae6a3c64cfdb46c59cf47b482df5200af49ba5eeccb663538084b SHA512 74cc1c8f56c88bdb669d52edca69c8aed7500e51498e8bf4099b2edbf85a2beab1e6d447029eb24e12fdfcbf2272f5d8b741eb4aa48fe83dac44759478429284
+DIST rust-1.46.0-arm-unknown-linux-gnueabihf.tar.xz 120726564 BLAKE2B 5ef9c319d4744016e336a8d8bde99b2b9183dd13fc6873d4f0e239a52a86e054d42ee48ca1a84ac42d140b1bbe234f4eeaf90717f14959ad6966681429eef233 SHA512 89972cc03c05dd5bc003f6cf16e062b935b3fda288ae0c3d32a3d08ccdcbf7699c306aa3c017a13e76f13f8dca7a951ec98f23507de978ae87cffb6d6907af5c
+DIST rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz 123912836 BLAKE2B 97cdb2e8d643826f7dd1554096e14c58c35b38cc2eebb49c478343bf8bc157995a9f1099c014800701d34edbf0f0798ac29babbd2a5bf261d1956bc731b0a99c SHA512 c7e320fd5169c99bf8a12fb5bf1c5fb19a05d14f75ce655e4b64cad3456594ef09be1da7ac34a09b5d84da0c857d1a6e5a0695b5ff04cda491ea92fea15d28dc
+DIST rust-1.46.0-i686-unknown-linux-gnu.tar.xz 141319800 BLAKE2B 712227e42b8597ee1c645cb344042e79ca40aef0e22d783c4a0c042bd07f686aafd9b80bebe0dfe69b4b012056509bfe510fffa8ba5357656d459fe5885fe0fe SHA512 b01e9b06c9de50e43bc6b5e1a5e6cc49dab1cf28b9cf0a8b974d2630c7ed4c6a5df6f321c872e11eb622c42f1d8cfaec77c1b67254a84365464fe3415acfa07f
+DIST rust-1.46.0-mips-unknown-linux-gnu.tar.xz 110175584 BLAKE2B 23e38e81d281d0df23795ff60e4a7503f63d443d966bc6d5068edc50fc0dd90e2fe45eb90b901a1fb3f8f813375533eaa142d625b661f5d76d2097b0cf572606 SHA512 0635060dd15f548834e5c946ec8deea10bf234f550f6a01d4d491f45e0d5f16e957f99caba14c91225d100e7c59e909869b816dfffe9f8681c09e9e5b6ca2bdd
+DIST rust-1.46.0-mips64-unknown-linux-gnuabi64.tar.xz 117357812 BLAKE2B c3118a0b710ceaffda8523840551306d4bbc7c78fc26016fc1ac0037c2a7cd68f56c11999f7e3bc435f93e0dbebf348fdc52255cc5978bdffb2d55dc9d56e23e SHA512 5dc6de40429e72ecad9546390f1f5e626d388938c7bc50a56fb258787b45e8d7363170d8d1a2bff56fbd8bef22060b6cb0c50fb016ccc7d4fb767ba6b7e80c2d
+DIST rust-1.46.0-mipsel-unknown-linux-gnu.tar.xz 111804692 BLAKE2B 4779d5602f2107321d5c6042dce1baaf6eec2f60cf2ba4330bf72fda0868d7e8294cf573b3ffab3654a0689d11599f2fc37430005686e91439abc7ae6fefb977 SHA512 3c9d17fa89636d37e125d7665883abc9912330d4a1f5291d44771fd1cbb17d604deccc07685cb567f1b141dde3668d5ef55f3661b04e4506d5337d69acc6738c
+DIST rust-1.46.0-powerpc-unknown-linux-gnu.tar.xz 111495200 BLAKE2B d618c61a05507abe13d1294594187a4552896cb61396c2f8bd6e506a71ab4bb5cd26ae3b2b573d1d5a4ea79fb4dd2238a2ae34059357ef397264beb0b67cbc34 SHA512 38df2204bd4bfe7371365266651a84da218ba909c3ae107432f6fef892e71488d193b8f54fe6738edd91aa0ca029038d864806b25289254711bd10f736bcc2d7
+DIST rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz 124882812 BLAKE2B 2362e25d39cfd2039ce18db08f43bceaaccd208ec113c16f6718803eadda964bb254a6afc606765a00026adc93cf366495d3546d6aac8a7444088f519d421c9b SHA512 40f9423d838cab74b9920372e728c4ca7057005d83af587387dd2b164a0bf93de65cebc035320bce25f80914c63ce65b84218b9a776b0b905428e4cba0821b8b
+DIST rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz 130200900 BLAKE2B d38a7f131983aee27e6af59ab03999e7420745a0f9256b2623e71f36dd6f12605025dbdc510bd5ffb73e0d31a5c7e56a791bdf718b2eba629d08e2f75221b1c8 SHA512 986f0bf7995f35836b73fb7045cf43ae5efe0c2543c75c66cdcc0f8c1dd3513def3c291e021241e328142deaca690ce113526ffc870c4412a7841f244258a43e
+DIST rust-1.46.0-s390x-unknown-linux-gnu.tar.xz 134521076 BLAKE2B d3efd71dd7db812736680929185ad5f58a2dbf7d1b8a6f851834dd7b41713fc171dbcdf2472bedc13751bfeed58070d919d2a1138765ab75c0f4bdf817cb6418 SHA512 b6146695225ff6d0516e7bb6bc4620599356bb89b14f429a09d9d7f8715a94e8e218402346d5c9a10eeb54c0bdc40fb179289216b0cb4edd5bdf886f6b69aab4
+DIST rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz 127200200 BLAKE2B 7d755e0622cda99d111490197b21ff4aaeb7b13292804566bc677b7b1d833eaa644b7a801863a1a01e3aa34be28a80344cae69edc57f8c8788884c78e037b750 SHA512 95f5adc2d2137010c7e5ac8a0fc70485250b4f9a909cb8b164b35fffff76ab88e9b09d305bfac37324ed080c5fc7643001d2abec5454ca911dc3513f1af52c88
+DIST rust-1.46.0-x86_64-unknown-linux-musl.tar.xz 142372372 BLAKE2B 7d3672234b61b772e2311127db569b37296bf3a9bf86841fb78c6d20da6a6abfc6c866ba4aa7cc44c12eebb0744fbeb401b491314db9eb481b926792cadcca22 SHA512 e2599c4c10fe9725e63524d89c0be869d43347620b0f6ff1a93cee5e7219f5560c6171d8eda99e5624eba60b9d488bfe0942c23eacdbac2ba42e4cd63f14b7c9
 DIST rustc-1.44.1-src.tar.xz 94756856 BLAKE2B 60f536c3ba0fa1fec4b6333ee57809ee5226090ad5041c14a136b4356ff3b898062e06c3fe54effe873e27931ac8fcb902cd48a38615a8de7eebc6ecb3bdc2bd SHA512 1c17002edae844a710db9b144c17171416330dc565343c65af8a6e112fb61555e2025bb4cf33cac1229d7df689e6ff8858b91ae00552400ccacafaf1de11849b
 DIST rustc-1.45.2-src.tar.xz 98683036 BLAKE2B a4102a5d4744b7ccc9b076aba00c39d69532f777e7d39e0e4ce2033b663b43e27b55034fdb3a1e13379fae9a16bff9e7748865a84507f7388ef0ebf9d421eac7 SHA512 cc6250c0bc844e77ca6dd7ae013e434ed3009b001914114866ed31f28edf3960221454d131e298b15050e3b8153fb8298d509559c2f7307c64611aa8e36b4d25
 DIST rustc-1.46.0-src.tar.xz 101868452 BLAKE2B da9798596b124a10d79c236a871228f05e5f571d22c2259328e7026c91e088c85f5de9c0536a16531e0cb10477bfcd16d3ac11467979f5561cb6199442b877ef SHA512 099857f1d295043587a4e2a65ef3e6a90e12c8b6958e98535a1656c113c553f9a9b621aba8a19cf21bd8d2c79d27cbfa4b8e6fabbcb3cbfee23b545be7b450b4
+DIST rustc-1.47.0-src.tar.xz 104143736 BLAKE2B 0454094dde35275488046826da87655e51bf0795481d6d08fd70d644bfc12481bca8641166106ef32f20494906025244715b16ff21a1c023f4bd2818aab42521 SHA512 6ba83c0158f8130ddeae7e070417a2121d8a548c8fe97e28bce116d84048636c75aaee78e0c92cd43a50f5679a1223fc226cc8c5ba9bbd1465e84c5c6034d5c9
 EBUILD rust-1.44.1.ebuild 14912 BLAKE2B 107391d3f6cbd0974c06398f7b9fec061cca9dd24ffd72ca903d5b9758edc630070b841a5973b0688ea17dc5afe95141874734bd365fa6d9fb283b97df7bf27e SHA512 78456cbe534f7735d3b2400f52ad07cd1a1dd3db5ae8c834d62f8744e4b4f5205d04b83d462d0a25a82f53158c19c7f625792d8c2cfbbdb63bc41f373b2ebf8f
-EBUILD rust-1.45.2.ebuild 16607 BLAKE2B 31d1fcdce4c4905e4ffa18c6534fbd54965f2b4ad6a7a9f25028b2c03fe1fd6d18df03e498232ddb621e5826d04ab35e9e0dd95473abb60f7227212f4afb8329 SHA512 1af474a6830f826239108d7312dc3435c34a26862a81d2eee6520a7b2d9d38d79ba08f79eeee1d42c549acb07e7f9e5c03f684315651b2c1010ed00980db8e8d
-EBUILD rust-1.46.0.ebuild 17299 BLAKE2B 976ab8f612b40f7546d96a94ed445de11f899762612379a53fc3044ba39ad59878387a4739d2cf16476d6785d637fe77f2a74090f99f6e85529e3e173f637a74 SHA512 39e0a63ee21077f14702027402318f669616ba8c5dd42797f01d9e572a11ee07b1b305212214937a8b9bc8f7fe57d3ce7137d61f5ca799dc8abf6d0a9ac9e91c
+EBUILD rust-1.45.2.ebuild 16648 BLAKE2B 1391d9058e0315b3406a6063f625d351eeaec4e4f1aa4b45fcb637ffc0e278f3ffa878ff40d95a0f6c111a48d3ada0f3a9ed7c94ce831b75671b72391f7d3198 SHA512 06f15095dd885517625c4c0d3834052c21336d7899a5342f7bfba43c1e713b2deac3d15483ca6b01a925434b3f8b728f5c8cef5bff7db6f7014bc3cefdbb3eaf
+EBUILD rust-1.46.0.ebuild 17337 BLAKE2B ff8b883e9e1d3da227c804c688aaa0a6b1d7fbacb74630b8e2514b3612d100ddb0aef8ec7ac60620e3008d394cb2d084f33db21264e5c07c557497a39afbef38 SHA512 adc5c81880f079b2c54e07bbe25a46fe286dc7886e9958e228c6eaa2c8e3531ed74f42d5a7d04d41d95833309e25e72ea38bf008bb2c0c11657f94f22a7a8620
+EBUILD rust-1.47.0.ebuild 16890 BLAKE2B 8dc77c496401976af0e39212744138235eda7aba878471281204c6c80c5108b8b8c4ad57f97392cee102958ba7b7a512a57d72498da27a441e19a5a43bfcf001 SHA512 b4c2bd3bec0ff2720066bf3d36447257b8afe3b45a35798d69cdb29bcbd982854d787d9107063ebb2913a58f2a00b1711c91f592d96b5135d282aa67b3743056
 MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4
diff --git a/dev-lang/rust/files/1.46.0-don-t-create-prefix-at-time-of-check.patch b/dev-lang/rust/files/1.46.0-don-t-create-prefix-at-time-of-check.patch
new file mode 100644
index 000000000000..9064a52ac2d3
--- /dev/null
+++ b/dev-lang/rust/files/1.46.0-don-t-create-prefix-at-time-of-check.patch
@@ -0,0 +1,31 @@
+From 6b31232a9d32529e30765108f30365ac48587ce6 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 8 Oct 2020 15:48:33 -0700
+Subject: [PATCH] don't create prefix at time of check
+
+---
+ src/bootstrap/install.rs | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
+index d9ee3bc..c5da9ce 100644
+--- a/src/bootstrap/install.rs
++++ b/src/bootstrap/install.rs
+@@ -73,12 +73,8 @@ fn install_sh(
+     let docdir_default = datadir_default.join("doc/rust");
+     let libdir_default = PathBuf::from("lib");
+     let mandir_default = datadir_default.join("man");
+-    let prefix = builder.config.prefix.as_ref().map_or(prefix_default, |p| {
+-        fs::create_dir_all(p)
+-            .unwrap_or_else(|err| panic!("could not create {}: {}", p.display(), err));
+-        fs::canonicalize(p)
+-            .unwrap_or_else(|err| panic!("could not canonicalize {}: {}", p.display(), err))
+-    });
++
++    let prefix = builder.config.prefix.as_ref().unwrap_or(&prefix_default);
+     let sysconfdir = builder.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
+     let datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default);
+     let docdir = builder.config.docdir.as_ref().unwrap_or(&docdir_default);
+-- 
+2.28.0
+
diff --git a/dev-lang/rust/files/1.47.0-ignore-broken-and-non-applicable-tests.patch b/dev-lang/rust/files/1.47.0-ignore-broken-and-non-applicable-tests.patch
new file mode 100644
index 000000000000..ff1707f4b8a4
--- /dev/null
+++ b/dev-lang/rust/files/1.47.0-ignore-broken-and-non-applicable-tests.patch
@@ -0,0 +1,75 @@
+From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 16 Sep 2018 16:38:48 +0000
+Subject: [PATCH 12/15] Ignore broken and non-applicable tests
+
+c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475
+env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox)
+long-linker-command-lines: takes >10 minutes to run (but still passes)
+simd-intrinsic-generic-bitmask.rs: broken on BE, #59356
+sparc-struct-abi: no sparc target
+sysroot-crates-are-unstable: can't run rustc without RPATH
+---
+ src/test/codegen/sparc-struct-abi.rs                            | 1 +
+ src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile   | 2 ++
+ src/test/run-make-fulldeps/long-linker-command-lines/Makefile   | 2 ++
+ src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
+ src/test/ui/env-funky-keys.rs                                   | 1 +
+ 6 files changed, 10 insertions(+)
+
+diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs
+index 78e5b14a212..6f93e93286b 100644
+--- a/src/test/codegen/sparc-struct-abi.rs
++++ b/src/test/codegen/sparc-struct-abi.rs
+@@ -4,6 +4,7 @@
+ 
+ // only-sparc64
+ // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib
++// ignore-test
+ #![feature(no_core, lang_items)]
+ #![no_core]
+ 
+diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
+index f124ca2ab61..363b18f0985 100644
+--- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
++++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
+@@ -1,3 +1,5 @@
++# ignore-aarch64
++
+ -include ../tools.mk
+ 
+ all:
+diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
+index 5876fbc94bc..5f167ece1a2 100644
+--- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
++++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
+@@ -1,3 +1,5 @@
++# ignore-test
++
+ -include ../tools.mk
+ 
+ all:
+diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+index 9e770706857..6d92ec5cec8 100644
+--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+@@ -1,1 +1,3 @@
++# ignore-test
++
+ all:
+         python2.7 test.py
+diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs
+index c5c824ac58d..f3fe047a79c 100644
+--- a/src/test/ui/env-funky-keys.rs
++++ b/src/test/ui/env-funky-keys.rs
+@@ -1,6 +1,7 @@
+ // run-pass
+ // Ignore this test on Android, because it segfaults there.
+ 
++// ignore-test
+ // ignore-android
+ // ignore-windows
+ // ignore-cloudabi no execve
+-- 
+2.24.1
+
diff --git a/dev-lang/rust/files/gentoo-musl-target-specs.patch b/dev-lang/rust/files/gentoo-musl-target-specs.patch
new file mode 100644
index 000000000000..0661a26841b7
--- /dev/null
+++ b/dev-lang/rust/files/gentoo-musl-target-specs.patch
@@ -0,0 +1,168 @@
+From 9fb44efd4a6270443ca2a06a098c83cf9820cc8b Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 8 Oct 2020 22:38:54 -0700
+Subject: [PATCH] add gentoo musl target specs
+
+Directly based on patch by Samuel Holland <samuel@sholland.org>
+Found at: https://github.com/smaeul/portage-overlay/blob/master/dev-lang/rust/files/
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ src/librustc_target/spec/aarch64_gentoo_linux_musl.rs | 11 +++++++++++
+ .../spec/armv7_gentoo_linux_musleabihf.rs             | 11 +++++++++++
+ src/librustc_target/spec/i686_gentoo_linux_musl.rs    | 11 +++++++++++
+ src/librustc_target/spec/mod.rs                       |  8 ++++++++
+ .../spec/powerpc64_gentoo_linux_musl.rs               | 11 +++++++++++
+ .../spec/powerpc64le_gentoo_linux_musl.rs             | 11 +++++++++++
+ src/librustc_target/spec/powerpc_gentoo_linux_musl.rs | 11 +++++++++++
+ src/librustc_target/spec/x86_64_gentoo_linux_musl.rs  | 11 +++++++++++
+ 8 files changed, 85 insertions(+)
+ create mode 100644 src/librustc_target/spec/aarch64_gentoo_linux_musl.rs
+ create mode 100644 src/librustc_target/spec/armv7_gentoo_linux_musleabihf.rs
+ create mode 100644 src/librustc_target/spec/i686_gentoo_linux_musl.rs
+ create mode 100644 src/librustc_target/spec/powerpc64_gentoo_linux_musl.rs
+ create mode 100644 src/librustc_target/spec/powerpc64le_gentoo_linux_musl.rs
+ create mode 100644 src/librustc_target/spec/powerpc_gentoo_linux_musl.rs
+ create mode 100644 src/librustc_target/spec/x86_64_gentoo_linux_musl.rs
+
+diff --git a/src/librustc_target/spec/aarch64_gentoo_linux_musl.rs b/src/librustc_target/spec/aarch64_gentoo_linux_musl.rs
+new file mode 100644
+index 0000000..420fe7c
+--- /dev/null
++++ b/src/librustc_target/spec/aarch64_gentoo_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::aarch64_unknown_linux_musl::target()?;
++
++    base.llvm_target = "aarch64-gentoo-linux-musl".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+diff --git a/src/librustc_target/spec/armv7_gentoo_linux_musleabihf.rs b/src/librustc_target/spec/armv7_gentoo_linux_musleabihf.rs
+new file mode 100644
+index 0000000..067e2d6
+--- /dev/null
++++ b/src/librustc_target/spec/armv7_gentoo_linux_musleabihf.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::armv7_unknown_linux_musleabihf::target()?;
++
++    base.llvm_target = "armv7-gentoo-linux-musleabihf".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+diff --git a/src/librustc_target/spec/i686_gentoo_linux_musl.rs b/src/librustc_target/spec/i686_gentoo_linux_musl.rs
+new file mode 100644
+index 0000000..1cd39cd
+--- /dev/null
++++ b/src/librustc_target/spec/i686_gentoo_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::i686_unknown_linux_musl::target()?;
++
++    base.llvm_target = "i686-gentoo-linux-musl".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
+index fa29ff3..a685600 100644
+--- a/src/librustc_target/spec/mod.rs
++++ b/src/librustc_target/spec/mod.rs
+@@ -490,6 +490,14 @@ macro_rules! supported_targets {
+ }
+ 
+ supported_targets! {
++    ("aarch64-gentoo-linux-musl", aarch64_gentoo_linux_musl),
++    ("armv7-gentoo-linux-musleabihf", armv7_gentoo_linux_musleabihf),
++    ("i686-gentoo-linux-musl", i686_gentoo_linux_musl),
++    ("powerpc-gentoo-linux-musl", powerpc_gentoo_linux_musl),
++    ("powerpc64-gentoo-linux-musl", powerpc64_gentoo_linux_musl),
++    ("powerpc64le-gentoo-linux-musl", powerpc64le_gentoo_linux_musl),
++    ("x86_64-gentoo-linux-musl", x86_64_gentoo_linux_musl),
++
+     ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu),
+     ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32),
+     ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
+diff --git a/src/librustc_target/spec/powerpc64_gentoo_linux_musl.rs b/src/librustc_target/spec/powerpc64_gentoo_linux_musl.rs
+new file mode 100644
+index 0000000..e840bb2
+--- /dev/null
++++ b/src/librustc_target/spec/powerpc64_gentoo_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::powerpc64_unknown_linux_musl::target()?;
++
++    base.llvm_target = "powerpc64-gentoo-linux-musl".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+diff --git a/src/librustc_target/spec/powerpc64le_gentoo_linux_musl.rs b/src/librustc_target/spec/powerpc64le_gentoo_linux_musl.rs
+new file mode 100644
+index 0000000..1037d82
+--- /dev/null
++++ b/src/librustc_target/spec/powerpc64le_gentoo_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::powerpc64le_unknown_linux_musl::target()?;
++
++    base.llvm_target = "powerpc64le-gentoo-linux-musl".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+diff --git a/src/librustc_target/spec/powerpc_gentoo_linux_musl.rs b/src/librustc_target/spec/powerpc_gentoo_linux_musl.rs
+new file mode 100644
+index 0000000..a623ffe
+--- /dev/null
++++ b/src/librustc_target/spec/powerpc_gentoo_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::powerpc_unknown_linux_musl::target()?;
++
++    base.llvm_target = "powerpc-gentoo-linux-musl".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+diff --git a/src/librustc_target/spec/x86_64_gentoo_linux_musl.rs b/src/librustc_target/spec/x86_64_gentoo_linux_musl.rs
+new file mode 100644
+index 0000000..f330473
+--- /dev/null
++++ b/src/librustc_target/spec/x86_64_gentoo_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::TargetResult;
++
++pub fn target() -> TargetResult {
++    let mut base = super::x86_64_unknown_linux_musl::target()?;
++
++    base.llvm_target = "x86_64-gentoo-linux-musl".to_string();
++    base.target_vendor = "gentoo".to_string();
++    base.options.crt_static_default = false;
++
++    Ok(base)
++}
+-- 
+2.28.0
+
diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
index dbb1d9183f1f..5c87a5c5a60e 100644
--- a/dev-lang/rust/rust-1.45.2.ebuild
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -131,6 +131,7 @@ toml_usex() {
 
 boostrap_rust_version_check() {
 	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
 	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
 	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
 	rustc_version=${rustc_version[0]#rust-bin-}
diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
index a6aeacae2492..ceaa6d45c121 100644
--- a/dev-lang/rust/rust-1.46.0.ebuild
+++ b/dev-lang/rust/rust-1.46.0.ebuild
@@ -18,7 +18,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
@@ -130,6 +130,7 @@ toml_usex() {
 
 boostrap_rust_version_check() {
 	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
 	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
 	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
 	rustc_version=${rustc_version[0]#rust-bin-}
diff --git a/dev-lang/rust/rust-1.47.0.ebuild b/dev-lang/rust/rust-1.47.0.ebuild
new file mode 100644
index 000000000000..a5041ff03fed
--- /dev/null
+++ b/dev-lang/rust/rust-1.47.0.ebuild
@@ -0,0 +1,583 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt +system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one 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. < 12.
+# 3. Specify LLVM_MAX_SLOT, e.g. 11.
+LLVM_DEPEND="
+	|| (
+		sys-devel/llvm:11[${LLVM_TARGET_USEDEPS// /,}]
+		sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
+	)
+	<sys-devel/llvm-12:=
+	wasm? ( sys-devel/lld )
+"
+LLVM_MAX_SLOT=11
+
+BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		dev-util/cmake
+		dev-util/ninja
+	)
+"
+
+# libgit2 should be at least same as bundled into libgit-sys #707746
+DEPEND="
+	>=dev-libs/libgit2-0.99:=
+	net-libs/libssh2:=
+	net-libs/http-parser:=
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	elibc_musl? ( sys-libs/libunwind:= )
+	system-llvm? (
+		${LLVM_DEPEND}
+	)
+"
+
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warnings
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+# causes double bootstrap
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/1.46.0-don-t-create-prefix-at-time-of-check.patch
+	"${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
+	"${FILESDIR}"/gentoo-musl-target-specs.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+boostrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run \'eselect rust\' and set correct rust version"
+		die
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=6144
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rls 512 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	M=$(( $(usex system-llvm 0 2048) + ${M} ))
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 15 10) * ${M} / 10 ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+	use system-bootstrap && boostrap_rust_version_check
+
+	# required to link agains system libs, otherwise
+	# crates use bundled sources and compile own static version
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
+
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' src/librustc_target/spec/wasm32_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools="\"cargo\","
+	if use clippy; then
+		tools="\"clippy\",$tools"
+	fi
+	if use miri; then
+		tools="\"miri\",$tools"
+	fi
+	if use rls; then
+		tools="\"rls\",\"analysis\",\"src\",$tools"
+	fi
+	if use rustfmt; then
+		tools="\"rustfmt\",$tools"
+	fi
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		rust_stage0_root="$(rustc --print sysroot)"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+
+	rust_target="$(rust_abi)"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		compiler-docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = false
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debuginfo-level-rustc = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+	EOF
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- EOF >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		EOF
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		EOF
+		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		if use elibc_musl; then
+			cat <<- EOF >> "${S}"/config.toml
+				crt-static = false
+			EOF
+		fi
+		if use system-llvm; then
+			cat <<- EOF >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			EOF
+		fi
+	done
+	if use wasm; then
+		cat <<- EOF >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+		EOF
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ar = "${cross_toolchain}-ar"
+		EOF
+		if use system-llvm; then
+			cat <<- EOF >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			EOF
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following settings:"
+	cat "${S}"/config.toml || die
+}
+
+src_compile() {
+	# we need \n IFS to have config.env with spaces loaded properly. #734018
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! (
+				IFS=$'\n'
+				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
+				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+			)
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	# https://github.com/rust-lang/rust/issues/77721
+	# also 1.46.0-don-t-create-prefix-at-time-of-check.patch
+	dodir "/usr/lib/${PN}/${PV}"
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) DESTDIR="${D}" \
+		"${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml || die
+	)
+
+	# bug #689562, #689160
+	rm -v "${D}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${D}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
+
+	local symlinks=(
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+		cargo
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		mv -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${i}-${PV}" || die
+		ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}-${PV}" "${ED}/usr/lib/${PN}/${PV}/bin/${i}" || die
+		dosym "../lib/${PN}/${PV}/bin/${i}-${PV}" "/usr/bin/${i}-${PV}"
+	done
+	dosym "../../lib/${PN}/${PV}/share/doc" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		LDPATH="${EPREFIX}/usr/lib/${PN}/${PV}/lib"
+		MANPATH="${EPREFIX}/usr/lib/${PN}/${PV}/share/man"
+		$(usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/share/doc/rust
+	EOF
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 096f3d25f5df..57a7ae06006f 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -7,11 +7,8 @@ AUX spidermonkey-60.5.2-ia64-support.patch 1615 BLAKE2B bd2ae36194bdb6a17638ec50
 AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 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-78.3.1esr.source.tar.xz 339088596 BLAKE2B 27e594a23b111b937ed277ddafa99c07fa9ee003cbd6b7c6cbdc4428e54769ec9ec1961653c1ec127d7adf159ff8b3be08ebbdefb0d11f1ac21717ffde9461b3 SHA512 162860df8e4ef7322e91924bd4aae731a49dbd9829f02b306e4e5acc69c611f4a1e5727c3857b2f98e951745a3b1d8f550966105badc095205644d1ad7f5a340
-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 firefox-esr-78-patches-03.tar.xz 172416 BLAKE2B 2d67e793e4f4bde447a3a3f3296d1c5ea6c92843439f87e0ab08b51d2f0dd74f0d37762807a1f24853e56f7987e18af65f010027602e32d40a3444c7e418ef47 SHA512 86f35b89ad573c10b839b1631149c6fce3374943d101a6496c40a69a813525826cb2bac4926fc7813dca334c9dcca534e0a963b0725ac3f95fbd3a1c2bf8dc3e
 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
@@ -21,10 +18,8 @@ DIST spidermonkey-68.6.0-patches-03.tar.xz 4744 BLAKE2B 2a323ea9b6291e427631f986
 DIST spidermonkey-78-patches-01.tar.xz 2100 BLAKE2B 5001c30c395c3ad4f77eb2c3f542f5547184b9c7493988b9433a175853983020b4c450efb674ea94e2575be50f9aff36d0e1418777327b7c806c52e37e8be556 SHA512 d31a037ebdda4a1b9d9a53881f5e5d3d547349b3fe4a0dbcf1c1cd27ff8076ee71186f080358fde586af8305cc82283c5fa67f4101637272078d057100a24065
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
 EBUILD spidermonkey-1.8.5-r9.ebuild 3995 BLAKE2B fb52ebb4287a3209ad318d8cd73687ddb6222e033b4b54311a99819805af89e095e3db95977713b54bb2adf694017fbc2e806760746d30df10a182860cd5e9f4 SHA512 faa9f16336a5326ee586f3d5b15fd92668d6fc22bf3e2342f5686157ca76afb4372e605248bd5cbfb09a5ed1b38a399725dda0bc321a98184593d43eac1613ca
-EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4592 BLAKE2B 506e6a1958e0c4cd7f3898410efa2a5379fec57f6b758c44bdf1ebf7f015eed946ff8a5260db2a6a419047feecc320288a78c7daf9f9aa3083a98d332984e065 SHA512 939d5947a02a020992ef51449e12524ea19c7e2e875ccf1248008f1720c7bcc31fa907cd400487f762fd1eeb4d177b82b0656e3da4cf59d68ad5c2aa3065b02f
+EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4591 BLAKE2B b8fe23279548903b66139d3310f041eb45f114c3012867cd01160155f6e8732e6d914a07346697d1a719439e351b891809bda603a842b8b220160d1d73db03ad SHA512 8f950866d7406a2a8626b2fd45a32cd89dfc4b4322c793cbfbab694ffc8eb7b752d032435302f1eae01d5e4882dca595e06b304ee1dc8b3fb095c1df88eb9287
 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
-EBUILD spidermonkey-78.3.1.ebuild 7383 BLAKE2B 12a3895b88933c47cedefb80ee67713a2c325b959caebb0b7f809a9001f2cb93faec49603fc8f98f78554be4058b8c5f84e67bb5cad588cc562d0cf208512364 SHA512 e7e2b12dab7a170cf4fc0efb28b91d503fcb30e0c4b33cd2831425537aed82b7358c4bb4814c1a66e8d5912afbae01b72f43f6938da7d3dbc8ab47e7969b40ce
+EBUILD spidermonkey-78.3.1.ebuild 7383 BLAKE2B 0248684e683e6a20863318b3c2b11fb9a33b29591566fae23173a8d34f4b2d6cf88975e555292432ad5a33bc6a0531b403fc55e428ae99e83317e817bf2bacfd SHA512 5d958d92786700f0b1d2951fced9c02a284ddfeba2196934b15f025c69da51d7d899c4cdd0011097cd271ded6a80f8d97bd9c4aa9235d60b5b9911a7a83dd609
 MISC metadata.xml 806 BLAKE2B c1b86b680222a9f427f762f469a68849ee1d1f9eb8da0ca326e586fa3c15b03be0cc03fa752b460e22439c31aad98b0a213371e5f6b7b3afc622baf8244aa6bd SHA512 6fe4608fedba243622286bde5bfb26cba20dbb5a0a7fbb1b8a363b479e23c0e380833e9596b7abf696c4daa988f59bd82d29acc2a2424afe6f467eefcbd9ffa7
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
index 5b47c03a9c44..8ee26fbc1d3f 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.
 
 LICENSE="NPL-1.1"
 SLOT="52"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 x86"
 IUSE="debug minimal +system-icu test"
 
 # Disable tests:
diff --git a/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
deleted file mode 100644
index d88bb88fc17c..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-78.2.0.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"
-
-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-01.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
-	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/spidermonkey/spidermonkey-78.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
deleted file mode 100644
index beec62444260..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-78.3.0.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"
-
-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/spidermonkey/spidermonkey-78.3.1.ebuild b/dev-lang/spidermonkey/spidermonkey-78.3.1.ebuild
index 1694f51c1847..e94dbd3d5733 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.3.1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.3.1.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
 fi
 
 # Patch version
-FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-esr-78-patches-03.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-01.tar.xz"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases"
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index aeace6f77864..87de6e133a12 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -3,5 +3,5 @@ DIST swig-4.0.0.tar.gz 8052518 BLAKE2B a34eb17d795ba5b34ea7362f8f07d6a6e82fd4394
 DIST swig-4.0.2.tar.gz 8097014 BLAKE2B 4c36b7e9b9bf1663779aa31b0eda8a1fe443695d945bcc1642c3404b22e45440def85e58dd65dc18a2ca8c00ffdcfe0f1d75373b7becc0b0e5402fda90b8c29a SHA512 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
 EBUILD swig-3.0.12.ebuild 850 BLAKE2B 0bb048398af0fa3bc245ddbc84d239be3cbdb3573327a11bd1978dda689ce40c12ed9958995dbe60ceac50fca0c6f9db7749fbdbc83768fa6c652904551bb7d9 SHA512 f332940d4ce3c5579c6f1f471d10393b19224b620087081fde8d5802e87fc0fc34b44ea183934cdc155e32590316c5ddea0f49405505e630529021d41c8c3bf4
 EBUILD swig-4.0.0.ebuild 1081 BLAKE2B 12452e725eb9f122d486fb2cca0219aaf68b8dd23a16197c60dc46d9432392c1da37e670192a1864b8c81fdccec0c2e9965548c7754ff3051e134f7f2ceb2b6d SHA512 4c66772c92f1165fb1f747d7f9a59da00704503d914b2060f4d75d605a669567e215ec5b154b648423039f83c7e236a9ea013bc5968547fedfce48243daafb89
-EBUILD swig-4.0.2.ebuild 941 BLAKE2B 2d4e070e9e64ec64a9a7475c62e3e998d65eeb1f791e2c1585d609daec8d9eba5e6bf3d7f8e701aebe158155ee7d55f66e8015216c068aa325802a8aa2b5e92f SHA512 93ee073ee6ec282fa3d0b190bb8ac23bc3354bf5712a781f10b9e2d300679b6132470830022e1c2ed4b2534b05600dd7be912b4bada4a98e13b90fff2c06c38b
+EBUILD swig-4.0.2.ebuild 940 BLAKE2B 8a27ee8ca1ebd5885646735dd0128128167f40a2076e4ae0d822c3daf99eaefaa380d894a2b62ddf76de887ca6582741f6f04bdc3fe96d10c19e07d6f08a9ed5 SHA512 24870071b89f4c8b804348e091b4650c590a6c63a56088756fb4c53af5dee5381d301b1206c99dd7d28638c660da071383f3ad737c89c4b80cd2d3862b38dfbc
 MISC metadata.xml 1018 BLAKE2B c939a56a7dba17ea306dcbc20c63dac2e47addd3632b7493c46fc187b42d5e71a7c3bbf93d37c935c266eb28eaeaa3acf334a5996ed6419e9efe3d5cb9ce536a SHA512 1d24bf77a36660ca5a238f5059c42c942fe5abd795204bca65a8ecac0e98a6111a01d1ebc03224d265b454a76f76f49e991b1e2424de7f2095641ab1aa06c3fe
diff --git a/dev-lang/swig/swig-4.0.2.ebuild b/dev-lang/swig/swig-4.0.2.ebuild
index 62dbbf450e65..021ea46fdb6c 100644
--- a/dev-lang/swig/swig-4.0.2.ebuild
+++ b/dev-lang/swig/swig-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index ee93b66b230b..8c050ec6d5c1 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -4,29 +4,33 @@ AUX 0.44-valadoc-doclets-data-parallel-installable.patch 6063 BLAKE2B d27b69ab82
 DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c
 DIST vala-0.40.20.tar.xz 3443256 BLAKE2B 4cb53448ffabd29ea2c1411d019aa3749be113371e411d90803aa77a5ba19790d3766dae43af58a107680acc04870b30670fd53d4ce239de8d15dd79571cadfb SHA512 767f156c85bd901e6e672439c2bf7fdfe60e4f7b088ca89f8787179e57b42904c92749ca8bd79c1e4319ec998e0e3f6bd6f13ed679be1f5240041f797657eb36
 DIST vala-0.40.23.tar.xz 3462092 BLAKE2B 49eb5f7205d59b0806e807fc0f99771ace4d188222be60f12ef2f503bf8da9116ee7eedb742a6e50400655ae86d1eeb383f3b8ac1832e82f2787b0162c2a4dc2 SHA512 9d5638d44d8a42124fefd02b66454d19cc5d24291ec1525e1fd9c1c8df814d55d2bdc6f5be0168639a8712766cb4828abf3ae70ebfc9e0a72393dd584c25853d
+DIST vala-0.40.24.tar.xz 3484308 BLAKE2B eb31444099c55b41ac2a2aa5be40eb3bc767e08d0670f2a36d51317cfd39a4a601578561863687385b8a922232909b5d8fb85a842e414aace077290070044100 SHA512 c10e9e51b5854d2f0087ce8a9eac561fbc22785bb719bf96936c69187550b2cb92ceafb5fd9df85b4eaa49f5c1f77c660de305d0cee944c216850c80c5f4cc65
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
 DIST vala-0.46.11.tar.xz 3424380 BLAKE2B b4af8b8345ac14793ba4b67dd2785408aac7c59ee4ea491c6e83c645d25b0cd7b795cdc35edd7f94a7c36eb40acbea7a8d7e08b41370f386f231733a3185e188 SHA512 c2b61f88deb787622680e49078d4caaaf210c19818607ec5b0ccd4564c5127657eeeba24b98c48e78c093456170b7f8aeea232125d702c1d7e624b6af854cec9
 DIST vala-0.46.12.tar.xz 3430948 BLAKE2B ab04291fd1b46053aa3177504ddd954bbc655bfcdb869ffad21b5cbe60cadc2e96dcbe065eb14cfc668c5bc345d1b0509274ecc0b4abfce7b28b89c27b4221c0 SHA512 13a56583743e249724bb0b642e9f22576a16c195b8f61a5dd19d581071217fa73cd73d5db0b44552fe5a5de9710136dd9f0153d3f71377cc5239250a21178af6
 DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
+DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
 DIST vala-0.48.8.tar.xz 3470240 BLAKE2B 753c1f4bd1619bb4671f74f3a82ed1919efd5bdfcbc7d2a0797303627214de1b9d22bb9bf4e5d8097773986bf95b27126061cf1ab862837d0ced49e0c860bb90 SHA512 a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.49.91.tar.xz 3506404 BLAKE2B 77a4e88d6718112747d6ceb0d70712db818fc175c2c4ef5755bc2c091469e32028d73467a7fda84748b3d29f87fc2f5af9601df8f59d96bcc55ce1bf01b25c7c SHA512 15817b032cce95a360b28a51509259b88e070a7ec6fd7a82452717ef98cd14b1fb60307a5bdd7f4b0627e59575a64c44fb41dad25327cecf8d9a56dbde01a820
+DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
 EBUILD vala-0.36.20.ebuild 801 BLAKE2B 28a0b45feb749184a38652c09c10e4e10fa89e13ae613394fc89395244249783d5d66e63b9a808a3d2b6d0585f6f03c70d418874ab103032502df7830e64ef0f SHA512 fb5d44393b0ecb62098873f25f16ee9f9f2b268faa5524268923ba88258ada9b6e9d74f3ab4d0d9c11d1972d869ae1e97bae848f4005ebbe29069219a4078d47
 EBUILD vala-0.40.20.ebuild 1188 BLAKE2B 9754e3990f8b9d97a9db2d475a8338dbad1ac0daa74118a4966d08709bbb8d713817ae4a163bdc79ef2ce26aad00e633418734a2333a4e2c72b8a10b6a53d814 SHA512 d55a8a950eda084f4d527d090fa768436808922b4adafbd756cdaed73fb7214d9a1f74c77fc1c0d232e3dc6bd7548ded04ff3fbe566c609c7c2677404e757636
 EBUILD vala-0.40.23.ebuild 1189 BLAKE2B 42ec55f24d20afeb5c3e268c5491be25084e9cd6f94e306568e9a0377c0e2a3197b4a5da9ec5108ce39433d31a339075a26485546d59ce9bc5a845f6efc40500 SHA512 18066dadbb427a8f494fd28402bb3dc71752209f47432e29fa9935c82e8a9f417eeea6fdb5b6e63a2f95ffdf6fae8bc133aa1ac1e79f1bd8ba9a2cb3cf97ffab
+EBUILD vala-0.40.24.ebuild 1196 BLAKE2B e2c6de7f13f532e577c26db204f440ee0d9256844618ab02d1f4761646f1cb74f1f268fadb5d043701aa64f014464bc9b6c9116856ef7c96abde436f10c5d62f SHA512 a4bbd7dfdcf4e6351f7abb0a4ffe7fbfe09846e883152c9e178f78f108c22e8cc9c3d2d340eb409f60fe923c97805fe503254b16e3a3e7f6779a32c48188c3f3
 EBUILD vala-0.44.11.ebuild 1110 BLAKE2B caa359b186daa04e09b9f3c2185280dfedabd8428ad060304e78cad7fe106ec00c1ec023dcd2f0a7f4239ab5be705413667cfa9683fc30ac88ee2b0b1389e588 SHA512 e14b37221c39f2b50c788c31c28b929251db44e944bae83cb81907c2d304e4b6a9838c7173fc5c74f2ffdecc89d8d0f1ee3cb8d6ffea023491e8f7f92e25c79f
 EBUILD vala-0.46.10.ebuild 1304 BLAKE2B 00ff3c6ac28fd59d5a914c4702bfefcb4885c6147dee21ab99bd1f0179844a2e2f919cbb7e1681a44d09a121d3e00ec518a705b3dd11c66158b93462ba6a9ebc SHA512 a014c280ed597aeacc6c1bc754237b6e9d53cc323968aad50c8d1f6c398cacb01319916d3ec13f987b25210aca84e23f1a69a4e7618cda7e4c9b3f4fc1eee237
 EBUILD vala-0.46.11.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
 EBUILD vala-0.46.12.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
 EBUILD vala-0.46.13.ebuild 1307 BLAKE2B 672b2c9bc89bc0f35198cdd7d8128828fb1e17c56185b1913dd951d16331ef2a7c05d345f05dcfb093001f8d1f2bad094c77fdef44ac4544cbf0b4808f589732 SHA512 f624413934e3e122510c3823ec56ba3a0be1975e76662b95dcfad7ecc98492fa7e862b564841d7e0f2db8be34f59517373ce6af87ab2ca5edd2271ab38f0600c
 EBUILD vala-0.46.7.ebuild 1303 BLAKE2B 9eab2887ca949595c7673fb81cd9066bacdcec0a3a3608924ae7d42ce38f8c60609a7ea641d48e379ed882908743d4dd3b62401ec1f97ba12992b5a8ff755efa SHA512 a7d042b51962a8e9d921d2dd04bc4dc6a3e6db4061c894aad3eb60bd142c655f1982f3277224ed85107ee1b20f8d407c2c2f836885f446c9392203cb08b103de
+EBUILD vala-0.48.11.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
 EBUILD vala-0.48.6.ebuild 1304 BLAKE2B d90e05ab7274beb9ce6e4893527ce84e9e57d1687a88f71e4a890609d42761bea1b59d718a6cc3c03c7782fa4f10edd0bdbb7b54b045c9e902dd8fd179f18187 SHA512 12e9eea51d27a9863f8697530d4c6b6d8ec352961474d1772823a55facf2cfad18c9d727fcafcd70ae3862e4d52f0315735d983c50bc5a52c8fb33b55c8d1dc8
 EBUILD vala-0.48.7.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
 EBUILD vala-0.48.8.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
 EBUILD vala-0.48.9.ebuild 1307 BLAKE2B 78e667e3afa87eff663ab77f86648495d49903db2d04a0bcfb58aecc434bd003a2d67a945ba9314c1982c1c1ff2ceb067a51625c4aae2f5526fbce6b18b3d7cd SHA512 7451023b805cd3531dc19654ee065ac774a5e56f50d90d42d72aece182d627e6c025716daf8296f4c64b037083e50ce3d55ea7b6e8941535343c23b5fba317df
-EBUILD vala-0.49.91.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
+EBUILD vala-0.50.1.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.40.24.ebuild b/dev-lang/vala/vala-0.40.24.ebuild
new file mode 100644
index 000000000000..661aaba47561
--- /dev/null
+++ b/dev-lang/vala/vala-0.40.24.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.40"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+PATCHES=(
+	# From master
+	"${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
+	# Add missing bits to make valadoc parallel installable
+	"${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
+)
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.48.11.ebuild b/dev-lang/vala/vala-0.48.11.ebuild
new file mode 100644
index 000000000000..1f7c05bd15c1
--- /dev/null
+++ b/dev-lang/vala/vala-0.48.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+	!<net-libs/libsoup-2.66.2[vala]
+" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
+# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.49.91.ebuild b/dev-lang/vala/vala-0.50.1.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.49.91.ebuild
rename to dev-lang/vala/vala-0.50.1.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cea4f9086695..e95acfe0d8fb 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 35844cca6181..2fb02003eaac 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,8 @@
 AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c
 DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
+DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
 EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
 EBUILD botan-2.15.0.ebuild 3091 BLAKE2B 2da5cfb879e65537227b0a6d524c30f7ec186a41a3e71797c4a57dd3b85013c10ddb60d8f5ddcadc02418978292be393d71b8fd2bd8521f13578c0234964768d SHA512 6f1bf731cb1a704cf6e40d5bd7fe36ebeb7a3690303f10dde754ffcb3eb0ab47dd2ca04df8d114662df5e35a55cd2292f5d061463d707c38052d3db6e6ecb1ec
+EBUILD botan-2.16.0.ebuild 3094 BLAKE2B 155d33762a02cb0737058a8985d17da9428fb521d1f82b66469457475efb94915a45beffbd3f76eb8fbf074ed9ce70e9663eae7f462dd89739e59d8d64566680 SHA512 8569fa59f78203c877a0ac4dfb46e7af807348df2f6ad91b433df32d33e4c76d0fd0e1f50b61a6641bffde39269ed0d7fd0afd4bc64a51084ca86b63060f1f86
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
new file mode 100644
index 000000000000..17cef74104b9
--- /dev/null
+++ b/dev-libs/botan/botan-2.16.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_P="Botan-${PV}"
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+
+RDEPEND="${DEPEND}"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling module(s): ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	local chostarch="${CHOST%%-*}"
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
+		chostarch="sparc32-v9"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) chostarch=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	# Don't install Python bindings automatically
+	# (do it manually later in the right place)
+	# https://bugs.gentoo.org/723096
+	local myargs=(
+		$(use_enable static-libs static-library)
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl openssl)
+		$(use_with zlib)
+		$(usex hppa --without-stack-protector '')
+		--cpu=${chostarch}
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--docdir=share/doc
+		--libdir=$(get_libdir)
+		--os=${myos}
+		--distribution-info="Gentoo ${PVR}"
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+		--no-install-python-module
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 0a3ed090ad71..fa183df87e2d 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,4 +1,5 @@
-DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
-EBUILD cloog-0.18.4.ebuild 1385 BLAKE2B cf3f72b4e6405fab7b1e376466ff9d6f4173c91310342731f6f728ee129fd624d481af98f28c7480559e4d893e2c4448dbfcec30ff97ba877cf02521341af8e7 SHA512 f6bf82c8d1a78e78aab1151f724cb3dbcb2b4a8ae178f27aed12d9df4ffde4e1f4646d0f3313e8f68c60b1d08633a6f6688ffb6bff0d57d45419c62db5a51621
-EBUILD cloog-9999.ebuild 1418 BLAKE2B 6669775c81ec4e0f23b7e5208dc29fbabc21b29d467c52a3e66ddd026ca0cfc9ea1bdd65fdde5abb7b0decef0f7863fdd62112ca265e4e9c028636224985385f SHA512 cedf51282c4e46ec1f62b920fe25bef47dc25e75fde881a9e35a9340ce055bd57bc2b7ef785486d8510e3130bf48f45b91d2e263f9b1b1559005f0bb4405e123
+AUX cloog-0.20.0-notex.patch 1326 BLAKE2B c0a6b0961b46523219bbe55ad962ff3b7cf3f335dfe9a3cb7d0c783573026647317c74e5fefd7dd7c7ef7f16a4a5de4c317fd82be692fd31f8c36e4538b448b6 SHA512 4c011cedb37d0ec2ba97bc0904721a463197fce789eff657d05372b31df639af54bb2830729c32b78f9c4095f97a994fa9b1118de17ded0f0a00f9d4bfb9714f
+DIST cloog-0.20.0.tar.gz 512106 BLAKE2B ac5ce6b7bb6ad586fc614c02b7c2e7c17322e49a775e21b50fb9862e487b4278a2b1024a7269830b55be1ae3c4b4c70f3d411d6c86052483bda124bc9bc07b20 SHA512 2663bbce49c42436681750968823dbee9b3cfbe4c086f5b340d11e51d8c8f138d1a2ccfd1691ae4395b94c082ccc49c0d7e5a1475b29192d13ab3c0148a8c347
+EBUILD cloog-0.20.0.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83
+EBUILD cloog-9999.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
deleted file mode 100644
index cc37d6f8a906..000000000000
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils ltprune multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		./get_submodules.sh
-		eautoreconf -i
-	else
-		# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-		# sed to avoid eautoreconf
-		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-	fi
-
-	# Make sure we always use the system isl.
-	rm -rf isl
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-gmp=system \
-		--with-isl=system \
-		--with-osl=no \
-		$(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-multilib_src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	emake -j1 check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/cloog/cloog-0.20.0.ebuild b/dev-libs/cloog/cloog-0.20.0.ebuild
new file mode 100644
index 000000000000..590340afe675
--- /dev/null
+++ b/dev-libs/cloog/cloog-0.20.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/periscop/cloog"
+else
+	SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
+	S="${WORKDIR}"/cloog-${P}
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/isl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
+
+DOCS=( README )
+
+src_prepare() {
+	default
+	AT_NO_RECURSIVE=yes eautoreconf -i
+	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+	# sed to avoid eautoreconf
+	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
+
+	# Make sure we always use the system isl.
+	rm -rf isl || die
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-gmp=system \
+		--with-isl=system \
+		--with-osl=no \
+		$(use_enable static-libs static)
+}
+
+# The default src_test() fails, so we'll just run these directly
+src_test() {
+	emake -j1 check
+}
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index c85bd46b030f..590340afe675 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -3,47 +3,47 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit autotools
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://repo.or.cz/cloog.git"
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/periscop/cloog"
 else
+	SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
+	S="${WORKDIR}"/cloog-${P}
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
 LICENSE="LGPL-2.1"
 SLOT="0/4"
 IUSE="static-libs"
 
-RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/isl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
 
 DOCS=( README )
 
 src_prepare() {
 	default
-
-	if [[ ${PV} == "9999" ]] ; then
-		./get_submodules.sh
-		eautoreconf -i
-	else
-		# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-		# sed to avoid eautoreconf
-		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-	fi
+	AT_NO_RECURSIVE=yes eautoreconf -i
+	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+	# sed to avoid eautoreconf
+	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
 
 	# Make sure we always use the system isl.
-	rm -rf isl
+	rm -rf isl || die
 }
 
-multilib_src_configure() {
+src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--with-gmp=system \
 		--with-isl=system \
@@ -52,12 +52,6 @@ multilib_src_configure() {
 }
 
 # The default src_test() fails, so we'll just run these directly
-multilib_src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+src_test() {
 	emake -j1 check
 }
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-}
diff --git a/dev-libs/cloog/files/cloog-0.20.0-notex.patch b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
new file mode 100644
index 000000000000..72c75a1820d4
--- /dev/null
+++ b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index 9edba30..fcca42f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -181,19 +181,6 @@ doc:
+ 	@echo "              *-----------------------------------------------*/"
+ 	doxygen ./autoconf/Doxyfile
+ 
+-#/*****************************************************************************
+-# *                                   Doc                                     *
+-# *****************************************************************************/
+-
+-if HAVE_TEXI2DVI
+-pdf_DATA = doc/cloog.pdf
+-dist_pdf_DATA = doc/cloog.pdf
+-doc/cloog.pdf: doc/cloog.texi doc/gitversion.texi
+-	$(TEXI2DVI) -I $(top_builddir)/doc --pdf $< -o $@
+-endif
+-
+-doc/gitversion.texi: @GIT_INDEX@
+-	echo '@set VERSION '`$(top_builddir)/genversion.sh`'' > $@
+ 
+ #/*****************************************************************************
+ # *                                   Tests                                    *
+diff --git a/configure.ac b/configure.ac
+index 88d346d..fec9b04 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,8 +72,6 @@ AC_CHECK_PROG(CD, cd)
+ dnl Configure needs an empty install.sh file with this, i HATE that...
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+-AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
+-AM_CONDITIONAL(HAVE_TEXI2DVI, test -n "$TEXI2DVI")
+ 
+ AX_CC_MAXOPT
+ AC_SUBST(CFLAGS_WARN)
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 9c87d00b3337..b747d6e3f20c 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -7,5 +7,5 @@ AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da
 DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
 DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
 EBUILD elfutils-0.180.ebuild 2422 BLAKE2B 40571def8e77f4d077623ad2b0c4a600b4bc70f14702facb099958a4260cc638e3ac19ecc73b043d531c3cee873fca1ad254e0c5d3bc3ba1e003edf27f786b6e SHA512 82614e2da77c393a36fa9a1a0a121743acc3db4f2d2c66521c214d3adf80c27f945403f86ac7861e87dc2b2c2ad7ac9c0a0d79662c4ce3ec29ed245f9845dc9e
-EBUILD elfutils-0.181.ebuild 2466 BLAKE2B cb089361fbb8e912888ac81f13e686161d3ccf06bae6d2705ed4e77ef38460290f5c8b389d5e9c0de298d65cfe72edc49d1c8380264bbf7572ac93296cc07333 SHA512 83d659750dc4a6d68471d7305a064802de231e69e1f8b75a662d382bf076427a19789623bd35b401d5fd7d8b4d11ced747315ec64c3a7583b850a14f2ba1cc05
+EBUILD elfutils-0.181.ebuild 2464 BLAKE2B e4054d51434c1022e4daf183b6fc242fcb73623953afc6e3cf9c3ae24d84087f1a646a43bb2152d2264acaf82b2a4a83dab7f895c1ce2678365b67b8ef97ddc1 SHA512 1eee78b00f97087792b0ac0a7b485e7b32ac4c022070bba0150e27616e8204d026b0a5249badca083eea2b33f8ad8d3f1588ce8fef6437b8e217ea783c611e70
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.181.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index 83603f15c7b3..d45cde13c1d4 100644
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 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="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index dcb5cf520c8a..99a917878215 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
 EBUILD gmime-2.6.23-r1.ebuild 1499 BLAKE2B 5fa080e22105dedbbb3c948aebdc41cdc8dfacfd42b858173d8044b7cf8f9dfce8f0271fbe27f5c48ba885d0502c64f723228373a39970f63d3a07ad740c01c2 SHA512 cbcd5ce244219de5e7ef7b604a0349df42005dd23a30f5c74ca501b77b035ef01e6d8d9528bb1112f982abd92ff505ea3457bc92fd0f8dc865f1432678f10e14
-EBUILD gmime-3.2.7.ebuild 1577 BLAKE2B 19966e1e5ed21a24da86b6f99715b20fc4d0c0819b0736cf026b4e1597ddc0576f8d135097244de9c747c7b649d0c021162606c07ba4e857f1ee6ca31db8aeaa SHA512 339593494d4287f84fe3d9c4e6d707a7775f3be9f572714468f74a3c24b0f5a930d6171443d13f8a5d518294e84d882de32c2f1133845051a6f705742c93fc21
+EBUILD gmime-3.2.7.ebuild 1576 BLAKE2B 9e225e514c113c70ab51afc18579ede3e9fb95b3d12016febffd426fdc421bad041537c27ac0cb935323c89237d653cb548a28116ca43af522ca4d864ccce848 SHA512 84c7558ec0e9cebb59fb96ca078c75b09de09c951a37686bf36fef64336bec4ccd610f2dd79f7ac0972957ba7522e72db880373544187d3d315eb095d7a4d3f5
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index 4d2f9bd3c3a5..3475f16747b9 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 7ff7c1324cb1..22fa99f93217 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-common-1.62.0.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021
-EBUILD gobject-introspection-common-1.64.1.ebuild 933 BLAKE2B 42bed1558e4aeff881f6a10774fb01479543975c19ff924b7b67612a3d50c1b59d8b154dbde9e74eaf0f19685183ae4fbd8d02009c1d9661c2424879d7f24d34 SHA512 69e82eeeb88c01b67444f73ca6c50f4851f254fa8131b7f2e85d45cbd2a08a3a91d62fdf3da59c967a4c3bb5fb069cc00650f79299e6b5b8c1ca5257f5ec0504
+EBUILD gobject-introspection-common-1.64.1.ebuild 932 BLAKE2B 69df8f5f5654bd74144aa6f6fb66624ee8094deaa24a35709199937476a5b844411ed18c16ecdfc96513c33ba05093582554d70694442bbbb663b2d09eb7942a SHA512 27bf96de2a5a3a8942ccbdebdf432ea2a52344b91a33e13e9b0d0fe15140f54db45f33973ea89f9f88ce77a24c39f06a09a44749564761b3bb0ee033fe48d66b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
index 160b9fff2b40..825d2adea5af 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 189db31194fc..b48e23293020 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054
-EBUILD gobject-introspection-1.64.1-r1.ebuild 2006 BLAKE2B e4342bc36794a030d166ce478e0ace1c1430aa8cb6507b7e7c55c0d5e114dacd4780df4e63af0fac0e4f806f5da00472090c814368b8dcf6c0cabee351ade871 SHA512 930c6f396f393c15f0e487d666a1826594d07db1008a7f389cb2a5073725f1ad5bd9d9d0a93b0218f4a41a934997e353f63c7741f8bf2b67e5c40a29ba2e1c4c
+EBUILD gobject-introspection-1.64.1-r1.ebuild 2005 BLAKE2B 39be2de025475bc2b8396af5019b53860ace78c24123c32a40c53a454dffb5c2b8dbb876e0bb3efb22ce14d4f261a89ae50588b264cf0eaf1be3c42b5fb53203 SHA512 d282d3f62b28d67417c75b3c60f829c6e79dfa23afba2c264802a77ec423e5a222a6f03be2a3c9412275cccf6ddbb617b5cca6e0e4d71bad7a072ea596c3aa1c
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index 4296dae81691..f8fe7c83e9a9 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
+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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index f1d8ad847b6a..135249f68dca 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,5 +1,8 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6b7385718898c4091b2bdf79f409fb34b1499b3af6ad903f524d6dbe96dcb90e404f6b2c33d03e4a2cd829bea18adb8 SHA512 ac6ddda51071918234cf3b79c4df094ec14c5eeecc35f4cabb2c5b6549089db704f7a69585a9bb21c95b72b203010f75c23252e80663381502663d76538f3820
+AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4349a16c89d060c6b77552c98c11c03048f3f9ebbc16c47de3d9428ea3fa83da8878d1404eea8d9cd62b6e561104ec81c155507fd75b SHA512 d7d24991d29712e697ee22716933ea0c78e743d1689a452dab13d0d7e1a865ba479c08b17d4a743d05880e22d652c97f7b5fb4250841f14040696fdbd1e86390
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
+DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
 EBUILD hiredis-0.14.1.ebuild 1899 BLAKE2B 36cf0eae92dc3cfed0979be6ce3b46d2d582fd944fcb40fa0e34cb855e9dd63acccd0cdb7b5af33147a8984a8d168e821283054ef07babbebaac7973d2040960 SHA512 1db9c4fd111f6763728fd0594e042e9e074c4f28294c0c3b724052b701dab642469c9e6a0480bee2ff56faacb6b5cb0cc0f1d91681842f4ff51937893f1f03a8
+EBUILD hiredis-1.0.0.ebuild 1864 BLAKE2B 9973ae49cd625c7e0b080357712a0a1fab7ec0278d9c36a7b47039419c0c6455f3a2ff77e613e3615714913283fcc410cd17acb2ed30c71b13795ccceeeace77 SHA512 729da3967f49e3228b5b7b5f0f88128a5526f52356525eb891fba03e9aace87fdf3b71f6c73bda6cf47a0a0ae218d3ea39aab6d67cff2e09323738c8b8f790ef
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/files/hiredis-1.0.0-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-1.0.0-disable-network-tests.patch
new file mode 100644
index 000000000000..c8a5822c8ef0
--- /dev/null
+++ b/dev-libs/hiredis/files/hiredis-1.0.0-disable-network-tests.patch
@@ -0,0 +1,53 @@
+diff --git a/test.c b/test.c
+index c0eeca7..5d70471 100644
+--- a/test.c
++++ b/test.c
+@@ -641,6 +641,7 @@ static void test_blocking_connection_errors(void) {
+     struct addrinfo *ai_tmp = NULL;
+ 
+     int rv = getaddrinfo(HIREDIS_BAD_DOMAIN, "6379", &hints, &ai_tmp);
++    #if 0
+     if (rv != 0) {
+         // Address does *not* exist
+         test("Returns error when host cannot be resolved: ");
+@@ -662,6 +663,7 @@ static void test_blocking_connection_errors(void) {
+         printf("Skipping NXDOMAIN test. Found evil ISP!\n");
+         freeaddrinfo(ai_tmp);
+     }
++    #endif
+ 
+ #ifndef _WIN32
+     test("Returns error when the port is not open: ");
+@@ -670,10 +672,12 @@ static void test_blocking_connection_errors(void) {
+         strcmp(c->errstr,"Connection refused") == 0);
+     redisFree(c);
+ 
++    #if 0
+     test("Returns error when the unix_sock socket path doesn't accept connections: ");
+     c = redisConnectUnix((char*)"/tmp/idontexist.sock");
+     test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
+     redisFree(c);
++    #endif
+ #endif
+ }
+ 
+diff --git a/test.c b/test.c
+index 1e8fce1..91625ca 100644
+--- a/test.c
++++ b/test.c
+@@ -1324,6 +1324,7 @@ int main(int argc, char **argv) {
+     test_blocking_connection_errors();
+     test_free_null();
+ 
++    #if 0
+     printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
+     cfg.type = CONN_TCP;
+     test_blocking_connection(cfg);
+@@ -1332,6 +1333,7 @@ int main(int argc, char **argv) {
+     test_invalid_timeout_errors(cfg);
+     test_append_formatted_commands(cfg);
+     if (throughput) test_throughput(cfg);
++    #endif
+ 
+     printf("\nTesting against Unix socket connection (%s): ", cfg.unix_sock.path);
+     if (test_unix_socket) {
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
new file mode 100644
index 000000000000..f65824d561b9
--- /dev/null
+++ b/dev-libs/hiredis/hiredis-1.0.0.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="Minimalistic C client library for the Redis database"
+HOMEPAGE="https://github.com/redis/hiredis"
+SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-db/redis )"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-1.0.0-disable-network-tests.patch"
+	)
+	default
+
+	# use GNU ld syntax on Solaris
+	sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die
+}
+
+_build() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBRARY_PATH="$(get_libdir)" \
+		DEBUG_FLAGS= \
+		OPTIMIZATION= \
+		"$@"
+}
+
+src_compile() {
+	# The static lib re-uses the same objects as the shared lib, so
+	# overhead is low w/creating it all the time.  It's also needed
+	# by the tests.
+	_build dynamic static hiredis.pc
+}
+
+src_test() {
+	local REDIS_PID="${T}"/hiredis.pid
+	local REDIS_SOCK="${T}"/hiredis.sock
+	local REDIS_PORT=56379
+	local REDIS_TEST_CONFIG="daemonize yes
+		pidfile ${REDIS_PID}
+		port ${REDIS_PORT}
+		bind 127.0.0.1
+		unixsocket //${REDIS_SOCK}"
+
+	_build hiredis-test
+
+	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
+	local ret=$?
+
+	kill "$(<"${REDIS_PID}")" || die
+	[ ${ret} != "0" ] && die "tests failed"
+}
+
+src_install() {
+	_build PREFIX="${ED}/usr" install
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	local DOCS=( CHANGELOG.md README.md )
+	use examples && DOCS+=( examples )
+	einstalldocs
+}
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 2bfb2445d1b1..81450c4f305d 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 890 BLAKE2B 909e4e4d6a7433be1c793b2578d2deeb4939d58dc78b655f392ba8dea998a4ec18d5a8579392f38681966445a6d05607dc982c5781b9588b6f777b31fdf5d774 SHA512 7d2ff259e7a4931348e807faaf2f1341bf97ac2547303bbbe1e874da89dd349e67c495ef778129aa3d5e54b2d24b48fc596cea65a362ede2d51e0774d88f1e64
+EBUILD jansson-2.13.1.ebuild 889 BLAKE2B 4a291ece01c4820ae413d675423d6591c8a8177a955c17c13f23bb5d2429d2395efdea6eb1613bce46f7b2584104734aea092f896df00ccc0efe8c392491dd45 SHA512 9d98f73be1db6e8d4492891047c1dd3ccd02a6dbe716d42baef049e04f1c7871a1bb62a38bdc90eb630b77db9b23ab858134a94b046df724f7c77d13f62081e2
 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 31290cb12d0e..00eb6d74fa27 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/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 1289eecee3de..5c72524882b2 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,13 +1,5 @@
-DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
-DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
-DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
-DIST libarcus-4.3.0.tar.gz 30540 BLAKE2B 58937764d9eec4a235bcc26aa85ab1f1418ae2c576c24759fee5155c7690a3a5feee1946cbae8e7836fd4eccdb0f673167aeda46c3dae124101cfb03510697e8 SHA512 b3893e3c422de85a6968443a6f26149e9dee9f15038c11c219693b9aa8d5174d908421e33c8e3ce4e4ecab8c5077da217b44a9ec6bb4b351ff67b7f2d42cc890
 DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093 SHA512 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250
 DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B 93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57 SHA512 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374
-EBUILD libarcus-3.4.1.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
-EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
-EBUILD libarcus-4.2.0.ebuild 1027 BLAKE2B 029645fa5e8c62b062f4ddbd2dbc0ecabcfc7d2833481024de1a0bd308a126c7529850049fc45f1e051f94a3b82d87869fa8e002b99a2df4794f1092ad9d3e09 SHA512 e3c7c30e082c55851acb1bd08d81f5c20261e09fdf5d88395e393b47ef0bbcc020e64b5183b79d12e62f7e519a19b3a1eb8a89c1ee7d986f94564240fdfcf60a
-EBUILD libarcus-4.3.0-r1.ebuild 1396 BLAKE2B ace6fed8c7a8b8db4829737c3b1b8d99a0d8ccb53688de4e029b39b7391b8a8771388f818eac032164c2efd74110a6bc987bc3d05dc81758eaabcbf24b5cff7b SHA512 9ec58979bafc8a7d4e5d0e334d0e12d3716fbffd4d2d9060cb52b9f061a06c676a95c0cafa8a344b22b8dcd855e3a41794d7669f4f037290d951acc6bcd0763a
 EBUILD libarcus-4.6.1.ebuild 1413 BLAKE2B b86d88ae8593f0604b1aed03d4463bec146eeb3ffe7b9387a3e4a40fa4aaaa02dfbfd2fcf75441012aeea630700e606a7f0d2fbb5e164e5100b4792795d94dd3 SHA512 d96d6c1dc57ae1364d6776ab0eadfa05633982fc43e0275cb9b488813b73157849c8b11b64d8eaf479dd26c137680a6873c11726fedd1348bcedab9bdaa8a3da
 EBUILD libarcus-4.7.0.ebuild 1296 BLAKE2B 46122f8ecd8ca43cdec1a249d01198b5e5d72257d69c42a11ab3fe3bc8b555e68cbbafe548f6cd30bb53573b5fd5379208cc90c37378393eef177618152aecfa SHA512 4575ab25cd24d8745f8a19ccee7fd0157e4fcdf7cf2ea74db4cf1e96cfd941436351117b6f3d50641b9cbbe669b7289628d0d3df4dfd9d1a0c5a54da0802a928
 MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49
diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild
deleted file mode 100644
index 120cd3820013..000000000000
--- a/dev-libs/libarcus/libarcus-3.4.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=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-3.6.0.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild
deleted file mode 100644
index 120cd3820013..000000000000
--- a/dev-libs/libarcus/libarcus-3.6.0.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
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild
deleted file mode 100644
index 0dbed3da3dd0..000000000000
--- a/dev-libs/libarcus/libarcus-4.2.0.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 )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
deleted file mode 100644
index f949a913e19b..000000000000
--- a/dev-libs/libarcus/libarcus-4.3.0-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=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index f53fda8a8225..1ef5a7422775 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,13 +1,5 @@
-DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
-DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
-DIST libcharon-4.2.0.tar.gz 145482 BLAKE2B 38f2efa1c19f81646e8b9692c57d71dda0a53fcc7c120e973f8faf55a0d92d4f8daa21e3debb873f4965f37c7e1cf0f5f1aaaebb9d078565d4fcb3edc57c9314 SHA512 4011cba788ed1789c0f364d605dfe2fc775a1f5e0ab9f0457454094f9cc3a400fdc7241692e88abae968e32e3c5394bef95cd3f77d2c68e4dbfc73ed27905b86
-DIST libcharon-4.3.0.tar.gz 145484 BLAKE2B cbb0edca76921c32b69809dfa8e07c07baedba90ff3c8f2ad5128cc1efa60e34f0f96c1936567825f7e876d298ef1ed4c10d0058f5b3697f87c412891654fabb SHA512 77ed18fbd11c008659a02419250647c9c977a57772d648f4af353c637224ba586006665e60e7fa2394b9f8cf53359a6211b936b5920ccc379754a743dbf2416f
 DIST libcharon-4.6.1.tar.gz 145486 BLAKE2B 43a3bcddf128da9305711757b707394b5b0c23da27e27c3615d521e0af79683b2a525fefa7ae877581b56dae4c1dd7036c3189c17f8f86c92492b46e129a22b3 SHA512 43f7606529a933067bcb82a16e95d76f713a7847535887968c2933131d3197ec6127376e10c7d5f1debd218fc902962329fe22d4f9229b434a804daff94122cc
 DIST libcharon-4.7.0.tar.gz 151221 BLAKE2B af9fe83e07303e1ff296b878c9745a329531a9957ad16a9b39b36e53f3f2275f850806b6d1a51638013c7148f3ee68b92489a67629a6026056a8c4ed3f2338b1 SHA512 690ce086bf8bba3eee2ce087d02ce00c23a7ac4079b0a2961c05cf75d461b0d5dee0c1f86ed769b50f1cd9ef83d8570a54f4fac628e0c19a5a593138292bc64c
-EBUILD libcharon-3.4.1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
-EBUILD libcharon-3.6.0-r1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
-EBUILD libcharon-4.2.0.ebuild 563 BLAKE2B 05d8210539c2251b38bc8314a70aceca0a5355b81c98e444c918d678b719efecceaacdf4e587b4c7da8a855fec1c288084958e155580148db58396d945abb90b SHA512 3fd4727350ed0160d2024e04f29dee04468f93490a81c9c6639bc018f3da8b68743107680222dfd0ecbd8324a7935c148061bf928fcd90a53d07a5760aee9bbd
-EBUILD libcharon-4.3.0.ebuild 783 BLAKE2B 116426e6f5089367803504a211916b3a72f97164ef43526e44e12ce51cc15d3876ecc519d643dc3ac5d37140dbcf7b57e6d8bc1d5d8214848ade6c6d35745c65 SHA512 0d3cdb427aa4f7e375baca1818fc5160cbccd45bfcb1dc03df7f873bef33ffc6584b5627fed840a059a432bf9048b2dad18b6763ec774d5f73e08ddec5f82fc5
 EBUILD libcharon-4.6.1.ebuild 879 BLAKE2B 16669d87920270c86b67935c836b5f6929218aeaaa8904301c7ccd439954b6a6efb26b0e06c8dc82531ceee401def4581da1b85ac6e08eb668aa2c1b984ef1a9 SHA512 4675e202878348756d337c789f08d610ebd44cfa74e29b2fc76eb424e81358a5fedce52995b304a365fd118ab61e1754583257b3de8ca875206dad0a3f2fb135
 EBUILD libcharon-4.7.0.ebuild 1780 BLAKE2B a042010ac83d21edf3a2c7f03d8bc16d0e876f2182cde29975b62b84dc2caa1b4779620424b51165db5e74352f5f23207cef135c24448b7daff40ea24c158302 SHA512 0fb259054a968f0d3bd3cb36dfe425389393328611a6cc20fbd2c5c46091e791d0108e44fab1a679df3c42df49bccab11867aee4a55a0cc0924bab039d34966a
 MISC metadata.xml 1098 BLAKE2B 6167df47c3514dfd94d9e8d9046167ec1af4b02a224428671f3a3a70471f4fa81805ceb18c9ef85fa687e74c8229c2ee0d1601c9203c329b89644ad300611b30 SHA512 a41c8b8bf3904242479f66cae5875fe9991e8ad1b7cd706393570218c223985c15cce9701b4c4191a6b5b2d15d72a45e3743bfe4c6d985ee6861483ffa24b358
diff --git a/dev-libs/libcharon/libcharon-3.4.1.ebuild b/dev-libs/libcharon/libcharon-3.4.1.ebuild
deleted file mode 100644
index ffdec8a73007..000000000000
--- a/dev-libs/libcharon/libcharon-3.4.1.ebuild
+++ /dev/null
@@ -1,24 +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 cmake-utils python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND=${PYTHON_DEPS}
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild b/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
deleted file mode 100644
index ffdec8a73007..000000000000
--- a/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,24 +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 cmake-utils python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND=${PYTHON_DEPS}
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-4.2.0.ebuild b/dev-libs/libcharon/libcharon-4.2.0.ebuild
deleted file mode 100644
index f216952ac7f4..000000000000
--- a/dev-libs/libcharon/libcharon-4.2.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
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-4.3.0.ebuild b/dev-libs/libcharon/libcharon-4.3.0.ebuild
deleted file mode 100644
index cf5a18458b03..000000000000
--- a/dev-libs/libcharon/libcharon-4.3.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
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# Use current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-
-	cmake_src_prepare
-}
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index da4aeb382362..14712ab1ad69 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -6,7 +6,7 @@ DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f96
 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-r1.ebuild 1483 BLAKE2B 8958077ab8b4c04f6b56cbbb19af258d838e0e973728187b37e827b0e96e36a2a131aac66be1524ac4774d8e384067d1a643f9f8874dbccc5f21c201e9927409 SHA512 d44804937d5fdde9198045f6bd2af607819ab9e078270b90955a589c9d4becfa92e497a911e8cccd6f71bfa038a7aa42bdc2eb65d8fe29ade6e84f1d599fe74e
+EBUILD libdnet-1.14-r1.ebuild 1478 BLAKE2B 73f98f86bf2e16784a3a42725b2fb2bb5cc5d4c0a79a86023bb05b7b51e42e26e09a8cb053cd3dfca14d32941bff331736027f78d6040e2dedcee1cfcbce675f SHA512 7ee6983b7d0b9e2789c91143ce7ae6adc844ac9864d78120b3e1ff4dd7659016c292d8e2bc165c53468391a37fdbdd4fadf369f964ea0324f184f64919d498a9
 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/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
index a709c3f636c7..6f45b8bc56cb 100644
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r1.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="
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index 90f614a66292..06e679c22311 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -3,5 +3,5 @@ AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158b
 DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31
 DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
 EBUILD libotf-0.9.13.ebuild 879 BLAKE2B a3719983bf6de5d6f16a404e833c1749cb42dcac97b3308e8081bec6fd61e637e24c2219e7ddf7e6e91cefab44ef8b72b79d023aa76239298ee4868e12e988f4 SHA512 415002854bcac560e0be0e43d73486e4d40617f541f4abb3968d9aeb48e25adbd659f7b2de7d0afb4bddabdf16e79640234eb9e13a07909d65a33d2b89189d57
-EBUILD libotf-0.9.16.ebuild 988 BLAKE2B 40ff19731a695de5bab26d5b45adbfd43986bd9c9d4262a6742bafcc373eb572e6dff90ac768f96fd9b968fcd8711633a992447f52c1cb9cd0149a14276bc498 SHA512 b07abc17e608c9b01baf07b4bfe60588067d9eb80846b03793283a913880bdf33ccedc729e75d10359aab525d1af495bc276e7f1570f759511e30a2b7e61bd6d
+EBUILD libotf-0.9.16.ebuild 980 BLAKE2B 9d80c500688e5ffdbdf88c663eb091eb93cb4cb62a1b84f78296f09cbfc6a1d67f74cec22e1914eea7d61fe18b58514c5bc7768ce6db8edc6c8d8078cbfcd3b8 SHA512 e7db42bfe22d204651b31639a8a9846d64d83335e67e29adee1c893098454aa3c00ee34f4752dbc07d09d8b343308da2c7f4292c6d6542a8b7018d7cde2515e1
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild
index 0ed54fe76641..36ea187d50d3 100644
--- a/dev-libs/libotf/libotf-0.9.16.ebuild
+++ b/dev-libs/libotf/libotf-0.9.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 6d71635d17f4..4f6f5dbf1a65 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -3,6 +3,6 @@ DIST librelp-1.6.0.tar.gz 522827 BLAKE2B 04e608a3afe4e6e0109cc9bf753de34e9486595
 DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5c0de0bc1ba81fcb6d6ed6529146140a32b05fcdb47330be2b573a9d84779ea519dd9cacf50d3b7710d523b808 SHA512 e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd
 DIST librelp-1.8.0.tar.gz 539467 BLAKE2B 3d1d396059955d2b83a21a42838b56c6a18cde296e6b7c4beb79ba9a8d222d7e5d738419b87b24ed05da553cb16fd827e8820c4c81c50d5a3770ad745efe3ef5 SHA512 aa3e02010cdd4587ff28987f00291708e752b2e2f5f37f5a5239bda6992f55cf428cf1b6e06847062be31844cfdda6b654bcbb9024dff943d140b405ec93c0f4
 EBUILD librelp-1.6.0.ebuild 1411 BLAKE2B 5922b8be561df56c0b687cb6ffc62a43fb907034174341ac6f0fbf60edaf802d4a540ea96472444ef6cbcf7750d2cd40a89be76735a1b5e7eaa5f625ef138909 SHA512 a353bd623a5eeb17a25ff4e45296526c03e92ba8879afeb9548d9431a27c40b04b61814b8fad61d25809a08a8517a388d75602516da75cd9057e10b44eb09334
-EBUILD librelp-1.7.0.ebuild 1467 BLAKE2B a0e025efd686ebd29eb56414ff3dd81d59fe740978894fce6f1f613ddbed8974cab6e2fd3ad21e5000777bf8d68b5b323dd30d21b6748901349633782a9e53fd SHA512 5040729cd51874c47c5849bba0dee6ed9b355d19f8276e3dbd7708cc3f9d7844ff325124517a36914a5e4c6d7fa7a2c016e18d2e88056aa8dd42d9de1c29cbc1
+EBUILD librelp-1.7.0.ebuild 1465 BLAKE2B 584dfe60ce28675defaa4306bb2715b81272fc836ecf5e8d18a9b1e84743ff75209ed46c4e6936945a03ea50136810fe5d0167deb259c05667ab45c1f7126355 SHA512 659dddec974fff09d68235cf9c5743d28923fa7a640e46cf59e1931031866f37526de6cb3c01edace712eedb96260a4a7dcfc8cdebfee453b60cb02762c9f451
 EBUILD librelp-1.8.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
index 4c52a175b781..94d158024d85 100644
--- a/dev-libs/librelp/librelp-1.7.0.ebuild
+++ b/dev-libs/librelp/librelp-1.7.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 hppa sparc ~x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 5b7821d02b84..8b1791fab200 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,17 +1,7 @@
-AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
-AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e2325904cad018409faecc0c6292e4e0e67f4655c7f94a36c756d1a647a62d4bb735b428fb0b8e5eca32dd8c523beabd29a52cc4dc888e7313a018 SHA512 c42965261c9aaad911a5d6f947ce139c4948375e7c74481682a4e6774a6368f335ca88024886e8640ec2a24fd382b1015ec35a75e873316a6b6dde171022f459
 AUX libsavitar-4.6.1-remove-packaged-pugixml.patch 2098 BLAKE2B 83bf2850e91dfca67288d6dfabd8cd70551a6e35d40d79621ec652e227a3831f675d2fa31ebf080ba6db1da023c4288ff141339b72c7f533e795e8c881bdd60b SHA512 159c669eeb7c324155bf06ad57574e7405fb29fa3f843fb64879ec9ec65a259a5cf5c5b3f4de90f4e06967c08abf002ee75b49c53d053200cadc881780115441
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
-DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
-DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
-DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
-DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
 DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2
 DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d
-EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
-EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
-EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6
-EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78
 EBUILD libsavitar-4.6.1.ebuild 1346 BLAKE2B ebee4d8131f57b10ef3901e18a4c7c5463d38047eee586eb5a834af5274ab42af091aedf658507ad57f4c67ab3049781e4068087a8d5bec45e3986674a2013f3 SHA512 a2a4472d6c54f88910ada2200a0ae8491469852406e10712b5dedd5cbad2ca36069867584643069cf34c63b6550f48129c317741bcc96807be907846af08e14c
 EBUILD libsavitar-4.7.0.ebuild 1753 BLAKE2B 83e91f17eacb614bdfc25f75bfc3bf25fb79e5bf332aa3246c161beaf0894feb9d8990ffd4a5361b7f1b1a359351d2321f2f90a31fe982a6f6bcd0f8ac5297b2 SHA512 313398f3ee57a42ed7e572d6befe1f5b7da862ae8b51b88cf95cbda95f00b8bdb10609f7c507fda8a8a7198c16138489cbc4b59166d578f6c8b35d1bc70ed493
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch
deleted file mode 100644
index 629e8edb51a2..000000000000
--- a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 91aa70c6320461ae65600dce954b5ffb905b7039 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 9 Apr 2018 12:36:35 -0400
-Subject: [PATCH] Do not vendor the pugixml library
-
-This prevents trying to co-install pugixml with existing system
-libraries, and also fixes the includes for pugixml.hpp to actually use
-the include path added by find_package/add_subdirectory instead of a
-hardcoded relative path.
----
- CMakeLists.txt             |     3 +-
- pugixml/CMakeLists.txt     |    80 -
- pugixml/src/pugiconfig.hpp |    74 -
- pugixml/src/pugixml.cpp    | 12622 -------------------------------------------
- pugixml/src/pugixml.hpp    |  1434 -----
- src/MeshData.cpp           |     7 +-
- src/Scene.cpp              |     2 +-
- src/SceneNode.cpp          |     3 +-
- src/ThreeMFParser.h        |     4 +-
- 9 files changed, 7 insertions(+), 14222 deletions(-)
- delete mode 100644 pugixml/CMakeLists.txt
- delete mode 100644 pugixml/src/pugiconfig.hpp
- delete mode 100644 pugixml/src/pugixml.cpp
- delete mode 100644 pugixml/src/pugixml.hpp
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5e991a7..1077c7f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,8 +7,7 @@ include(CMakePackageConfigHelpers)
- option(BUILD_PYTHON "Build " ON)
- option(BUILD_STATIC "Build as a static library" OFF)
- 
--
--add_subdirectory(pugixml)
-+find_package(pugixml REQUIRED)
- 
- if(BUILD_PYTHON)
-     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-diff --git a/src/MeshData.cpp b/src/MeshData.cpp
-index 03e5089..701122d 100644
---- a/src/MeshData.cpp
-+++ b/src/MeshData.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "MeshData.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- 
- using namespace Savitar;
-@@ -85,7 +85,7 @@ bytearray MeshData::getFlatVerticesAsBytes()
-         int v1 = faces.at(i).getV1();
-         int v2 = faces.at(i).getV2();
-         int v3 = faces.at(i).getV3();
--        
-+
-         // Add vertices for face 1
-         float x = vertices.at(v1).getX();
-         float y = vertices.at(v1).getY();
-@@ -188,6 +188,3 @@ std::vector< Vertex > MeshData::getVertices()
- {
-     return vertices;
- }
--
--
--
-diff --git a/src/Scene.cpp b/src/Scene.cpp
-index 4612f78..f218b71 100644
---- a/src/Scene.cpp
-+++ b/src/Scene.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "Scene.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- #include <string>
- using namespace Savitar;
-diff --git a/src/SceneNode.cpp b/src/SceneNode.cpp
-index 5c95b6f..c4782bc 100644
---- a/src/SceneNode.cpp
-+++ b/src/SceneNode.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- using namespace Savitar;
- 
-@@ -121,4 +121,3 @@ std::vector< SceneNode*> SceneNode::getAllChildren()
-     }
-     return all_children;
- }
--
-diff --git a/src/ThreeMFParser.h b/src/ThreeMFParser.h
-index 3394683..89da659 100644
---- a/src/ThreeMFParser.h
-+++ b/src/ThreeMFParser.h
-@@ -21,7 +21,7 @@
- 
- #include "SavitarExport.h"
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- 
- #include <string>
- namespace Savitar
-@@ -44,4 +44,4 @@ namespace Savitar
-         std::string sceneToString(Scene scene);
-     };
- }
--#endif
-\ No newline at end of file
-+#endif
diff --git a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch
deleted file mode 100644
index 1d5744aebf06..000000000000
--- a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt
---- libSavitar-4.2.0_old/CMakeLists.txt	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/CMakeLists.txt	2019-08-04 17:23:27.099395645 +0300
-@@ -15,7 +15,7 @@
-     find_package(Threads QUIET)
- endif()
- 
--add_subdirectory(pugixml)
-+find_package(pugixml REQUIRED)
- 
- if(BUILD_PYTHON)
-     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-diff -urN libSavitar-4.2.0_old/src/MeshData.cpp libSavitar-4.2.0/src/MeshData.cpp
---- libSavitar-4.2.0_old/src/MeshData.cpp	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/MeshData.cpp	2019-08-04 17:23:59.891051757 +0300
-@@ -17,7 +17,7 @@
-  */
- 
- #include "MeshData.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <cstring>
- #include <iostream>
- #include <stdexcept> //For std::runtime_error.
-diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp
---- libSavitar-4.2.0_old/src/Scene.cpp	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/Scene.cpp	2019-08-04 17:24:10.425265944 +0300
-@@ -17,7 +17,7 @@
-  */
- 
- #include "Scene.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- #include <string>
- using namespace Savitar;
-diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp libSavitar-4.2.0/src/SceneNode.cpp
---- libSavitar-4.2.0_old/src/SceneNode.cpp	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/SceneNode.cpp	2019-08-04 17:24:31.617696840 +0300
-@@ -17,7 +17,7 @@
-  */
- 
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- using namespace Savitar;
- 
-diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h libSavitar-4.2.0/src/ThreeMFParser.h
---- libSavitar-4.2.0_old/src/ThreeMFParser.h	2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/ThreeMFParser.h	2019-08-04 17:24:53.996151843 +0300
-@@ -21,7 +21,7 @@
- 
- #include "SavitarExport.h"
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- 
- #include <string>
- namespace Savitar
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
deleted file mode 100644
index 1ee1e2a50841..000000000000
--- a/dev-libs/libsavitar/libsavitar-3.4.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=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
deleted file mode 100644
index 1ee1e2a50841..000000000000
--- a/dev-libs/libsavitar/libsavitar-3.6.0.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
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
deleted file mode 100644
index 55f2b677a7ef..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.2.0.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 )
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
deleted file mode 100644
index 599349de9add..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.3.0-r1.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
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index 4b717808c3ab..2e1c3244039c 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,5 +1,3 @@
-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 606 BLAKE2B 1f2fa69254a8c5260af784c586fe1bb0d971e40b3162cc849c6a19b2feb134e663fce3fa1508cfaae73ff237d2a0d2b0eb775ee05e9a4a584b99919d9209888f SHA512 8f71b933980b9b2cd0865c2e1a37fbf873030916354a9c3ba83b3b8b04e6ea017b8ed7c8f4d4ce8ced70594f85de07688889a460b236cce7cf249864535772f6
+EBUILD libugpio-0.0.7.ebuild 605 BLAKE2B 0dfdf4c9244fd34a79ca8713c6503a16beef07851b5bd1f89bebcbd555793146dcd9edb20f1a24e9d7d9edb5465192c3a2a223c68eb5d8503d4850e973543f96 SHA512 daf3dedd5f830e04ed23f087f3e10f8c15ae77979abba53cd66206260b1bc51987ef4f41fd05dc2c40d46198b12b8e399f5cf1cfc5a3f6a46810b8814d58e936
 MISC metadata.xml 634 BLAKE2B 08bf2fa023595f3444926c7fca72af2d2a649ff2ac5b8372447f58113f4667ba4d85b46c0a872cef9ce76f4bd437b6c28a03e5c602c640de465a08ffe3718720 SHA512 946cb753670d9a2bb3c2cb4a35feb3e633e4d3d9a44584ff2e896544e11621aeb31630938d7e64d7d830e1e9fcf7edb4755dbda6fa502d624472e23227dd6d14
diff --git a/dev-libs/libugpio/libugpio-0.0.6.ebuild b/dev-libs/libugpio/libugpio-0.0.6.ebuild
deleted file mode 100644
index 21229f6f0191..000000000000
--- a/dev-libs/libugpio/libugpio-0.0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Lib for the use of linux kernel's sysfs gpio interface from C programs"
-HOMEPAGE="https://github.com/mhei/libugpio"
-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"
-
-CONFIG_CHECK="~CONFIG_GPIO_SYSFS"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libugpio/libugpio-0.0.7.ebuild b/dev-libs/libugpio/libugpio-0.0.7.ebuild
index debc4aeede03..f36b3a392322 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/mxml/Manifest b/dev-libs/mxml/Manifest
index 415f6d30e4f0..eecf2e797bc1 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,3 +1,5 @@
 DIST mxml-3.1.tar.gz 9267206 BLAKE2B d5cee24804978b474bf5b58c7a5932b50d7197a35e65da20c2517ce7db01d22027449348d6b15ddf0d186219ac81993055deaa4af9f48439273f8d2d74b27edd SHA512 8f8923b394093db5c471c52c17185916bc3c91f66c97de66919bfef2a09f271879a52f285e5fc4ded03484a3f83ba8fdb588d985b06e0c25ee001f1a80ffa586
+DIST mxml-3.2.tar.gz 9267930 BLAKE2B f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b SHA512 ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
 EBUILD mxml-3.1.ebuild 1402 BLAKE2B f97955c73de42b8fcb7675c84ec741b53ac46d3a6001e59c9bd8cdab0dbaf62474c338e43f748e7281f58e3edc52c1cd9a3833964af859e6194623e1f1d11894 SHA512 e9d28e45c82f56fe3e619cff830242350bcd1f689aecce628ac6fa6d111a16bed95bfd1a36f7de1abb32fa9f284c92fd1519421332ba5a5f0f2b341ed6f5ac03
+EBUILD mxml-3.2.ebuild 1413 BLAKE2B a54fc57037f95551723db71a2ada70c59d548a07b9770a8c12332ef1e0a0d0e7277c0b870223ecd4a4fc422a166246b3d2d730c7510e45413229763ba2488673 SHA512 e1c0d26833cd964bf82ee0991303e9d89b7370c048beaf6e854ae7c60fae3035aad037546edfb7cc9ed7031ab99b928a2e946f7d599c8843e779ae1b6a1ae023
 MISC metadata.xml 1379 BLAKE2B 9980eb701a13296c1f307c52427336ae892bd9905d86619bea889b3e4ad9fd3cd8dfbe23454c8a562a512628e83fd9cbd2100a2036e607bdf27585599481a9ec SHA512 d3a3de9e7b8ad130622bfa2e689bb1a944e1fb344961fda5ea39ad9fdba754e44bcb225a753834387e7bc490f25667a28422c79ef78ce4324ffb8706d0a71108
diff --git a/dev-libs/mxml/mxml-3.2.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
new file mode 100644
index 000000000000..7d0f5db4b8ab
--- /dev/null
+++ b/dev-libs/mxml/mxml-3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
+HOMEPAGE="
+	https://github.com/michaelrsweet/mxml
+	https://www.msweet.org/mxml/
+"
+SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Mini-XML"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs threads"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-Os -g//' -i configure.ac || die
+
+	# Don't run always tests
+	# Enable verbose compiling
+	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
+
+	# Build only static-libs, when requested by user, also build docs without static-libs in that case
+	if ! use static-libs; then
+		local mysedopts=(
+			-e '/^install:/s/install-libmxml.a//g'
+			-e '/^mxml.xml:/s/-static//g'
+			-e '/^mxml.epub:/s/-static//g'
+			-e '/^valgrind/s/-static//g'
+			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
+		)
+		sed "${mysedopts[@]}" -i Makefile.in || die
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		--with-docdir=/usr/share/doc/"${PF}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake testmxml
+}
+
+src_install() {
+	emake DSTROOT="${ED}" install
+}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index da7cf57064c6..cef833d39682 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -4,5 +4,5 @@ DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b0
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
 EBUILD nettle-3.4.1.ebuild 1790 BLAKE2B 556d39f46ddc010db277004599bc6ac59ee28192b05eb5cc46ca0c1d12349f9255a2548705000e6728a9c9739556665a52800ad5e8f2424c538f28124c0286ff SHA512 b3152d8e5f2569afad23587361ae302846d357f02956b9222642b1f9ae3267b52d6ef0ecf43ae53c0269c0c1cb677d9daf04127be88805417eb9d77eda230bc6
 EBUILD nettle-3.5.1-r1.ebuild 1751 BLAKE2B a6bb47e9a8df3e48403a94e801491b833072bdacbcb6ae84ee806854ea947424452ea16dfebabc5023a7ab7ab72678b8c704f4a003e0bcd420109dc2853cc7ba SHA512 b2f8977f00c4bfa283336978c3376b9fd30b2b19524f97d279ef2109bfdd2354610f6c7872f6c85a366cb198b9b05df66b345d5f8bf10399ac8f6d74a4b0e07a
-EBUILD nettle-3.6-r2.ebuild 1804 BLAKE2B 57cb20e6bf266faf4a3bdbb1dfc9526737fa866f86c54b95a9d35d16b1f3871173e6e3bda3b27cf53bd4253cb66d8fe413e16e2c790f8e844107b12b24d8868e SHA512 eb4cedbd9bd966100beb1fd0c8757729c8f7f14aa50b9b739b947630f4a0e86313e1553da639149d572c11b200d053d586bca83f4a213d68a3b53a87b744a5cc
+EBUILD nettle-3.6-r2.ebuild 1803 BLAKE2B 99529ed7e701fdcb8cb391f9d94f302eb96ec02ebf94bdd49795d92b18d13221a5524f3eab55e9ca4ebcc3b10bfeb7b092b6a183244d4e71feaf390ae23b5762 SHA512 06c5c7922cd14e0448b368884dd7847b1bdc69a4340a0899cace6a18d2887f1016ca4317e866eaa246aade350c874f964ca224ee56085942d94f9a44b08f96ff
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index d813e7d1c276..57e545cca866 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index c979bdfd9173..4bcbc9662d6e 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -14,7 +14,7 @@ DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f3
 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.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
-EBUILD protobuf-3.12.2.ebuild 3022 BLAKE2B e684db1bca60953d0939c6cda911171191d0f88ce2004b05a311be34e8cec1cca3545e4f5db4148f7c361c22b6ee24b4106f6709ebd3f2b825a793476f987078 SHA512 d8e2aa9241804b8a37081e3208ab5bb21cdc24919a22a86f42a44537390b4797b0f266dbe357f0e06109f69a85a08fa0f41a20b642c874ea4a09a31637ce36ec
+EBUILD protobuf-3.12.2.ebuild 3021 BLAKE2B aa95e12ed8b3c9e2afd27fee3751d61745a546c09933fd8b6041de5eb3da8c3667afe96324deba7c165fe7eaeb389e828489478c3dfb40c420ecf04f4fe11a75 SHA512 e504d11cb312f90ffb89a8cd82e4eed571c852ee1020684109b634cb49a21450bddb78a4f6f5b81bf754bfbb32d2d79067ed5aa34a63407c3e6c6cab28297725
 EBUILD protobuf-3.12.4.ebuild 3215 BLAKE2B 7a1325827898a6df817b6c5afecf49a5440825c76467497bd0fb89e4fc80b47b84730c384d2d7a9df02970286b4887a9280bf0ec2e3b6aa19de12e32316c2e2e SHA512 e68cf52f1f68c1d18c1b4bfcb537b95e843028f7b50ec5ba12da6fd6e5ff04da534f5ab71634c2159a30c272e6c5039e0f79df72f76e5e2ad325fc1fb5e17d69
 EBUILD protobuf-3.13.0.ebuild 3218 BLAKE2B c3a7389f4da1d9ff6f1628b504897ebc1e72ae02c33d713b7625cbd30ff74e4a5cc8e9823005e6d31512edbe4cb06ab09de35bd9d65b003003fc6437b2cbfab8 SHA512 6462ef2647c0ee9ea3d703afd7402aaf337ec3078fe5fe0219cd7f157101446f3df863063427863604fac0f61f8def5df61255020b095c8ab4aa7b09426f478f
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 19039df5ff9af194b335978f77c6ac9f8ed3387840e01c449e7661ce628129a1bc9de5938c453a08e21d9ce6e0d734430796aa911135a3c43c84557500da43ad SHA512 32744cffb2e57592c6475845bebc5dc221a8cd933a057699c2203205ed93828041e4b6242aa34c1e07d5f36cb24573a675ef0bbf9ab3fc56e341e3e31acbec47
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index 62a3532c5ce4..e62e90b99669 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/qrosspython/Manifest b/dev-libs/qrosspython/Manifest
deleted file mode 100644
index e8664dd1c03d..000000000000
--- a/dev-libs/qrosspython/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST qrosscore-0.3.2.tar.gz 3963954 BLAKE2B c7553fc1a0a2f4fd3f41ae0dd8bbb8c752c790c8a79b95b9b05ee38260e1ab9b2a337cc8fdf9b9aa513cc178f1155e0f3d7e5e0238aca50c9c970b981c189418 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16
-EBUILD qrosspython-0.3.2.ebuild 727 BLAKE2B 8479b23e37eab8b80cb3828db9071af09fa2f6aee1a0885228c0714d76dbb64f31a76ba5792dfe930b6fa74cdf424f91f523127d74b3ce6dd7bf23b2fc57658f SHA512 c14ee98c2bd8aa92d534562ffd76acb8d6b8af1d2bc5262183bcc7987e1020973a6f9bc0cb5858770bc7de84f0bdaff28c25ed9895ff8e0ba2d37c122a4154fc
-EBUILD qrosspython-9999.ebuild 660 BLAKE2B 2f5e0c20867df434608f9909d16cb2842a834b4644104d47a293eab56f53de0507856dbd51cbc4b0e5b5d6b9b6a1f98165dfb053950ec49923d58cdeec1848f0 SHA512 3fc9f3dbdc99aa9499a0be7d9177eaab96099158d2e40c56a82e02451b0f825999aa018c432e180f9e448eaa4f89928b2d44ef1d0e5344dcb7d324461601f450
-MISC metadata.xml 445 BLAKE2B 86fa57a651c7a35cb86b98da098010f90f7d7fd38575ccbc7cd5505784929284a63b048b96b5033c3f181054fef6ab059a8a8bae859f420ab7277e999af6e68d SHA512 81fe8b05cfb46a512e708751b67314b183f320de6b85a0781c2a1ca93cec51862380290d0e10a671c3716a5e20ca5087a21a4dcbe90ed20ddf7a61166c879f0c
diff --git a/dev-libs/qrosspython/metadata.xml b/dev-libs/qrosspython/metadata.xml
deleted file mode 100644
index 047a3d36582b..000000000000
--- a/dev-libs/qrosspython/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="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">0xd34df00d/Qross</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/qrosspython/qrosspython-0.3.2.ebuild b/dev-libs/qrosspython/qrosspython-0.3.2.ebuild
deleted file mode 100644
index dcd6a6097957..000000000000
--- a/dev-libs/qrosspython/qrosspython-0.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 cmake-utils
-
-DESCRIPTION="Python scripting backend for Qross"
-HOMEPAGE="https://github.com/0xd34df00d/Qross"
-SRC_URI="https://github.com/0xd34df00d/Qross/archive/${PV}.tar.gz -> qrosscore-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	~dev-libs/qrosscore-${PV}
-	dev-python/sip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/Qross-${PV}"
-CMAKE_USE_DIR="${S}/src/bindings/python/qrosspython"
-
-mycmakeargs=( -DUSE_QT5=ON )
diff --git a/dev-libs/qrosspython/qrosspython-9999.ebuild b/dev-libs/qrosspython/qrosspython-9999.ebuild
deleted file mode 100644
index c7d265051246..000000000000
--- a/dev-libs/qrosspython/qrosspython-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit git-r3 python-single-r1 cmake-utils
-
-EGIT_REPO_URI="https://github.com/0xd34df00d/Qross.git"
-
-DESCRIPTION="Python scripting backend for Qross"
-HOMEPAGE="https://github.com/0xd34df00d/Qross"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-	~dev-libs/qrosscore-${PV}
-	dev-python/sip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CMAKE_USE_DIR="${S}/src/bindings/python/qrosspython"
-
-mycmakeargs=( -DUSE_QT5=ON )
diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
new file mode 100644
index 000000000000..9b33af391bb4
--- /dev/null
+++ b/dev-libs/qtcompress/Manifest
@@ -0,0 +1,5 @@
+AUX qtcompress-0_p20180513-remove-zlib.patch 276 BLAKE2B f19e4e9a26f64ca0329ff99e64b7c7aa92997a903dc011547d79efef0c457b56b955c037ee73726238c75931dd25e13561a4744c8ca6cfa423bc076c2282881f SHA512 c99e0aacdf9e485f915d911b55e1824046345364c89e6a4fbc172687bd604b4eeff20bde22975ea5c65c103efda3c9af7e907b9599b6acdfad095fec9501670b
+AUX qtcompress-0_p20180513-test-include.patch 377 BLAKE2B a44f61f1321c7ec81404dff13b62c064c27553d74c0776cefa3e1c7b6031b11a16e6b5a57fb8f63398f3c1d3f1511b0ed0ce89b23e99007dfbebd42b504ef276 SHA512 1dffaccebaac8071467406273a7242949c197f95125b0ac8ad2678c63c24d7c7a018757ab7c91ef618feb4c16eacb839fb2ef27caaf362d7ba69af4e5e714105
+DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
+EBUILD qtcompress-0_p20180513.ebuild 1414 BLAKE2B e87f969311798a30f826f02b1dc49a97efc9ffd1af36ccef5c379a707e607dae53dbaaa57faa7845f9dc3be1901e004612ba17542306025ae4590d55ccec6249 SHA512 947759ad4f9778cf9cb9dbb4cdd7b666fd1f84cc462d032470f8af39556a640f866dd66e9ab3cb81d095ab463e0bb5f16835ed3c941af823f5c82118d6e5bbaf
+MISC metadata.xml 457 BLAKE2B 5d91d6540bde9264de584a447773b0e88770a674ac00d70e661c4be7d569335b9669c44dec78be1352fc1f3108372601d6610afa91146e69264ee84336a542cd SHA512 86d096ae7e165edb3052cab594e400c3d8af08bb4dd99e4cb8d44c4cf111304f5baaa476ccc0dc59dd66b0da9a7e9c559f4ce67c7dd1b68508df32da726452fe
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
new file mode 100644
index 000000000000..de89e7ac2ae4
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
@@ -0,0 +1,10 @@
+diff --git a/src/compress/compress.pro b/src/compress/compress.pro
+index 14ec502..3105a7f 100644
+--- a/src/compress/compress.pro
++++ b/src/compress/compress.pro
+@@ -11,5 +11,3 @@ HEADERS += \
+         qtcompressglobal.h
+ 
+ SOURCES += qzip.cpp
+-
+-include(../3rdparty/zlib.pri)
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
new file mode 100644
index 000000000000..cc7bec4ed1e1
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/unit/qzip/tst_qzip.cpp	2018-05-13 09:44:01.000000000 +0100
++++ b/tests/auto/unit/qzip/tst_qzip.cpp	2020-09-28 09:40:14.493025102 +0100
+@@ -41,8 +41,8 @@
+ 
+ #include <QtTest/QtTest>
+ #include <QDebug>
+-#include <QtCompress/qzipwriter.h>
+-#include <QtCompress/qzipreader.h>
++#include <qzipwriter.h>
++#include <qzipreader.h>
+ 
+ class tst_QZip : public QObject
+ {
diff --git a/dev-libs/qtcompress/metadata.xml b/dev-libs/qtcompress/metadata.xml
new file mode 100644
index 000000000000..a07b3622f7d5
--- /dev/null
+++ b/dev-libs/qtcompress/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nezticle/qtcompress</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
new file mode 100644
index 000000000000..1d0b1471137d
--- /dev/null
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs virtualx
+
+DESCRIPTION="A public API for QZip in an easy to use module"
+
+HOMEPAGE="https://github.com/nezticle/qtcompress"
+MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677"
+SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
+SLOT="0/5.11.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/qtcompress-${MY_COMMIT}"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-zlib.patch"
+	"${FILESDIR}/${P}-test-include.patch"
+)
+
+src_prepare() {
+	default
+	# qtcompress is bundling its own zlib, remove it
+	rm -r src/3rdparty/ || die
+}
+
+src_configure() {
+	local pkg_config="$(tc-getPKG_CONFIG)"
+	eqmake5 \
+		"INCLUDEPATH+=$("${pkg_config}" --cflags zlib)" \
+		"LIBS+=$("${pkg_config}" --libs zlib)"
+}
+
+src_test() {
+	cd tests/auto/unit || die
+	eqmake5 \
+		"INCLUDEPATH+=${S}/src/compress"
+	emake
+	virtx qzip/target_wrapper.sh qzip/tst_qzip
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm "${ED}/usr/$(get_libdir)/libQt5Compress.la" || die
+	insinto /usr/include/qt5/QtCompress
+	doins src/compress/{qzipreader.h,qzipwriter.h,qtcompressglobal.h}
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 9ce2473ca222..0648041095d1 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,7 +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
 DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
-EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 3c7ff48c692a05f300fa0fc93accc6f93cb1cf2a7328765fa5689ec0b0bc524cea24ef161fb130bb94da8f6a8b0b3950baf1d09d382e82a1044c3f4c684bf16b SHA512 f124f80e396d11ad5e8a3600ecf713a714efb22674bffb77ee8940e44008af7b78475ed1a013a150537906f66eb43774bab526d2a111d882b1cdb9ebf3030c44
-EBUILD serd-0.30.4.ebuild 1150 BLAKE2B d94b74a4d87dde7bd3fc8d358e32cb4da101340cf6aded9202404bc85f031459617203e614405b10872390b4b414aa90d73849037e3189b92071f6afe76c34c6 SHA512 8dfe1f68bed3cae7ec03c2b2616d5078da02288b48aa0831d979772bbfd250d6f022a090e613c763328880eea22f59c98f0f05cd03a02b1cf5f049da3052bcd3
+EBUILD serd-0.30.4.ebuild 1149 BLAKE2B 3c7ff48c692a05f300fa0fc93accc6f93cb1cf2a7328765fa5689ec0b0bc524cea24ef161fb130bb94da8f6a8b0b3950baf1d09d382e82a1044c3f4c684bf16b SHA512 f124f80e396d11ad5e8a3600ecf713a714efb22674bffb77ee8940e44008af7b78475ed1a013a150537906f66eb43774bab526d2a111d882b1cdb9ebf3030c44
 EBUILD serd-0.30.6.ebuild 1157 BLAKE2B 0d188fcb733bb707edb1345edb472f12478afa29cdc67af65bf903f38d79c805dbcc588ea6135c5a36ae0ab7697c749e1f1fa73e032353753aae8620daa20c32 SHA512 b4788ace68e1e44dc7a8ded2dd2530b7a058add9445ffc0aa1e3f72db9988e6f4eaaf41e87607c4d3f8d48d6c9c835294f7f9c656f7cd1d6fc76ee4c6eaf407b
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.2.ebuild b/dev-libs/serd/serd-0.30.2.ebuild
deleted file mode 100644
index b373d009b2aa..000000000000
--- a/dev-libs/serd/serd-0.30.2.ebuild
+++ /dev/null
@@ -1,53 +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,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-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=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-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/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
index 43920443958d..b373d009b2aa 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/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index f9fcc1fcd431..fc19b22b3e39 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -1,5 +1,5 @@
-AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
-AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
+AUX serdisplib-2.02-disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
+AUX serdisplib-2.02-use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
-EBUILD serdisplib-2.02.ebuild 2556 BLAKE2B abbbf9c3e17ce00f2208664e62427d4fb91361ae16a7bc9b76e7f0917c7bd17518d95bf8eff374f5548276eaa5d49c0f152b16b877b16528920b356997499713 SHA512 80627f7f272a80678374611457131de45e6e80ed48b4e5cd0851b4aee3f41627ece004686dc939eb6ece718724f505b2e8423c42e6307886fddf62dabcd8d0df
+EBUILD serdisplib-2.02-r1.ebuild 2818 BLAKE2B b5904152290d33ad81e895b8df0aaa88eb8c49d75c0690e76532e72ccbe56e7f4c7a034f8b11a08ced9333f8bccbcdeff3512687ab40b6716228df9d9e209e8a SHA512 1a7b8e956352a86ae8fa93c0a09a58a676c17b06201a12a2986fe6f41a920046dc11b9009a703e722d05bc71496147e0c864daf336bcaa31f9d1848cd0b781a5
 MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91
diff --git a/dev-libs/serdisplib/files/disable-static-build.patch b/dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
similarity index 100%
rename from dev-libs/serdisplib/files/disable-static-build.patch
rename to dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
diff --git a/dev-libs/serdisplib/files/use-destdir.patch b/dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
similarity index 100%
rename from dev-libs/serdisplib/files/use-destdir.patch
rename to dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
diff --git a/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
new file mode 100644
index 000000000000..4b15b752c72a
--- /dev/null
+++ b/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
+HOMEPAGE="http://serdisplib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="threads tools"
+
+# Define the list of valid lcd devices.
+IUSE_LCD_DEVICES=(
+	acoolsdcm ddusbt directgfx displaylink dpfax framebuffer glcd2usb
+	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544 remote
+	rs232 sed133x sed153x sed156x ssdoled stv8105 t6963 vssdcp
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'.
+# Also enable 'lcd_devices_directgfx' as default.
+IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
+IUSE="${IUSE/lcd_devices_directgfx/+lcd_devices_directgfx}"
+REQUIRED_USE+="
+	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
+	lcd_devices_framebuffer? ( threads )
+"
+
+# Specific drivers will need some features to be enabled
+RDEPEND="
+	media-libs/gd[jpeg,png,tiff]
+	lcd_devices_acoolsdcm? ( virtual/libusb:1 )
+	lcd_devices_directgfx? ( media-libs/libsdl )
+	lcd_devices_displaylink? ( x11-libs/libdlo )
+	lcd_devices_dpfax? ( virtual/libusb:1 )
+	lcd_devices_glcd2usb? ( virtual/libusb:1 )
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.02-use-destdir.patch"
+	"${FILESDIR}/${PN}-2.02-disable-static-build.patch"
+)
+
+src_prepare() {
+	default
+
+	# Fix Makefile, as it will fail, when USE="tools" is not set
+	if ! use tools; then
+		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
+	fi
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
+		if use lcd_devices_${lcd_device}; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local use_usb="--disable-libusb"
+	if use lcd_devices_acoolsdcm || use lcd_devices_dpfax || use lcd_devices_glcd2usb; then
+		use_usb="--enable-libusb"
+	fi
+
+	local myeconfargs=(
+		$(use_enable lcd_devices_directgfx libSDL)
+		$(use_enable lcd_devices_displaylink deprecated)
+		$(use_enable lcd_devices_displaylink libdlo)
+		$(use_enable lcd_devices_remote experimental)
+		$(use_enable lcd_devices_vssdcp experimental)
+		$(use_enable threads pthread)
+		$(use_enable tools)
+		${use_usb}
+		--disable-dynloading
+		--disable-statictools
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	udev_dorules 90-libserdisp.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/serdisplib/serdisplib-2.02.ebuild b/dev-libs/serdisplib/serdisplib-2.02.ebuild
deleted file mode 100644
index 9fb47346044d..000000000000
--- a/dev-libs/serdisplib/serdisplib-2.02.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
-
-inherit udev
-
-DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
-HOMEPAGE="http://serdisplib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="threads tools"
-
-# Define the list of valid lcd devices.
-IUSE_LCD_DEVICES=(
-	acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
-	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
-	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
-REQUIRED_USE+="
-	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
-	lcd_devices_framebuffer? ( threads )
-"
-
-# Specific drivers will need some features to be enabled
-RDEPEND="
-	media-libs/gd[jpeg,png,tiff]
-	lcd_devices_acoolsdcm? ( virtual/libusb:1 )
-	lcd_devices_directgfx? ( media-libs/libsdl )
-	lcd_devices_displaylink? ( x11-libs/libdlo )
-	lcd_devices_glcd2usb? ( virtual/libusb:1 )
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
-
-PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
-
-src_prepare() {
-	default
-
-	# Fix Makefile, as it will fail, when USE="tools" is not set
-	if ! use tools; then
-		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
-	fi
-
-	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
-	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
-		if use lcd_devices_${lcd_device}; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	local use_usb="--disable-libusb"
-	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
-		use_usb="--enable-libusb"
-	fi
-
-	local myeconfargs=(
-		$(use_enable lcd_devices_directgfx libSDL)
-		$(use_enable lcd_devices_displaylink deprecated)
-		$(use_enable lcd_devices_displaylink libdlo)
-		$(use_enable lcd_devices_remote experimental)
-		$(use_enable threads pthread)
-		$(use_enable tools)
-		${use_usb}
-		--disable-dynloading
-		--disable-statictools
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	udev_dorules 90-libserdisp.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 6ed1b1ea8999..19bec5b5cc40 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -5,6 +5,7 @@ DIST skalibs-2.6.4.0.tar.gz 226780 BLAKE2B 80d01d3696452b54d0247c8e523c059bb5ecd
 DIST skalibs-2.7.0.0.tar.gz 226543 BLAKE2B be626eed2f6b898c3b1cf6026f527730146a5c4175a76e43a2c9e0b22d7063de84378668e7e1c28c183b8ea9e187e92f86a1de06294ab708562f17ae7ae70b04 SHA512 33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1
 DIST skalibs-2.8.1.0.tar.gz 227598 BLAKE2B d5121299ee13cbc12908778e8fab2eb4b7ec3c6e3ed59fbda29a66e8e37b02dc3639c9f00628274f430f1c49ea1a2fb32459f2720686ee046016c7a6e200bc5c SHA512 d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86
 DIST skalibs-2.9.1.0.tar.gz 229792 BLAKE2B 82102e98ed87941b8653785a3a26b4dec01608d1b8d81b4caed4e0040d50c68ff31aa22f3f39382d8ecf6a646c50d0cdceaef3b79138222527348a85d5a2ae8f SHA512 a85a9397cdb10cbc42fd7ef4984a77802cf8c42abeabc8ff18de6d2e11ff97d950418aeda5f2dd66a04bd30004a5c4608e7cc6f4c7e23b91f56ef1ff59f4b6d5
+DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
 EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0a12d921b22f4c25947183b59eff0ae70dc74f350b2043a4ab1b864b763a65014542ed3a69b9ff34672adf465f78 SHA512 ff52e56a44d1ec81ed2e21fb0bfd91e42b88228f19b63b32b843b90b103cfb971e7f9e94086e2afbbe0ae37d64d24aa637a8f54ce7c720f12eed2efefeffc578
 EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
@@ -12,4 +13,5 @@ EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0
 EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
 EBUILD skalibs-2.8.1.0.ebuild 882 BLAKE2B f3740ba8bc67c046903273f9afb3694f8333df95da37fe23a1a52143a0b1b7ebd803d7f42c0adda6ed6271c5782fa4da54e17eb1647df86818c1712a43ff4938 SHA512 4d7e3cf600955a6e34b9c540c24d54ef6de8094cf6ec2082064f1802e7f2adb3d29dbff2cf67674ac743c526b0cdb614053f42c6e49f35f21c00b676a2678f05
 EBUILD skalibs-2.9.1.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
+EBUILD skalibs-2.9.3.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
new file mode 100644
index 000000000000..73dd8d6e2540
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--datadir=/etc \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--enable-clock \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index 8045824d4422..df362291022f 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -1,5 +1,5 @@
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
-EBUILD unittest++-2.0.0-r1.ebuild 991 BLAKE2B e2534d3950b1398a4aef2985159eb52f80f7e5f4bc253e972044fbd4ba9d3c9ec8486715712a27937069553e394b6510953a596bc41ee788061b3d203ea5e039 SHA512 d05fd6971bcd8f7816eee1d6b44b07a35dd392322c2d2ac0a2d439688b8cf7c0be13d50ab3d4b4bc354628ea959862fe99b2bd62c11ab79716bc1967f727ec46
+EBUILD unittest++-2.0.0-r1.ebuild 1082 BLAKE2B 1ba9a0302f39ea36d30d3566e2d185ece2f7a5cebcbf872338b25ebdd447ef4d4abe3f3fc9dfe37ec72cc50cdd14637363d301c338fb94dd44fcfcbd340ca2e6 SHA512 fa6347d4a4da9e656523f49c31f0e553a2c45203edad7a1a70bbfd0a9c9c5b7e08ad003b299d6174dae93925ad38863f1fd86d00b4b0706de060b6d0027dd7b7
 EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
index 0da36ef58d5e..4744a8bd5dd9 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
@@ -32,6 +32,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		# Don't build with -Werror: https://bugs.gentoo.org/747583
+		-DUTPP_AMPLIFY_WARNINGS=OFF
 		-DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test)
 	)
 	cmake_src_configure
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 20ec133c4d0c..8e7006b0487b 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,15 +1,17 @@
 DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
+DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
 DIST vala-0.48.8.tar.xz 3470240 BLAKE2B 753c1f4bd1619bb4671f74f3a82ed1919efd5bdfcbc7d2a0797303627214de1b9d22bb9bf4e5d8097773986bf95b27126061cf1ab862837d0ced49e0c860bb90 SHA512 a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.49.91.tar.xz 3506404 BLAKE2B 77a4e88d6718112747d6ceb0d70712db818fc175c2c4ef5755bc2c091469e32028d73467a7fda84748b3d29f87fc2f5af9601df8f59d96bcc55ce1bf01b25c7c SHA512 15817b032cce95a360b28a51509259b88e070a7ec6fd7a82452717ef98cd14b1fb60307a5bdd7f4b0627e59575a64c44fb41dad25327cecf8d9a56dbde01a820
+DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
 EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
+EBUILD vala-common-0.48.11.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.6.ebuild 646 BLAKE2B d84fa9f606e5cba0763ee49202cf16f5cd01520dad44abdc02e089fd9890f3179c4a02fc33782d028b5d3a405135491309f5823004905d394eaa04b4b656dfb0 SHA512 443f71539e0605f9cfceb6b5c76792590dd36e4e51465f1848954f676e69dda63943c8e5ed9be4a7519f1ba9500f05d43ea275209677a9b2eb53434e9c304725
 EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.9.ebuild 649 BLAKE2B 55d9b57e96bbbb1b815f516190f292b443baef2ba5e361d0cc69ce60fe178575d73a4dbf4f5f4ae2104bb6c18f9d04ba3a510087f0f21303cd03ab66ffa023e4 SHA512 5346d8890d211752b9dba04e300340b69961b2dbdc66e30a92db618d9b008f7a8664f6c276c78705ace54483c46abe9dcb5e0dabece9c8eb232c3bf784445ed7
-EBUILD vala-common-0.49.91.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.50.1.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.49.91.ebuild b/dev-libs/vala-common/vala-common-0.48.11.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.49.91.ebuild
rename to dev-libs/vala-common/vala-common-0.48.11.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.50.1.ebuild b/dev-libs/vala-common/vala-common-0.50.1.ebuild
new file mode 100644
index 000000000000..ee55cfcad100
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.50.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 670b7921b23f..4c9aaff71aba 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 6c93ba3fe290..a68ed09e55e6 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,4 +1,4 @@
 AUX clisp-2.49.92-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
 DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae066083592ccc71cf483b70b4d1be349cdee9d403e0a7ed1ad1c8c5d805c1dab51c1a5031d77469ff8c4dc52eb58913df SHA512 cc9412a7b3f21c85b040bf5e660380fafb3c2374765a1c00272feb3f7838f2161e27a5d6295cef9976f0c4522f10796cf5ee5447716090d1cc69ecfe598ef306
-EBUILD clisp-2.49.92.ebuild 4027 BLAKE2B 0b6a08ef5ffeb257bc27dc4006f4a72a83fccfb0edb7c5574d8090747e4d6544eb7ac62df8241d2683932559029140043de329b631c460e4cb49a7812c84faab SHA512 70b515dc55fc04905a8a0a4cf56c540fbb136c24b5485218b7e231d9bdbe10d789385d8ac436fcb30f7249937946bbc7c3b1f930413adb0a7dadb98ec7aceda7
+EBUILD clisp-2.49.92.ebuild 4030 BLAKE2B 0d5702ce765099160415df03193c7580d2cc19efa36a51a8365c79a3ee88e18b74e3816c069d264ea6f94f4cf1de519c565c50af61908397ec6c582d043d5798 SHA512 707ceabd4c5d319ded9c0c9c3a26ecc8286d06ab921a5381024c50b1470e5f00a4b64b8e4d404b6c05525b85dfb6963476d06b5ecbc42d32d129964d9d24996b
 MISC metadata.xml 1240 BLAKE2B f64eb9d2b7885fb771d0bd455c3551191ef85c17ef036686ae213058fa9ae3f87f8dab5dab7d6c89c66dbb883c89f0624009ced645a05f40463f22560802c581 SHA512 8b40fdaba20939478eb982350eed9480df6ac8a48885ceb4e04da9d4bfd77e3c8451f96d2745ce4baff5d4e16db5363d81a66c50a364046f921a47478d563b49
diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-2.49.92.ebuild
index bd144974f803..a9e1a4ab03b8 100644
--- a/dev-lisp/clisp/clisp-2.49.92.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-lisp/asdf-2.33-r3
 		 >=dev-libs/ffcall-1.10
 		 dbus? ( sys-apps/dbus )
 		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm )
+		 gdbm? ( sys-libs/gdbm:0= )
 		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
 		 postgres? ( >=dev-db/postgresql-8.0:* )
 		 readline? ( >=sys-libs/readline-7.0:0= )
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index fd6c6bd432f4..16e76d16822b 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
index df8ce5212b12..3dd5d6b26e60 100644
--- a/dev-lua/lua-bit32/Manifest
+++ b/dev-lua/lua-bit32/Manifest
@@ -1,3 +1,4 @@
+AUX lua-bit32-5.3.5-fix-32bit-conversion.patch 1773 BLAKE2B daa46659c3f31efd13dd0849000ae88e4eb6a3536ce990cb8c84b741b8921d946ef468e43163fddd27558d12a1e3356f486f9c535b41237a39c8b5e6ed4cfb70 SHA512 4a957cdf813f19149d9c23c9b52d9860a52210a1d620f151f390c65277bba79febec3ccb711b262e4847f0500a2780425cc6399dbe921944fa12c00b13a6f7fa
 DIST lua-compat53-0.9.tar.gz 53599 BLAKE2B 7d9efe0afb49c40a68b1d6c28f975080b3331e07d0aa788e0f1f77d5c360504a5cac9cca4e6074b2c64aa7ad8934df3fe2609ff8009db52b046b2f639b670213 SHA512 bec15b6e95cb5cc775785515eba1f094e453059a0ba1eefa433d328b823378b7f48d9c7a34080ad77478cffb2008bead93418f809793afa6021e6046562acc58
-EBUILD lua-bit32-5.3.5.ebuild 1270 BLAKE2B cc69c0d34763589c78e81b954b33bedad6f0d69dc030e3cf8b05b4bd72f540b9e0e6a517713af1359bda3a397e631e36595e3ff2fb50435863c628cb08a71089 SHA512 3d389fc5e116909208994e1fb9e81f25269509137bafa7de385a7054a058068c79840fa64b92747fa1da10afb56119bcf4b5a3cbca3198c14ab3107c29be36a3
+EBUILD lua-bit32-5.3.5-r1.ebuild 1359 BLAKE2B 67c305d70c58b869f3adac3dd3a3483efad54fc9dcf015d0018918a2c2d9316ee3b551790b6a28b84577825949c97669c98aeab0bd1e84f7ccead2ebb7327baf SHA512 15e585c4157de703744cde7741ea1739b55321cc4c2616225d5ca7d581f27da9004bdc663e310125323df1bc85508c5c6521c6036c2572676d9e9d2fe66b75b2
 MISC metadata.xml 485 BLAKE2B a5ec0e8d9920cd1f13a9211604ae5eb25db248a81b1d9469931347b77b1c64cee0fb34e54f93ab36611d35b79025966cc0ab13606084c81d1c7959a84bda045d SHA512 d79b3496b6d54ba350161c8b0aeee317df5053d334627ee9e8cdace0a699b4c9f1d9f58e5e391327baa89d4b6aa00fbccfda5b40718f7e852d4e21dc8da3cf27
diff --git a/dev-lua/lua-bit32/files/lua-bit32-5.3.5-fix-32bit-conversion.patch b/dev-lua/lua-bit32/files/lua-bit32-5.3.5-fix-32bit-conversion.patch
new file mode 100644
index 000000000000..36c0ef16cec5
--- /dev/null
+++ b/dev-lua/lua-bit32/files/lua-bit32-5.3.5-fix-32bit-conversion.patch
@@ -0,0 +1,51 @@
+From e245d3a18957e43ef902a59a72c8902e2e4435b9 Mon Sep 17 00:00:00 2001
+From: Philipp Janda <siffiejoe@gmx.net>
+Date: Sat, 10 Oct 2020 16:43:46 +0200
+Subject: [PATCH] Fix bit32 conversion issues for Lua 5.1 on 32 bit
+
+The default unsigned conversion procedure from upstream using
+`lua_Integer` as an intermediate value fails if `lua_Integer` has only
+32 bits (as is the case on 32 bit Lua 5.1). This fix uses a `lua_Number`
+(hopefully double) as intermediate value in those cases.
+---
+ lbitlib.c            | 14 ++++++++++++--
+ tests/test-bit32.lua |  1 +
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lbitlib.c b/lbitlib.c
+index 4786c0d..db2652a 100644
+--- a/lbitlib.c
++++ b/lbitlib.c
+@@ -19,8 +19,18 @@
+ #if defined(LUA_COMPAT_BITLIB)		/* { */
+ 
+ 
+-#define pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
+-#define checkunsigned(L,i)	((lua_Unsigned)luaL_checkinteger(L,i))
++#define pushunsigned(L,n)	(sizeof(lua_Integer) > 4 ? lua_pushinteger(L, (lua_Integer)(n)) : lua_pushnumber(L, (lua_Number)(n)))
++static lua_Unsigned checkunsigned(lua_State *L, int i) {
++  if (sizeof(lua_Integer) > 4)
++    return (lua_Unsigned)luaL_checkinteger(L, i);
++  else {
++    lua_Number d = luaL_checknumber(L, i);
++    if (d < 0)
++      d = (d + 1) + (~(lua_Unsigned)0);
++    luaL_argcheck(L, d >= 0 && d <= (~(lua_Unsigned)0), i, "value out of range");
++    return (lua_Unsigned)d;
++  }
++}
+ 
+ 
+ /* number of bits to consider in a number */
+diff --git a/tests/test-bit32.lua b/tests/test-bit32.lua
+index cc91e52..a408b7d 100755
+--- a/tests/test-bit32.lua
++++ b/tests/test-bit32.lua
+@@ -4,6 +4,7 @@ local bit32 = require("bit32")
+ 
+ 
+ assert(bit32.bnot(0) == 2^32-1)
++assert(bit32.bnot(-1) == 0)
+ assert(bit32.band(1, 3, 5) == 1)
+ assert(bit32.bor(1, 3, 5) == 7)
+ 
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r1.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r1.ebuild
new file mode 100644
index 000000000000..23fec675521b
--- /dev/null
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Weird upstream version descisions...
+# Result tarball may be reused for future lua-compat53 package
+LUA_COMPAT_PN="lua-compat-5.3"
+LUA_COMPAT_PV="0.9"
+
+DESCRIPTION="Backported Lua bit manipulation library"
+HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
+SRC_URI="https://github.com/keplerproject/${LUA_COMPAT_PN}/archive/v${LUA_COMPAT_PV}.tar.gz -> lua-compat53-${LUA_COMPAT_PV}.tar.gz"
+
+S="${WORKDIR}/${LUA_COMPAT_PN}-${LUA_COMPAT_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-lang/lua:0="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-fix-32bit-conversion.patch" )
+
+src_compile() {
+	# TODO maybe sometime there will be luarocks eclass...
+	compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -I/usr/include -c lbitlib.c -o lbitlib.o -DLUA_COMPAT_BITLIB -Ic-api"
+	einfo "${compile}"
+	eval "${compile}" || die
+
+	link="$(tc-getCC) -shared ${LDFLAGS} -o bit32.so lbitlib.o"
+	einfo "${link}"
+	eval "${link}" || die
+}
+
+src_test() {
+	LUA_CPATH=./?.so lua tests/test-bit32.lua || die
+}
+
+src_install() {
+	exeinto $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)
+	doexe bit32.so
+	dodoc README.md
+}
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
deleted file mode 100644
index 82297b4fe6ab..000000000000
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Backported Lua bit manipulation library"
-HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
-# Wierd upstream version descisions...
-# Result tarball may be reused for future lua-compat53 package
-LUA_COMPAT_V=0.9
-SRC_URI="https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_V}.tar.gz -> lua-compat53-${LUA_COMPAT_V}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-# Strictly for lua 5.1
-DEPEND="dev-lang/lua:0="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_V}"
-
-src_compile() {
-	# TODO maybe sometime there will be luarocks eclass...	
-	compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -I/usr/include -c lbitlib.c -o lbitlib.o -DLUA_COMPAT_BITLIB -Ic-api"
-	einfo "${compile}"
-	eval "${compile}" || die
-
-	link="$(tc-getCC) -shared ${LDFLAGS} -o bit32.so lbitlib.o"
-	einfo "${link}"
-	eval "${link}" || die
-}
-
-src_test() {
-	LUA_CPATH=./?.so lua tests/test-bit32.lua || die
-}
-
-src_install() {
-	exeinto $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)
-	doexe bit32.so
-	dodoc README.md
-}
diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
index 86812580eaaf..fb2a1cd3cdd3 100644
--- a/dev-lua/lua-zlib/Manifest
+++ b/dev-lua/lua-zlib/Manifest
@@ -1,5 +1,5 @@
 DIST lua-zlib-1.1.tar.gz 16572 BLAKE2B 22f504230616ea0df505c4aa00fc562c2cdfebd9f8e40b6000fdda883dbdefbeb10d22a2466386f1bfb314672aa17524420d047498346e5c980ebc6f5e175b41 SHA512 df9768efb96be8175b6afe1fd347b268565ecd93a71dd0f1f7ec1b710fd52bbd7a7c37a89f7c3d939906c7ac1578e9bdb542a0052673b6ac6eec7285d7f75633
 DIST lua-zlib-1.2.tar.gz 16612 BLAKE2B ca2ff51c97929fac0918de3902a175eda583da3ca415f9eff5e68a9c3ba0414827c3a96b968e9fcbccbe9612b1ade3fdc4498e50c4df53b0fa768912f428a287 SHA512 da13239089c1027b0bfb4ee463043b326ef5586206c5d76af8707736da3c03622b2fc38e732761a5b7a6422ad81a09557abc8548f37fef07ada0d4064eabfcf4
-EBUILD lua-zlib-1.1.ebuild 565 BLAKE2B ac5f7d1ea868cfd2215de7772f071c2b33d3712e0cefd7bcb4bd41e574fe00f72efedcb0843bbcc52f3438a6f4353f567bd6cfe594b1b2c8edaa3e82f01410cb SHA512 49d7e482d1d7af71df1a9866e2354d34ec82f70c94da387887261e4dac10e7cf4eed6b60c28a1cd700492644ed3a8519ff6fd941c3c66700928b7368385de0a4
-EBUILD lua-zlib-1.2.ebuild 666 BLAKE2B 17bd0666214ee732ec6200649b000d82a9ef1e127ff59715e35539a8d7f64584acee39cf4cdf9fe8ef063aa4f45a2cbb88156fe69e760f71879aa687e3bac08b SHA512 194d5b50aa7c2c0d27b3f2d56a0a73294bc42a7699ce83a4a5daa44145fb62a5fbcac64748cdd21bb506f2cc5aa2d9b8a5ad699874b34e0c60cb2af0e83a6167
-MISC metadata.xml 255 BLAKE2B 820ddc4489fc6c4387305bcbc3b339e13be1230d100ef3e9b45e13dfb850c2be0e7968c9cbe1c15e8cf3a4887b05637615ca11d3358aa032f96f23edfccc5cd1 SHA512 3d46a3689375944f47933ce2af13543ecb79bce6a7eaad56083931111c277da45d3b8120bdc1643985cd746be3ffc84017da34038adc05367e90601e883e5b92
+EBUILD lua-zlib-1.1.ebuild 564 BLAKE2B 203e756b59cf226829503f3b77623df1551dff4dc1dffe25cf0708a12f3ecd8ef9fc889c6479591f1062a2cd8bad80aae6f1b91c42045c89d81b76a249362e02 SHA512 9ead1ee1c59a4d97100e5aefe9c042fa38cba0f6273b78badce20226fca819be9e2c1906b6b30a449cc68383ea065477e787cc8968de97776d98ca2000a037e0
+EBUILD lua-zlib-1.2.ebuild 673 BLAKE2B e0450a8a3fa16da71d32fa257c71ec20b0b20ea2401103eadc880cd21a125358d442c3bce11570f76caf174c31ea6585542009bae0987a7fc9f75f220b3bf8cb SHA512 f19efe8394d62fdc63d2187f751c1e2c837b3eeba52ca56b1352bd0bbcff608c22eccde4d34929db5db27292a06346903c46eff4be6756f8c39e17e5e759648d
+MISC metadata.xml 333 BLAKE2B f65699b0f49f67c857500010ae12d8416cdb0c7d5817b445aed9de46000bc80186ff7d84f8eafcc63d760c8b95713561eedfe24f0500781866b294f9086ba30e SHA512 9473337d43cd76c8d23c3d4c300412f06b296afa9ca59d51b46d4c880a0b5e36523f71eb86a5d0bb856b29aa1cb936ee611aceae81a9d2d4907b9392e51b282b
diff --git a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
index b51a835e97de..d64c4c3e799e 100644
--- a/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,7 @@ SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
+KEYWORDS="amd64 arm ~arm64 x86"
 
 RDEPEND="dev-lang/lua:0
 	sys-libs/zlib"
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
index 243df12a0a09..7a46c1ab994b 100644
--- a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="dev-lang/lua:0
 	sys-libs/zlib"
diff --git a/dev-lua/lua-zlib/metadata.xml b/dev-lua/lua-zlib/metadata.xml
index b89e350d8c26..0cc17802b297 100644
--- a/dev-lua/lua-zlib/metadata.xml
+++ b/dev-lua/lua-zlib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">brimworks/lua-zlib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brimworks/lua-zlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 04841ca198ab..9cc9b37d4751 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,6 @@
-AUX 0.5-r2-Makefile.patch 1784 BLAKE2B 212e3b7c86b54d1633a95ed4a00c0c92cf10504c51ae173aa0fd1b77b98b44203f0b9b4994ef72b6879f281e3342806e84c85012bb522769b73f5292450a750b SHA512 c5399e53e124fbb6bf362bf6d1588c5afc02c12074e12a8208f5b7c97c155f4ba164118ab0ce2c93e8cf1195c12aa6c142a62cb9ba519a38ef0e01e080a8dce4
+AUX luadbi-0.5-makefile.patch 1784 BLAKE2B 212e3b7c86b54d1633a95ed4a00c0c92cf10504c51ae173aa0fd1b77b98b44203f0b9b4994ef72b6879f281e3342806e84c85012bb522769b73f5292450a750b SHA512 c5399e53e124fbb6bf362bf6d1588c5afc02c12074e12a8208f5b7c97c155f4ba164118ab0ce2c93e8cf1195c12aa6c142a62cb9ba519a38ef0e01e080a8dce4
+AUX luadbi-0.5-mysql-8.patch 2293 BLAKE2B c2280877353387593d9eeaef8a6d795293ff64472cfe60b306d6cebe55538c1ca4c2c1dd1fd0027b97181ca10045f5282ebc90f72acdb977950d7f97532f4d44 SHA512 7b111ed570858abd99e842aa7b5892166c2ed80c31561a784588c6552756794bc1334ba28484a5209c319d379be2e439dcd61dd3d4bd9c5cf12701f26d39c015
 DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
-EBUILD luadbi-0.5-r5.ebuild 1806 BLAKE2B 04e53cad9497933fd81bdefead2de4093e8f8f778f4376a8da511e1af6d01a172f6b3d4a7d795e5797d92b2e74fc6b218d3376e79776a8053637f12770e623e3 SHA512 46a3f2a28f6cdbce7d89effa1a887e007ef360c6d73fd08d17361e43afd8f9dd87f287e4d67e95c1c64adeb4757b7870b2820c48524a02f54bd74dec7b741b5b
-EBUILD luadbi-0.5-r6.ebuild 1861 BLAKE2B f2536d15d61eec9ee55acae0c96a691ed46709378a6707495103efc338b73e24adf5891d5ecbc8a5788dd2e5f4fd994b8cf8a34aa972726483ddc001d3e0bdf4 SHA512 708b87a4230980c455be08a03b3e088d0d6215881d7d0031a8cf8e9d69feb05ba6b9e4cfd5f59290075110c12ac03bb80ec8c78db9a16ae8935bed54de90f468
-MISC metadata.xml 243 BLAKE2B ae629fd9f0637db05afd7749d7ecef15baf33f716d7a6f9972214040c75ab219283b85aab2721d88ae59eb24040af1e744f75f39c6c0a1bd2ff5c007a24f5eb9 SHA512 05ffe6ac7acff76e9dced367bfd8033602835e047e01f8a87decf2a05ff548395e56f8a1d3be5388b61df32d6bb329725141a0d356efa2651a1c555d882219cc
+EBUILD luadbi-0.5-r5.ebuild 1847 BLAKE2B 455d29e1fd340b4ffacc1e3a74cd7f6d5abf18b875439f4e213af40686b2c2fd41a69ed3a54522bbf5fca59ca4e0c64779075133fa0976a755bc2866e996fa4a SHA512 f6b326d50c9bb5913cf8ffe1a2cf9ec5a3da129797c9fe61b4f06e6727018bf91ee11ae88b325d3a18d295e3e5d5e0b8c497e27938131beb3bfd12cf99023865
+EBUILD luadbi-0.5-r6.ebuild 1899 BLAKE2B 26f430fa6dd4e62ab52487ed6e9ee39a11d298aba3384f23ac40dc80587e1b88ae554012f8ca51c402c3d7620f7b8f8816f7dde0ba0fbe5f872f96d1b0eab2a3 SHA512 0c5c95b0862c83b364046c4e308c64c35df981112506b02c6fd259e2ad0898da9ac27c3dc941a004de1209429fe1758ab56b69feb1d1e77a3f670acc8c72d41e
+MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/files/0.5-r2-Makefile.patch b/dev-lua/luadbi/files/luadbi-0.5-makefile.patch
similarity index 100%
rename from dev-lua/luadbi/files/0.5-r2-Makefile.patch
rename to dev-lua/luadbi/files/luadbi-0.5-makefile.patch
diff --git a/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch b/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
new file mode 100644
index 000000000000..a75c9d46d07d
--- /dev/null
+++ b/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
@@ -0,0 +1,78 @@
+--- a/dbd/mysql/statement.c	2020-03-09 15:55:43.212010825 +0100
++++ b/dbd/mysql/statement.c	2020-03-09 15:57:37.703464570 +0100
+@@ -200,7 +200,10 @@
+ 	switch(type) {
+ 	    case LUA_TNIL:
+ 		bind[i].buffer_type = MYSQL_TYPE_NULL;
++#if MYSQL_VERSION_ID >= 80000
++#else
+ 		bind[i].is_null = (my_bool*)1;
++#endif
+ 		break;
+ 
+ 	    case LUA_TBOOLEAN:
+@@ -209,7 +213,11 @@
+ 		*boolean = lua_toboolean(L, p);
+ 
+ 		bind[i].buffer_type = MYSQL_TYPE_LONG;
+-		bind[i].is_null = (my_bool*)0;
++#if MYSQL_VERSION_ID >= 80000
++                bind[i].is_null = (bool*) 0;
++#else
++                bind[i].is_null = (my_bool*)0;
++#endif
+ 		bind[i].buffer = (char *)boolean;
+ 		bind[i].length = 0;
+ 		break;
+@@ -224,7 +232,11 @@
+ 		*num = lua_tonumber(L, p);
+ 
+ 		bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
+-		bind[i].is_null = (my_bool*)0;
++#if MYSQL_VERSION_ID >= 80000
++                bind[i].is_null = (bool*) 0;
++#else
++                bind[i].is_null = (my_bool*)0;
++#endif
+ 		bind[i].buffer = (char *)num;
+ 		bind[i].length = 0;
+ 		break;
+@@ -235,7 +247,11 @@
+ 		str = lua_tolstring(L, p, str_len);
+ 
+ 		bind[i].buffer_type = MYSQL_TYPE_STRING;
+-		bind[i].is_null = (my_bool*)0;
++#if MYSQL_VERSION_ID >= 80000
++                bind[i].is_null = (bool*) 0;
++#else
++                bind[i].is_null = (my_bool*)0;
++#endif
+ 		bind[i].buffer = (char *)str;
+ 		bind[i].length = str_len;
+ 		break;
+@@ -385,7 +385,7 @@
+ 
+ 		    if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) {
+ 			char str[20];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second);
+ 
+@@ -396,7 +396,7 @@
+ 			}
+ 		    } else if (fields[i].type == MYSQL_TYPE_TIME) {
+ 			char str[9];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second);
+ 
+@@ -407,7 +407,7 @@
+ 			}
+ 		    } else if (fields[i].type == MYSQL_TYPE_DATE) {
+ 			char str[20];
+-			struct st_mysql_time *t = bind[i].buffer;
++			MYSQL_TIME *t = bind[i].buffer;
+ 
+ 			snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day);
diff --git a/dev-lua/luadbi/luadbi-0.5-r5.ebuild b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
index e1cdb2f76572..f2dd0d9452f3 100644
--- a/dev-lua/luadbi/luadbi-0.5-r5.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-r2-Makefile.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-mysql-8.patch
 	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" \
 		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" \
 		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" \
diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
index 2f194b5ab36c..6a338b541a1e 100644
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r6.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
@@ -11,7 +11,7 @@ SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
@@ -24,7 +24,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
-PATCHES=( "${FILESDIR}"/${PV}-r2-Makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-mysql-8.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-lua/luadbi/metadata.xml b/dev-lua/luadbi/metadata.xml
index 2ff9f66c8898..1dbf53904c3d 100644
--- a/dev-lua/luadbi/metadata.xml
+++ b/dev-lua/luadbi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="google-code">luadbi</remote-id>
+		<remote-id type="github">mwild1/luadbi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest
index 9ab21b42da42..29637aafb33e 100644
--- a/dev-lua/luaevent/Manifest
+++ b/dev-lua/luaevent/Manifest
@@ -1,5 +1,5 @@
 DIST luaevent-0.4.4.tar.gz 22249 BLAKE2B f4375e02a4a0e2a4517e559b6625188bc0b577f5dc2ce843ba2d9b8811f2953a3255ebf7ee28313731ecc5c7c4877ef78c119a4633361eea2f915426b6a92a2e SHA512 2f2d669e645c3186d5060f2a5358fed4756087e173bd94431cf74b158fc25ff8de4640f1a832704d1431a7b10797385a449ae79ce049e98edc414260cd4c85ea
 DIST luaevent-0.4.6.tar.gz 22599 BLAKE2B 2f70ef105ce43d6b48e69bcc896e20a64ca49e124ad979f5191606d10bb61de1664782016b55cc9f2bc32a704d8f0b4d664eebd8176905f72f9a4e3d1e8b0fdd SHA512 21e222d5bba75fd2e623a8abf20fc3cd38505bf7d3fe94d8781ed626556c398a8501775eb423f0567918cc75f2d846026d4aa559ac5129eca8261f0c73427913
-EBUILD luaevent-0.4.4.ebuild 1157 BLAKE2B 077a975277825bbc6400237af83a68c9777864bf9456e93da6e00b83b7889ebf0c3a1b841248f16b4377f3bda2483155415976700df96e98c2cb8fa1a2e9fd62 SHA512 339215026520ec8cfae8df034325e5d2cab704072a2c0dd9762ceedc4ca63e579bbb7949389f67c3cd0cf4e21c66c330e09e30ab6c3beb92ad29e8f4c6ac47b6
-EBUILD luaevent-0.4.6.ebuild 1172 BLAKE2B 7254dcd5d2dd1cdc0ae635424d565d9d62f4738720c9d7045b0830766dd48ff402be9cf4081ca84f5ed00c3a736fddaba2e7cba49da4a24cc8fb638e5355270d SHA512 fbce3c232909e12bcc0220e87ff58d89de2fd650b422de594ff2188265f4b94f4cb99c3c83ee9680ab0f8fe8d0ebf305216ada81c99ea94722fb53cf0afc30d3
-MISC metadata.xml 309 BLAKE2B d4292352166a4f69bad73e53a00cc500fdac6b05c4b8deecc774794b6fa7ba6a08398e3a26752d8ceda1a28d4003b5d9b62e457f3f35ef2d424dde4dde0faadd SHA512 29785300a4f0b5f4afdab52d0186698f47afb36b5b94943ad2034ba7a5b34020cd1b8d3e225d4255cc0b1ab380fb19c8f70bf23da3b31eedb88daf6d9e53e0d6
+EBUILD luaevent-0.4.4.ebuild 1156 BLAKE2B 015d8a84362a3579eae6cc5097464373d51f72e2aa7847ad2c7b60d8ed2bdab2ab8621ff4797fafe7214442775a34f4d89cbec85270824f41ccd4fe4fd244701 SHA512 7a7b99d8809b91c8a61afb22906bae5660e51ba945f2b8ef3860b97dff83933585a7e292517d553276c1c3fc3190d6eea8fd0267e6a98d3b394d8bae97fe0d00
+EBUILD luaevent-0.4.6.ebuild 1171 BLAKE2B 87ea0f602d89cfa6fd4d88c436beb1df7893e3c414b94113c4a5b8f15da8d995cbaffbcfac279c2fa1142f348c3e62858fc0b7389d42c48ffa4804b7969464bb SHA512 32375b015f6db86ffa83ab3c04be86e17b249c531108d9864e74f7bb1630418f6096e5bb05ee3d4e43ec9ddcf966a9722c492458f9393c1d44f73df94ea8e501
+MISC metadata.xml 412 BLAKE2B d38a312a6841ec1c241efdfd7582fc6059578291015bbf4a90fa669864d2e831099c24dd2bd46c73d946613a5440ad52d4cdf1bd87ca468e25bbb259e1495aa4 SHA512 63aafaff1b4115b3f1f530563e417dd6c6cfad2a62e8be3deaeb1b49a2154efc9756073636c2efa11d534c3019c33bdda0cf9c420f6d0713790f26206ccb2d19
diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild
index fc40540709ab..37fbd4df485a 100644
--- a/dev-lua/luaevent/luaevent-0.4.4.ebuild
+++ b/dev-lua/luaevent/luaevent-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,8 +11,7 @@ SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="dev-lang/lua:0
 	dev-libs/libevent:0="
diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild
index e814d6b25c58..ad3ee225f79b 100644
--- a/dev-lua/luaevent/luaevent-0.4.6.ebuild
+++ b/dev-lua/luaevent/luaevent-0.4.6.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"
@@ -11,8 +11,7 @@ SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="dev-lang/lua:0
 	dev-libs/libevent:0="
diff --git a/dev-lua/luaevent/metadata.xml b/dev-lua/luaevent/metadata.xml
index 32ed283086a3..41cbd4dc71b8 100644
--- a/dev-lua/luaevent/metadata.xml
+++ b/dev-lua/luaevent/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">harningt/luaevent</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">harningt/luaevent</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index f8cca5134c03..9c3043fa0846 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,7 +1,10 @@
 AUX luaexpat-1.3.3_getcurrentbytecount.patch 945 BLAKE2B 311210432c90d2d67ba0f44f3d2f4c811b9603e22d1b3c60e7e5d9bdc4e4cd08f133585edb9f5fc97b5b6b8e14c06f81fa15cc4fd099b761effa5cee70cc7f06 SHA512 4664a52bb964e1556f7b47602728f0bec2a1f909b240c3e46775e8879cdf75e7bd764c83ba464aa12838678fe9fc08bb91c8ef41f6460623468c259a33a24e9b
-AUX luaexpat-1.3.3_makefile.patch 410 BLAKE2B 45b0c24795c679fc69c5cbf9683aa2a47da5ef1f874acb0336df014ef319566a7149c51253f843e5113263212ea585b517095423c77f3bf0580f31acee140b09 SHA512 c34f4e68d3b72b2dc5f7f09ed2f3128ec37becfbc6fa0d72d35be3374f4fc92a4159fa279d6a101a3671c05a4a1f3e248756ba1a0505f900bbece3290376c577
+AUX luaexpat-1.3.3_makefile.patch 621 BLAKE2B 8c04a2324668ab13e2279df8754c64d5ff9a3645eb430b56889fb26410b49a5dd20878c5c95406629bfbf11de080ae0a7761e0d9bfbb0cf032b2f14fa36ea25d SHA512 9dc6026cd12a3aa7513d7eb52f228ac32e1d71b018f50555e19dbd301e466def1c2afef40feedf060332d979b3007855a908617c4061832fc9895bec006a0efc
+AUX luaexpat-1.3.3_restore_functionality.patch 3944 BLAKE2B d6e502f44039110cfc8eabc3a83405b0c72522ec43628af16f72d21d0976d617e7280818259258c15cb8582f917e5fdadd81bc2ce35c052a951fec0ccd200e5c SHA512 f6e56fc84550af781c40d8bd004c3f840021a730cccd988f5547b83e2ccc89072ebd09f49631442b25fac8a81a4d7e7f5d4163d7f62dedc876356dee94d96b41
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
 DIST luaexpat-1.3.3.tar.gz 32099 BLAKE2B 7fdec97932db4f7d582f651b9a7215f2ef0f6e23022d4013f37e62a0ba3e257e44211266ee4cbbc84d190bf9828e0e028ab3eecf9fc6e619ae3175fd5fe23ddb SHA512 aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63
-EBUILD luaexpat-1.3.0-r1.ebuild 1330 BLAKE2B 590fc39478e83833ecd56830181a630e19da3bbfa785b724c27b41e0716f13f4200cc8198418485740b4e6a2aeedf45c3f7cfda14edcf8408f5662a227548999 SHA512 7aef89e153094caf0d3ed99ac2a226b9f00f6f252842dfdb6f4a5e3cf3b72b47f2d5de95770eb5cfe2558b9c9b1ee9fc5357d6b9071a1656c39775d6217905fd
+EBUILD luaexpat-1.3.0-r1.ebuild 1332 BLAKE2B cfb065300c13a0d17bf67369c0473fd5a571c59057cb6c72888a6046a799af764b4c5152fa411b27a25842b81b7891b846e57a58917596e9a8d051e2a79789b7 SHA512 3efe63f60c4ef30a7dbbd8f3f551f8385f592778c0c0c95310dedef0bbb67b67d0e33800e41dfc1b3be511b734b1c0d9452227d6dda11e83471de7d0e79b3acf
+EBUILD luaexpat-1.3.0-r2.ebuild 1181 BLAKE2B d4b741c6115660df2bc2312dcec3c54df8313d1f30e80b768abb64778a2da5943eb5650065fc59ba9d8244b61fbdb44112ac947da5766734cf83a2cc46e2de71 SHA512 efabf77df9bcd91737acb1095e2aee4486ee797ff1ed6322e492777f10850abf9072f4492ee1ba5b07960fc89146ffe6dc048115d20ec5388ddb52ff9dfe99f4
 EBUILD luaexpat-1.3.3-r1.ebuild 1217 BLAKE2B 8ee4ea788766f11f703207fee34a1c74fb90362890bbb983f005f29c1e84d3f8b03c8ad106e039a202b442c2ec19a3bde8510be8614483c472f354d4a9d0f73c SHA512 4aca96b4ce8b31db238bd97b926ce47bee31d40d2d604f1ecaa265a1c0cf84b06a21d725f5578698922d0699bd07bab24f101442e80a34df4c6cb14fb4db739a
+EBUILD luaexpat-1.3.3-r2.ebuild 1265 BLAKE2B 3ddd7ae3f5a75fac07bbb465dc1477c59f6ac950b3cd3d2ef1171444122788d59b4e0e2d865590b52e4e6ecbcbbd0be67285b4137de3a41e3039344c1a6d764f SHA512 681d5ee8233e60ae96d84f6315c9886080dd211bd55c8e3ceb89b679221c0d3bc8871bf96ee8b91c24fa12feecca6f213e6e0f91de94b9b102e4308130ee208c
 MISC metadata.xml 480 BLAKE2B 2eaf94b50215f43616af6cca2a5102ea4c52ba629f54e6b32b1b9bc4a4edf601619902de285129cab26cf97dd5f847c2dad80d36d896b03a8b5e83d3cda9a4f3 SHA512 33052ffee5b4e34879461358cdd6fd553d093e03d53e13e61186ad45d5c8d1d9171c7c8d461a8d7ab40457458cdac1f7794b2c450423764a19306699a3fad0c3
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
index 95de7be60690..a780dddea838 100644
--- a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/makefile b/makefile
-index 1a5a145..df09239 100644
+index 1a5a145..50912f0 100644
 --- a/makefile
 +++ b/makefile
 @@ -45,7 +45,7 @@ OBJS= src/lxplib.o
@@ -11,3 +11,11 @@ index 1a5a145..df09239 100644
  
  install:
  	mkdir -p $(LUA_LIBDIR)
+@@ -53,6 +53,7 @@ install:
+ 	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+ 	mkdir -p $(LUA_DIR)/$T
+ 	cp src/$T/lom.lua $(LUA_DIR)/$T
++	cp src/$T/totable.lua $(LUA_DIR)/$T
+ 
+ clean:
+ 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
new file mode 100644
index 000000000000..c0bc8c1a7b41
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
@@ -0,0 +1,109 @@
+From 4ef48128bd9a725daca1d5a4aabe0c1665d78742 Mon Sep 17 00:00:00 2001
+From: Matthew Wild <mwild1@gmail.com>
+Date: Wed, 2 Apr 2014 21:02:29 +0100
+Subject: [PATCH] Make merging of CharacterData events optional, controlled by
+ the 3rd parameter of lxp.new()
+
+---
+ src/lxplib.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxplib.c b/src/lxplib.c
+index a7d6c42..794f6e3 100644
+--- a/src/lxplib.c
++++ b/src/lxplib.c
+@@ -57,6 +57,7 @@ struct lxp_userdata {
+   int tableref;  /* table with callbacks for this parser */
+   enum XPState state;
+   luaL_Buffer *b;  /* to concatenate sequences of cdata pieces */
++  int bufferCharData; /* whether to buffer cdata pieces */
+ };
+ 
+ typedef struct lxp_userdata lxp_userdata;
+@@ -171,8 +172,13 @@ static void f_CharData (void *ud, const char *s, int len) {
+   lxp_userdata *xpu = (lxp_userdata *)ud;
+   if (xpu->state == XPSok) {
+     if (getHandle(xpu, CharDataKey) == 0) return;  /* no handle */
+-    xpu->state = XPSstring;
+-    luaL_buffinit(xpu->L, xpu->b);
++    if(xpu->bufferCharData != 0) {
++      xpu->state = XPSstring;
++      luaL_buffinit(xpu->L, xpu->b);
++    } else {
++      lua_pushlstring(xpu->L, s, len);
++      docall(xpu, 1, 0);
++    }
+   }
+   if (xpu->state == XPSstring)
+     luaL_addlstring(xpu->b, s, len);
+@@ -393,8 +399,10 @@ static void checkcallbacks (lua_State *L) {
+ 
+ static int lxp_make_parser (lua_State *L) {
+   XML_Parser p;
++  int bufferCharData = (lua_type(L, 3) != LUA_TBOOLEAN) || (lua_toboolean(L, 3) != 0);
+   char sep = *luaL_optstring(L, 2, "");
+   lxp_userdata *xpu = createlxp(L);
++  xpu->bufferCharData = bufferCharData;
+   p = xpu->parser = (sep == '\0') ? XML_ParserCreate(NULL) :
+                                     XML_ParserCreateNS(NULL, sep);
+   if (!p)
+From cbaf85740f6032cfc025c7bde3f9861d15825928 Mon Sep 17 00:00:00 2001
+From: Matthew Wild <mwild1@gmail.com>
+Date: Wed, 2 Apr 2014 20:56:58 +0100
+Subject: [PATCH] Add support for XmlDecl handlers
+
+---
+ src/lxplib.c | 14 +++++++++++++-
+ src/lxplib.h |  1 +
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/src/lxplib.c b/src/lxplib.c
+index 35bec3c..a7d6c42 100644
+--- a/src/lxplib.c
++++ b/src/lxplib.c
+@@ -345,6 +345,16 @@ static void f_StartDoctypeDecl (void *ud, const XML_Char *doctypeName,
+   docall(xpu, 4, 0);
+ }
+ 
++static void f_XmlDecl (void *ud, const XML_Char *version,
++                                 const XML_Char *encoding,
++                                 int standalone) {
++  lxp_userdata *xpu = (lxp_userdata *)ud;
++  if (getHandle(xpu, XmlDeclKey) == 0) return;  /* no handle */
++  lua_pushstring(xpu->L, version);
++  lua_pushstring(xpu->L, encoding);
++  lua_pushboolean(xpu->L, standalone);
++  docall(xpu, 3, 0);
++}
+ /* }====================================================== */
+ 
+ 
+@@ -365,7 +375,7 @@ static void checkcallbacks (lua_State *L) {
+     "Default", "DefaultExpand", "StartElement", "EndElement",
+     "ExternalEntityRef", "StartNamespaceDecl", "EndNamespaceDecl",
+     "NotationDecl", "NotStandalone", "ProcessingInstruction",
+-    "UnparsedEntityDecl", "StartDoctypeDecl", NULL};
++    "UnparsedEntityDecl", "StartDoctypeDecl", "XmlDecl", NULL};
+   if (hasfield(L, "_nonstrict")) return;
+   lua_pushnil(L);
+   while (lua_next(L, 1)) {
+@@ -420,6 +430,8 @@ static int lxp_make_parser (lua_State *L) {
+     XML_SetUnparsedEntityDeclHandler(p, f_UnparsedEntityDecl);
+   if (hasfield(L, StartDoctypeDeclKey))
+     XML_SetStartDoctypeDeclHandler(p, f_StartDoctypeDecl);
++  if (hasfield(L, XmlDeclKey))
++    XML_SetXmlDeclHandler(p, f_XmlDecl);
+   return 1;
+ }
+ 
+diff --git a/src/lxplib.h b/src/lxplib.h
+index 9c0be4f..4c7084c 100644
+--- a/src/lxplib.h
++++ b/src/lxplib.h
+@@ -20,5 +20,6 @@
+ #define ProcessingInstructionKey	"ProcessingInstruction"
+ #define UnparsedEntityDeclKey		"UnparsedEntityDecl"
+ #define StartDoctypeDeclKey		"StartDoctypeDecl"
++#define XmlDeclKey			"XmlDecl"
+ 
+ int luaopen_lxp (lua_State *L);
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
index 2cbb8f239da6..46acfd17f8e9 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[deprecated,${MULTILIB_USEDEP}]
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..720457682bf3
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="http://www.keplerproject.org/luaexpat/"
+SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e 's:-g::' -e 's:-O2::' Makefile || die "sed failed"
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
+		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
+		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc -r README doc/*
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..5b99b5d96bac
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/ https://github.com/tomasguisasola/luaexpat"
+SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_getcurrentbytecount.patch"
+	"${FILESDIR}/${P}_restore_functionality.patch"
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LUA_INC="$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
+}
+
+multilib_src_install() {
+	emake \
+		LUA_DIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
+		LUA_LIBDIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc -r README.md doc/*
+}
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index b94803760112..fa878679e60a 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,6 +1,6 @@
 DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
-EBUILD luasec-0.7.ebuild 1110 BLAKE2B 8776d00d3c3b5e437b70f91a0785a655ec95e2981321ec4002b207da2a1e2581f27b93471d08f527a16e032424a824e613c82ffc57297f3f74a4578072977761 SHA512 3aa16b8fd2c58a95ef4e1744ca4b96ecabd5d82a34121e3dabe394548d7ee92ff0e17249cc3120c12ae093c9ebb68e8bbdb96901f9dafd0123c9a685702e43f4
-EBUILD luasec-0.9.ebuild 994 BLAKE2B 680eaffcf974bcd70d01133f95ef4df3d375effe55aef2b7756030624431c4e2c51a13ef81a5651b2430379eaddb7e6d4f05b12222807ca10a95964c538699d2 SHA512 9c8c944fabaf6053ddbe4ebe6bda040b95c4ee2093a18c344e397c642fcaa227f3eb3a5390187e3573fdeb054385be60c57af0b8dd43735e09768ee60efad7b2
-EBUILD luasec-9999.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
-MISC metadata.xml 471 BLAKE2B 678f1c3e123d5690a1f7c68ee5b4c0bba74f48762692e9fc27739bdfa79e609ca9c140cb2eed1548b8c9f08f29bd828f805b28ca8b99ec51f301c77e52e41113 SHA512 8b5bd42751700ef9893f73111e8014c116b4a6e07891346602c42485c7daf4de63388936c95182bc6d2a9506353a48354e1a1e56e7ef299643206ced57d506df
+EBUILD luasec-0.7.ebuild 1117 BLAKE2B eaf0c4d0bf061052050fcf87e33587911f96e20659dc5afc951ce15b024d154ad4c8325a2aa2c7aaeba64e6555e69b087364fdd7ef847969ec11884a28c7a3d0 SHA512 cc8dd8a4b08f351bcff361ab0cd970c64adc301b6e389c1e908c58d795e698b6ed4539489f7bad9395cdde0562cfaf3de926e1b7c2eb4ba18723a3aebd49c676
+EBUILD luasec-0.9.ebuild 1001 BLAKE2B 6f27365cb971438786b7f8f49a5151250a98bf0b2dda34e00d278ae455a03b702479f52eab6aa066863112c396ee036b1ea67e3be4409d3e3a003556d869b94d SHA512 00ec4c52aa7323b4d81bcee1cce40c0329f0760e1d221fa3134916fab6eb9c2ccaede7ef6ea23f5bff006b3eed0e66bacaf5507371c1145d7907ef402243b251
+EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60
+MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660
diff --git a/dev-lua/luasec/luasec-0.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild
index 4dc8f5927ae9..d7eb58e44d93 100644
--- a/dev-lua/luasec/luasec-0.7.ebuild
+++ b/dev-lua/luasec/luasec-0.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 	S=${WORKDIR}/${PN}-${P}
 fi
 
diff --git a/dev-lua/luasec/luasec-0.9.ebuild b/dev-lua/luasec/luasec-0.9.ebuild
index 013a9b13d85e..754e3bc7c85f 100644
--- a/dev-lua/luasec/luasec-0.9.ebuild
+++ b/dev-lua/luasec/luasec-0.9.ebuild
@@ -8,7 +8,7 @@ inherit multilib toolchain-funcs
 DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
 HOMEPAGE="https://github.com/brunoos/luasec"
 SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index df666e66d836..0023fbd9de48 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN}-${P}
 fi
 
diff --git a/dev-lua/luasec/metadata.xml b/dev-lua/luasec/metadata.xml
index e33b533b4b13..67fc375b3b4a 100644
--- a/dev-lua/luasec/metadata.xml
+++ b/dev-lua/luasec/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">brunoos/luasec</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brunoos/luasec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 19114a682a17..3699b7f99298 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index eee24633a656..f71bd7a042e8 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 1074 BLAKE2B 22c6c1723b8783dace048e62dc280ac75093b6b8cf6a2eda3f2d615e416afa591dd31d1efb56132fa22d2abd92bf1b628fcebc1696f2986d94d946313fc2206b SHA512 08dd83da8530fdeec0f5bca1aa3ccd786b2baa41976ffb1107686b47873e65b2a10bc10c8468a89549d6640259e8d15fa7a01bf0dee9d499a08480aa2b1f4c66
 EBUILD camlp4-4.05_p1.ebuild 1079 BLAKE2B 44fe543de664a84d7e6d262cb65b9ad49d4c262afaad04a24516507694029179c570a9752d2d4097a54deb180a104a90c64cf959bafec8403335724f6db887ae SHA512 a59f8f1ed0cd9667447860ffd7061a75a2387056ca92beb018fb0fbe555de24dd4b36c8594f0707aaf885fa2dc4119b42f21e8fa39046a6fc112eb9ae23cb4bb
-EBUILD camlp4-4.08_p1.ebuild 1143 BLAKE2B de4f6b830da39772286db934d9e5efaa9fbbb2e1b2e09ae7358b0ccc352d7dd1e4d7c113af202a471e10a3659fbe331ba2419c1825d4c68f506aafcc27b05cc7 SHA512 a9996ff236f68d0ba96dc32145dfc579326d3c4cb5723a0b8b1025a68c2827ba393f9275a64bc2be34c5e4a53026392dbb092c336f1260f23ebb317bd55ba4a2
+EBUILD camlp4-4.08_p1.ebuild 1142 BLAKE2B 6f391adf6fe6f637e9dd9e8026597d4178f3cffc5f9a4d07864df3405298ba346e5ebfae719cc54b8977c92648e8203c7ae18c24d402c7f178a5476d98fdd6dc SHA512 a30d867bf822bcfda4a2e6ab50fc92e92d4e80ebeedc69df5d502e46bdadbdf25b978ea498f531b5f6de11397a53bfd5da49725cb25c77f3f55e18d980eb6f7c
 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 72778c7e23ff..3c23ad7767da 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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
diff --git a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
index fddc59a62bfc..2cca3075e56d 100644
--- a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
+++ b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An NTLM authentication module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 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 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Authen-NTLM/Manifest b/dev-perl/Authen-NTLM/Manifest
index 5bac34410ef9..fb529bd18b7b 100644
--- a/dev-perl/Authen-NTLM/Manifest
+++ b/dev-perl/Authen-NTLM/Manifest
@@ -1,3 +1,3 @@
 DIST NTLM-1.09.tar.gz 28766 BLAKE2B dbf8f4497f2e57c72ad6a5dc6ff21e3cba35bdeee1ebccfc9efecb04a9808b7f3fb929c055acb7038f2990e6ef6a553a09573af70b065ffc74a72fba223e2fae SHA512 faae9a4a39f483a9612e5a7daec15bb8ddd940ccc73e52372dd004a9067336fccc4c490deafb3eaa0cf56c0dfe3a085cb6bba38631a5122c2f2fa6e960845039
-EBUILD Authen-NTLM-1.90.0-r2.ebuild 644 BLAKE2B 803f6d9b89e2b3a7fc26f3871c49bb3adb4f77c4eb5e840772f68c06b0388ae9d18f35f72cdfbe9dd69f77b3bfc0c90943c29b571dad740a1135bd3a0356bbc6 SHA512 9b1d9447b8e367dea55c3af0e59437242ddd6208e8e60b88bee27c3cb5c597cdaaeac5f7dddd47fcd0a553e15f4acf30a6964998df42aa4e7a0a4467adbc1486
+EBUILD Authen-NTLM-1.90.0-r2.ebuild 643 BLAKE2B 2f531474b8e55417e0d504572abaf8a21d06d67470ff7d0d53d956b42031ed98e86a86d51f2b45c48f706353515fda323f90db8d40d17fa766402d46a3db01ef SHA512 3caf13acc3aadf6366fe76baf2c720e16a1904d15c7bd55dcdadc198d80fb5237dfa0326aedb8629af97cd500bbacf22bcfd6967d9f56cbcb80209b0863d06b9
 MISC metadata.xml 515 BLAKE2B 921ac9699c641917c345c9856780467ca3249ca9ec0474aebf6c6aca9cc9962a75490b42333211e46190d588b6ee8460755cbd43ad1fd7211259d0431bf355df SHA512 eb1cc4c67fffcefe2e262f0b483d810e0d8719628dcfd5c528c95fc721f66862b1aabb4865d10add7851a557bc5d9cf484eeb49462f9ac493a6a4b4ec08f03a8
diff --git a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
index 7bba7c3655f3..4eb06b33bdd0 100644
--- a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
+++ b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Lightweight IPv4 and IPv6 validation module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~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-perl/Data-Validate-IP/Manifest b/dev-perl/Data-Validate-IP/Manifest
index ca3ef21b5804..03041245db0a 100644
--- a/dev-perl/Data-Validate-IP/Manifest
+++ b/dev-perl/Data-Validate-IP/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Validate-IP-0.27.tar.gz 38139 BLAKE2B 5fd260fafc3a283bb14bee0b51aad9f829682353e4802cb570fd9f7ecdbfdfaaf2a7bc77ff704dc64c9866c93e054aac4252ed86fff57135c04849b817b06f52 SHA512 5a93f730d53e7adcac4fe5e227b69a44e58cdc94b0081d79978547263095e97c3690c8c6fc6664fc8e4b230ab4c360beda22e6600a3c7abe5e61129ee70553b8
-EBUILD Data-Validate-IP-0.270.0.ebuild 611 BLAKE2B 7c5d68e2ef47db43d55b0e81eecfa9c1b830d4335ef6f6be8e97e4729142f1fb2af148a441ce7db04409b2dd7338b3ba269b52ee25059addaf987a0859714819 SHA512 5d4c3a173d22296f8f210777f8ca98197b465805cc1b2712d92d49f5640be10038c3e7801ad83046552b76ed0f0806daac4ac1934af29dad2b2b24b28b5beadb
+EBUILD Data-Validate-IP-0.270.0.ebuild 618 BLAKE2B a58d69c3b6654cd998c23ad242d5b065b43cd741a8c8c162e9113cc501a25c41cf4b9422dd6d34fb31915e8bd8ec33964d9acfbaa95fe1541887b0905668e852 SHA512 8990afe9126595a1b3c4e52f5fe7e0b16e85fb2da319637cfcd7ea6134b9e113d33d4918304c1c331c5490551176ae0e1ad7aa4ad328b5988143a8889e710ae4
 MISC metadata.xml 405 BLAKE2B c3bfd8adc080f8b9326035f8596138e5fb7b6c2f22c33ca87c555d768d820e266e405a1c7853086258409bbf33dfeb149b59acb06b700f06988ec49287ca258c SHA512 5d39792f857258ebf9a8ea82ea7407b0ea4b05de767d562d026f5cfefddd940cd3d413f142b2e861981a3806b0a8559dc94d8db3ed43f4e5e9df79fba0ff6c31
diff --git a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
index a65311e675e3..c0c6a45b21bf 100644
--- a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index d33fa52c8fad..3cc7064811ca 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -1,5 +1,5 @@
 DIST File-Remove-1.57.tar.gz 22157 BLAKE2B 1dff9819789795497491f17f24887f701e519adba507e4cb3e833a4921598c043bfe3fb5f00565e8e58593500be1c9a98d5f156cdc9d5a815ddb0e704095cef9 SHA512 dec41e9ffaabe953e72386fa0f5112fe6ebaac0fdf6752256749162d505aaf17b905500fcf52d0cb2ef944788b8e13cb3b2cf37be8671a47aab9081e228bc92e
 DIST File-Remove-1.58.tar.gz 25575 BLAKE2B 20673b6384817cc93378a1bf7a6b0cae52815a8d4d5ada2727d0adf26abcfca31e144bd9ad8267cbd1fa8b1f8860cc529db9e336e8da7cc1a6d568701920914f SHA512 2d616751328d57ff6975775189f92745fb3cb1d69675049ebddd96a2612c11c62c1995a70720efe4e73a9c10b9a2ec5528b90d468815e7c2ee395145241608e2
-EBUILD File-Remove-1.570.0.ebuild 707 BLAKE2B 8b1b870c82abb5c6067a02d13e8e987f870bff6e6823c0a81a1fd9816b2d1a7d488c3bc5cb338aeb40bf68223895ce601bd2938109bbfed2b70226607745f277 SHA512 bc9894e6e35e44b48328ce98c190e57f97b310a5ed5d4d17578c6c96109bcb69cf0d53543c9b217c59f907ed38e4a66f18e2baaa12b6f9a66ce05c803f03c57a
+EBUILD File-Remove-1.570.0.ebuild 706 BLAKE2B 44d90bcd9e6b5c33e31825bb2faef15b16e1148e7155a45ec4d75243c97980160138a66eb45264e071d6fb40664cd639b9f2c41b13beb8461c57b46518c2a749 SHA512 5504d647c57b6a67e0b65324a01903bb338ef01e1c1e6669efd62598e056f26a38f17ecfeb4beb2701a67a56a5394f49f2fbb25b17284eebc214073af1bbd1e5
 EBUILD File-Remove-1.580.0.ebuild 739 BLAKE2B b5e6384c41e3f6a3bcd70248dc426c854f491c55a9bac95cda2f1dadd6583daa0f3d1e63146c82ba98fdd971910880d3699c028fdefeca5950bf3e53da9e3cf7 SHA512 0dbbebca09c3dbfc52b56a4c1d2ea243e5609f3d829216b546202b5b12231666b449698a73f025c3ceb438134b69ecff8c4238196e0e18ce46c6711005a87e43
 MISC metadata.xml 394 BLAKE2B 12f606d262b6dcc55390f4d23a8aa7624ac0c09704ca261e7698404b20d16d4f31cc09ed6fa6516cccee1f20bf7cf895dbc13af15d7e2fd08008541ddb6c932e SHA512 a7ac4d8ecc1b0e4be8268ce717e2ccd67dc652719497f8906665347e8c33d6c85c53e88e340fd34382b9cc41c62b7e098d491b8a999365ec11f6fd02b363723e
diff --git a/dev-perl/MIME-Types/MIME-Types-2.130.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.130.0.ebuild
index 45a750def312..0d1f92fbfc0f 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.130.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Definition of MIME types"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MIME-Types/Manifest b/dev-perl/MIME-Types/Manifest
index 46319f464cbe..f93bf6f1c957 100644
--- a/dev-perl/MIME-Types/Manifest
+++ b/dev-perl/MIME-Types/Manifest
@@ -1,3 +1,3 @@
 DIST MIME-Types-2.13.tar.gz 57032 BLAKE2B dd23c4037831c21891c8b0b43d3c08768a45f1d72b973c2bfd282185987ee302f9321b784438cb121f3b31adb915bffda00eb0c7da16cff9e8fa259fd2e038f6 SHA512 675d89faa03e78162a2441d0fd9c986a77e44dbfde1e2f20ee501de8f530deb51cc5705481b0e7450e1e1c0f7f680572be7f661456477c8a34818be89a0acc0a
-EBUILD MIME-Types-2.130.0.ebuild 565 BLAKE2B 6e2ee394ebf78be6e1aee282f8e1eca8668fb0b6cbc0b9d696514b72e6a46db8f40e1ef33657f1d6b17878c36bcd88fe2e635ef2d439a396ca6b3df8f1602bfd SHA512 d7f411c7645b51f0a2f6eef9a8fd5dda864aeedd5b834d9b7a122498cb98013d25be2f9affb8c975133f96e4a0f6b1c74d27139444fd41ea57c55e6c85fb47f5
+EBUILD MIME-Types-2.130.0.ebuild 564 BLAKE2B 4794b3567dde1df9d7c285e7302665bb3a97f8f8312d4f39d6931014c2ba242152f285ca192912d43b783ba8b844d2d7611e968f084983747bfdc89ba0ac3cd3 SHA512 1f7fd23d831bd8ef91b82a00c2d0c642a410aad0cf5420898614e86d47a0828c0da539302f1eae726f93c8258aada1f1ab7da1054ecb6bb1fffe5760e5ec3e24
 MISC metadata.xml 435 BLAKE2B a6a8b0df81a8493d0faa108c336d552ce2287b88e97ef975bad8e8ffb64876f4229259a3354a46cf82843a3bdbc26bc370722c037a6540858a0043746316e3bf SHA512 8a130b096581247065aca50c2c51a1704512819c602da41ecb55d873406e668bf94cc2ee49d33e9fc9663d7c650807a58bc8a74ee319fac6ae878c95634b3f3d
diff --git a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
index d4065ab72dfe..3cc93d6100d9 100644
--- a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
+++ b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mail::Box connector via IMAP4"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-Box-IMAP4/Manifest b/dev-perl/Mail-Box-IMAP4/Manifest
index 608433d47e92..3639030a262b 100644
--- a/dev-perl/Mail-Box-IMAP4/Manifest
+++ b/dev-perl/Mail-Box-IMAP4/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-Box-IMAP4-3.002.tar.gz 41874 BLAKE2B 86b57eb0558d42e593c9b8ef44454ea805498229d8f2c75638f3dea399697bde62dc539c48870906eebd3bdd98c28a7efef2055c44a43b514b0950154c6800be SHA512 0d5ef070271ad67492209d479acfd056fb7c3e4d21e2a0ed5986535e3a59d3a330831771914c35223e4819b78a47ab02f350788fd8617ae293cae3dd7887896f
-EBUILD Mail-Box-IMAP4-3.2.0.ebuild 663 BLAKE2B aa8434122e3d81dc67773ead65527975a7a52fbeaae1c49afb964d24b6a74a542829b7b7c165348a976d8aa15111337e2ae4669f2d1420e5b4f5340f89392d82 SHA512 998f0c0cc9c0405bc0daf29dbb19e1b91cfb184041618d8c53d540464c9f01c515e0089a5ed5dfb6916a0125c1695e7f13415c074ec64f78a1776c1b2606b9b5
+EBUILD Mail-Box-IMAP4-3.2.0.ebuild 662 BLAKE2B 1f4113a5a9559c9c0359e2ff9d4ea2e38ef15f046b276196997ae232d966733766f105816563371d229f2a9c8614d5cc08e8a3c675935cde903cd2a79a44f5e2 SHA512 559e3e0eec4b05002fe5c7f04b16d257ea1f8fb440bd235660dd3484b757e906f32d653020b39288b9b3e46dc2b599af5119aef09201490eb816b2730e51c794
 MISC metadata.xml 968 BLAKE2B 5b44b8e7508f8a23a69be773848a9c2f563e8a4d67355087b56f03e1535e31c44f6b2108c4a953573ec7b4d120428535b5cf3db6f27282b9d6392dcfdd921e83 SHA512 404c9c94711b4b01c84659183ad18696fb85732df7a15f6be38ffe33f345c361a2821f42ef56c05563e610e5eff1983c5d40995c6d3e2929834b9d6e9d250b4f
diff --git a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
index 662e265d8f72..8cce82a9006c 100644
--- a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
+++ b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mail::Box connector via POP3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-Box-POP3/Manifest b/dev-perl/Mail-Box-POP3/Manifest
index 5b4f84dd3620..59c2730f12fa 100644
--- a/dev-perl/Mail-Box-POP3/Manifest
+++ b/dev-perl/Mail-Box-POP3/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-Box-POP3-3.003.tar.gz 30500 BLAKE2B cfa99af8777bc590eff77fb776a2e161590809da59148dd986fba7409860244dd99eca431e398aea9f00046b73d172a70762b504e79eeacebf57f4e8ca277688 SHA512 be63f85abbf78e1497eb6d6d3f87e80a3fd6d58fa6469f8732435cc740f72c2ffc6da8f5d98907e2dd4b7d0412c15f94abb994fc9274701ee050f4a3e1f50397
-EBUILD Mail-Box-POP3-3.3.0.ebuild 660 BLAKE2B df78dec17e3807ff2f3e12179092db10268575e707cfb21c6b2f897165a9a1502519bd6194f24898ee7726770a4c57e0bc9592d5bd7df1306eded6a14cee6bd9 SHA512 2b4e65313aeeda971e6932f70cc84e95f8879d8f310916b667a8b47d3ab412289b0ee6597a6cbbc090dde6ec223fecc09bf4a47f63c52c9c0d94730bb4e5d71d
+EBUILD Mail-Box-POP3-3.3.0.ebuild 659 BLAKE2B d1c73a5d7d96a4852b5156f5bb531dec1a1df898ec6ebae1c6ea7b152695fc80c004e8f82dba91f6673970efe6069c55f91d3d6e1dc086afcad7e93f7441116d SHA512 525f3ff129c13bbc1ca6aafd482fad84ad3d09b60a76e2c88a01497d24cd605cd9f4d424979695af9ff9288cfd8076014fb6fc4e070eaccd5061184dcd423953
 MISC metadata.xml 669 BLAKE2B b903688b65901d93a013292fd794854efb53a707bd403d0719357b9f8b0c531243051027adcea2aae3b28849df373b72392ecbd8e9d8fe716ebda7a5d08fce58 SHA512 0be6b17ee52b22b1e88f530ddfd6fd13ff56964b09dda2486bf121818d6b5d39a0acb660623266dc36a357622cad8a0ec4f307242be7eafc8c68e148bff87746
diff --git a/dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild b/dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
index 394c353746f3..1420f3c4494b 100644
--- a/dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
+++ b/dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Mail folder manager and MUA backend"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-Box/Manifest b/dev-perl/Mail-Box/Manifest
index ac2f89b145b0..a3173903e690 100644
--- a/dev-perl/Mail-Box/Manifest
+++ b/dev-perl/Mail-Box/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-Box-3.003.tar.gz 340558 BLAKE2B b6119c6b519ef3fa277dc8af7c53d78ed611351bd3c7e961f4fe96c6a73355761e42448e61e7a071b1e52b15f4c8982964e3405385c7cf762a9772777270b73a SHA512 02a3fec4d7ec99490bb6e1223e606db0b6149479ff047ebf7a9b905e0f299256f58ec27b2335c7f9e309d23d2b32a99544dccd5edde41a5910bd64078dfc6629
-EBUILD Mail-Box-3.3.0.ebuild 874 BLAKE2B 9509fcaf3ac8b7978974d8e21d18698685dd94f9c9a5ffe9742dacfc32b6a03f25a7527497218de1612d1a6241400d1d54e40226c8c367c3a578cecc0adff092 SHA512 523f80e5af38eef108f198618230a7bbe7e5ccf859e37773ff368aea2b54341e42ea2c6d19a379f51d6c62529c84621193ddbdedb3f7f971563c4a7ee4daaf51
+EBUILD Mail-Box-3.3.0.ebuild 873 BLAKE2B b389a1c94f59c55d5cdb91020ff7664ad9833f7ce51595650c2f1cf27e36a716a25d6ec4b1da6176789cde115a946f73feb2f3c550e317272c8d00527bab9903 SHA512 2e3be9df98b37564cbd5a80c17f1280291df65d6461f202537159db73209c505db904fe669ffeb56c331f8d3e34bf41585ce437037711588eaead63b57ce28c0
 MISC metadata.xml 3242 BLAKE2B 35677bcd285f30351881878fad44b6eaf7d09d059351ebd6b90e6d980fc313fc4a394700f70e97012c38174be9a4a3476958e36c39d0b1ccffb28cdbcd79fc93 SHA512 34cd19b5f83375f885077ded50a40c53861d1baebd80db03b44e6455ee519ec069aeddfe31927fc092b2f804ebf0cd76cd3b34bbd8ce6d5b9cc456daae1a7139
diff --git a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
index f7d0149d1488..26d843d87a24 100644
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
+++ b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="IMAP client module for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86"
 IUSE="test ntlm md5 ssl zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-IMAPClient/Manifest b/dev-perl/Mail-IMAPClient/Manifest
index f62a3fd16fcf..24cd8a75964a 100644
--- a/dev-perl/Mail-IMAPClient/Manifest
+++ b/dev-perl/Mail-IMAPClient/Manifest
@@ -1,4 +1,4 @@
 AUX 3.39-makefilepl.patch 2592 BLAKE2B f19b22a6f32c6acb1cdfd2bbf7f6a14d1d4b360933c5832e949be73e21167b3eb814078466722ee35fb582271b46e0c0b65125ee16e3a1fa73bd8962fc346789 SHA512 007dd94afc738de520317275c940569bc4bb95b4a70eb8e0699c59c23a9e58d2bd68f5ae73ceeb7b7e9b84cf1f61f1e28ed0f05a20eff89191589b9342d443d1
 DIST Mail-IMAPClient-3.39.tar.gz 190965 BLAKE2B 43fb640d2282945b21e743ccb8bec037103b7bcff78396f1f72f26d7860d5b5f69bcab837f3e857610426f958c860085f66cef21c8d5115940fc64ae3667f1e3 SHA512 156e5f6682d55f2c112ae5065448f0c502d3e748c4405768152ccccd7d944cf949f7c3fd42f30f40c86337457dea5c037959bf29739e4c413e4b45af2b74c222
-EBUILD Mail-IMAPClient-3.390.0.ebuild 1108 BLAKE2B efd1ba52adbf98294f086eed081ad250e3cee8993f92aa68c01fd83259de6bf14c32f0ff1c330a0473068cb19223e015caf99c84cbd3b89af918181fa1ce2f8c SHA512 d2c78276bf80d4d7d4c1e0392e9fc8d222d6502b5a91740a36a0625d93a2465d02d7788ff050256f5d1cd1333059787bd6d25608aca3040a57b67977f126c5a4
+EBUILD Mail-IMAPClient-3.390.0.ebuild 1107 BLAKE2B 630c67adf1010d1c4d0dd5e51156d540dbe242d4a7d0dba1eaa877e4e04fbcd6f182edf5ed2cdce27084c492f1ee929764ab1941039ccb7c25e2cbd0429d2736 SHA512 7655afb96a3a7803fefc02e24cf8e94cc2ae00f06b68517b1e357dda8422d2923e31868c7683864d0cc6b952804b95b9d930e83d94812bfb94aeb0780273b0f7
 MISC metadata.xml 1479 BLAKE2B c6dd142a9311a0e0d425ef22933e04327f24d53cb41d8428d14de58806be9a55be319382e1f07bf445c8f35d83842d915ad7cacbfc47621f957a8484985369e1 SHA512 9ab467eb24b4805b0b505cc0a4c950206281d65ea4868d2aa759c94457e1bb8a382ee7ac84627392f3e3416056da7e1aa87f0de810c1d9fc63d39628040ecddf
diff --git a/dev-perl/Mail-Message/Mail-Message-3.2.0.ebuild b/dev-perl/Mail-Message/Mail-Message-3.2.0.ebuild
index e42d28b03092..d8b32461958d 100644
--- a/dev-perl/Mail-Message/Mail-Message-3.2.0.ebuild
+++ b/dev-perl/Mail-Message/Mail-Message-3.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="General Message Object for MIME Messsage Handling"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-Message/Manifest b/dev-perl/Mail-Message/Manifest
index 37b6baf20c2a..43dd4fbc0ae5 100644
--- a/dev-perl/Mail-Message/Manifest
+++ b/dev-perl/Mail-Message/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-Message-3.002.tar.gz 256679 BLAKE2B c73796e993b79d0692cb8abba520ef84c48afd04422a6d1802abee6633e1b49e90a63be63ac3d88c0731ec9a81754f423a03c0724015790f6f7755218e6b9e5b SHA512 06aa8903ab9f4275916981c4a49a63741cef15161411e6b56ed58e08d539d1e3572e8eaa0bb77b7140e55beb60b8bfc2b26381295b5fcd82bb277652bd86c09e
-EBUILD Mail-Message-3.2.0.ebuild 756 BLAKE2B beb9b075c6ce95a3db1625727d1bff68ba5a5d2967d23793492035e5322a8c50e2c2278b0a4c2ae269db97410ccee6bd7c1518d5f0450a59828c04a14a3f772d SHA512 ec46ecb07e9368e2fdf7eea9c3f54dec5a3d810478541f97de9e460d7b1de58ebfb8e37b8d632d0c220f8363eb00113906fcab7b38b71c3377d1c5441d3f6165
+EBUILD Mail-Message-3.2.0.ebuild 755 BLAKE2B bdac410f1ae3265cb3f3e84d2dcb9580bc14633cbb4659069e99c03c8f5398b4c32aecf7c990a6d4d0f34a3c283d61beb415a66e23387466889d2d13638feb28 SHA512 6faf02d74aebb05553fea17f7eb77a9d717bad79d53b998096785e8ceb0db0ba178d4a80b67626ec4ecbf6b2a20eb795e11adca5c7cd07a7f66a072b0e85e7ce
 MISC metadata.xml 4104 BLAKE2B 32c96c4d909d8e304aa5b6441152caf008365c6ace938cac1d4ef06094a98b353a41a3b4e1ba10baae3ccb529f37b69915b9f8b512ee8fc439747106c7147353 SHA512 3efb09e837baf08d42c8835cd015f5791be493c282c9acf41f04a7cb989fe822786535928fbd1b74f9bad069b450e48266762bf56fe5f27d2d44eea49eb8bd01
diff --git a/dev-perl/Mail-Transport/Mail-Transport-3.0.0.ebuild b/dev-perl/Mail-Transport/Mail-Transport-3.0.0.ebuild
index e61a98e26f1b..e21a77b7d250 100644
--- a/dev-perl/Mail-Transport/Mail-Transport-3.0.0.ebuild
+++ b/dev-perl/Mail-Transport/Mail-Transport-3.0.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Base class for Email Message Exchange"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-Transport/Manifest b/dev-perl/Mail-Transport/Manifest
index 949f94e9425b..a017394c05ee 100644
--- a/dev-perl/Mail-Transport/Manifest
+++ b/dev-perl/Mail-Transport/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-Transport-3.000.tar.gz 14839 BLAKE2B 5213d2b4ce042dba5358c4d70bb638e1c797d88564c7b4935d75e692215a10b2e8715b75d95499edeb2a0b978f03f97f6901447c1844e72f07c4b6705f031a91 SHA512 6a209aac34fd79141ce8559038a3e523e50338301391ff08e6450afc8494058afbe5c8930ac919a9e0c20227d1a3a5a08d7c6dd1a02641e94951923736772d4a
-EBUILD Mail-Transport-3.0.0.ebuild 594 BLAKE2B c38e3b5ece50e9c4c7311b105b141ac521cd5df436aef3adfe703e140ff2156636a02d428681894efb91c12e32a0a58aa895e2dc10a120ef5be67da0a54c4a47 SHA512 04f96684d40aed341696c375c54991e31760be54948f00e76460ce19637752d6a7e470a5b3d4e91992806daa635ea565f63bb5950f0f02fb5d0fb26299134712
+EBUILD Mail-Transport-3.0.0.ebuild 593 BLAKE2B 3f3514d4d7f6529812f876eda7e85844a43447abda08a3edfa4de6e817dcc69fe33b46f5ed1e013ebc2c93ab921068a7459510c47af58e36f205f111192d9087 SHA512 1f33e1b862625277bf32e47013d76ed33d5232a1cf3e40624a5f33712b2875f438ee6c266cb4a6b98956ad7b29647c89fdca7f402ad33fb592f9412fd54086d0
 MISC metadata.xml 885 BLAKE2B 442e9fa1c9264e5307e061e12156a915f34552bc02f9f989d26b2e6b40a507d03111c969d05787b22538b9540ea8a010810571bcdbb923c78376ea20b1a1b5a5 SHA512 b93e90f114c72ea563182ced57f4240a9b42ca26767453f4577c0c2bc15e25c27374cce9aa9b77841dc88018a3698346cd703447e57823fd7f2bb2980e571404
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 0fed1851bd11..34098613049f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Object-Realize-Later/Manifest b/dev-perl/Object-Realize-Later/Manifest
index 6172f51c206d..693d645d06f6 100644
--- a/dev-perl/Object-Realize-Later/Manifest
+++ b/dev-perl/Object-Realize-Later/Manifest
@@ -1,3 +1,3 @@
 DIST Object-Realize-Later-0.19.tar.gz 11013 BLAKE2B 1b4cbcb8f9ffa8dfafc8c9e9669b2632fa3d56034935fe113178a0ae334c76bf509423728762f5109c6ec3f56e1a721dd61cabd21a3d3a62f2b46ceed746f04d SHA512 4e4d57e17600ab553b8c209aac815e64d3b7164d38afd27db2676da774ee95910a00eea09688d49a53734c07c60922901c2bcec46dc6aada9a3b76f3392b0ffd
-EBUILD Object-Realize-Later-0.190.0.ebuild 456 BLAKE2B 8d17c10f3848f47616a8705a56c547bb565e1fd024aadaf6212c20f667f0953a2af76231dad348a5d9cb32f3efe33969ed92c64cedaecbf1df33c24610198ca2 SHA512 645e1666757d4bac20e91b754b284480dbd07d7f40b8c41e2c0c4aaa1d1e323fd4db03ff826a7e250e188236f0ecdbc65c429965338cf3baaf8e2ba8fbab5465
+EBUILD Object-Realize-Later-0.190.0.ebuild 455 BLAKE2B b2f8b42f5d6ed82adf7ebdfc3c94e993bb8dda493d37f42a6b0709f1c402c11043e5ea5373271c1fd7b78fe37878bf078fd5b0296adcc898b7f12f6f163bf0d2 SHA512 6e3a87b7a1d0709d2be1c274f1cd6ff3c70f6c58e003548e8c383cd2f4a41be7a4cf17ece9c8a13250b01e8b5f002b85b9e0976b2cb2fe68f3e077fc0405b0c6
 MISC metadata.xml 413 BLAKE2B 7de2584d18e3ea0b12f1becfd32acc6f28793288351808ac210d1c4c94a20c6bde880b28e3ff1d0b095b12f6b90ea795de7d77ee0e0772e0f9b555f4a558384d SHA512 b7e535a3dc5be979b51b0d8fee9c5837ef7a778b460a1eb933f9a90bc7ffa7b9f919a7c15571067bee10c3393f1c791d5ce49a973baafb3841e9edb84aa48130
diff --git a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
index 313d4dfb7471..57b921f1efde 100644
--- a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
+++ b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Delayed creation of objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/String-ShellQuote/Manifest b/dev-perl/String-ShellQuote/Manifest
index 2af0e8f0e8c1..873fae9b4668 100644
--- a/dev-perl/String-ShellQuote/Manifest
+++ b/dev-perl/String-ShellQuote/Manifest
@@ -1,3 +1,3 @@
 DIST String-ShellQuote-1.04.tar.gz 6867 BLAKE2B 8f18aa5004635b9536d776cf2e8658c7027e2772138dac3791dd9f742d82f9b9203ea220a4e36da35d9ab593e9ec5a894bc1ca17186e8461e81876b5c50b2728 SHA512 f5b472985fb9c15d5c82c03b5c6c90a3a545ada854b90a96cfb7b0f57b8a817707ed91ca0f20344a2b8d200fe365ea737a9b39b64d526310d41ac2466552236d
-EBUILD String-ShellQuote-1.40.0-r1.ebuild 319 BLAKE2B 0194dd79f586793c1af56c08dc84c3042734d4f707bee6fd8d42520a117e0363ea49f25247b166c89c9348073c6319752276829694f692a5b7d45e3490f59000 SHA512 63d89a8280bf8b924f4924f9e548b3ec7052e97935664732f252f1f29474f9b83f1383db2134e695d479db064545cf98e136c55443d368858ac9a1157925d9d2
+EBUILD String-ShellQuote-1.40.0-r1.ebuild 318 BLAKE2B 71f2ea7656d346d696cb0f753c06ef873aadec5400667cdedd99c11713fb693629144d675bb460dcf750daf82bcc46d87262bf7b3c12508e849b216c6789d35c SHA512 83a47704401d07bfd3ff1bb9afc96ff5f6349c6e52427b95928f00dbe91764a09deac8d8ac8d2304a2030b6d0ecf6c7a785ed9cd7e83b732a2ec1642277322d2
 MISC metadata.xml 406 BLAKE2B 5b2f8c80dcb533eae0fd0c5cf08f9ef9a68d6b2a46ba2be5223f868834087a91d71cf62225c5a4d7dd0c48fb552c00d81caca3c8a20166eba2d3de26eece6595 SHA512 b25c5479457f547d91eb915e845c3047f2119ea221451740e62bf3c92cffcdf2e95d8e63d2e53095e2d04b3fb26d94b808f3ad334e9ae1d0020dbe35b0c3f55c
diff --git a/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild b/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild
index e967296340a7..113374ca2519 100644
--- a/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild
+++ b/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Quote strings for passing through the shell"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~mips ppc ppc64 x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Test-Taint/Manifest b/dev-perl/Test-Taint/Manifest
index ff7ab9897dd3..21003e47ee75 100644
--- a/dev-perl/Test-Taint/Manifest
+++ b/dev-perl/Test-Taint/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Taint-1.06.tar.gz 13346 BLAKE2B 089d3c51a90bf307001fe77b6cf6bfee3f6c1b49ea270724afabd04be32a4fb2dced13eac26a8d735728d7ee8af75da99c080406ccbc45c0429784d2538646b5 SHA512 58221b0145d9b908994c093168ca547a18cd56113f4923a4662bb9c113635378740363914d1fd43602f15c76a23cfe26d0682ed6ce22836d712692f439e782c2
-EBUILD Test-Taint-1.60.0-r1.ebuild 534 BLAKE2B 8c01e7e86befd16267343e28786c74db554a39b2023e5805d13919f95baaab23404d99f972af2a7da2379d253c7bcb896f42a863b57c1f15b6479a51f6168b76 SHA512 a67a803897bb9658faccfee17db3329998997ab50f0707df79c55a68d1cfe8fc2070e76fb632966e4b92ec1f2ba7eb0381f8d64bcb707341fccb29b265b51fd4
+EBUILD Test-Taint-1.60.0-r1.ebuild 541 BLAKE2B e8df3dc5bd42cbb9adce0fc526c4341f2142ad9af7f3f72a09d8f0562ac4e2ef49954c4deb8bf72c15574bfc1f0d5db18711ca79923e33fcf208cb5e4338196b SHA512 2ee7c0d8ef683fb05d30e3792ec70844032fa11976fd70ffac103eb52b8a88c4e935efab30d92a9cc10cfc8f98d930083734e64393a9351f1b2638c3b93553a8
 MISC metadata.xml 392 BLAKE2B 033a266db2b032687f8497ffe24cf4023e0c94494f823378a84c7fe21e84ee24313ffd8ba851496c43517ee1ac193ff5b84c5d3d4648ad61789070000d9e9d7f SHA512 5a4eae869a1d446ebab295240ac4d25115aac84708dbef145fd86c5274570bea57a52efefc8b5d6fa9677db488b6cfabc201bb4a37beadc3200c1bc93fc77fab
diff --git a/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild b/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
index 51673fb81e1a..063014bd3851 100644
--- a/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
+++ b/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Tools to test taintedness"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/User-Identity/Manifest b/dev-perl/User-Identity/Manifest
index 3552726011bc..b213d18ade1b 100644
--- a/dev-perl/User-Identity/Manifest
+++ b/dev-perl/User-Identity/Manifest
@@ -1,3 +1,3 @@
 DIST User-Identity-0.99.tar.gz 28657 BLAKE2B 7374c2ae8be5d81c52bf57d94adbc881c2b07f5d8b11c7dd86d301b95deb93f77a75714831155cfb47fdf085cb271d014203bb3ed917d683faaa7cf0acf0701f SHA512 b0706cb5aed372b384229459c5b1a9e46968cd8d58f713754cd1a65a7caad0931839bf9d1540ce7a849f94a3d37f580120940364eb29684d3a84a009fb702cbb
-EBUILD User-Identity-0.990.0.ebuild 509 BLAKE2B 6a0871d9fe7b9c28a4a00344b2c8b6b3243d61b96b36b8360aae2887ea9b563b50c40402f1e06d4002c98711a73c4b7d109fae33065e1d97850b8e6e993252eb SHA512 966b626b03562811b687c275fc5239af535b7af9d98b0eea9788c5cd66e34af26dac88501227078bdd0d61d53e253e8b81a51c8af63a01b28477144741c9b1df
+EBUILD User-Identity-0.990.0.ebuild 508 BLAKE2B 6048ddea3d8321aebedb5377e34b1dfd5d8a2e9b4f613db2dab812fc989c506b647ae91467e5fe9a4da6be3ba6d4f169de60d624828ad3c8f9fbce462b3f5006 SHA512 9d943d65392ca07496544f8f22a8f1832f715d6a887aad696341867a05170895ff7b1ffd73a2f24ae8fbe3c73b556a15f002d854f75a0a4450900e4ced233d72
 MISC metadata.xml 1213 BLAKE2B c39c59b289f194355ffbd9f2f9bd611f69e390a87915ce9d733c5df77b07299b71e168ddd0072f03c67d2b061d1972612d3a01b631be0653cec35317c2618da6 SHA512 2701abcdf1efb1925990b6ee9e943b6f781737469890211b09f3d865fe71891b4842412805e784c19dcb6e6917b4df651a78442b49baacd1017d7bac235a5dd2
diff --git a/dev-perl/User-Identity/User-Identity-0.990.0.ebuild b/dev-perl/User-Identity/User-Identity-0.990.0.ebuild
index 96936bf60f6b..ee95944ce301 100644
--- a/dev-perl/User-Identity/User-Identity-0.990.0.ebuild
+++ b/dev-perl/User-Identity/User-Identity-0.990.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Maintains info about a physical person"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 933582ca4d4a..e2cde465ab01 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index b68d1b5ee77d..41e68aba2141 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,3 +1,5 @@
 DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
+DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
 EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
+EBUILD igbinary-3.1.6.ebuild 599 BLAKE2B 574cbbe31a4aba26a815825345c778b203bb63d96f92a8b42bcbefefa388607d06c8c528626650cf2e48b1e53a1c29da6e27538a7a22f36228b55e1cfa6a28ac SHA512 f02a4c2ec35240862a7532c41d556eb01c68be7dc3d2b912bd185529a0bb7b82f965cb2fbcabd1dee86d54c278b4b1a68f8269a304b6dda349786e041b719e74
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-3.1.6.ebuild b/dev-php/igbinary/igbinary-3.1.6.ebuild
new file mode 100644
index 000000000000..e50a7e5bec71
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.1.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+#IUSE=""
+
+#DEPEND=""
+#RDEPEND=""
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index ec2e741533b5..7f1fabe749e4 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1,3 +1,5 @@
 DIST uuid-1.1.0.tgz 15225 BLAKE2B 0a5a326076707e0d3e7c779151a13853e52d026ebdf62c9ab147cf5d00bbc68a3d82e15101c1d4a232d96ea7e988304a25517723adb3127938474172dfab16c2 SHA512 aea814a12e266e4a9e36c58bae78927fa9de6d2b7bf9c75a911710b26958aeecd31d972f56519cf4882a4b13864bc0740ad968b06e704ce7642279253009e76d
+DIST uuid-1.2.0.tgz 16270 BLAKE2B a3746dce1c27973247fd84ccdf8d73809fae775fa0cf133c3bf09c862d93c6c3a53f2d093a1df3dd8bab90f4e58c326e6e7944bfdf436723c79ad5b634e46e18 SHA512 bd557823a8c2b78f74675a2554445eafc69193c6fe5af1f9435cdd90a8efdec0d3974ae8af759fe7d30b2f805876fc2ef55058dea245c9d89a792f634fdb0a10
 EBUILD pecl-uuid-1.1.0.ebuild 422 BLAKE2B 9365759899e4c20d1c12e2b54c19f1f9bdd981f8ece3e0ef187cda55144581b2f6779fa372e7f8dbe1d1b1b87c3f3e651d0d1765373fad29648f5d8138b6514b SHA512 269853f1eb67f90e89b2ed2a6155cacd1c2f55627cbc75c5fd2e4ffd3e8185d55dc93c7e29d4e3113127641afe957bbd0166de6bbedbd75b9bf0f48bee9b1f07
+EBUILD pecl-uuid-1.2.0.ebuild 422 BLAKE2B 9365759899e4c20d1c12e2b54c19f1f9bdd981f8ece3e0ef187cda55144581b2f6779fa372e7f8dbe1d1b1b87c3f3e651d0d1765373fad29648f5d8138b6514b SHA512 269853f1eb67f90e89b2ed2a6155cacd1c2f55627cbc75c5fd2e4ffd3e8185d55dc93c7e29d4e3113127641afe957bbd0166de6bbedbd75b9bf0f48bee9b1f07
 MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
new file mode 100644
index 000000000000..f030569d725f
--- /dev/null
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="uuid"
+PHP_EXT_INIT="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A wrapper around libuuid"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a435f93557db..402ffcb17765 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/SchemaObject/Manifest b/dev-python/SchemaObject/Manifest
deleted file mode 100644
index 3577fdbd4953..000000000000
--- a/dev-python/SchemaObject/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SchemaObject-0.5.8.tar.gz 13909 BLAKE2B bbb3d16b22cc5915803f64cd2b158ed73cf93492448bffc8301b9b25cc13774e51eb7d47b7d107f1b7495660c4f0267b00310596176ea0da66df8ae85e43fb9b SHA512 656a0f27fe9618be39d0be45275f83bc53f1c8437d249d97aec7cd18b5c873af1258ae6ffbcf53459705ec213e2d4a6bbe4971749fc245771de50fae0d2faf55
-EBUILD SchemaObject-0.5.8.ebuild 456 BLAKE2B ceb03f620edcba16f545435a199c7484b4c7fde97994635714ca6787413709ab5bd06655436d5a4d438ddc3d96e66fcd5257474806637fabeb532304a7e69d23 SHA512 4da3910d74b080fbb99c70e77e94bca8481bd33559a991f5607557104f3c78f97b45ec0fe2e0a63ba07daa9bc2b7cb47dd280ad4591b4fb38ac7c87d6269ed0d
-MISC metadata.xml 388 BLAKE2B ede95453d68c2bd620b956fba9e491d29a02596a3978cdcd0342f7fe43a0640998e6a061d15c4d9c49f68de42ca68d4039a4540c1ba7f1c5a83434e877e834cf SHA512 b0630ad281d27b9422ccde414e8a5990eb437b14a1f1fd1152cb83794617fed59f2cd9b593e57a70948b386921e9b2c9e40ab879fc39d25402837c278c165e82
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.8.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.8.ebuild
deleted file mode 100644
index 46efc2b1b74b..000000000000
--- a/dev-python/SchemaObject/SchemaObject-0.5.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python object interface to a MySQL database schema"
-HOMEPAGE="https://github.com/mmatuson/SchemaObject"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/SchemaObject/metadata.xml b/dev-python/SchemaObject/metadata.xml
deleted file mode 100644
index 74a7c51f5345..000000000000
--- a/dev-python/SchemaObject/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mmatuson/SchemaObject</remote-id>
-		<remote-id type="pypi">SchemaObject</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 3cd2ee35ee6b..a14e87c21ba0 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1,5 @@
 DIST asgiref-3.2.10.tar.gz 25669 BLAKE2B 2cd0328054b218ae8abf840f85c7da6d9183dd5a52cef78176756020eb1f565fded9717fced3bc7fc4b85f9f1ff34b46ea95231b74afec0cbcc5000f9468c28b SHA512 8688d71103dfe569978712481161a88cce9aa6587eacbf29ea42d585817c813625360724d1d561d12456a6580647f9d4a098f194bd780f3c9f7e52a1e0aa8c88
+DIST asgiref-3.3.0.tar.gz 26945 BLAKE2B bdb1154175f95fc068fd1841a69ec9c5e782c212d9649aef0b9ca7592987f88d23311149f573febd76e5ab6fea4e6087a8c5e6e9e2edb4dab37d34ff3d180845 SHA512 fbb66af8f0e2bbeed31ae6ac358f045c0eef6cdeec6edbaf358f7551ff24e69233cfbc898b60ac9d16d747a9fb7e10a8b203065602140c025b2ae7d4d7229def
 EBUILD asgiref-3.2.10.ebuild 553 BLAKE2B 2cdfb25bd9f40cb79054b7d3702dc693045c66476d32921d086fdce5fbed39ef69ab2140adff05f3e071d139422c03376bf4f8582585a98bb4387de68a9daad9 SHA512 634b888ddfde6ad601e0c7d7d751b302ba74732c3ad440eb0434da0f1b03edf33765acfb6b855584a39e07ba16450dc4a4564051ab1c17b30f931b7362385921
+EBUILD asgiref-3.3.0.ebuild 555 BLAKE2B 0b6a29fb597615a1340f525b3f11345019e91de6927899519f2ff63551bb6feb539273f214066c97613b586f136909d4178367a162440df1e549770afc875bf9 SHA512 35762a636c0e74d3681f67964c88edf3cff219aa6433a16a6e20af53695590c9ecf4f75703a005ed69d4beb60011558b90a3cb83aebf4bdebca8746f06652ae7
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/asgiref/asgiref-3.3.0.ebuild b/dev-python/asgiref/asgiref-3.3.0.ebuild
new file mode 100644
index 000000000000..2a8bf860303e
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.3.0.ebuild
@@ -0,0 +1,23 @@
+# 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="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
deleted file mode 100644
index 084242097778..000000000000
--- a/dev-python/backports-unittest-mock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.5-r1.ebuild 1605 BLAKE2B 2a56838ba5cb467358546852341ede30f043acb9a44960b118cfca128d5779f74f6cfa1d304f0d618e8e3a95794be0d0f687c036c5593bc5e2ad53c9e01b5654 SHA512 79e96f3c4812a8ca16709b07edb8377ad8a563379f2b7027dbe0762f897a99ef73432ec53f2ccf956051070270c749fa8ce4a1fc373361890cc60551772b746b
-MISC metadata.xml 681 BLAKE2B 22de012464edfac5f0affab83c4cad95d416b1c822f9f50e788e60cd4a5d438ef3ece606c55621896ffe1778c1d17595c23449bf41199b964a7c153cb98e90bb SHA512 161c7de36344fbeca29706e7a7e12b9acb1e22ae82dd179b336054b64e04bea7a5af53386c0d4a06b45584146103cbc8546e83e6f5aa51eb345243aee8a6bf15
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
deleted file mode 100644
index 3cc0eb0d8c6d..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# avoid a collision with dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-unittest-mock/metadata.xml b/dev-python/backports-unittest-mock/metadata.xml
deleted file mode 100644
index 654b580f7f2f..000000000000
--- a/dev-python/backports-unittest-mock/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">backports.unittest_mock</remote-id>
-		<remote-id type="github">jaraco/backports.unittest_mock</remote-id>
-		<bugs-to>https://github.com/jaraco/backports.unittest_mock/issues</bugs-to>
-		<changelog>https://github.com/jaraco/backports.unittest_mock/blob/master/CHANGES.rst</changelog>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index e442dcdae362..6748b8369e44 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -5,5 +5,5 @@ DIST bleach-3.2.0.tar.gz 178910 BLAKE2B e7e97cc367420a656086e5a0e6c1c527348a0edc
 DIST bleach-3.2.1.tar.gz 179763 BLAKE2B 5288277ceae1f51fb76c360db72fb646e1d391b3e51f29ba2b25f5dba7704af8ef7cfd2db017237dad42ff4a99e502daa29cdf4edd82952e15842e288c50c0dd SHA512 61710f48f00333b38d251360736e19078063433ca4d7aada210a986f7d79b08c79c64b412686c67f360e4b2e8420c40c4b515eb175ab92bd546f88e2ba0e5835
 EBUILD bleach-3.1.5.ebuild 940 BLAKE2B 5315ab3d17d8bb34c94476e8002fb39797a250fcc27d80d2742d4fd4d094ddfc1dd05e45444f6129f6f3bde9b43094ccaf5d07a4785180dd84e182a6583973fd SHA512 90b38022a46803687d0cd0ca59d34096b326eb41794890ee39989b0bee48d8ce7434d2dba5b2ccefcfba24eae0065e681993915cf627608ee73e28d3f8a2f7b9
 EBUILD bleach-3.2.0.ebuild 957 BLAKE2B 212d497c9a976c26e5e114dbbc08d670330638b1a90f96730393f7d530a5faaaa54ad15aee07e93848653ac7b5ec82d078bcf7c8a75075f0d9e6e2b4015ec544 SHA512 66f3cb38660ecff452034774df89a8690d2dddafda66c93972e1404a07e7c5b13f852c9ff5ab45f465c5d00f7af5e05b86237be0a136159bc8d3f6e58542922d
-EBUILD bleach-3.2.1.ebuild 973 BLAKE2B f40585757043d04ca894d70bea67b99a801dfabe88cad3222d303731c5490f312b6977aa3f6b2ef1f8cf6affd36a360e278f16645d33984b3732768a7ef873fb SHA512 e40a6e10c5b7a1aa0e8dbdd6630274835eab469d9166e25a971e7846671fa00ffe2101538b74de5e6448267286ee5ca5ad34005494a26deffc6ec69064e8468f
+EBUILD bleach-3.2.1.ebuild 964 BLAKE2B 0fc52adbfca45e15a806fd2e4ff20f229f3699f9cc7bf6fc5e58b059f1cdd345c62628a18e7ed3cb8acd0cca919dfc0fd871e4aa4d70c3dfc9f9de2a0d70d1fd SHA512 e091913b8ff9b96d43aa5ce395fd7320f3741c243652825eab7b91b070bd3057aa50405673dd950dc0c2b22ce952fe917c81bfa0e004143fc92570efc3ec6c1b
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.2.1.ebuild b/dev-python/bleach/bleach-3.2.1.ebuild
index 4d1438843f60..147371a7c288 100644
--- a/dev-python/bleach/bleach-3.2.1.ebuild
+++ b/dev-python/bleach/bleach-3.2.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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 994f833bdb18..6be35525e44a 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 1707 BLAKE2B a6921683492ca6bfda6f2196edb51efc3e44bee1017c08acd4f2527e714a1ac52785072e84db3add4aad1084db880ede2195fe52a6a7f06c7842705a8639175d SHA512 97247eecb668280ab04afcd1a0f5b93b31c0f9ee0aba6dd25b2c695290500163256a8b2528ced0bf1355b92273b806ba8b7651f124cbec514dd68ec7e367c93b
+EBUILD blockdiag-2.0.1.ebuild 1712 BLAKE2B dff8084e5e82cdaf0498d1661e50f508ee3d4409783561cc9d53b72c117d7dce0e12b4e9b7e03e0f67c9deec93ca07684f60555c559b254be5df452f79498943 SHA512 19343b002b011b9a93ebee3cd66a7c2495d367eb6cf8bb3935779ff63d84fcab3d4141eabfbfff3781765af7fa946de225d5d4978daf3ed6d9d467cf4c642151
 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 691d7ccea55e..4620470514df 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="~alpha ~amd64 arm arm64 ~hppa ~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/boto3/Manifest b/dev-python/boto3/Manifest
index 87f74a4d6565..d777122389ac 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,6 +8,8 @@ DIST boto3-1.15.11.tar.gz 336108 BLAKE2B 9fdc00c194698c047ba7e42dbe8eedd3952fdb6
 DIST boto3-1.15.12.tar.gz 336150 BLAKE2B c6817e39fb19cd40f7cdcf6140303bd1993ec115e4ed9d0379d3fb05d31115abb964df86d5532cf3325a313957006565718945c2b07fb482d241e45a61659134 SHA512 a12cbfdd7664263ce1a2cba40d13b8a1b82fda9acf113c547e660adba46c31f382cce018ebc47686d5c65763ba5507757504ef00a4c5f2f12d3ff161b5badb14
 DIST boto3-1.15.13.tar.gz 336233 BLAKE2B d82c38c4021c4f76ba5aa37c2b6328cd4870c3d64b343d2ccf4d441c231243ff369d91ec56b45380ca19b1b35a3934c548bca41a61832a7ca519e4119911c383 SHA512 5e50a212f1b47c79e75d3f2dc6ace0984c82041c11a8c87c831cf3ed2452234089b3f91be05af5342893ae377ad3e119e5e2b5f329cf200a877a46f418b55cc1
 DIST boto3-1.15.14.tar.gz 336351 BLAKE2B 61e4ee1b235c07dc3d0d961a3e4b6138c79ee49a9d9e80b15d68d9f1d3bf7eaddc3f993f7de914d2f8ba939d0508875a912b87c58570f91e726a5b44198c2adb SHA512 a40c123b017d45dc100d70d66a2cd7850dbfe5cf3fca715d3f6226e23423c7710a157ec7567d9d9f45311bbb764b47b281c9a3757e9910c4453451bec385383a
+DIST boto3-1.15.15.tar.gz 336346 BLAKE2B 1dab0b7810cba83b28391b50e8c24a50d051827c090f7eb1b9511ecdcfcf625986aba639e292439315a413029c4392fa7a795ab154819ee7ac5dc7cd476169fa SHA512 b6ffe472bac7c6a12d9a1c901ddf9ed55368913e242421282e003eac1c02ad3336993e3c4343e5b8b624ea981e78df2536a41c74f42cc2e8a0d4f46d315200a6
+DIST boto3-1.15.16.tar.gz 336442 BLAKE2B 106c6bb5ee8ce43a11f486204528e04fd53a23e30ed58346782183e95e36dc25c1739915d3dc5bf3cd739cb93b7690f616d3273d0d8427c4f057003e075463e0 SHA512 21803d329964c598584d7452b83458dce6a8c3a36abc1c966f4db4386ac401ab78082973db789d1fccdd8f1866807793462a8197e3b4d75320dd0ec15f6187f0
 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
@@ -26,6 +28,8 @@ EBUILD boto3-1.15.11.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44
 EBUILD boto3-1.15.12.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.13.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.14.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.15.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.16.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
diff --git a/dev-python/boto3/boto3-1.15.15.ebuild b/dev-python/boto3/boto3-1.15.15.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.15.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.16.ebuild b/dev-python/boto3/boto3-1.15.16.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.16.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 d4a292fabd86..8fcf3c4a588c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,6 +10,8 @@ DIST botocore-1.18.11.tar.gz 6903038 BLAKE2B 07115ca9106997f9185fe84ef0ce8dd415e
 DIST botocore-1.18.12.tar.gz 6913367 BLAKE2B 243b30d32e229d72d659ebf2b27b57a69042f488c8ca43e00f82e6b64e2c09665e129894b972ce806ea0bd0a89a295d0545d1d53e0cd3246d2dafcdb2e43f56c SHA512 173e5b3ed7de93362ea69e581b236b551dfeec7f8a57652ca04347f334e5163f5adf52acd20a2aef0cfe20f157d0a5b13f09ca4c92bf603f6a3f22d517cf6306
 DIST botocore-1.18.13.tar.gz 6919052 BLAKE2B 52ef86c31e0b92221058ad2eb43eafe2953c59d1ed21d033f855961b409f43a77cfd72cce297b9752e230cb9953ed55febd3b0bdf44c99733472868b7e3db8dc SHA512 b3cf534d679533e43dee05d6c6e89271b88bd11185abf3790effe8df3b698e1d79a96d3d23b51f943861f975a3c883d9318e085b8ceda8d9dc454f6f0c50b9e7
 DIST botocore-1.18.14.tar.gz 6924624 BLAKE2B 78aa481a792cdd54712730189808df3627c5475e0f86a6927978eeb4c0056ed8f5f65d35949094164fba5be31b05664418b1c9368af265af5bd52c95a159c9a8 SHA512 dcc790b786634a308676b8f43b3bc9fbf4c84ac455a547b2240eb48bf93592fd30f68616efa562be0f1b59fa1a8b5dcefa1d5453ffaaf21804a282a5fcb56f47
+DIST botocore-1.18.15.tar.gz 6926102 BLAKE2B 04947ce595233c04c37268ffb237ba97b1a758280367ed4e01dc9dec17daf75e545d621f42b08fc74d7a27d680188ac3405b4368adef0c1adf6949225913af72 SHA512 a97f12a6fdbdeb97b4e44c895122bee6aeef0b67211dfdb43c7b5aa41af9b4881fcc9d75d83b0dfbc716000c8429577d7c2e73ea63b84f8337ef5f826a3a7015
+DIST botocore-1.18.16.tar.gz 6930500 BLAKE2B 3fc435ab9963544d31675c12c63dee166d49804f857bb7a278af2f564d27551dcafc5f9c5e84aef8f8648eae1afcdc509e498820df94819a1ebdb8bf6e34c625 SHA512 ac4c714c29309fb423caf805a855795d6713be85643e4b7269e412f52b79ab67225efa30e25c425fff45ed742e7aa2b4ac2ebe803705d8f60f49d477b0dd49f4
 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
@@ -28,6 +30,8 @@ EBUILD botocore-1.18.11.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7
 EBUILD botocore-1.18.12.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.13.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.14.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.15.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.16.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
diff --git a/dev-python/botocore/botocore-1.18.15.ebuild b/dev-python/botocore/botocore-1.18.15.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.15.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.16.ebuild b/dev-python/botocore/botocore-1.18.16.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.16.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/cbor2/Manifest b/dev-python/cbor2/Manifest
index 3463e5431dac..3d713312170c 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,3 @@
-DIST cbor2-5.1.0.tar.gz 72328 BLAKE2B 22737f1ce152eb356fc937199ba83e9558b68900f8183ee8acca52312fa56499812d6b26aaaa629b6e2cfacbdfbb72f65cb7fcbe93a010320aff94aec8dc3978 SHA512 0df4f0c5609ae8d73627a64ee1544af88461b2bf829538f23d912138cf47ae8d03193644c7315e2a77318e58fd2bd61c4cb103d94ed0710db0ae5c2cf4df60b7
 DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f
-EBUILD cbor2-5.1.0.ebuild 793 BLAKE2B ba87377c387ec8f77e743d8238b00d507a2cbae2b7e268f35c0c663b51abb27eac8bf237dcca360176be001d1708ed3b323baa5d4893bd89d19f24cefba1ce23 SHA512 197843e9efb07fdd5ca872772ef0ce60303780a33bc6cb8b7f767158c32d2e1998ce695f9679205442710d07efc229ed0336adbb1e0a80e2e7aa4d68950aeeef
-EBUILD cbor2-5.1.2.ebuild 794 BLAKE2B 53b7f0ae17cd0a36e901199185996efa15cce7f8d24ed4333296ff132490ba0c9b86b8ececd03312242c85bb94c9b6d200dbd617f0d6f2e1b9edd8b4b3cfee71 SHA512 d8aebc5b18ad2017156bb551c4a8f13c27f0c6053ea9bb858421b4c1d7c0942c697ca7e7bd07ee569e5e1169c8c84f71521577c38b15b96b94c11a40224d519c
+EBUILD cbor2-5.1.2.ebuild 793 BLAKE2B ba87377c387ec8f77e743d8238b00d507a2cbae2b7e268f35c0c663b51abb27eac8bf237dcca360176be001d1708ed3b323baa5d4893bd89d19f24cefba1ce23 SHA512 197843e9efb07fdd5ca872772ef0ce60303780a33bc6cb8b7f767158c32d2e1998ce695f9679205442710d07efc229ed0336adbb1e0a80e2e7aa4d68950aeeef
 MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
diff --git a/dev-python/cbor2/cbor2-5.1.0.ebuild b/dev-python/cbor2/cbor2-5.1.0.ebuild
deleted file mode 100644
index 212a52fd6ee0..000000000000
--- a/dev-python/cbor2/cbor2-5.1.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=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/cbor2/cbor2-5.1.2.ebuild b/dev-python/cbor2/cbor2-5.1.2.ebuild
index 3129f5bae8f9..212a52fd6ee0 100644
--- a/dev-python/cbor2/cbor2-5.1.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.1.2.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index c617c7c1d7d7..5707d860c637 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,5 @@
 DIST debtcollector-1.21.0.tar.gz 28472 BLAKE2B a7c4a2d41ff6df1df1bfc2b775d888c1f9839ddb76bc80ff6b9bb9d1fb8e14eb225006021a0889d2a49c317c48f65cec024ff1d3c4e9c9bee1c0139a7cd1fc71 SHA512 a5a4f66a4d65134e84164de6953d4c6d5b2b9d36974055d26263b6d8505c4a131d693c371287ccd9c76220a9b59d6c3d1f0015db1d0f2bd8eafcb79c0bef0822
+DIST debtcollector-2.2.0.tar.gz 28833 BLAKE2B 33361daaba12c52a1cc0bac168199ef3dbb959279def29ef782fa421f0aa106038de02217f6321c64e02845abd0573e69f5638b384411e7fbfd194dd3f6b3356 SHA512 6e5fdf38a25406a7a56d18e9b900471e3e4ce513ef62619c9eafa153ea08ff6b4b9bd90c524cfa16e04ff0c9c324e90d4fdd75212fced0b202245cdddae02137
 EBUILD debtcollector-1.21.0.ebuild 1446 BLAKE2B 7a06f5c5cff9d96e0e4f707a871ffbf9c748d08476b6a4a134008dfb3371bb5cdb6857cded68256ed4318cdd3a6447d79c7527ad6b814bce8c31093f98b44daa SHA512 f9a7f99913dd0f7543be2a4012746f94d5298324c39ff857f4c30982edf52ec9bfeffe3b3e3ef55584c0c1c1a17a85f8f6dd453ddf011364f601497b4daa7b08
+EBUILD debtcollector-2.2.0.ebuild 663 BLAKE2B 6c3a52318acf34911fd493b5a474c853d441e10d72dd5aff6f8562998d03a406db45b7b23e27b37b6f9289f4fc93bd1d6c77e183e9a1af2af53bd9877014d45d SHA512 67d3f028f0306c442688158a56d7147ad67a86b7cbda841d42bb4ddbdbdf1e1ee9f0d183c7164f0874bc6cea04711632dfa93caaf13caa83e1e0c28d397edfc8
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-2.2.0.ebuild b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
new file mode 100644
index 000000000000..e76434a9b879
--- /dev/null
+++ b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
@@ -0,0 +1,25 @@
+# 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=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
new file mode 100644
index 000000000000..311758c428ca
--- /dev/null
+++ b/dev-python/fastjsonschema/Manifest
@@ -0,0 +1,3 @@
+DIST python-fastjsonschema-2.14.5.tar.gz 33488 BLAKE2B 4604ebd46851c8fe856909fa3943e053ac7359a9f360c189add2a46780fe045ca1952033174d008db7696bfc861a504c3aaa7389c33a2edbccd10cb14de8a097 SHA512 255db86d1d62845e512ca5669f3200360847d974710050ac53fe88536d6d9f943ccf41a8414702dad70fa1a38defe9859f2b608e13a54af11199c90d63cdf1d0
+EBUILD fastjsonschema-2.14.5.ebuild 580 BLAKE2B 24a55e7988ace6c0d847a65588175fb752ace0ade7f1fe4514bbe779bb7cc1077e6238c05e8b24c97af15ba886c01e311d06b6e6896291ba0c020b90a65b472b SHA512 895d73e63a828df72bc366ec576acb55026d7f1495e1fe70a4d320230b0f1613a3c389132fe572d30044feca3ca6aede61aaf89cf6a583412647ea6f8ccc6bc4
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
new file mode 100644
index 000000000000..b6cd18b90bad
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="https://github.com/horejsek/python-fastjsonschema/"
+SRC_URI="
+	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -r tests/benchmarks || die
+}
diff --git a/dev-python/fastjsonschema/metadata.xml b/dev-python/fastjsonschema/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/fastjsonschema/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 7425075b4761..b1e7125ce146 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,5 +2,5 @@ AUX flake8-3.8.3-pytest6.patch 1883 BLAKE2B bd4eb8f184636bfbc33b262df8c5612402a1
 DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
 DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
 EBUILD flake8-3.8.1.ebuild 1370 BLAKE2B dea3b7d66efcbb3097ac81e75cd0d76910ea424fee8017e7ae9cde2804858da1f0476a422403b00b17d476eba997afe96b393fd119d25d209ff2e43b72a337f4 SHA512 ea4e8d513f18033b12ee674a16328d41dad86590706623987c379871249b54ffb2527bca1ef0a8a5c5ff661655cef6a7cc9113573d2d4d498472de9568c1a9bf
-EBUILD flake8-3.8.3-r1.ebuild 1353 BLAKE2B 7fd5e93c85b51e861f2ff6936ba62ae7e1eddcdfaacfa8a5d14ca949f783074c67f1f393f5677212ceb1441efc576e94f716e8a7e79eedbb26da1570e50351ce SHA512 d0942783df4f7158e7af6c5c07dd98003c037fb17bacfd90d020a6809c250e5e7c812ac37a2138912e9633aae5f605d8790fa82da0a27aaeceb213e6f13de512
+EBUILD flake8-3.8.3-r1.ebuild 1365 BLAKE2B 198664af3f8cd61f1ba6b57bff031f6bec4acb0b2f985a0c63c3652384215a2f2daf2818da595df2006d4805a17fcf58fc1220ebf3c9e30ddb22fc6a0138d190 SHA512 99aa3e70b1218ebdb714c43e87eaece803fa0eaf63ed820adac2409a3e713817f940477912b39d8514a9eaf2e2ea76b46637b1ac14617e29643b9cee3cd7f51c
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
index d64a823cf239..8076bf0ff4b2 100644
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ b/dev-python/flake8/flake8-3.8.3-r1.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 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index daf7697bbec3..9db085fcbb96 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0c
 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
+EBUILD grpcio-1.32.0-r1.ebuild 1208 BLAKE2B a740044f3e69fcba659d4b950b363ab9fcffccd78e4932d8dd72ccf1e6f9e9e2d412b8a46585b421518ba590f730f7ad4aa0beb33cb1e1e255c90f2336f57146 SHA512 9d72375b52b0158d199567460499c277b8076506c095876dc5ab2cf2fa531c1965cda561f6a99158476fe289bff35a27a7304a42f1a5aa876433034dc34e14cd
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
new file mode 100644
index 000000000000..6a709cdf780c
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.32.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
+
+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() {
+	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
+	export GRPC_BUILD_WITH_BORING_SSL_ASM=
+	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/grpcio/grpcio-1.32.0.ebuild b/dev-python/grpcio/grpcio-1.32.0.ebuild
deleted file mode 100644
index d5fdc2f0f42b..000000000000
--- a/dev-python/grpcio/grpcio-1.32.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
-
-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/html5lib/Manifest b/dev-python/html5lib/Manifest
index a7ad0cc1ae9c..120dfacb0fb0 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,7 +1,3 @@
-AUX html5lib-1.0.1-collections-abc.patch 1336 BLAKE2B 2b626d56830ff818168ca5b0fa272290e787a700c12b5295e085c0092dbe0746df1336f550573f1960bc0cb911d0639cbeb06a011a9bbeb3b2e42fcbe99e6bef SHA512 ad959536b627984948b984b700758a1e61d7f2e145a920d4020d23e7ff15fe88b31a3569c441df39122ffbedf2a1dfebf17fb00c3194c6ceb69a00f412622ecf
-AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f2008978378c54a889cdd3cc28f33993d16654dff6ad7dbff69a42dcdef7c3cbd57677c88bec9650fdccdd754b488c956146168290661090a4702c9e SHA512 51435c4094fa0e0c423e21c15709e5ebe10546cbea3ac97635c3d1ebef9287d6c42a479075cc790ccf233c67924a518638d6618f073df2b0871da3fb2838e10e
-DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
-EBUILD html5lib-1.0.1-r2.ebuild 1000 BLAKE2B f9d18a3bc62939db608535664b81d2d81e10cac020b08ac940798a036145f9e1f0156a98d3d17dbc56ad25785b9078df99be8a213b0beff3a2d03b0af8878f36 SHA512 0812c6c817aff122c8edd70d85ba51dcc8d1a751ce1ad08cdd28ef5954cfb79135a477e2a046a08dcab99ff0ecf06860d79a381ee3706af6170cdb19c9313d36
-EBUILD html5lib-1.1.ebuild 806 BLAKE2B 75704b97487457ca6a5fe83c9e7e0b79932f3c1823f83c0a17bf86b6de8be3a28c14192b22438af69727877bccf260b079425675ebd957901c08d07ea9ab82e2 SHA512 4cb48d3f6be07d149b7e5565529878a8e3e881aa2cf1e65af1db7079ed615b4a55b5ca9a15694e111699ae9a8c271e8eb0bb0dcb013a1dea7ce891c45e3684a0
+EBUILD html5lib-1.1.ebuild 802 BLAKE2B 7325fd67a0c6ac07fa2e50d2655b3ba9a75f8e46c54caf0eaa6c58d20ed8fc693b831c9f42fdc875e30d9d8b865401ae367f721cb19d1661d148069dcd600ad3 SHA512 0a32a46b25bc0aa5e297a8bd58e7b641dedfe0a9e8b8499175f023978bf95e164cd2aea6cdc66e81986004d07981777f8078cd44a739612a62a8bbe9aed0cafc
 MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch
deleted file mode 100644
index d5a9dcac299d..000000000000
--- a/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4f9235752cea29c5a31721440578b430823a1e69 Mon Sep 17 00:00:00 2001
-From: 5j9 <5j9@users.noreply.github.com>
-Date: Mon, 1 Oct 2018 15:02:33 +0330
-Subject: [PATCH] Try to import MutableMapping from collections.abc (#403)
-
-Note that collections.abc has been added in Python 3.3.
-
-Fixes #402
----
- html5lib/_trie/_base.py      | 5 ++++-
- html5lib/treebuilders/dom.py | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/html5lib/_trie/_base.py b/html5lib/_trie/_base.py
-index a1158bbb..6b71975f 100644
---- a/html5lib/_trie/_base.py
-+++ b/html5lib/_trie/_base.py
-@@ -1,6 +1,9 @@
- from __future__ import absolute_import, division, unicode_literals
- 
--from collections import Mapping
-+try:
-+    from collections.abc import Mapping
-+except ImportError:  # Python 2.7
-+    from collections import Mapping
- 
- 
- class Trie(Mapping):
-diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py
-index dcfac220..d8b53004 100644
---- a/html5lib/treebuilders/dom.py
-+++ b/html5lib/treebuilders/dom.py
-@@ -1,7 +1,10 @@
- from __future__ import absolute_import, division, unicode_literals
- 
- 
--from collections import MutableMapping
-+try:
-+    from collections.abc import MutableMapping
-+except ImportError:  # Python 2.7
-+    from collections import MutableMapping
- from xml.dom import minidom, Node
- import weakref
- 
diff --git a/dev-python/html5lib/files/html5lib-python-1.0.1-support-pytest4.patch b/dev-python/html5lib/files/html5lib-python-1.0.1-support-pytest4.patch
deleted file mode 100644
index 98c9fb23fc77..000000000000
--- a/dev-python/html5lib/files/html5lib-python-1.0.1-support-pytest4.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 2699544837e68b12f1740a7eb56882a0dc0a4008 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 28 Mar 2019 01:45:43 +0100
-Subject: [PATCH 1/4] Support pytest 4
-
-Fixes https://github.com/html5lib/html5lib-python/issues/411
----
- html5lib/tests/test_encoding.py    |  4 ++--
- html5lib/tests/test_sanitizer.py   | 14 +++++++-------
- html5lib/tests/test_serializer.py  |  2 +-
- html5lib/tests/test_stream.py      |  7 ++++---
- html5lib/tests/test_treewalkers.py |  2 +-
- requirements-test.txt              |  2 +-
- tox.ini                            |  2 +-
- 7 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py
-index 9a411c77..97b6ca2a 100644
---- a/html5lib/tests/test_encoding.py
-+++ b/html5lib/tests/test_encoding.py
-@@ -99,8 +99,8 @@ def test_encoding():
-     for filename in get_data_files("encoding"):
-         tests = _TestData(filename, b"data", encoding=None)
-         for test in tests:
--            yield (runParserEncodingTest, test[b'data'], test[b'encoding'])
--            yield (runPreScanEncodingTest, test[b'data'], test[b'encoding'])
-+            runParserEncodingTest(test[b'data'], test[b'encoding'])
-+            runPreScanEncodingTest(test[b'data'], test[b'encoding'])
-
-
- # pylint:disable=wrong-import-position
-diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py
-index 45046d57..1b7285fc 100644
---- a/html5lib/tests/test_sanitizer.py
-+++ b/html5lib/tests/test_sanitizer.py
-@@ -67,19 +67,19 @@ def test_sanitizer():
-                         'tfoot', 'th', 'thead', 'tr', 'select']:
-             continue  # TODO
-         if tag_name == 'image':
--            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
-+            runSanitizerTest("test_should_allow_%s_tag" % tag_name,
-                    "<img title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz",
-                    "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-         elif tag_name == 'br':
--            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
-+            runSanitizerTest("test_should_allow_%s_tag" % tag_name,
-                    "<br title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz<br/>",
-                    "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-         elif tag_name in constants.voidElements:
--            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
-+            runSanitizerTest("test_should_allow_%s_tag" % tag_name,
-                    "<%s title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz" % tag_name,
-                    "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-         else:
--            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
-+            runSanitizerTest("test_should_allow_%s_tag" % tag_name,
-                    "<%s title=\"1\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</%s>" % (tag_name, tag_name),
-                    "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-
-@@ -93,7 +93,7 @@ def test_sanitizer():
-         attribute_value = 'foo'
-         if attribute_name in sanitizer.attr_val_is_uri:
-             attribute_value = '%s://sub.domain.tld/path/object.ext' % sanitizer.allowed_protocols[0]
--        yield (runSanitizerTest, "test_should_allow_%s_attribute" % attribute_name,
-+        runSanitizerTest("test_should_allow_%s_attribute" % attribute_name,
-                "<p %s=\"%s\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>" % (attribute_name, attribute_value),
-                "<p %s='%s'>foo <bad>bar</bad> baz</p>" % (attribute_name, attribute_value))
-
-@@ -101,7 +101,7 @@ def test_sanitizer():
-         rest_of_uri = '//sub.domain.tld/path/object.ext'
-         if protocol == 'data':
-             rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ='
--        yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol,
-+        runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol,
-                "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
-                """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri))
-
-@@ -110,7 +110,7 @@ def test_sanitizer():
-         if protocol == 'data':
-             rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ='
-         protocol = protocol.upper()
--        yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol,
-+        runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol,
-                "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
-                """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri))
-
-diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
-index c23592af..a4250935 100644
---- a/html5lib/tests/test_serializer.py
-+++ b/html5lib/tests/test_serializer.py
-@@ -222,4 +222,4 @@ def test_serializer():
-         with open(filename) as fp:
-             tests = json.load(fp)
-             for test in tests['tests']:
--                yield runSerializerTest, test["input"], test["expected"], test.get("options", {})
-+                runSerializerTest(test["input"], test["expected"], test.get("options", {}))
-diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py
-index 27c39538..a9b3ebbe 100644
---- a/html5lib/tests/test_stream.py
-+++ b/html5lib/tests/test_stream.py
-@@ -308,9 +308,10 @@ def test_invalid_codepoints(inp, num):
-                           ("'\\uD800\\uD800\\uD800'", 3),
-                           ("'a\\uD800a\\uD800a\\uD800a'", 3),
-                           ("'\\uDFFF\\uDBFF'", 2),
--                          pytest.mark.skipif(sys.maxunicode == 0xFFFF,
--                                             ("'\\uDBFF\\uDFFF'", 2),
--                                             reason="narrow Python")])
-+                          pytest.param(
-+                              "'\\uDBFF\\uDFFF'", 2,
-+                              mark=pytest.mark.skipif(sys.maxunicode == 0xFFFF,
-+                                                      reason="narrow Python"))])
- def test_invalid_codepoints_surrogates(inp, num):
-     inp = eval(inp)  # pylint:disable=eval-used
-     fp = StringIO(inp)
-diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
-index 67fc89e5..c2323b7e 100644
---- a/html5lib/tests/test_treewalkers.py
-+++ b/html5lib/tests/test_treewalkers.py
-@@ -99,7 +99,7 @@ def test_treewalker_six_mix():
-
-     for tree in sorted(treeTypes.items()):
-         for intext, attrs, expected in sm_tests:
--            yield runTreewalkerEditTest, intext, expected, attrs, tree
-+            runTreewalkerEditTest(intext, expected, attrs, tree)
-
-
- @pytest.mark.parametrize("tree,char", itertools.product(sorted(treeTypes.items()), ["x", "\u1234"]))
-diff --git a/requirements-test.txt b/requirements-test.txt
-index 4e223a3f..b936e0fa 100644
---- a/requirements-test.txt
-+++ b/requirements-test.txt
-@@ -4,7 +4,7 @@ tox
-
- flake8<3.0
-
--pytest==3.2.5
-+pytest>=4.3,<4.4
- coverage
- pytest-expect>=1.1,<2.0
- mock
-diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py
-index 97b6ca2a..9f137e7a 100644
---- a/html5lib/tests/test_encoding.py
-+++ b/html5lib/tests/test_encoding.py
-@@ -95,6 +95,7 @@ def runPreScanEncodingTest(data, encoding):
-     assert encoding == stream.charEncoding[0].name, errorMessage(data, encoding, stream.charEncoding[0].name)
-
-
-+@pytest.mark.skip(reason="broken under pytest4")
- def test_encoding():
-     for filename in get_data_files("encoding"):
-         tests = _TestData(filename, b"data", encoding=None)
-
-From 8ded69fdc0ae45f0531e1633927beb2190ab18a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Fri, 8 Nov 2019 15:28:00 +0100
-Subject: [PATCH 3/4] Make flake8 happy
-
----
- html5lib/tests/test_sanitizer.py | 44 ++++++++++++++++++++------------
- 1 file changed, 27 insertions(+), 17 deletions(-)
-
-diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py
-index 1b7285fc..a29d5ef3 100644
---- a/html5lib/tests/test_sanitizer.py
-+++ b/html5lib/tests/test_sanitizer.py
-@@ -63,25 +63,32 @@ def test_sanitizer():
-     for ns, tag_name in sanitizer.allowed_elements:
-         if ns != constants.namespaces["html"]:
-             continue
--        if tag_name in ['caption', 'col', 'colgroup', 'optgroup', 'option', 'table', 'tbody', 'td',
--                        'tfoot', 'th', 'thead', 'tr', 'select']:
-+        if tag_name in ['caption', 'col', 'colgroup', 'optgroup', 'option',
-+                        'table', 'tbody', 'td', 'tfoot', 'th', 'thead',
-+                        'tr', 'select']:
-             continue  # TODO
-         if tag_name == 'image':
-             runSanitizerTest("test_should_allow_%s_tag" % tag_name,
--                   "<img title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz",
--                   "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-+                             "<img title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz",
-+                             "<%s title='1'>foo <bad>bar</bad> baz</%s>" %
-+                             (tag_name, tag_name))
-         elif tag_name == 'br':
-             runSanitizerTest("test_should_allow_%s_tag" % tag_name,
--                   "<br title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz<br/>",
--                   "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-+                             "<br title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz<br/>",
-+                             "<%s title='1'>foo <bad>bar</bad> baz</%s>" %
-+                             (tag_name, tag_name))
-         elif tag_name in constants.voidElements:
-             runSanitizerTest("test_should_allow_%s_tag" % tag_name,
--                   "<%s title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz" % tag_name,
--                   "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-+                             "<%s title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz" %
-+                             tag_name,
-+                             "<%s title='1'>foo <bad>bar</bad> baz</%s>" %
-+                             (tag_name, tag_name))
-         else:
-             runSanitizerTest("test_should_allow_%s_tag" % tag_name,
--                   "<%s title=\"1\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</%s>" % (tag_name, tag_name),
--                   "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
-+                             "<%s title=\"1\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</%s>" %
-+                             (tag_name, tag_name),
-+                             "<%s title='1'>foo <bad>bar</bad> baz</%s>" %
-+                             (tag_name, tag_name))
-
-     for ns, attribute_name in sanitizer.allowed_attributes:
-         if ns is not None:
-@@ -92,18 +99,21 @@ def test_sanitizer():
-             continue
-         attribute_value = 'foo'
-         if attribute_name in sanitizer.attr_val_is_uri:
--            attribute_value = '%s://sub.domain.tld/path/object.ext' % sanitizer.allowed_protocols[0]
-+            attribute_value = '%s://sub.domain.tld/path/object.ext' \
-+                % sanitizer.allowed_protocols[0]
-         runSanitizerTest("test_should_allow_%s_attribute" % attribute_name,
--               "<p %s=\"%s\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>" % (attribute_name, attribute_value),
--               "<p %s='%s'>foo <bad>bar</bad> baz</p>" % (attribute_name, attribute_value))
-+                         "<p %s=\"%s\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>" %
-+                         (attribute_name, attribute_value),
-+                         "<p %s='%s'>foo <bad>bar</bad> baz</p>" %
-+                         (attribute_name, attribute_value))
-
-     for protocol in sanitizer.allowed_protocols:
-         rest_of_uri = '//sub.domain.tld/path/object.ext'
-         if protocol == 'data':
-             rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ='
-         runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol,
--               "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
--               """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri))
-+                         "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
-+                         '<img src="%s:%s">foo</a>' % (protocol, rest_of_uri))
-
-     for protocol in sanitizer.allowed_protocols:
-         rest_of_uri = '//sub.domain.tld/path/object.ext'
-@@ -111,8 +121,8 @@ def test_sanitizer():
-             rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ='
-         protocol = protocol.upper()
-         runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol,
--               "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
--               """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri))
-+                         "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
-+                         '<img src="%s:%s">foo</a>' % (protocol, rest_of_uri))
-
-
- def test_lowercase_color_codes_in_style():
-
-From b4d066b2d9b4ea1135183c6500565c2ab8758bf1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Fri, 8 Nov 2019 16:17:19 +0100
-Subject: [PATCH 4/4] No limits on the upper version of pytest
-
----
- requirements-test.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements-test.txt b/requirements-test.txt
-index b936e0fa..1cd46922 100644
---- a/requirements-test.txt
-+++ b/requirements-test.txt
-@@ -4,7 +4,7 @@ tox
-
- flake8<3.0
-
--pytest>=4.3,<4.4
-+pytest>=4.3
- coverage
- pytest-expect>=1.1,<2.0
- mock
diff --git a/dev-python/html5lib/html5lib-1.0.1-r2.ebuild b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
deleted file mode 100644
index cb7387aff2c9..000000000000
--- a/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,37 +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} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-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 s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT+=" !test? ( test )"
-
-RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest-expect[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# fix deprecated import
-	"${FILESDIR}/html5lib-1.0.1-collections-abc.patch"
-	# https://github.com/html5lib/html5lib-python/pull/429
-	"${FILESDIR}/html5lib-python-1.0.1-support-pytest4.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index cee55175f437..f4474efcf50d 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.1.ebuild
@@ -14,7 +14,7 @@ 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-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 0e79d2afbbd4..3ab5600b095c 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 567 BLAKE2B 9fbbe9fa9495f07e45e81ad0e828289c29c100557dbf929eb70a7b60b055b22b262996d5570c3a19e4e301666366549fab6c47b5088a8606af9cbd12690fd35b SHA512 13c4d68d55e1eb9ae34d6475a49e086eb87fe89bc1372f1a56188eab5707c00db0b9e88ebb8d9d3e2670d7e2ccd053fde22b5eb22550ca6bbe94a2257027ffdd
+EBUILD iniconfig-1.0.0.ebuild 565 BLAKE2B ee0830dfcea5ed57db1de3a222297fa19162ad5acac8683584189ae4e3c5f7e9df833f63fbe10d20ca096dae3e879d00959e280255eadd660d49375e299704e5 SHA512 3da91707303e321ae1541202c236c1c2ad5c363107d560e81314781e5935844064ebd91d489dc8883e8a5bc8c85bf1764a5ccad8513c8018de1ec990ffa30ec9
 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 77fa2d51ed44..90855e8bfa53 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="~alpha ~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/iniparse/Manifest b/dev-python/iniparse/Manifest
index d83284a883d2..1951da7f7690 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,5 +1,7 @@
 AUX iniparse-0.4-python3.patch 16919 BLAKE2B bb33df2937755ab4381adcdc17e3ae72eb08f0f7d22d640aae06fbe52f16f90218e298c674a030fcc299dcf7107b1073fe4e3ec8f34683d283b9586316bf9aa5 SHA512 ed292dca5b124da5de1617cb2ad4f743b836607226805e488572b37cb08e9a71595ef2e008a26f99f8dd0acaa1308a77cdf58b48cde231524d034138df26ef7e
 AUX iniparse-0.4-tests.patch 779 BLAKE2B ccda778ea17d34d59fe16e0b63fc140ac12c1e06756e1959327787e8f7cf17dd070857b15ee62e5f6a62401da64aedd8819adc2db54936179b0b7b76001e5692 SHA512 543770491ca075463e4947d7adff0c846e31e03ba7b263c37d9728b93486ff751d8066cb5cdec3a244c30e00f6f1edbd39ec6ea1188340d0a3edf460af147ee3
 DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
+DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
 EBUILD iniparse-0.4-r2.ebuild 628 BLAKE2B 6211a2be0748307111dc2cef4e8347149f308701feb9e5c4ac709d31b3d7926ead2ada0f2cc8d2f472d8b60740b64a3e8902ee3c51ba304c8a834c4466d45231 SHA512 b3d588bca29b8938f58327bfdd6fe42e3bfb18c4c135044b5585720a20984bd1960c70fb228e2eaa08fff236772923c46e62a1f52d7a9748cf88725349cfb4b9
+EBUILD iniparse-0.5.ebuild 552 BLAKE2B 7427d9070a447ba65a24df350ed84632346b0b37baf95daf4b73a7f0db01659843165063e66a498327f2d8fc04399578dbaea1f3f6e02594e1eb397864f11422 SHA512 eef92057b77a2273c934f7e444415719d84528a8c891674715f2d40785a54917e0973e1ffb94e3cbfc83150a3dc126308230c6405f2809244d5d0eaa1c7b801e
 MISC metadata.xml 311 BLAKE2B 04891a9e61e3ea4e639f43044579b5ad5bb5a0cd0b1b9cef41e49b896b73c8d8ac22962f202764082de0355ce7bfa3ce1953a7c7d6d1d3523d4cd8d58fa06ad7 SHA512 f29afa7ed4888925433a7af5746a6d707c51856a95bf08c6f3b705e721091f84e18b1654d5e0cfb2e00d50d8eff2fa169d94a3642c5903e8cc503ff2a833ce72
diff --git a/dev-python/iniparse/iniparse-0.5.ebuild b/dev-python/iniparse/iniparse-0.5.ebuild
new file mode 100644
index 000000000000..f916d7a5feb9
--- /dev/null
+++ b/dev-python/iniparse/iniparse-0.5.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_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Better INI parser for Python"
+HOMEPAGE="https://pypi.org/project/iniparse/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die
+}
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 7e0001753542..2cac7e2f6d0c 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,6 +1,8 @@
 AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e77b79aa5095a428c29a2420ca0308b88ede5070d827fcd5ac5815895f9dcfa846dfd2d983640134343e89b2079ef37 SHA512 6e32001e2f3fdc97da37f82dbe37ab293b1a7489d5c533f276583161028384da623bc3ea51e90e7440a866c28c6828eed272e27821a3f101d0e3e635f809efd0
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
+DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
 EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
 EBUILD isort-4.3.21_p2-r1.ebuild 789 BLAKE2B 555ce31eb81a5cc99196fb73c98472368f191aa3614bde3ecd9d06c5c9b7956d1d4211b0a08c2f626c8d7a24c8ad346e427b074884d9960a620dd7a49204fa2e SHA512 eb8e7ba2fe0b40a90bdab8b06a8ea71655c6bf2d84ce2119780cce907ffb09c4d3d50d9813e0390b98ec14603072c3307342e66fb72a494b578dd98aad8be57f
-MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
+EBUILD isort-5.6.3.ebuild 1615 BLAKE2B 2d9daeea34def504a3b761dc5740eb05917b3f7c7db6825c23934b0248bb22bd2de231ca1a4a3d23b3c806a29342ad080c240f55b6cfb183b02391bea4712369 SHA512 1a40931eb76df000121e7c50d8627acc422faf4b7562f2b79d96d669e13dab1b1c4313365b90cc53d5d4858c29092c0859a7fe85b56d38f96f0b1aae0260f25c
+MISC metadata.xml 549 BLAKE2B 930c90b9f50799ce1e2c844f2bc5b746567843ff32d91fc39d00b97342432d2a5ab088c70e16ab366249207db3440c8d4431ef2e0a7c9344704ea949f0b6dddc SHA512 8e43b0072cf5a68e2e081a7bef8f6754925276d1600faee317dcf8618848ca6fda13c8607adb6ea03df7a7de9418b88b0be30f5b3d89cc1e5815558b6c984e02
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
new file mode 100644
index 000000000000..d110e4d7d91a
--- /dev/null
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing
+	local skipped_tests=(
+		# Fails without -s, run it separately to avoid unnecessary output
+		tests/unit/test_importable.py
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+		# Require "example_isort_formatting_plugin", we're not going
+		# to add an example package just to run a few tests
+		tests/unit/test_literal.py::test_value_assignment_list
+		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
+		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
+		# Same here: requires "example_shared_isort_profile"
+		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
+	)
+	pytest -s tests/unit/test_importable.py \
+		|| die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/isort/metadata.xml b/dev-python/isort/metadata.xml
index 27370316e81d..459e820983fe 100644
--- a/dev-python/isort/metadata.xml
+++ b/dev-python/isort/metadata.xml
@@ -10,5 +10,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">isort</remote-id>
+		<remote-id type="github">PyCQA/isort</remote-id>
+		<bugs-to>https://github.com/PyCQA/isort/issues</bugs-to>
+		<doc>https://pycqa.github.io/isort/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 95827cbcfeba..da233123f1b3 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,7 +1,9 @@
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
 DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34
+DIST joblib-0.17.0.tar.gz 345984 BLAKE2B 4f4cb83037fc02ce9ea17e7dc5d284235b847eeb90bf1a877c4168aabd9ad4dd762e45a6485806efc759cdfcb98e6ee70e6d9a498cd7645b1d6b0051a9f9ba2e SHA512 73c42a9f5949478a4a03b97ec31549cabca2ebc968d2c869632696b671c175dc85ae7aa8ac92905f13f830083b2305b56df1552f1d70fa7fe51945ae7286840a
 EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
 EBUILD joblib-0.15.1.ebuild 1149 BLAKE2B e709f488c7fca5f6c292be9be23aad64e770dddfde15ef70f0ed8981dc96fc728f14bfb359f9de86f8c5594b9d61973f4cd37d25c294ff8f58e7a8a8148e5dc0 SHA512 0c5f8ba7e79646eb12418bae0b50a0a252547339e781c4d24fc93a07f370c8349edfa0c238b22f277aed92e004d3c7b988939f6e28051d8a5de6284e72317fdd
 EBUILD joblib-0.16.0.ebuild 1411 BLAKE2B 5149186a07a23d3b1bb74c325772f6c83ffe7ae7ee7cecc82b91d211af4c5976f65d399a793e59bd4ce17d135aaa25bb7a8f1468b6e1dde9c7027fe03d03d708 SHA512 31f125a0f98751656404299c42099eb693eede55f445ca88ed989f1cf2726552d9a5a667765689a02b4b1d6c5e9248e3da38f4d271183e17d9e995b73e9cfe65
+EBUILD joblib-0.17.0.ebuild 1297 BLAKE2B 76d16bc336a6acbecc4ebbd72a2e61b41220e06b5e8ff9237571ac704dff44dceba165aeea0462aef8a2bacf8432aa19f5fa8a3bc560ca421d89fbe5783d0c79 SHA512 34828284105e78cfd20e6b65efefbfc7303b6aca46cd34191f32db5341b9aa5210416d2e41243cd50474aa76bdd1126d2dad9fda6e24d569ade7b89b75784fd9
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-0.17.0.ebuild b/dev-python/joblib/joblib-0.17.0.ebuild
new file mode 100644
index 000000000000..cbff1fbeb9f5
--- /dev/null
+++ b/dev-python/joblib/joblib-0.17.0.ebuild
@@ -0,0 +1,50 @@
+# 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="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+# joblib is imported by setup.py so we need ${RDEPEND}
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	# https://github.com/joblib/joblib/issues/1115
+	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
+		-i joblib/test/test_memory.py || die
+
+	# tries to fetch from the internet
+	rm examples/compressors_comparison.py \
+		examples/parallel/distributed_backend_simple.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 619b1611aa72..4311035a5499 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,3 +1,5 @@
 DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35
+DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
 EBUILD keystoneauth-4.0.1.ebuild 877 BLAKE2B 93c70b939b0790bc9bd8e1c33121f411156905abb3642868b018ea069935330c98d084dfe2e89b67878f466fc056f70ceaf7c1166284ed10400c84ef2b22fd09 SHA512 10a15403a11302974bd4385812fdc48dcdeaf430d6bbe43b5f49137e64f2a5336879998690eddee5bc43b9ce11fe14d000c8703a6478ae8cdcae44ebf6d80d40
+EBUILD keystoneauth-4.2.1.ebuild 881 BLAKE2B 5276bbc4db68a6cb8c19068fdf06cf6ada6862cc5eaa18bb1b6f167e47db7ccc98c14121ed40f10cfd20fb098889dad7d713d242d93759d8befff851606aff7e SHA512 e847cdb219a39777cb4fd621400ce4160870ce868f4317c690170b2b10eb4e0ed5c2729c03bffc3bf50e0461cb8f6b29b032c0578679f68f7bb9bbcf64b0e9e5
 MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
new file mode 100644
index 000000000000..e3d33b772a08
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1.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 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${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/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1a89b2828144..8fc98e8bb1df 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 894 BLAKE2B aa084b3a3d776b1619178d3fcca66186b3ad477280c5dec680b266ad3fe1b23d70369c38a41612cd056ee368504dafd36a249597fb1f4c1e27fc04d054c0a990 SHA512 156bc221dfccac6a6c31ac4e0883b6cab0899acafebd63866638c8e6cc62240ea714a5bce3922fa8531129c6c9eb5b17262cd7905c628a472a9c09003208b8ce
+EBUILD lit-10.0.1.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
 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
diff --git a/dev-python/lit/lit-10.0.1.ebuild b/dev-python/lit/lit-10.0.1.ebuild
index e3e467290212..d5ada9e0bb8f 100644
--- a/dev-python/lit/lit-10.0.1.ebuild
+++ b/dev-python/lit/lit-10.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index e743e3e37f91..e8fa9d22b2b6 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,5 +1,6 @@
+AUX lmdb-1.0.0-pypy3.patch 1657 BLAKE2B faeda530b91755269415c7c2b2015d68e4567acb01c2375ed98073a0f4f74be6ce0494a28dcc7e57be4409645ea629d75b06e59bb605ee35364131a4e7d73ad8 SHA512 6bfb0b5de254480fce86bd7360529cd1d419eaf100359fcd5c315cdba93b47b0e16ec1f712e62f3dc1147ead22beeda437804250a4caa40c9227e4f9ad11cfb9
 DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
 DIST lmdb-1.0.0.tar.gz 876673 BLAKE2B 33fdf7dd344e42412b756f7c6d42c291f94bb2410366802b22b8045c8ae5ff4f73f41cdc655e750f0ccb9f547f70b190bb9b584d7858edd07c1fb274bff684eb SHA512 3a4dba711ce5a3795a7f916cf04d5c7e9d4b5df30161dcbd02b53bcec73b96450865fb2bd8fe4a9ca2b5060531d03cefd9ea19aa09f139f93c3d03b2516f5632
 EBUILD lmdb-0.92.ebuild 569 BLAKE2B 67b60c349456abd4d8ba7f78013d2fc8fcb38ff1992128c1c9d4c1ae680d0b2f68850f0cc3a82ef8d946926bd803d47394b17a041553e67e76bf9c7274bea1c6 SHA512 d292090a491df1bcd155186b1a2eb93eeec51f556bf83a5c909af8c8ab43b956e5e8e5d64a5a8e99199238d32ee7421ec016864f60e3d3a1721e384b2cea22a3
-EBUILD lmdb-1.0.0.ebuild 751 BLAKE2B ddaaa2fad5c87a1e4cf45160782c798361c4f1b4accc29691c00d02962899cebbbbb5715f4ab314d8fa97c2c07fae751da53bb136a43d4ab25b7cc86b6231376 SHA512 3fb3ac91b33b8d6591575aef9aecb4b5c0d371c9953c45a7a887b4d1b611128466a39eca6160a11abaf041d5c1211f02d95bcb5368d826f5fff2c1bdc075e646
+EBUILD lmdb-1.0.0.ebuild 936 BLAKE2B 78745457e47017493ba7c64873b8185faffc5f19220d7c953b0849eb1e805abe71201acd89e88e6e7b8e10b9b3adbc0029e4fd421f991edba1191839803fb83d SHA512 170cf8caf10ea1b7b5abd5791086b600c9e04fcb9aa8df6b229b40898268238d74e9bf91191954b47a8e83158420e48ae922d1a18170f8c3e174d0c23d6b12e0
 MISC metadata.xml 419 BLAKE2B 7bb3bd08439249e8bcb7f64d91a707245dd2c32eefed576a4389019217c304173754628f1fdd82f147e6f7a077e2abcb6062dcbaf76d0547c8d710c8d16d0a64 SHA512 700345b4a50d602e35c983fadf73eee5da01b7d9dc4a647966277aeb7fe1fb26f583c681acf1718060dff14b195df7fa4689bad2451c475d1883b66e223ad29d
diff --git a/dev-python/lmdb/files/lmdb-1.0.0-pypy3.patch b/dev-python/lmdb/files/lmdb-1.0.0-pypy3.patch
new file mode 100644
index 000000000000..008213ac46c6
--- /dev/null
+++ b/dev-python/lmdb/files/lmdb-1.0.0-pypy3.patch
@@ -0,0 +1,40 @@
+From 2d0f93984f53c19925f07d742584f5e3e69d7902 Mon Sep 17 00:00:00 2001
+From: Nic Watson <github@nicwatson.org>
+Date: Wed, 7 Oct 2020 12:44:30 -0400
+Subject: [PATCH] Get pypy3 passing tests
+
+---
+ .travis.yml          | 2 +-
+ tests/cursor_test.py | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/cursor_test.py b/tests/cursor_test.py
+index acfb0ea..22dd6f8 100644
+--- a/tests/cursor_test.py
++++ b/tests/cursor_test.py
+@@ -245,7 +245,7 @@ def setUp(self, redo=False):
+         self.txn = self.env.begin(write=True)
+         self.c = self.txn.cursor()
+ 
+-    @unittest.skipIf(sys.platform != 'linux', "test only works on Linux")
++    @unittest.skipIf(not sys.platform.startswith('linux'), "test only works on Linux")
+     def test_preload(self):
+         """
+         Test that reading just the key doesn't prefault the value contents, but
+@@ -264,13 +264,13 @@ def test_preload(self):
+         self.path, self.env = testlib.temp_env(path=self.path, writemap=True)
+         self.txn = self.env.begin(write=True, buffers=True)
+         self.c = self.txn.cursor()
+-        minflts_before = resource.getrusage(resource.RUSAGE_THREAD)[6]
++        minflts_before = resource.getrusage(resource.RUSAGE_SELF)[6]
+         self.c.set_key(B('a'))
+         assert self.c.key() == B('a')
+-        minflts_after_key = resource.getrusage(resource.RUSAGE_THREAD)[6]
++        minflts_after_key = resource.getrusage(resource.RUSAGE_SELF)[6]
+ 
+         self.c.value()
+-        minflts_after_value = resource.getrusage(resource.RUSAGE_THREAD)[6]
++        minflts_after_value = resource.getrusage(resource.RUSAGE_SELF)[6]
+ 
+         epsilon = 20
+ 
diff --git a/dev-python/lmdb/lmdb-1.0.0.ebuild b/dev-python/lmdb/lmdb-1.0.0.ebuild
index c96b90dc4e14..8801f1e82357 100644
--- a/dev-python/lmdb/lmdb-1.0.0.ebuild
+++ b/dev-python/lmdb/lmdb-1.0.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-# TODO: add PyPy3 when it is supported
-# https://github.com/jnwatson/py-lmdb/issues/260
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -23,6 +21,11 @@ DEPEND="${RDEPEND}"
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/jnwatson/py-lmdb/commit/2d0f93984f53c19925f07d742584f5e3e69d7902
+	"${FILESDIR}/${P}-pypy3.patch"
+)
+
 python_compile() {
 	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
 }
@@ -30,3 +33,8 @@ python_compile() {
 python_test() {
 	pytest tests -vv || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+	# This is required when the CFFI extension is used (for PyPy3)
+	LMDB_FORCE_SYSTEM=1 distutils-r1_python_install
+}
diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
deleted file mode 100644
index 2977c77fc6be..000000000000
--- a/dev-python/matplotlib-python2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
-DIST matplotlib-2.2.5.tar.gz 36678633 BLAKE2B fb3084a2d34a920413c44a23a956ffdcf7a31d521e2d1df50a68c9f17882cb87deebb403ec47154284593b39df24dad72e6352e1427091f795058db11f1d3a1b SHA512 f4771dca4b3c936e0d47f42630759207ccfe11586b3efadb401144b014a600914a6521af4fbe060fa80fd74132c92f1d3b37cac4fea9999ca90300c1dec8391b
-EBUILD matplotlib-python2-2.2.5-r2.ebuild 4950 BLAKE2B 7565efdc034c6814289e90376321a20f8069de7c7be2f2ab7a4e52a96ba077571f9b2689d9f7878366c446968c47423f3570bd2e7b7b0128ef3da39d5a3e0810 SHA512 c4080465961e67dd52a013186954928a2f6e32acd78b0fda02772a844b9b9acfd281523f66ac397e07d4b21ec77bd98d7e38847b17e6a0c06039ca368b3d817d
-MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib-python2/files/matplotlib-2.2.4-doc-fix.patch b/dev-python/matplotlib-python2/files/matplotlib-2.2.4-doc-fix.patch
deleted file mode 100644
index b6a01b097a61..000000000000
--- a/dev-python/matplotlib-python2/files/matplotlib-2.2.4-doc-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/doc/conf.py b/doc/conf.py
-index 017ce210e..5a397082b 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -170,10 +170,10 @@ source_encoding = "utf-8"
- master_doc = 'contents'
- 
- # General substitutions.
--from matplotlib.compat.subprocess import check_output
--SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
-+#from matplotlib.compat.subprocess import check_output
-+#SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
- 
--html_context = {'sha': SHA}
-+#html_context = {'sha': SHA}
- 
- project = 'Matplotlib'
- copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
deleted file mode 100644
index 4d925d88348f..000000000000
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-MY_PN=${PN/-python2}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pure python plotting library with matlab like syntax (py2 version)"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="cairo excel gtk3 latex test tk wxwidgets"
-REQUIRED_USE="test? ( cairo gtk3 latex tk wxwidgets )"
-
-RESTRICT="!test? ( test )"
-
-# #456704 -- a lot of py2-only deps
-COMMON_DEPEND="
-	dev-python/functools32[${PYTHON_USEDEP}]
-	dev-python/subprocess32[${PYTHON_USEDEP}]
-	dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-	dev-python/cycler[${PYTHON_USEDEP}]
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	)
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/matplotlib-3
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/${MY_PN}-2.2.4-doc-fix.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		qt5 = False
-		qt5agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-		gtk = False
-		gtkagg = False
-		$(use_setup wxwidgets wx)
-	EOF
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib-python2/metadata.xml b/dev-python/matplotlib-python2/metadata.xml
deleted file mode 100644
index f024fad13338..000000000000
--- a/dev-python/matplotlib-python2/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>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-	matplotlib is an interactive library for plotting and doing basic
-	data analysis in python with a syntax similar to matlab. It provides a
-	variety of backends and hard copy formats for almost ready
-	publication plots.
-	</longdescription>
-	<use>
-		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
-		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">matplotlib</remote-id>
-		<remote-id type="sourceforge">matplotlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index b70a8799029f..a5f6671fde31 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,4 +1,4 @@
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.6.1-r1.ebuild 746 BLAKE2B 633237e22e2fd9516d06d076a2308c9acd4b1cdad7feadd446f4ffc78957675ef7ed6fd902c672bc1df0a4ba79c172fa61bcf92bfa47b00882d51fca532dd761 SHA512 b6476932275c77cadc7f5875c6eef4347bd161ff5e9a237f985263bbf3bed787f93646e7d036f9f432f9456a02cc1ac456dd093d26f5db1d8c0198a34bdf1cbd
-EBUILD mccabe-0.6.1-r2.ebuild 696 BLAKE2B 667a3210eb38c2ead6dc6a8f00a2d91e3d7ce68e6d0c549591f185bdc83b046d11da5c4a546bbe93b3136b64f140d772d5e4f95656dd253bd268c5489c004fe7 SHA512 c09a91cb8294447c0aa834da8f749f1cb79569cae84e0a27bc8966594f248628b2880a16486623cee6c28b16b11a2ad188187e2150cc09daebd55da2fabf265c
+EBUILD mccabe-0.6.1-r2.ebuild 708 BLAKE2B 111e0ba59049a4ebe3a79dff86c869fb534c29b04869b8de0c8ac3d5afcd2f85a59472a3e533cab46001b22af0fe00f2b4c9f7915c52a716783361e235db3fd0 SHA512 7219c573cb325e8fb9a0b1ffcc0f9528bd1abde292ae54173be9428f65897da78286dec279c3f9bea5ce444d6a5f8a4f2665abb15dbe83b3b72252e549d0d4ec
 MISC metadata.xml 398 BLAKE2B 868cbcff67488d329190b54ddbb2fcf9d7be6c3ed535d8437161b6ac35f067d8585d8de67874ae87615656073ab113f0bb10ecd164d32f92844cb489489085dd SHA512 a23a9f2c7bbdfee2547cba6c99cc8112d900297c76a6e2ff739177e32a1877156379f341b6c2d3565e4e503f3999f51317ea35b1ac620e8c18911c1c1e0d1b40
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index acd46c555a8c..e37565b033a4 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 374f9d5d5d6f..44c57c493cce 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,5 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20191224.ebuild 741 BLAKE2B 7a10b4c13fb48b8a3ac67f1f85415bb73a03453447210e251ba5197c6af0fb8fad7cf006f40a609f9b95157ee882f09c049aa1644840660714c33b002abb8a84 SHA512 e4c3eed34a629410f236d7d7cdca9d2d4d8aa95b939d108990cf33381f7822096dc1c6f023a8070bd89bd9cf79a3115d95d2d1f2a43a511f0fa75f3ee01c709c
+DIST miniupnpc-2.1.20191224.tar.gz.sig 543 BLAKE2B ddbde04faa7bce62fdbb5b555bda9dc9ff69f09cc97442049adc787a03ec91824f14cdddaef6e577cf8d08fa96202fc792333b8dab7e6e8c30847fa9302a35d0 SHA512 b8885d2002259c95ede7ab57aaf82db83c2bd7ace3d0986179efac4245ffd42161049e0167a9ac1ff18de6c8df4d39356f0fb6aa6dada7523a238b4db4838887
+EBUILD miniupnpc-2.1.20191224.ebuild 906 BLAKE2B 7719aef18f2ed3829e8005d67c6e6b3c381cf6de6c5012c5a2ca1a543057bb6a21aadafb04708a45814a28675582bbc0fa0fe899c1ac3c2fd0d1d5ced4d712ac SHA512 ca4c2772c17e29910d8cb90c2b5c9f611a395645f813b4daf81ea3cc8448e357c8082c669fc4500d67f92c35a998f5eced9defde665db117b2bc6e096069bbbb
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
index 5e1d489b2e1e..e2122994dfda 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 verify-sig
 
 DESCRIPTION="Python bindings for UPnP client library"
 HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,8 +18,10 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 PATCHES=(
 	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 3ab0a0ddf307..24c0ea16edd6 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 875 BLAKE2B a4009a0d402ca70243aa460671f7472a7fced8b2ee075dc32f0249c4da89f3b4c196215d48b988edf4292fa64000f6f636cbc354984a76bb24e170e2f2df5bb2 SHA512 30a1a45ab4cad9de5e1b948c367c533c41831aa4980d849beb4633649ddf858ca70c55db120b48f063187b516ef7ba4f3825c7857ea9b3c4dfa71d113674c83d
+EBUILD mysqlclient-1.4.6-r1.ebuild 874 BLAKE2B b7a5137b4c7eea859b507caba08407bd0f9058b5b189c27d66c99f09e7f61f6a68c411d979404476f58bfe197d8cbad02f533e4dc7bc5adc5fa26ed1998454a6 SHA512 58f859490b58378f08942fcb092fef390ee5b33976393b92271ef287533ebc4226d34fa2c61e9a1823d0f858f4c1386c2cd373372dfe08e38a4ac09a8671df86
 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 9dd4e5a530d6..9a7e7f521813 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/nbformat/Manifest b/dev-python/nbformat/Manifest
index 857d14e20584..831b77e67d79 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,5 @@
 DIST nbformat-5.0.7.gh.tar.gz 125328 BLAKE2B fa048ceef9d0612052dcf3180bca4228dba5117c6b0fb642f777bbd35e2b6f868454ae3d793aa0da3904757e42309ac53be19621a62967b719da86ab37d5f052 SHA512 3c1429a232d15d023f161f41cdab3364242f1a026349ea5aaeceba6a80afba981cc512a9f148ae3a0fa856a847c4560cc95abd965cc5d088a9f89c2b61d48fd1
+DIST nbformat-5.0.8.gh.tar.gz 127329 BLAKE2B 6252d35f72fd0af5a89d83e9e48f61baf2656eb6530d4a7b05a5241e7272098992d70d68705da4fb9921ab1939378658b2e6e5f765a453f932e94e9232006a66 SHA512 956add98517f1128d8efacae1f3cf9fe27b4d7acae4a56e14dd6c2942aab39b063170759bc6de67bcedd2e0fd6c7ab1a36aef268f2088644ba31caa936b9359d
 EBUILD nbformat-5.0.7.ebuild 798 BLAKE2B 52e237055211a98d350c7d366fc50942eb562f83e994a4ad8c9d1a0a81d62595eccfb9e5c2d1067b6ed432b1c6540ae03831c630f3000c62e0391d7439b286ca SHA512 ea73628104c7c7b394cd2e537ea824b36f13fdf32220b5fa4e0b312ecdccee2a0ae74836892f213cbaa154e23fdc20d7e69eb1cedc17d4dd931c1483cfd0891f
+EBUILD nbformat-5.0.8.ebuild 875 BLAKE2B 1463058689feb0a5bced4545641e5bc11fef7e50de13ee469e81769d9eff38894d1726d09e0f3c79387b1b4d4085938bb043c9b1700017fa359c857768462089 SHA512 4c9010b86711e7e87ba1cfc71f1153b8e3e0f0cc31d22b79f8fcaad59b1691b91fc90812c1e42046e1768430fa2b395cdb201b3556a670ecb5880d5fe3a74be3
 MISC metadata.xml 754 BLAKE2B 566e6a6a59e274323550624d9444267abb5279ef663328aa93906685a23bc7b38888468ccc3284889e3a1c6607cfeb501926ab6ac5ab84c5acd34fa62ead4205 SHA512 898ed2b6f39842e6a4624a0c7afeaa6480197637ee781001c093c21b807c094f5ec1cf436abde53b6d483abfe170c7b8720239b648499a697f0be140a0212be5
diff --git a/dev-python/nbformat/nbformat-5.0.8.ebuild b/dev-python/nbformat/nbformat-5.0.8.ebuild
new file mode 100644
index 000000000000..9fc3918c11bf
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.0.8.ebuild
@@ -0,0 +1,38 @@
+# 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_{7..9} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+# missing on pypi
+SRC_URI="
+	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	test? (
+		dev-python/fastjsonschema[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 62d8a7cbf471..b09176acce1f 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,5 @@
 DIST Nuitka-0.6.8.tar.gz 2390759 BLAKE2B 5f207a2dcac6a2825143268d3c28eab113705c050b67dbbfd3b655a0221ca3c04b2b206f3e8a85b4f17d28db52c11f19ea6260d2e7853c382942a76a15dc1973 SHA512 d9a9add759736c35fda57bbf82382effbcebce954228e56bf7c124502b96513f17a7083ded66da3ee33c52443b18c92839bff59a5c081d8fe44d6eec6c15fe54
+DIST Nuitka-0.6.9.1.tar.gz 2470517 BLAKE2B b3162eed308d98846a6266fa822d851757773ef9910a250644d61627d70dcc29706f5127221e2c09b1f856b74262c64f10cc638ec336a53d1fd6a10ad53e4e29 SHA512 a94a2e7f86abdbbdaa0147e569ff873c4d0f439378afb0f55ce78ea6e22a16ac759b62fd617944e0a4cf98fbe3294db5e56c3b3a6bd8cb78bd1c1132d557f6a9
 EBUILD nuitka-0.6.8.ebuild 802 BLAKE2B db9306a53158bff5900263e3a5be071c8d7d34556ba344ad82680b8dd495c9be3489e254eea43425bc2696a14f89989c92535cb46235f609f76111dd183c0b18 SHA512 f1775ddd5e1c4abe6a2077d29e8dea126158fc013dde5fede7768ab31715bc605b784e354428f5f42f269efe70198f763305fc7ee6a4b8839e22edd950bc6333
+EBUILD nuitka-0.6.9.1.ebuild 1041 BLAKE2B 631478c3ec34f885be0750eb43db77ac833966e7bcc9747d85179dda67a9beb1cf3261cf10cffe668007dc009a06a917168c6a6acb87fdd5aaaf840e0d6000fa SHA512 5d5910f7cc1324fbd0ff44c964f3f4d09bc130933edd88873fbbba8dda9b5fb7c57bc0e9c00fe611384e2167e2c9e31204650e6b8efd6bab5862ba2db982b1e0
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.9.1.ebuild b/dev-python/nuitka/nuitka-0.6.9.1.ebuild
new file mode 100644
index 000000000000..0b8a77447b0c
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.9.1.ebuild
@@ -0,0 +1,43 @@
+# 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} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+
+RDEPEND="${BDEPEND}
+	dev-python/appdirs[${PYTHON_USEDEP}]"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+S="${WORKDIR}/${P^}"
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 5fef190cd290..9a0f5b340802 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.7.1.tar.gz 99196 BLAKE2B 14912a0a50a46c085215f0a40467371859aedeaaf999f747d735df4c244529709b26c1257d3c5c05ed0ceea801d117bf6a330dbd30573fe274522e1101e2f4b3 SHA512 e8852ed1c7bd7f7e94ce5ad78de7a8a7ca30a5873dbfa4fae0a179fbcf956b1e66f2a09c1785f0d8d9e83a5cba359a55840a21784bc225aa01915a322709d370
 DIST numexpr-2.7.2.gh.tar.gz 118982 BLAKE2B b032f00c36ffadb88cf9a4cd6323137b920bce48ec73f88f006d3186f9a8c1d75a11ceb6bd32f412cba5c10cbe3cb518cdbdb19ef022100fcc408fc82ede9881 SHA512 41946df6d642e226b4a38b11d5db67ef91d63d56b33d3b52f09377c022d236ea4e9a5aaaf380737d18405ee25109260ae60f79d0c9465b95de14465f41c40075
-EBUILD numexpr-2.7.1.ebuild 1246 BLAKE2B 1e124b05528f9319c99830af4d83c5c433742bab7ae7478d5c470ee3db84404fe46ef662dad1b19d87a241d82bfd8f92bbc6a3f8ad7ca7da49c457d2ade8d899 SHA512 865b624119189e888976b489b6f3c41c10854eea18d760a99f50d0c20a6dc4f909357c0c1e23ded979873de7c5e2dd06af0fe076e6bd5466fdc1f996c674cf3f
-EBUILD numexpr-2.7.2.ebuild 1222 BLAKE2B a762ff3c2349a8c761a460d77abe0de02a886d1d90a11b2249c81d97ce6a7d5f0b3ee111b4d117f9ae11093201f8c3f8072669110d949368541c30a56d315c5b SHA512 2e9c9815c0d5a3b31d200b5f14630db5a21f3bf451e01729a608c4180b6837fe28d27a339668b4062258b5a98dff5ad96ed7b5a95fd8fb8b2e96083aa8403113
+EBUILD numexpr-2.7.2.ebuild 1221 BLAKE2B 561357cc6f57f4c85d7810dcf7286d89668885847ff5329c0fe996ec3a4d4bc4e1fc6c1f6d1139d78c6b42c8b1f5f060828ca10682287f345f461ed075f7d527 SHA512 f00f2d0bd83c71f95b8e8b1240ba76c4b0cc33a116b30ef5a3ca1dfa92d50ebe7e646961b245434c2d9fc5be803a1d90e8720d80bef41081c062581ecfc8f7e3
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.1.ebuild b/dev-python/numexpr/numexpr-2.7.1.ebuild
deleted file mode 100644
index eed440f7e010..000000000000
--- a/dev-python/numexpr/numexpr-2.7.1.ebuild
+++ /dev/null
@@ -1,51 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-			[mkl]
-			library_dirs = ${MKLROOT}/lib/em64t
-			include_dirs = ${MKLROOT}/include
-			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-			mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" \
-		-c "import sys,numexpr;sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.7.2.ebuild b/dev-python/numexpr/numexpr-2.7.2.ebuild
index 04126ab4ad41..129bd90b9a06 100644
--- a/dev-python/numexpr/numexpr-2.7.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9c863f5c7af8..56b24cb596f9 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 3736 BLAKE2B 4a5ad9885f542d545750efba40577f8bfc59e241a8e09fc74ca9a8ac552daaefff05940f91fa4c65a87d714ab358939e60153c4b9b9cccbe2b779811918ffb49 SHA512 664cbd6b84d3afa52f455c5284737f2a3f67ad07a12de2a3c32fcc9746413a450e10acf13284b0846808725042a6478fb2c1a08cf26ebdec310cd22590cab4c8
+EBUILD numpy-1.19.1.ebuild 3735 BLAKE2B a1a235af29f6b3db2d6b83c04344e89441f8f1a3390df8c9ce45ac11becfe5345e1d29d368586ec207a70776463d8e52bfe6c6056ef3904968059c01b1748ab5 SHA512 362b325653c3fc5fbfee88d5c4f75ddb119a15618aa4283213ffc7718fd8cc8999c6a48795941a694a793de8a780868c43f2fa3033ee08b4db4f1279a59414c6
 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 8bb0567ddc30..478fbdc806f0 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/oauth/Manifest b/dev-python/oauth/Manifest
deleted file mode 100644
index bc8eafbd1630..000000000000
--- a/dev-python/oauth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST oauth-1.0.1.tar.gz 9533 BLAKE2B 621926e0ec839ffe4aa3eb22eee1d3cbdf1e5fbfc152d4ef127ef271c69f7d036a2b4dec634a78a2dcdef1d3f4a6f5cc27900324787c23f0e4b7ebe59a64beea SHA512 a503b1bfff18c97a0e666cc376bfcb11e3cc0f3340dd16e0254fcd4340ed28ab0fc52d1de81b573309351a5edaf83d0b437c155580c00e32a81a7c219ee7eca9
-EBUILD oauth-1.0.1-r1.ebuild 412 BLAKE2B 36b761b85d8b88db244b2dca3910fb665abd8e97228f0b6d4ae2e6259a5ace283821e49b64c6da0d4149d4246a89461c8883ba839195ff5b17b9c8981d898102 SHA512 68eee6ef547eefd70e2fee437523b9a5e0ca0d6ce1d90308e8c5554170750333e09b56f9ca64c79825261cbc2232ec244292edf145d47bab36e2659a50399012
-MISC metadata.xml 308 BLAKE2B bc43d346ef9f7e197058b62366bd2c572f6367a154102bd22a7343ea4fd31704f0150e0b7e0e860be58c030bf3c2ac1c803dd000d4468405610bbfcf7280d912 SHA512 0f14e64b2b19c1895773d57a4814878d825986856cd5b8f383101e8f17e11c762123b57b19e9c9bd74bcb533c084a9cc33e46e990fc6291d623e83603e61882e
diff --git a/dev-python/oauth/metadata.xml b/dev-python/oauth/metadata.xml
deleted file mode 100644
index b8c2d350f545..000000000000
--- a/dev-python/oauth/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">oauth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
deleted file mode 100644
index b7d1b47d95f8..000000000000
--- a/dev-python/oauth/oauth-1.0.1-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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python OAuth module"
-HOMEPAGE="https://pypi.org/project/oauth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 9e5b0a5f4c52..b3f220aebb60 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,4 +1,6 @@
 AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bcb58275d90f59fca9dcc8bebdd52f5d6ed69455f9135647b27ed64d3251cb7d7b5f3da4e7b394bf45a45791b73c73 SHA512 8d8a43bcb75141a5fa278871d7e4e3b2ba1dcb833967a347f334675d6fa1a510d7f9abbcae82419617fc593ca02e1708ff69d9b4babe1d23e08d24814f9b564b
 DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
+DIST objgraph-3.5.0.tar.gz 638591 BLAKE2B 7a0ee6c9ee1d8417f7b322f19a397ea2452ed592ebbc07afc1378e86b5bad3895ed2e4a20d92a5f4b0215f68fc7440f85852303585a3161497a85d41d4c4e550 SHA512 da29202871bad06f2caa9cc297e7bf9a15af4c89e23baf9c271764e0ce93ff9557cd5c21d0bf39b425713460dbe2dbc8468d70c6bfcc1c3ff8b1b4d4a7923858
 EBUILD objgraph-3.4.1.ebuild 681 BLAKE2B 10640d6919f8c5e0c5db51977c1a5e2526d86c43221df63424567a2e458d84c611f70c4a238ed1bc61aee25ee143c0f5057bece372e2e90bb1396abc41efed70 SHA512 afc62ad12bb7925dd2bc68092eb0c9c339e1ee491921919007581193b0cad6848b14af8698f9412514bf4338b08489ecf85b6e5d592b534f3bd8d069068efc9e
+EBUILD objgraph-3.5.0.ebuild 686 BLAKE2B a0f8a525d423c134b5968f64244f6bcafa3e1a035f1030d66799fc7698caac42d691df14fc3c165fd3733955973364b5be4fcd8a0d9544fa4d8584cfa360e8dd SHA512 45ea9bc56edcba8c5414403938c5a3ddcc68c7f92a7badeea758e40fc5ffb2da15e62bc2b21cf68e50d0449dde5ba1a72285954effa12cc7b0d9afec8443f25f
 MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/objgraph-3.5.0.ebuild b/dev-python/objgraph/objgraph-3.5.0.ebuild
new file mode 100644
index 000000000000..86764006685e
--- /dev/null
+++ b/dev-python/objgraph/objgraph-3.5.0.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Draws Python object reference graphs with graphviz"
+HOMEPAGE="https://mg.pov.lt/objgraph/"
+SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="media-gfx/graphviz"
+BDEPEND="test? ( media-gfx/xdot )"
+
+PATCHES=(
+	"${FILESDIR}/objgraph-3.4.1-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/* )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 02a92721726d..b1a2affc14c0 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,5 @@
 DIST openstacksdk-0.46.0.tar.gz 928650 BLAKE2B f1cf41cc63efb0824ada0c9ac5fea2c1e9b7bc32482df612ba655c6bc94c707e4472c0a5995609914c4e73531aa730a28ee9612a2058a3867d7980581244e20c SHA512 188bb2b2ae9fd3100aa64356d282bc6402c6f175371d8b514ed753f1dd2b1774e3bab22ca45df455fbb7d813236012c0c5174578a84d3f87a3390821f888d709
+DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
 EBUILD openstacksdk-0.46.0.ebuild 1329 BLAKE2B b38669e9550d67bf88d84079cb9d641e3c642f0f41b4229dad80da3ee116073936d6f0f95edbeec86066b91fea4864ea0fb994168b8e3caa4f61f9fa8c687b7a SHA512 1123203c620fbf233369092942476a794e8f4889ca459db554c6cf95ef5e7e698ea41ac83115eb3e0a71c84540219845232e53b35a154fa7882c4458073e60a0
+EBUILD openstacksdk-0.50.0.ebuild 1331 BLAKE2B 46be087a532567fcf6f40091d0b5f56f3ee1af34bffed8434a299a4e7f6d46bbdac967a76321795db3822a024eed98fc2bf8596c63b9b7a74ed1b56065ffcec3 SHA512 fcbcd71df646bdac0dd935e3709f413afcdda8e17d633a024d3a8c607e17bb1ba57b77f8616acfa3a02a8a72495177476af96363079f372533a18f351a137031
 MISC metadata.xml 398 BLAKE2B 59bb0477f0821bc0460e08cf1f7702f105ef5cca807f5a509ff52823686faa6ffa3f6fcb18ddd92d7bf37450cfbdc42765de5929e552cceb917d3349a9fada86 SHA512 040d0a893c1f8b6e14b222ebafe34cc45de3b912840a2683811950939691d18b96a50bfb97126dfbf4e4736783e5fc584acc70bd3a149f340d41515012656426
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
new file mode 100644
index 000000000000..b6d18569f7b2
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
@@ -0,0 +1,38 @@
+# 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="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index ed8600796cd0..20b32d69b33c 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,6 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-1.32.0.tar.gz 48162 BLAKE2B 95f70717da5ad85b4a691bd89ca38989713f2d3654eac18c7b0001ccda8eccb266bd7ac3a25591d649af0814f8c97b718c88d856498e5042a07ca9920b6fe52d SHA512 2cca903347df75e18a0aab4244dc325f79fa7cb5a25a382ec7081a30d7e2c6ecbd5025d58c20873ea851396169e2b2c8253b0b77f6189a311016e57f8e065329
+DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
 EBUILD os-client-config-1.32.0.ebuild 732 BLAKE2B 35be51b95abe9aee7d1350a14dd35b2710b0e0359f0001dacc466b76c02c47d24df73f1ee347e44ecd9bc5e8770a583cbca330ec13df10e2c9a6b08b1cdb4f0b SHA512 88b6817f2c8bb6b618541e8d7ce44297cde3640f2bac5a26bfbfdef77dc8de442965f56e06addecdf177c812597ce6cff696440445d03203b1241f4b09f83258
+EBUILD os-client-config-2.1.0.ebuild 615 BLAKE2B 91264508fd4df6a93286203b7bad9b71fc60f7e026dee30c422368205509165364e0f80fe561a51c131d16954fc364624c6de697b828e7b7f58518a776e36b16 SHA512 dda946e767e40a994750dc086749e395d0619db86fac834a9835045c0d64105f891f89ea7116cc5a64a2c2b671b48d7f7e9155fe4711fe107221a56837e082c7
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-2.1.0.ebuild b/dev-python/os-client-config/os-client-config-2.1.0.ebuild
new file mode 100644
index 000000000000..0d3bc6e2e690
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-2.1.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=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/openstacksdk-0.13.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/test_get_all_clouds.patch
+)
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index cb3192e2f1ab..bd7b46c90d0c 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,3 +1,5 @@
 DIST osc-lib-2.0.0.tar.gz 93445 BLAKE2B eff1ba7e87fca3e6ba080066d46b7378f902ca6fea464ea6f5189175f7eb82d65b3a2d5cc5d4efc482412001505dd3edde48404f6dd448996f25233ceab6ac46 SHA512 6947ea6ac56b644dd9be4b3052905313c42c9ec46b4031d4c77e7df43292f3b04fa288e8aaaaad748eb7dd1a88edaa8d7d9263c8c7b899ce1607a7b2174e696d
+DIST osc-lib-2.2.1.tar.gz 93855 BLAKE2B e6c863a13ea950a30a033e3877660a66ef60f66ef1e42efec39d207b1d492499136f9fb696e10001fe40b815e6cd4fd320a45acfd995504a4b7222b29951bf3c SHA512 8328541f319dfa2ffd0ac51aa89429b05fee0b160b2d236fd30cd9ce2d233c86963b744ce0a63bbb849e5d47af9868ca843db2ad79e9099bd22f59d553235d06
 EBUILD osc-lib-2.0.0.ebuild 1170 BLAKE2B 9a947fcf245efeb4d51494df3fa4b74073eab452e77f14b23e4a04e9e54ca89476d900de65a4c6d8dcb746ea3772df5e30071b93a689e08d358603c9455cf4e6 SHA512 4ea1fc91b6267385bf6aa2ada31cc9cc767a338c0350f1e75310ed024dcc89269c89836c9ec76840ee655470f7427050f24db9715ed393f0ec88e726a01287d6
+EBUILD osc-lib-2.2.1.ebuild 990 BLAKE2B 11ad3798ac4cbc6be10f2f43c42698d246cffd52968c38b3f1e47012d6d985153a7b322f9f693fc02f1ec301456590bae5557349e69a2ce2498eb753cb2afed7 SHA512 01cf17bea622c9bc941217cf580f4818e4d163165fafc3e95c04dd47cc443a5b02b54d26e4cc7a25eda72b77adfea1a2307bee31d3c902378f7c86205f12efdd
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-2.2.1.ebuild b/dev-python/osc-lib/osc-lib-2.2.1.ebuild
new file mode 100644
index 000000000000..de339ec5f73c
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-2.2.1.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} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index f9aa7707432a..46b1050d2054 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4
+DIST oslo-config-8.3.2.tar.gz 148787 BLAKE2B ae3bf5c715d647dc1d5f1c82a6882f3282c87cb622a30ece23eca6453aca997363b6a65d3dc92666d95387c5051c9e9a87f337fa212500607ce6426ce6024847 SHA512 273ce5aeb7aa47b12a0e3a14b9920f7c177854a13c78a2382268e06068f443362088acd105deffc854689af14839c553c62aab983e9b4e29b4e079836b472957
 EBUILD oslo-config-8.0.3.ebuild 1263 BLAKE2B 92e1af2fc8aea20e97bce64f83b2c52a1262519ca08bd36b8ae6b8c3a1fbb3e831743cd06e41279d26f2f20f5a67acf8335182567cad8e0cb67af6e1145525a4 SHA512 fae4d1e2eaec5a47466f7877244f6ca5523ab707cec6308b6416fe32b6072b9736627cc523d2f4abf5e53f770e50ebedcd4395e701cc1c5561a6cf195db2e508
+EBUILD oslo-config-8.3.2.ebuild 985 BLAKE2B 682c84ba3d531388c7f41ee698d7e64e5de29361bbc0ad470e76c0f52b7acada2e76e5299d5321aa9fb63c80ff07d2e19be32589dc401e02ac76155349c3f145 SHA512 1cac51cb875054763870f61a05f62ee354a03e9d1214188bf21f308556d6b581a70c23a5fd0b78d03e1014e60a8a78e0636c949b2e342ca5a593b42efa3bfc36
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-8.3.2.ebuild b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
new file mode 100644
index 000000000000..25fa3048ec59
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.3.2.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
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 9aa14a58ceb2..4751aac8901c 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.context-2.22.1.tar.gz 29315 BLAKE2B 89c7dacfe42a9c3cd8d7fde8a77e3654f48788909cea725151e833a305c6916534919496393e603084311625cc9242661e72cbf1a2bdb72bedca3127e77ca9d9 SHA512 d0a3b9e41d23e8f642f8aacd998f6d6f4ad1fbf103947fc7403a57c4e3d9ae51b3cf73dfb79139d541875a0e412ed8600c4ce6b19cc207697429f48a7fb72887
+DIST oslo.context-3.1.1.tar.gz 29335 BLAKE2B 2179e5c273b5e387806fc4a8b1ac2f0641f4cc9f2345cb00e6ef9c2e7c8b69709c0c14dd11254d026283b2be7e032044b6f753a13f062915db9f000ae1873f1a SHA512 a9d16475bac5aa96d086019632f417fa5b496f615b814527e547a43362f1e36ed47c47266032e72194f88716237ccff7a24bf941d66bf36afe09b846a810583b
 EBUILD oslo-context-2.22.1.ebuild 1271 BLAKE2B 7c90620d1478dff470d3331f442488edcb5ee9224c9e2a84421759731b884b9444b37e70760aa60a0a735039465540541bcfe0b5cd60ef848f6e57ba25167fc0 SHA512 4008caea05cf43592beed2a1aea0b88e9da14bcdbadb51da0ce4993d5feb7fff51ff87a0943f1aff3757670e33b597c9d997148b66d248cf024ab8dcc594c039
+EBUILD oslo-context-3.1.1.ebuild 684 BLAKE2B 51e6aad974feb396c3d3b134a81e5421a24e0fd96d401c6aa992a8fb5fe1cdd5d22cc53b926eb5d8c3df195dc3c4d0a4e41d14978374977d49068ac9cb2613f5 SHA512 69b7585ac51595addd764a415e17de3bdc8d862dbbb4bdc6528f19aba456de36688cbe79580f4e99898e7c298c80cd28a0866e37751c0698a5b54afe21502ea5
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
new file mode 100644
index 000000000000..0bed5501a70f
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-3.1.1.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} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.org/project/oslo.context/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+S="${WORKDIR}/oslo.context-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 5baea7920b91..3266702286a7 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-i18n-3.23.1.tar.gz 44731 BLAKE2B 2205d5f27640fe15c7143df2e18d27b01a3f90c30b04b838643d33cc490cc4257cde77925d76fefd0add0d3159ee4976281608b6e43288f0c0cd4fc4c7959b47 SHA512 82ebcf54d7edbd7c3e7c1d7e13b223ca9cf88aae717ee6fa0c2fb9b423ef88403b42b3360cfd7b8dd3b6d973a077a1458fc9c879efbb6006a1cedc6ade35397b
+DIST oslo-i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
 EBUILD oslo-i18n-3.23.1.ebuild 1903 BLAKE2B 03d5e8cf04b50f7ba7d5715891d8a3768d215e6aebe2201a702a26cfcfbc503506ce75870dadf579079ddb97b1d28b748d3d401c589ef0f9fc5f20a505cbbd01 SHA512 f0a84f87624fcbd38585746c4d1978222b6dde513ead08e385a487acc22e92efe78e668d3e84a78fe148383b418d9dd2601491a04e13fc4b3ad87fa941a57f86
+EBUILD oslo-i18n-5.0.1.ebuild 626 BLAKE2B fb552ddd4140da87050dde70ab61b2c58dead63e0acdf69fc3000b0232873fcd9ccdab643b651689997434ecf3963470a0caa5698e7d3e02b1f62507e678c340 SHA512 d254d57f233ca19905a8b4b17d39a6c48cefb8e1587990a0f206e475a2bc1dc5c35241107570a2608c209b2c02af77ba51b01723e8f5548c185af204624e0572
 MISC metadata.xml 365 BLAKE2B de17547743fb15cc3453fbff770a48a4f7d7222e6a5f437064eef2269ecbc0a8ba3723893d653074364afd320894fda16f4e2f70da3dc6f60bf5e2ac763d61d5 SHA512 c3f2d54fd641ba2c5f423e2d358ccd8001354a7a3dc405af89b781ed167340b8a1dc23b3c15e70d60b72ed2d35ced17f9d4e6c1442ba8b3f919ab1788b33db37
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
new file mode 100644
index 000000000000..43a19397e95f
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
@@ -0,0 +1,26 @@
+# 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=bdepend
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 4c4995d00aba..bc097a3e890d 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.log-4.1.2.tar.gz 87095 BLAKE2B 20dd69c5002f33c288c7c04818435076ffba112b91e0f5726cb32674f10e162e378bce221278428714aa827cee81253cc21bb0588934cd024b7948b349e60a76 SHA512 f34ed66bd289fc88420d02d67ce59b498274d44f43d20b53cef1369699d715ec9706a5f62b81de3005010de1e1fa4c36aa935ee72f81160a75cbda3596a0d167
+DIST oslo.log-4.4.0.tar.gz 86108 BLAKE2B b710d110759612dc7c1516a0df7b0ffe5af1ee83f99ff776212e72a52a4249657b4857a8fa99aa06047093ac554b6374ba529bafee75d4589beb538baca5b190 SHA512 6501963e90d40d2e722f338ec7c78fa36f6b5b255d36fc5df7d6160d1f35397ff112b88053603f6b57d9d93539bdb665e3c1b6894f3898988fd8d06b5a356120
 EBUILD oslo-log-4.1.2.ebuild 1271 BLAKE2B 611d4c2d8cf6d7199dcf9f062f40f75bc1293c2e571e9eceedfc37e7e4827f42629b69364f47db2f6c6231c88917f8b64f767b9f66fdb35faef25028bedf0d68 SHA512 1996c1e2af625923e6f6aefdf4d0087e3cdebca2b1378fe05f94dba229ec5c88d79efbb756f098b5058085aadfa1b2669208d5bf00daa67fae554f0df68813ec
+EBUILD oslo-log-4.4.0.ebuild 1040 BLAKE2B 6b99a5e25ce261eb073bd5f9d43ffbe2e5abe834076a97418b31bfa406436bbe77ce0ae4591c691585fdb4cea7aaf68400acc10cc4618b3f5c947d988d9d061b SHA512 40d2199fec72e73ceefe77967eb0f879b68c6d8fec866cce59634adce22e4ae2f8efb1176965148ef5342d4e232bbc41423cc3ddf0f64d19c1a51723d8421319
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
new file mode 100644
index 000000000000..88037b33eaf7
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.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
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index d659b4b1c958..359e9a96ec48 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-serialization-3.1.1.tar.gz 32180 BLAKE2B 5ce0db206732430b2553b0eb01d5df717069a07370a20ef452b77e83ed95f1cd0542eac287ba28d4fd2a3f66541823c362a925e48a3ed175abdbab2c1aa5b2f2 SHA512 5a551c33a001eeb73213dac1b4e4bc50db2ceb7dc2f9881c07abbab05cc8ccfda4d73cc9bdc673e26628aaa05c3d66f9c76ba4eb370c851990f3614b33233a95
+DIST oslo-serialization-4.0.1.tar.gz 30010 BLAKE2B 0f5dae22ca096b1dd7e4eb35862c931c5cf2cb06cbd2d5660cb5322140a12052ba76c50ca24644a4957f116bc33bbdf12adcd4191ddef3006f1630d762bb71af SHA512 dea4ecb0face2bc730d1e8883e71b34d3709c6cb43a0dc3bfbb757809fda7c198949de42327b5854d65b152f3ab09fbb14311259cf584063c73b93a3cc1313c1
 EBUILD oslo-serialization-3.1.1.ebuild 1001 BLAKE2B b04a38f4b4bbf4f26be99061028e362a26c3c42562ad2f855c6eb783f3d0565e4e9f2e3f0ede72c863fa161b476ab241d03d245f84c28d33ee17fd135118fc42 SHA512 b33faa3d60129eb361d2d751fc91fcc39b6d3838f1808143e331ac11b0644b16cfde3b24960a21223bdf961d98a84ef45a741455290352f4e2fe5cd3a740e02a
+EBUILD oslo-serialization-4.0.1.ebuild 898 BLAKE2B 57396be5143b7a014afca71327054993acf25a1199c6e2d2fe34a22a9085f324631ae33dc9a0fc1261379ce92645932ada1e14345fceb2e415f80281c6a1c46f SHA512 069663459c3f384889ea95747f235ae63e474d6829cdf73349facc5d3edf8f2a6b94a8e658fd1d1c266432204382349b17d68979cb5d6e523648a54b89df206e
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
new file mode 100644
index 000000000000..76d72ac70113
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-4.0.1.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} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+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 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 2ca891cdea16..cacf7a5d017d 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-utils-4.1.2.tar.gz 92889 BLAKE2B 16397708abe47946c1495adf6b91ad9db6bdef8c2f475f398b3b4d390193b800ff0b1710183732b81dde89fc24aad204854d02a0e0567046e712663eaa685711 SHA512 d6784c7e1a30690ec2523514b464c95e1d6704a8c8fef5da85b76583dfb5d4b5cbfd18eb9451a90243210e50405f7541b85b39ac09d4f487119677efeef63418
+DIST oslo-utils-4.6.0.tar.gz 94148 BLAKE2B 2de92b22b849522a43e81f0fa9bb5e92d2c380c07eca81cd916c536e10ec55869d5933a3a9dcc65b682ac793534094e6b0aaa74b7ac9c74724231dccc0dbae3b SHA512 fe91522c9860a7637af8b8521c297d6467f2af643f026abc97b72fd3032789219d2b3fdc9a6d8beecb0e55e4e7c319e800be295abf9639b52e32da81dae0c9a7
 EBUILD oslo-utils-4.1.2.ebuild 2449 BLAKE2B dcf2c3583b98de2706dc29b01c8fce68633ebb100ad408981fa6e0a7ab94a4a565669c40526e174d34f38d42da2fb2c5e0a02d5a1bf06ddc89b81489f8daefd1 SHA512 f5d1e7f22bacc3bfafb9453c2db5671b3e4d1f5cac6f68b71b72447cdebb79a85bb33d51565430316b522acd7bce4041b2a878f8cd02a9abff92537c9394bac2
+EBUILD oslo-utils-4.6.0.ebuild 1044 BLAKE2B c27c30758b61bb34c467e2eb06abc8a0b3418870e205a584015d0e160e038e9c16dffe0503fd100d3d35accb64b52ec1252f6ff733c38b6bc91c798d1a7ed6b9 SHA512 222d45370e2424d4f2255bde354a37b453b7bf90299c2ac95e37072f69291dc645b943fc66a4cf0e8778deb78224c8333a6a636c1fb3ea6b95e0efdf72104eda
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
new file mode 100644
index 000000000000..82ffb8f09c7d
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0.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 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+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 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index e3524c792242..e47b4e274088 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,5 +1,7 @@
 AUX passlib-1.7.2-py39.patch 870 BLAKE2B 87781afb87427dd78c9040babdb2c3be9f8b14099bee1d1e0cbd0a1bc0deee56b0ba0f65adaa5a9bbd81fd998152661db5a602127a74e59bc1aa07d1ce1e1c46 SHA512 a77f51cad2c460abc41b99cf59c76f33c1a15a51b4237c968185dc46c11c6e4aa1dd866082df13cd9b34f7496c9750c276c18dab8ea08056200d125e3dccb324
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
+DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
 EBUILD passlib-1.7.2.ebuild 1025 BLAKE2B 4c85828eacc7f82d68ed6bc3e65b184aa7db65ed4875493c52a080eb36642fab3c4d30a1509e95be1f90d2ada2700a35d5ddc8279e66000affbc1fe6e2d8411d SHA512 650186ba94965305a4d5a3ae2087309a986aea413e7415e534e12091c5f63a07aee309bad6031dca399142598e4d798349e2823f071ccdcfbe2e42ca117cd71c
-MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
+EBUILD passlib-1.7.4.ebuild 939 BLAKE2B 2b09d02f0558998feddc1b3a32f9f3ead5d50002551d323c3d292eec3802ef37b4b45428890af4df303bae4ce694b60b4fdf39a54c27d80b7d3bad7e9dc0dc1d SHA512 14b2cb05b9e3aa6fdcc6994bbb4312e3c502f4cb7d1d308cbb3dcfd81a7d2798f19d924329d2fa39c740d563317f35b06f689b5c7bdd062f05557d64ced1dbef
+MISC metadata.xml 735 BLAKE2B 7e437ebacd95fbabf9484546eb1dccca655551a0d437c5e633b1504ee2fed7ec9de2ba0ce9eb6718f9eca7aec1858b2a5183e37802f7786b5bd4dc4e901f6109 SHA512 09d237f8d4b3ca0b5fc3d308ff07f8aa4bb5c1c66a26672aad42fbe9991e2a531f00f39447d5d9d5865b441754e52d09c7fb32bacbe35928bb93567559837ce2
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index a4bd399c529a..ddfe55c4aac5 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -20,6 +20,5 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">passlib</remote-id>
-		<remote-id type="bitbucket">ecollins/passlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
new file mode 100644
index 000000000000..d1db1aa27998
--- /dev/null
+++ b/dev-python/passlib/passlib-1.7.4.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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
+HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="+bcrypt doc +scrypt +totp"
+
+RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
+	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+	scrypt? ( dev-python/scrypt[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/scrypt[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d4e666fc4cb7..e42d34342b82 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,9 @@
 DIST phonenumbers-8.12.10.tar.gz 2254112 BLAKE2B 1fa0faf7347371a548b5e890e3cf8ba9daa32275670f40f7efe507ecfa817a3c372d5b47f2b91a1366bb519657447a614d3579bf69ba3249255c579e37ae883b SHA512 14fcdaa76a61624db2c4d4290a3df27252d985f889b8fb29c80971b88b502a5fe74efa0a110ee3ec92459b8d6a1ccc03dd5eb211b6addad741c9bb7527d5e600
+DIST phonenumbers-8.12.11.tar.gz 2254319 BLAKE2B 2a33978ab0e4e575aefe2f3ed4f5a89ea87f1b38881fa2f4b7a4a38d16c107c62f4e079521d579b8a5419c8b174cf51ae8c530a450b8a8f9ad200b13938f4039 SHA512 e9008086f9cbb13a5772f164b12d3446cd0122556d90522f1e49d0a0155355401f2348a44396c7c26b235e543135471b64c97d67f82406356787c3c636dd181c
 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.11.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.11.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.11.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/plyvel/Manifest b/dev-python/plyvel/Manifest
index e42a4ef8e523..117682f3f8fc 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,3 +1,5 @@
 DIST plyvel-1.2.0.tar.gz 145528 BLAKE2B 3a1604b536e462b3eccb7c8294c607828b8f41f3ead65c74fd200d3bb4179765d63f57508cb3bfaee1c4c57ecda7b986afe9416714ae74ed9ad35a9247397c98 SHA512 00b3424e248d1ed17f6443c9862c9f35c94ad76707df5adfe625d7a387620252ff71b3e1f7e903dda1c5cfcd53cb23883c1049e31df541dfe566b8e849c0a96d
+DIST plyvel-1.3.0.tar.gz 149379 BLAKE2B 0a4fc8c3073cc8e103ab217f8e7971f04d9e6d1862dea7ce3d2634ba9646bdeebdda740fe6cb2e83aeeab513601bddef374355c4f6c9f320ce6b4b14ff2b2bf6 SHA512 fc1b84f0e98bf3edcdc2d7eda4f18313186538bb419bd297f694330e60512a6ab63e8d2fabaa825023eb5570f175ebbc22b8ae81e29603b1a94c1abb37774e99
 EBUILD plyvel-1.2.0.ebuild 805 BLAKE2B abf8640c1d3a845eec15a47ee9efd851b2c9329f58ed18be83c2f290c5420750f7303b2a305a628fa66e30a1cb633cee09ff6ac64381425abd564ed6b4288f1f SHA512 2080fa6bb7714eda413956d84ae357ec3991cb41f4a9f19e2c2b13f0e87e584cacf3007a1c45f3ac6521bb9f7dba56a5bacb57d5ee197464a930eedb2e6a36b5
+EBUILD plyvel-1.3.0.ebuild 712 BLAKE2B 64eb63ac0d7c823f16bc70c9afa61d7fb438e98f926df4276b588cf6d42cb5ec30c78ee3abe894a3d71a5168389cd3864a96b849c919bcbdb47340b482578409 SHA512 f9a7ed92afdb371aeb9d89e9bcd1594cb2b4c084d57116729a6c688098d78b6e6c8348067b51da8082af1acde201fad32ad06b83a00540126f96b24eace6ada4
 MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
diff --git a/dev-python/plyvel/plyvel-1.3.0.ebuild b/dev-python/plyvel/plyvel-1.3.0.ebuild
new file mode 100644
index 000000000000..b49ff2018566
--- /dev/null
+++ b/dev-python/plyvel/plyvel-1.3.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="Python interface to LevelDB"
+HOMEPAGE="https://github.com/wbolster/plyvel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/leveldb-1.20:="
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_test() {
+	# With the default import mode, plyvel is imported from ${S} which causes
+	# a failure because it doesn't contain the compiled _plyvel extension
+	pytest --import-mode=append -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 8b3be8b03486..11f46b964b25 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,3 @@
-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 636 BLAKE2B 0b0ed718a847ddab81450d142a7a46cb119c729597b078d8b4f4aa5a7d12e207030d2a627303452c841be3f506b1674d1171b71ce9aa397440c64de187a93472 SHA512 cf3d02f0a3761b79b68e57f9dda299469849ccb71b415976066e2bf03a082acf1032a800131d6c01bf3319e37b69c5a9742f0bfa621a3c54ca752823e3d4a6c6
+EBUILD process-tests-2.1.1.ebuild 635 BLAKE2B 1219068540b47168571cb36d28afdfc308a92fdbc46ffcd2266f70da9b5c96d749b2b5ebf75984219303b11b0d055b84d262f9717a0235facb628106b8e681cc SHA512 3993ca525a7b700f1cef848b0513f6c0ffdc4854802163026a45a79be0044edd5eb942b91d20bbab90b3899c93066d117f528d82239809ee6ad036d4682c93a9
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/process-tests/process-tests-2.0.2.ebuild b/dev-python/process-tests/process-tests-2.0.2.ebuild
deleted file mode 100644
index 71d5a7a42405..000000000000
--- a/dev-python/process-tests/process-tests-2.0.2.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
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for testing processes"
-HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
-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 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/
-RESTRICT="test"
-
-DOCS=( README.rst )
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 583ac5f99d58..aa3c1468da19 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/progress/Manifest b/dev-python/progress/Manifest
index 2a1487b23e5c..911c90745132 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,3 +1,5 @@
 DIST progress-1.3.tar.gz 5300 BLAKE2B db7683550ac19e2e11832c8be19971fe07fd58d6077e5fbf585178e1353aca1bf873affdcb528182e7856cdb2f9c342c7caed74e7914fbebde2d803479258ac8 SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076
+DIST progress-1.5.tar.gz 5842 BLAKE2B 235f02edf0f010b4460d36b868be2df0cf4685f360de491f1649f14defffd3f1789c6c036c05b91007efac49cacbed3de5cb38fda3e21d0fd633279b2066c4f9 SHA512 a9bee3498746233f874da2d6509d052882d9592df69c223637279a1fae40174a4dc279b56a7558e95ed173b0d357ae07752501c577a3cb9c79e0f87095838896
 EBUILD progress-1.3.ebuild 639 BLAKE2B 73fc0e7f5c9d34508d8ba7ccd002ae6c39f94e65b131e3174802d357ed0576ba73b3d10b655bb76df2ac7512811adea5ea7d18c37f8c9e8a1cd633cbab992233 SHA512 f275dd935e35860acd2db87d6093f2565c28a09cb331b1d35c8abbd1367a71f1db640d8439be5b58fe210cfc190d127b31e3d174fdc328c0f01fef27836a3259
+EBUILD progress-1.5.ebuild 575 BLAKE2B 71767b8c6fe8fc88df9904182a935970f5cd3b017ee8d0d93c968ae6aa787b227359c37cff2d49a951d651c43e486bc6c9f14ca898e83bf550fb9392ad242031 SHA512 0c4f3e884f79448a4a52c9028315574d965b0693d03e1af19947c3d1c7a4929f119c9f51b5c1b80a5f08da8d11304b3488cfd79fd8eb6a4d5c114c4c45023025
 MISC metadata.xml 391 BLAKE2B 8c43d18b83bbba693a62930ea28e8b47f6cd4594e03aed277ba0744d94558e8f32a68ead65b311d1ffda228be6334cf88ce7a1171250ceaef59028785e95361a SHA512 641f3a01855cda8109b87dd9c845ab7bfbe0c8ca406cd8de947e817659b97e7ad0d902ab682620b63fd8eac749d89308d54cd1f666b6ab72687a897bf41c567c
diff --git a/dev-python/progress/progress-1.5.ebuild b/dev-python/progress/progress-1.5.ebuild
new file mode 100644
index 000000000000..d9ef31eeef8a
--- /dev/null
+++ b/dev-python/progress/progress-1.5.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index a310c1efbb35..c4b44167efcb 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -4,7 +4,7 @@ DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f3
 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-r1.ebuild 1755 BLAKE2B 3f799ed3eb955c14afc27c8874f1181039ebf689a128e3a4091ad4ad380ebdd705924998ad45c52bd829fa8399e961277733f24d5103e3e0d14291491dd7105a SHA512 e5768c3301f38aa0171052fed9d771b23965270f9c8d9866d06e7bb8a80cdf99ea9a30adae8687c6fda8468001eaebccd7ceaf6cca27165f2e2049b1327f67a6
-EBUILD protobuf-python-3.12.2-r1.ebuild 1751 BLAKE2B 5bf0eb3188ebf590f24f7abc046b4c61670fecaa19f72857bf0d8d202733d36f9b605689eed6f0e87d5808184ea621163ea17d2bdcb061b8967b7a753943dec5 SHA512 3dc91a6aca1664a08a4af6597e56e8b160d4eebee7150405b226c5d6c28e5c133c16ae77bb631cd681e80f1a208c70555949ec920f140a011bf36b808d15d51a
+EBUILD protobuf-python-3.12.2-r1.ebuild 1750 BLAKE2B d5b2863166c0600c5f9ac8932a18ee283404dbd842f9fb2f895fcebb240db039c8f73ca7a036e53807c6f4e4eb54dd50ad3bd0b035241258b41487242460d4a1 SHA512 4291165b69f8166f28ac16fc217bc7e133e02629f096e610a5328a78b4d8821397432a2d0c7e21fb4cec74f591b5321eac42215cfc39cbc0585b303e97f008b9
 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
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
index 6200ddbb0488..460e7a0e25cd 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
@@ -24,7 +24,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 31d0029091ae..072186770f16 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,3 +1,5 @@
 DIST pyacoustid-1.1.7.tar.gz 14990 BLAKE2B 866fa4a03032f15daa2b8dd06119eb6edc777dec4bc673fe2564363f85906bbe451b2ca16e6911e143e7172c728f1a700f5fc426f9a4de9786c1429e475379cc SHA512 2bd301ce51df8a352c71493dac5b5c15cdd0af0a9a0bf0c8640857a9d99c5f0c9d59c5c2bf8c2aec61689481dacc42948f847e0c11ac7d581a7338e6d1088162
+DIST pyacoustid-1.2.0.tar.gz 15770 BLAKE2B 9a5d62a8b8450393aec103d3755ed9e1fa999b6d4b25d1180d12e96020bb8bcf44b32f7de2e7de2ab0902ca9e65b352bc09edca173ce738019f4ca3330489875 SHA512 45827841df97b0f3a5d090edb076456fb822dfb35f3efbe55cc2877801b6c706f22a38f216d4ce7e4217d7da650e2116cfd987ea87000c828b06221fb8b06312
 EBUILD pyacoustid-1.1.7.ebuild 744 BLAKE2B 8de7b3954d5512fa989dd3e0f3c23a76a8a2b0bc9aee693307992ba92b04fe018896650ca2326ed681a792cf16a514ad8b0ef1b5f3803bf9c4ce540a98cb9f1e SHA512 77e6cbfc2fc361ba116c98e1aa916952d4dc943060360e2b2b130c569245ece9a229bceb4496ff2b407afebeb2ab39b478ae880b06dd55a00c4985a3a39e778b
+EBUILD pyacoustid-1.2.0.ebuild 694 BLAKE2B fc67b0da9028b56429cf458bf591285fcbdbc5f948e692d8620ea09a7a70328775e87c764eeac6d6722985c2bb18dd87b15b8e4c02be66d0638fd6de69ccd943 SHA512 6ffef7fca5dd07d1d4c9578b95ca8f84239cb0f8ca142a5e456edcceefd29981110e0961da4687b10dbb248898c7a19ba6b1b9e4298c2e499323dd6579a4575d
 MISC metadata.xml 911 BLAKE2B fc4c4a10000f8c9ebe95b4687cfa087b930b9f4ad3b2a94e8e6ef8e3d210ba618824cef6513ecedc4902172b3255b43096cd8e132b7e0a68498fc70b9b9bfb59 SHA512 fa81f319c0c6e6963e8b37570006e411374191551411005945dc64f0c75242a7585aab6830f13b527ab0efc7f2ce56e260571c372c93c8c026a775f49709cbee
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
new file mode 100644
index 000000000000..22f63e1faf79
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-1.2.0.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,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
+HOMEPAGE="https://pypi.org/project/pyacoustid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/audioread[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/chromaprint
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	if use examples ; then
+		docinto examples
+		dodoc aidmatch.py fpcalc.py
+		docompress -x /usr/share/doc/${PF}/examples/
+	fi
+}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
new file mode 100644
index 000000000000..554f240ac07b
--- /dev/null
+++ b/dev-python/pydantic/Manifest
@@ -0,0 +1,5 @@
+AUX pydantic-1.6.1-fix-tests.patch 1616 BLAKE2B 80a3c209bd9a94aeef76b0aa564abd349cd458d767c73ab531d0a04df174f816ad2d237ee2fd53146e49d30dda449aeaf0487d890756b58eeea534a11bb9d923 SHA512 dfb6096266510fed229e24bffce280c45e72da5a2bb18cbba3bac6098e6175cc515d58c3dc8e0e256f58ff3bffb23fe123c815c7a538fe48b85d4e0304b5a830
+AUX pydantic-1.6.1-py39.patch 13658 BLAKE2B d9562e5f36fbaf9c9489d045d833499caa750922156d74936a18ca35db65c223ae19935b059225408d6070d6583107a292c726155f66d722505c3b9a41fe6d60 SHA512 a671b538a84857227da5e062763c86d9308e10fdbdc1ef04a1e07220f60280a089ea836fd1a0e7ef2f936c6cf02895efd39259eeb9cf1b9fe041e429579d808e
+DIST pydantic-1.6.1.tar.gz 244677 BLAKE2B 0a1d6986858ab753cbc4dd262bd268b2a365c241a7de106a7bf21714c6c499c7dbacaea095789d3503507965ca50106da32545be670ed0261827f1fe0316ff67 SHA512 b0442f78a661f56d29697da7e27393261420bdb0f08473d2f7872145a49a18de8c17c903d0899a44263bcd8229e8790161da032dd5a3d5f2dae347c66bd6a567
+EBUILD pydantic-1.6.1.ebuild 1002 BLAKE2B 74967cc5755ab17a7ba321d2d59cae28b2665f26389dcd0769bdce7f4600b3bc89bbf370829d0f43e59e5c85b7c0ad8c0787d77a64cc08e7f68ea10f1e5ce271 SHA512 341ce3fe397c40be7271a1c25d32e334a2766066ca13525468da3b5b9980007346f7ec5e6a07245527c0c661ec58060036d850caaf844896bc9cb5e1d8e6f553
+MISC metadata.xml 491 BLAKE2B 1c17cf9901705ce6aa44e87902e2d52dbebf6c465ce3210b005ce0a2a69df04f91f90d3f8bfb3f44c1ce804bdb02bfd959920564b5e496ea58089fa77b4ccb22 SHA512 f7fd4fa24b1df7ecb7260f74569413af570c75df6e2c52fa59a8e01d030e4c0bbef120e53f6c3a6b0ad8100d8797c86dd8c1586f86f02c3a740362f6f0b96479
diff --git a/dev-python/pydantic/files/pydantic-1.6.1-fix-tests.patch b/dev-python/pydantic/files/pydantic-1.6.1-fix-tests.patch
new file mode 100644
index 000000000000..1d6dc5d311a6
--- /dev/null
+++ b/dev-python/pydantic/files/pydantic-1.6.1-fix-tests.patch
@@ -0,0 +1,45 @@
+commit 44eac223df11a1b711ffe0d7946019a173c2a88e
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Thu Oct 8 14:19:58 2020 +0200
+
+    test_config_file_settings_nornir: use less common env. var names
+    
+    Gentoo's Portage sets A during the test phase, switching to less common
+    environment variable names reduces the likelihood of something similar
+    happening.
+
+diff --git a/tests/test_settings.py b/tests/test_settings.py
+index d24aae3..1f4d678 100644
+--- a/tests/test_settings.py
++++ b/tests/test_settings.py
+@@ -437,21 +437,21 @@ def test_config_file_settings_nornir(env):
+     """
+ 
+     class Settings(BaseSettings):
+-        a: str
+-        b: str
+-        c: str
++        param_a: str
++        param_b: str
++        param_c: str
+ 
+         def _build_values(self, init_kwargs, _env_file, _env_file_encoding):
+             config_settings = init_kwargs.pop('__config_settings__')
+             return {**config_settings, **init_kwargs, **self._build_environ()}
+ 
+-    env.set('C', 'env setting c')
++    env.set('PARAM_C', 'env setting c')
+ 
+-    config = {'a': 'config a', 'b': 'config b', 'c': 'config c'}
+-    s = Settings(__config_settings__=config, b='argument b', c='argument c')
+-    assert s.a == 'config a'
+-    assert s.b == 'argument b'
+-    assert s.c == 'env setting c'
++    config = {'param_a': 'config a', 'param_b': 'config b', 'param_c': 'config c'}
++    s = Settings(__config_settings__=config, param_b='argument b', param_c='argument c')
++    assert s.param_a == 'config a'
++    assert s.param_b == 'argument b'
++    assert s.param_c == 'env setting c'
+ 
+ 
+ test_env_file = """\
diff --git a/dev-python/pydantic/files/pydantic-1.6.1-py39.patch b/dev-python/pydantic/files/pydantic-1.6.1-py39.patch
new file mode 100644
index 000000000000..7cd5290cd591
--- /dev/null
+++ b/dev-python/pydantic/files/pydantic-1.6.1-py39.patch
@@ -0,0 +1,316 @@
+diff --git a/changes/1832-PrettyWood.md b/changes/1832-PrettyWood.md
+new file mode 100644
+index 000000000..5038a0da0
+--- /dev/null
++++ b/changes/1832-PrettyWood.md
+@@ -0,0 +1 @@
++add basic support of python 3.9
+diff --git a/pydantic/fields.py b/pydantic/fields.py
+index 01792b628..c52b34ea4 100644
+--- a/pydantic/fields.py
++++ b/pydantic/fields.py
+@@ -32,6 +32,8 @@
+     NoArgAnyCallable,
+     NoneType,
+     display_as_type,
++    get_args,
++    get_origin,
+     is_literal_type,
+     is_new_type,
+     new_type_supertype,
+@@ -411,7 +413,7 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+         elif is_literal_type(self.type_):
+             return
+ 
+-        origin = getattr(self.type_, '__origin__', None)
++        origin = get_origin(self.type_)
+         if origin is None:
+             # field is not "typing" object eg. Union, Dict, List etc.
+             # allow None for virtual superclasses of NoneType, e.g. Hashable
+@@ -422,7 +424,7 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+             return
+         if origin is Union:
+             types_ = []
+-            for type_ in self.type_.__args__:
++            for type_ in get_args(self.type_):
+                 if type_ is NoneType:
+                     if self.required is Undefined:
+                         self.required = False
+@@ -444,9 +446,9 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+         if issubclass(origin, Tuple):  # type: ignore
+             self.shape = SHAPE_TUPLE
+             self.sub_fields = []
+-            for i, t in enumerate(self.type_.__args__):
++            for i, t in enumerate(get_args(self.type_)):
+                 if t is Ellipsis:
+-                    self.type_ = self.type_.__args__[0]
++                    self.type_ = get_args(self.type_)[0]
+                     self.shape = SHAPE_TUPLE_ELLIPSIS
+                     return
+                 self.sub_fields.append(self._create_sub_type(t, f'{self.name}_{i}'))
+@@ -460,7 +462,7 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+                     {f'list_{i}': Validator(validator, pre=True) for i, validator in enumerate(get_validators())}
+                 )
+ 
+-            self.type_ = self.type_.__args__[0]
++            self.type_ = get_args(self.type_)[0]
+             self.shape = SHAPE_LIST
+         elif issubclass(origin, Set):
+             # Create self validators
+@@ -470,22 +472,22 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+                     {f'set_{i}': Validator(validator, pre=True) for i, validator in enumerate(get_validators())}
+                 )
+ 
+-            self.type_ = self.type_.__args__[0]
++            self.type_ = get_args(self.type_)[0]
+             self.shape = SHAPE_SET
+         elif issubclass(origin, FrozenSet):
+-            self.type_ = self.type_.__args__[0]
++            self.type_ = get_args(self.type_)[0]
+             self.shape = SHAPE_FROZENSET
+         elif issubclass(origin, Sequence):
+-            self.type_ = self.type_.__args__[0]
++            self.type_ = get_args(self.type_)[0]
+             self.shape = SHAPE_SEQUENCE
+         elif issubclass(origin, Mapping):
+-            self.key_field = self._create_sub_type(self.type_.__args__[0], 'key_' + self.name, for_keys=True)
+-            self.type_ = self.type_.__args__[1]
++            self.key_field = self._create_sub_type(get_args(self.type_)[0], 'key_' + self.name, for_keys=True)
++            self.type_ = get_args(self.type_)[1]
+             self.shape = SHAPE_MAPPING
+         # Equality check as almost everything inherits form Iterable, including str
+         # check for Iterable and CollectionsIterable, as it could receive one even when declared with the other
+         elif origin in {Iterable, CollectionsIterable}:
+-            self.type_ = self.type_.__args__[0]
++            self.type_ = get_args(self.type_)[0]
+             self.shape = SHAPE_ITERABLE
+             self.sub_fields = [self._create_sub_type(self.type_, f'{self.name}_type')]
+         elif issubclass(origin, Type):  # type: ignore
+@@ -494,7 +496,7 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+             # Is a Pydantic-compatible generic that handles itself
+             # or we have arbitrary_types_allowed = True
+             self.shape = SHAPE_GENERIC
+-            self.sub_fields = [self._create_sub_type(t, f'{self.name}_{i}') for i, t in enumerate(self.type_.__args__)]
++            self.sub_fields = [self._create_sub_type(t, f'{self.name}_{i}') for i, t in enumerate(get_args(self.type_))]
+             self.type_ = origin
+             return
+         else:
+diff --git a/pydantic/generics.py b/pydantic/generics.py
+index 64562227d..0a5e75401 100644
+--- a/pydantic/generics.py
++++ b/pydantic/generics.py
+@@ -3,6 +3,7 @@
+ from .class_validators import gather_all_validators
+ from .fields import FieldInfo, ModelField
+ from .main import BaseModel, create_model
++from .typing import get_origin
+ from .utils import lenient_issubclass
+ 
+ _generic_types_cache: Dict[Tuple[Type[Any], Union[Any, Tuple[Any, ...]]], Type[BaseModel]] = {}
+@@ -37,7 +38,7 @@ def __class_getitem__(cls: Type[GenericModelT], params: Union[Type[Any], Tuple[T
+         check_parameters_count(cls, params)
+         typevars_map: Dict[TypeVarType, Type[Any]] = dict(zip(cls.__parameters__, params))
+         type_hints = get_type_hints(cls).items()
+-        instance_type_hints = {k: v for k, v in type_hints if getattr(v, '__origin__', None) is not ClassVar}
++        instance_type_hints = {k: v for k, v in type_hints if get_origin(v) is not ClassVar}
+         concrete_type_hints: Dict[str, Type[Any]] = {
+             k: resolve_type_hint(v, typevars_map) for k, v in instance_type_hints.items()
+         }
+@@ -79,7 +80,7 @@ def __concrete_name__(cls: Type[Any], params: Tuple[Type[Any], ...]) -> str:
+ 
+ 
+ def resolve_type_hint(type_: Any, typevars_map: Dict[Any, Any]) -> Type[Any]:
+-    if hasattr(type_, '__origin__') and getattr(type_, '__parameters__', None):
++    if get_origin(type_) and getattr(type_, '__parameters__', None):
+         concrete_type_args = tuple([typevars_map[x] for x in type_.__parameters__])
+         return type_[concrete_type_args]
+     return typevars_map.get(type_, type_)
+diff --git a/pydantic/main.py b/pydantic/main.py
+index c872f1e3b..87299b645 100644
+--- a/pydantic/main.py
++++ b/pydantic/main.py
+@@ -33,7 +33,7 @@
+ from .parse import Protocol, load_file, load_str_bytes
+ from .schema import model_schema
+ from .types import PyObject, StrBytes
+-from .typing import AnyCallable, ForwardRef, is_classvar, resolve_annotations, update_field_forward_refs
++from .typing import AnyCallable, ForwardRef, get_origin, is_classvar, resolve_annotations, update_field_forward_refs
+ from .utils import (
+     ClassAttribute,
+     GetterDict,
+@@ -256,7 +256,7 @@ def __new__(mcs, name, bases, namespace, **kwargs):  # noqa C901
+                     if (
+                         isinstance(value, untouched_types)
+                         and ann_type != PyObject
+-                        and not lenient_issubclass(getattr(ann_type, '__origin__', None), Type)
++                        and not lenient_issubclass(get_origin(ann_type), Type)
+                     ):
+                         continue
+                     fields[ann_name] = inferred = ModelField.infer(
+diff --git a/pydantic/schema.py b/pydantic/schema.py
+index 27c66b2bd..4f6258ab1 100644
+--- a/pydantic/schema.py
++++ b/pydantic/schema.py
+@@ -55,7 +55,7 @@
+     conset,
+     constr,
+ )
+-from .typing import ForwardRef, Literal, is_callable_type, is_literal_type, literal_values
++from .typing import ForwardRef, Literal, get_args, get_origin, is_callable_type, is_literal_type, literal_values
+ from .utils import get_model, lenient_issubclass, sequence_like
+ 
+ if TYPE_CHECKING:
+@@ -803,9 +803,9 @@ def go(type_: Any) -> Type[Any]:
+             or lenient_issubclass(type_, (ConstrainedList, ConstrainedSet))
+         ):
+             return type_
+-        origin = getattr(type_, '__origin__', None)
++        origin = get_origin(type_)
+         if origin is not None:
+-            args: Tuple[Any, ...] = type_.__args__
++            args: Tuple[Any, ...] = get_args(type_)
+             if any(isinstance(a, ForwardRef) for a in args):
+                 # forward refs cause infinite recursion below
+                 return type_
+diff --git a/pydantic/typing.py b/pydantic/typing.py
+index 070691eeb..729ebd71b 100644
+--- a/pydantic/typing.py
++++ b/pydantic/typing.py
+@@ -44,12 +44,19 @@ def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+         return type_._eval_type(globalns, localns)
+ 
+ 
+-else:
++elif sys.version_info < (3, 9):
+ 
+     def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+         return type_._evaluate(globalns, localns)
+ 
+ 
++else:
++
++    # TODO: remove the pragma: no cover once we can run CI on python 3.9
++    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:  # pragma: no cover
++        return type_._evaluate(globalns, localns, set())
++
++
+ if sys.version_info < (3, 7):
+     from typing import Callable as Callable
+ 
+@@ -70,8 +77,50 @@ def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+             from typing_extensions import Literal
+         except ImportError:
+             Literal = None
++
++    def get_args(t: Type[Any]) -> Tuple[Any, ...]:
++        return getattr(t, '__args__', ())
++
++    def get_origin(t: Type[Any]) -> Optional[Type[Any]]:
++        return getattr(t, '__origin__', None)
++
++
+ else:
+-    from typing import Literal
++    from typing import Literal, get_args as typing_get_args, get_origin as typing_get_origin
++
++    def get_origin(tp: Type[Any]) -> Type[Any]:
++        return typing_get_origin(tp) or getattr(tp, '__origin__', None)
++
++    def generic_get_args(tp: Type[Any]) -> Tuple[Any, ...]:
++        """
++        In python 3.9, `typing.Dict`, `typing.List`, ...
++        do have an empty `__args__` by default (instead of the generic ~T for example).
++        In order to still support `Dict` for example and consider it as `Dict[Any, Any]`,
++        we retrieve the `_nparams` value that tells us how many parameters it needs.
++        """
++        # TODO: remove the pragma: no cover once we can run CI on python 3.9
++        if hasattr(tp, '_nparams'):  # pragma: no cover
++            return (Any,) * tp._nparams
++        return ()
++
++    def get_args(tp: Type[Any]) -> Tuple[Any, ...]:
++        """Get type arguments with all substitutions performed.
++
++        For unions, basic simplifications used by Union constructor are performed.
++        Examples::
++            get_args(Dict[str, int]) == (str, int)
++            get_args(int) == ()
++            get_args(Union[int, Union[T, int], str][int]) == (int, str)
++            get_args(Union[int, Tuple[T, int]][str]) == (int, Tuple[str, int])
++            get_args(Callable[[], T][int]) == ([], int)
++        """
++        try:
++            args = typing_get_args(tp)
++        # TODO: remove the pragma: no cover once we can run CI on python 3.9
++        except IndexError:  # pragma: no cover
++            args = ()
++        return args or getattr(tp, '__args__', ()) or generic_get_args(tp)
++
+ 
+ if TYPE_CHECKING:
+     from .fields import ModelField
+@@ -115,6 +164,8 @@ def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+     'CallableGenerator',
+     'ReprArgs',
+     'CallableGenerator',
++    'get_args',
++    'get_origin',
+ )
+ 
+ 
+@@ -167,16 +218,16 @@ def resolve_annotations(raw_annotations: Dict[str, Type[Any]], module_name: Opti
+ 
+ 
+ def is_callable_type(type_: Type[Any]) -> bool:
+-    return type_ is Callable or getattr(type_, '__origin__', None) is Callable
++    return type_ is Callable or get_origin(type_) is Callable
+ 
+ 
+ if sys.version_info >= (3, 7):
+ 
+     def is_literal_type(type_: Type[Any]) -> bool:
+-        return Literal is not None and getattr(type_, '__origin__', None) is Literal
++        return Literal is not None and get_origin(type_) is Literal
+ 
+     def literal_values(type_: Type[Any]) -> Tuple[Any, ...]:
+-        return type_.__args__
++        return get_args(type_)
+ 
+ 
+ else:
+@@ -217,12 +268,15 @@ def new_type_supertype(type_: Type[Any]) -> Type[Any]:
+     return type_
+ 
+ 
+-def _check_classvar(v: Type[Any]) -> bool:
++def _check_classvar(v: Optional[Type[Any]]) -> bool:
++    if v is None:
++        return False
++
+     return v.__class__ == ClassVar.__class__ and (sys.version_info < (3, 7) or getattr(v, '_name', None) == 'ClassVar')
+ 
+ 
+ def is_classvar(ann_type: Type[Any]) -> bool:
+-    return _check_classvar(ann_type) or _check_classvar(getattr(ann_type, '__origin__', None))
++    return _check_classvar(ann_type) or _check_classvar(get_origin(ann_type))
+ 
+ 
+ def update_field_forward_refs(field: 'ModelField', globalns: Any, localns: Any) -> None:
+@@ -243,13 +297,13 @@ def get_class(type_: Type[Any]) -> Union[None, bool, Type[Any]]:
+     without brackets. Otherwise returns None.
+     """
+     try:
+-        origin = getattr(type_, '__origin__')
++        origin = get_origin(type_)
+         if origin is None:  # Python 3.6
+             origin = type_
+         if issubclass(origin, Type):  # type: ignore
+-            if type_.__args__ is None or not isinstance(type_.__args__[0], type):
++            if not get_args(type_) or not isinstance(get_args(type_)[0], type):
+                 return True
+-            return type_.__args__[0]
+-    except AttributeError:
++            return get_args(type_)[0]
++    except (AttributeError, TypeError):
+         pass
+     return None
diff --git a/dev-python/pydantic/metadata.xml b/dev-python/pydantic/metadata.xml
new file mode 100644
index 000000000000..3f626e20bc7d
--- /dev/null
+++ b/dev-python/pydantic/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<upstream>
+		<remote-id type="pypi">pydantic</remote-id>
+		<remote-id type="github">samuelcolvin/pydantic</remote-id>
+		<bugs-to>https://github.com/samuelcolvin/pydantic/issues</bugs-to>
+		<doc>https://pydantic-docs.helpmanual.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydantic/pydantic-1.6.1.ebuild b/dev-python/pydantic/pydantic-1.6.1.ebuild
new file mode 100644
index 000000000000..584f26cc9ec3
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# At the moment, PyPy3 doesn't have a dataclasses module
+# It can probably be added when PyPy3.7 is stable
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+# No tests on PyPI: https://github.com/samuelcolvin/pydantic/pull/1976
+SRC_URI="https://github.com/samuelcolvin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# https://github.com/samuelcolvin/pydantic/pull/1977
+	"${FILESDIR}/${P}-fix-tests.patch"
+	# https://github.com/samuelcolvin/pydantic/pull/1844
+	"${FILESDIR}/${P}-py39.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# So we don't need pytest-timeout
+	sed -i '/^timeout = /d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 0933782cd432..e2be7d0a781b 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,5 +1,5 @@
 DIST pydocstyle-5.0.2.tar.gz 68063 BLAKE2B 6d7bf04e97c853e50d953342d332847d0e80b080d5ab044f9d444536ed0352ad44402a1af0c3a6f552ec9f3bb3a372a84af2a5bbdaee58bb18dab585cad5dddb SHA512 5ac2e017ae95ff5c7759d6a2cb9ac990f94f668f5fd940792d927cc62628cd036afcf39ab5db6a11100dcca32af344b47f4a7319dd3a47c36367844d0c06d34a
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
 EBUILD pydocstyle-5.0.2.ebuild 955 BLAKE2B c2f040156346bcb23a85f42b6b7ff3ed0d8d59321b5da4fb8fb8f5c4ab795b4cea15b9547324ea3e920f3525aeb2f8bbc69653928233e51fcc85cfcabe96c72b SHA512 9f401abfdf48c389747a92b2a84668fced98e6cb624d8dd2fddc472bbbe5c0428e291c43437220adc7630917b81ec6cf109e789e676f89c979f98622a6143792
-EBUILD pydocstyle-5.1.1.ebuild 861 BLAKE2B a0dbd526bc57ddd67c8cb4c19f8223a0765267ae50b2901a79105bf50198ee54e49cb897c54d59690228518e71c41d084947ba9e128c36ddf3103205f059b078 SHA512 5218f60917b44b66febf1eadbde5b0f5eec1d8b65e7aa0b5c5a8e4e6cab6c7324faafb6c31788cd76e56198da99c2dc857eb6b192cde595b09e2b5b201e64887
+EBUILD pydocstyle-5.1.1.ebuild 868 BLAKE2B dfe8511b17f020a0ed56d1b98ce16a9287cbdb9ff693fe7dc3a4e945d93207d1c3f4e813645f44f2c2213a276ed4025e6b5383526c6fa51fab0c644bd09adaf5 SHA512 8585fef4f0f93e4f94612a8c7e72ac669c3ec5e9c725978289733932b581e9d948ae4cba26132b8ab4c7a171c6e7265e45de2b845e0f53afe4721f25f8e73669
 MISC metadata.xml 762 BLAKE2B 3beb9d084f02d336a8b8785df8bcad21c5e49f972b3a9a255eba79291630a1cb6dedd77d1a6c72c7cf787149b6a8ed0c4df2cc49dfb3eb0d9094ca271bbd5220 SHA512 8c3ddff21e08bce744df0d7f6157e0024f13f4e6dbc51c053b46058152c6c889ab529dcc423659f993b79b8292a5a76ad1bb161e3fd949a9bc3a3e7b416a86bb
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 15729d6e0770..1d10a7421369 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 2b747479796c..7fd3dda1f0ae 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,7 +3,7 @@ DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.dev12.tar.gz 5598471 BLAKE2B 339e96ed7f01070c3aa4b31b587a793b43b99ac476d72a431dff09d98b95ef48c6b0d4faa20301e6db43cb2b35b13245253d86859c16d2befbd3795f8ed48b7f SHA512 f732056b3c8377326caf1d6ded6c59e8665de2ab2f6233d6d95dcc26137d67d180f8c5dc92fc22578ec5ce0ecf5a1de5080c62355d15035ab248d518cd75180f
 EBUILD pygame-1.9.6-r1.ebuild 2294 BLAKE2B 1bf372a3814f5d28db059250e0adfd1f039d7d594801b5b319b77e5137c25957658c6db0a963888f5737dc5850e2385fe4819bb711dab7f0fd021bdbb8375cad SHA512 23959b2a00d38297e146d11a803771e0b18a48ef605e0696f008c23c64e134e8a170f79015169de8652c1384440a7648915a44840f5ac6bcc9f1a1b74689e085
-EBUILD pygame-2.0.0_pre10.ebuild 1913 BLAKE2B 0fab35afd02d8752456705b97602a822f7db6170a63bbf6e82cdbefa3030b3627ea49d2c6f140947f7715057a9aa3f3b6675faea090c6f9c3da24e5eeb735864 SHA512 67873cc30120e6a56065c4d8febd50ab81e9ae0c4d36315e1a579929a3218521a22ae7ad3e3a1b039fd771cce6913a42adf4bf1458c2a13d4fa30bf158989c12
+EBUILD pygame-2.0.0_pre10.ebuild 1912 BLAKE2B 3ffe401e7f1cd2f73a87b4bd1991bb2619d843d19ac27ff964e843c58882e9237ed461b7d87d85454b5c20ae6130de6b9d9addbf7becc902fb271e27c5cca95b SHA512 f3fed5cfaf1ba6ffb4805b07f8c132edcfe48cd1f275d589f7051a2445aca27430a0d88efb1fc0567a053a7caa09def5750219b2f906d312fd2c3f02d662fc82
 EBUILD pygame-2.0.0_pre12.ebuild 2010 BLAKE2B caa52588b03e11521bb95881b848c802acfd06a6b373bbda51f01b62e5359dc802fe399fdec2d75efaf3d51d0001422a07aee036efec5e3ee91e8a16ffd2c365 SHA512 ff4b1bbd4cffa77ccac261aef55014be8f14ac80db7a1f480f1d89b5a44ae057696bf1c4b6db4d9b54eb1cd1ea4e18e6f12fd0c17e6c113bf72682784b21975d
 EBUILD pygame-9999.ebuild 1737 BLAKE2B c854247d528ccf4aaee3c348d16ee9148d2de2624080e80e233d947249719b1d3f16d0898703a1579b725fabc369679a2a3e113da4ce6af9f64fdf2d7dd983e7 SHA512 c3ff68bc1c97aff762c5b66507f1ae159476a55cc9b7395841c462769109a105bc961cac9e5f7284223d169c0afbbdd305a533b06ecf2966e7c0c07b4833096d
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index 3d46cb1892c8..12474f9a4bed 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 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 examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 0ad3640e5931..27e27e081585 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-r1.ebuild 1896 BLAKE2B 2e53e017e9a4d12394fa45b88700a5af9cfb725edad3925c9f6074cbaa446dc7ed159e8a2249d914be697d37f99900a1f379bee6b4efdbd9ac2477eccd96ad98 SHA512 08eaf6f24dc0a71d394a0ac9c2a823f906d25ebdbe8bec4947863226805a7c6f05366dc2754399ef23640ddb2f46011eb8e6596ab0233c6eb8264fe8c88451cf
-EBUILD pygobject-3.36.1-r1.ebuild 1898 BLAKE2B 890b7f739e38735d9e2ae796e75578bc42f4a63b5a4ab5f546a1301606c9be4f19511d8c489b2b8722b44133302d8db9f1358fbb267e8931cb3eeadc314e47d0 SHA512 77204741bd734b3c16c7b9b8a4729803d1c3c533f788517be46a3b657fd42b935aa707d1a97dc0044be8a3a9036135a7d0caa7b06971103ffdab805012b611d0
+EBUILD pygobject-3.36.1-r1.ebuild 1758 BLAKE2B 6c7b313f5acadaf9f303cf4e1aa7f15e36303528c4ed765c386d8589229679f7d5e94d321d49d725a0f52fbb92cd246050570e3948c33a8ff4a319932f80a1b2 SHA512 f2c2749f33bcf47e4893a3d40c8138713145ce5a212d96767a626913508b74889a54a16383c36b8fc12e30c1153d0b8c0a326d0446b32512febbbf4e5305f8d0
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
index e07d82e9ea83..774991e0a087 100644
--- a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@@ -27,13 +27,11 @@ RDEPEND="${PYTHON_DEPS}
 "
 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)
+		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]
 	)
 "
 BDEPEND="
@@ -62,11 +60,6 @@ src_test() {
 	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}"
 	}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 038ce4266a3b..fc6717133641 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,6 +1,4 @@
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
-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 1053 BLAKE2B 10730b633dd90422c3d8f276149f34a25c9bfdf594027511c78938a3afef7f7be11c6ab6fa723bd58ddd15cc9b9f673475385f0840ceb8f08cd48f25e01294e5 SHA512 9a91ea51abed4e9ee18e41d58d38e81b144c20013137ea4093d6c1864039005541142c01f9ba8a977ace64c00959097357b256fba04efbd83ca37ce2e506e50e
+EBUILD pygraphviz-1.6.ebuild 1052 BLAKE2B 029d99b7a3e55b0d3061fbde3be7cca1cbfc64c49430edf1729e3a9b5a028a3d4d66b44f097772b33565d0c429f729f76724bd4fadb2635a4ddc2ccb67009f48 SHA512 f373da8430773d72b355535ea92d4ab4bb70d9764c1a7ef43196d48ff6fd55d0f10a0ba01ae0695d2c8d562706a10d6e5a1be31e38c46623b5576461fb925c12
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
deleted file mode 100644
index d87dcfbc259a..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="https://pygraphviz.github.io/"
-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"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	test? (
-		dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
-		nosetests -c setup.cfg -x -v || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
index 3caab34f5442..ba82b028833a 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/pylama/Manifest b/dev-python/pylama/Manifest
index df2616e5f032..594132789761 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,4 +1,4 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1256 BLAKE2B 40670b0859ab054b118a020eb415e388d49c580f6490f2e3ce72d2e9539aadfad2055db60d5bf393c014f9dd23c0e1328092acb0664963ee72890596f9a39257 SHA512 2a28332ce989756118a032bdaef67f4f72f2dd6b2b34235fe506631751b6b5a05bbbe60737e7f5fcd28e75fddce03338f3a6b7aba2162264ef78aff444f0c4a0
+EBUILD pylama-7.7.1-r1.ebuild 1263 BLAKE2B a87faf75a83bbc2d5c6494a9e4d08187061e15ddb58407fe450a43fd5355d9570d22b8472acac7c6ccb4c551f0b918ddd8e52620539686a11f2a818e74ad9886 SHA512 3a18779be99d1c6cdc486db0ecfdf6b548eba355fad696bf6bc2cb08fb146e0556bc1b872ef7a85f5c1c0acc762e578428f0c1f8a04b51e7637cb86a88dcaeb2
 EBUILD pylama-7.7.1.ebuild 1223 BLAKE2B 7a9fa4b2b257b67ac98d90de0db7303337eef8eb9e2b5b4ad700b586742a721f4bfe40f40f45b676f1460af29ae8143059c3fb3da57dd2ab9e25aa2700774d8f SHA512 36f0bd5a8d9f80efd6ea17c40d7c2ba505c5d8980972dd6c18bcf7ae99900bb087549fbdf58a33081ca1c14a664212f4efea23f30a5584068e9a96fbf7ddf86f
 MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 5ccf8ff9fbba..702796d2d9e4 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 8e1965b7a047..374172f4a23f 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,9 +1,5 @@
 AUX pymysql-0.10.0-add-missing-import.patch 536 BLAKE2B 664c1c93cef8d2cfe810a5afa517f1f755b854ecc2997000aace64bc890fbee1b877a81efb877aa668f99dec67ad8cb453f428639828ade322d51ecfeca7c07d SHA512 1b08d846495879eb17fdf5274b47cbb39beac2416a0120b81fc01f0ec908e92c2898d30ad1225f950d0c22341807bc45347384d5faed6ae52bc31954a38e1771
 AUX pymysql-0.10.0-fix-tests.patch 1471 BLAKE2B 058afeda49c45bbb2421301d2ad270a9de111e3d24322c268d2dcba2867d3dd169117e9af9d7d63bc8d3b59f6ef0e570febc0d3d2232531c91942c3d13dc119c SHA512 312e37ae1943bd1db3b44a28832a55dade62c38b8ff042b4ce4d7beb8bc2c74d87e61d7b1e44dc583072450a3951dc05c504cab15a0d9b9f0fa562efa276ae36
-DIST pymysql-0.10.0.tar.gz 86137 BLAKE2B bcd4746d3e3947c2598b875d46678984beedfa0d9161a1aefb1f7f4b5314e084f5292206435b0a2621fb100744194fd1e2963228e37b41c289c5c4021f475371 SHA512 7d322c526634380cf4d3216f666a7d1f38e120390aab525cb8806bcea3f2fd7eab82e744a0be7270eae47ab1f79be5b5f7409e7e5dc9aaabf1e3c0c8853f578f
 DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224
-DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
-EBUILD pymysql-0.10.0.ebuild 3630 BLAKE2B 2964ad45547b3a7416d182cc3acc75d7ea4a0499969c94cf7781bae7a938e34988552baf1c05bba5a677b7fcadcf7b8f0aad066d69b966f166ed6f282cfdbe47 SHA512 7aae18dc645baa1e241f64d05318a157c9c9110090651a1a6e1be0d2d4628f54c1a344ca8e3b10ac18bcbd4e57c2f0b28114ed6a63d99e74579615dc874a379b
-EBUILD pymysql-0.10.1.ebuild 3577 BLAKE2B c57eae961124b24ec88b17a27c1ecb714312b4fa2d281973bd462ba94dee4bd9a11aef4ca94713c7b5ff75afb1e30ec0cd9ce23c0a36aa1d5eae820b849f7cbc SHA512 011157c437a0f6f4f7f210e16a6fe6a3c093df2e123ca4db7bd5f976198b2123095f459cf462ecb46c820516db0516df7cde0afbfb3e6ae67f58743c89fc7678
-EBUILD pymysql-0.9.3.ebuild 2141 BLAKE2B 53cd7fa1adf3224e595e841339296441f31df2261fce0fbd1955bc903444eb218b89a2b8845ebaff4d9cd75bcd2fd29733d20cd16f68aed710e097c26922787b SHA512 3b854cd5af1502d81e6157f20044311152da0d2cd7fa471d88e68bdd284a380caad920f89594eb085f52da07d3e03d11a3a78fa7888d54e54263fbc8fdec7443
+EBUILD pymysql-0.10.1.ebuild 3575 BLAKE2B 67ef1a309f7f85b3236763c26f177d03db95c1c9fbe00efb83a4afa9bb91942ab75fdad70ae462e35d9c27f98950f8dba873e99bb613abd47bba3a8dbd0a2699 SHA512 8ba4d4dd61735e605eb7a37b0e85a1b526a8c52c94eef59ed474ce4055938afbafc7136cfdd78a30b146af3271481d19cc7536729b3097e05fd40e7713ff2c7e
 MISC metadata.xml 465 BLAKE2B ee6efa9aac32699c9746ecfe59dcb9421ed350712358e6daba43cd881fbca8cea649974509069a62555af49d7e9f771b8610e805d79f0857ded1926de3386f08 SHA512 c30ff59a0b772428c9c64b6f70871132251deb94d3a074a2a688b90f627bf1d953d6a3d3fd6c6216072f8ca5bfe53bd8707f7c6a125d41a2267cbbb4ca262c65
diff --git a/dev-python/pymysql/pymysql-0.10.0.ebuild b/dev-python/pymysql/pymysql-0.10.0.ebuild
deleted file mode 100644
index 059a093ed9bd..000000000000
--- a/dev-python/pymysql/pymysql-0.10.0.ebuild
+++ /dev/null
@@ -1,139 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# TODO: support other mysql variants
-BDEPEND="
-	test? ( dev-db/mariadb[server] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.0-fix-tests.patch
-	"${FILESDIR}"/${PN}-0.10.0-add-missing-import.patch
-)
-
-src_prepare() {
-	find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die
-
-	# Auth tests don't support socket auth
-	find tests/ -name '*_auth.py' -delete || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	if [[ -z "${USER}" ]] ; then
-		# Tests require system user
-		local -x USER="$(whoami)"
-		einfo "USER set to '${USER}'"
-	fi
-
-	local PIDFILE="${T}/mysqld.pid"
-	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
-		einfo "Killing already running mysqld process ..."
-		pkill -F "${PIDFILE}"
-	fi
-
-	if [[ -d "${T}/mysql" ]] ; then
-		einfo "Removing already existing mysqld data dir ..."
-		rm -rf "${T}/mysql" || die
-	fi
-
-	einfo "Creating mysql test instance ..."
-	mkdir -p "${T}"/mysql || die
-	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
-		--no-defaults \
-		--auth-root-authentication-method=normal \
-		--basedir="${BROOT}/usr" \
-		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
-		|| die
-
-	einfo "Starting mysql test instance ..."
-	# TODO: random port
-	mysqld \
-		--no-defaults \
-		--character-set-server=utf8 \
-		--bind-address=127.0.0.1 \
-		--port=43306 \
-		--pid-file="${T}"/mysqld.pid \
-		--socket="${T}"/mysqld.sock \
-		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
-
-	# wait for it to start
-	local i
-	for (( i = 0; i < 10; i++)); do
-		[[ -S ${T}/mysqld.sock ]] && break
-		sleep 1
-	done
-	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
-
-	einfo "Preparing test mysql instance ..."
-
-	# create test user for auth tests
-	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
-		INSTALL SONAME "auth_ed25519";
-		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
-	' || die "Failed to set up auth_ed25519"
-
-	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
-		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
-		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
-	" || die "Failed to create ed25519 test users"
-
-	# create test databases
-	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
-		create database test1 DEFAULT CHARACTER SET utf8mb4;
-		create database test2 DEFAULT CHARACTER SET utf8mb4;
-
-		create user test2 identified by "some password";
-		grant all on test2.* to test2;
-
-		create user test2@localhost identified by "some password";
-		grant all on test2.* to test2@localhost;
-	' || die "Failed to create test databases"
-
-	cat > pymysql/tests/databases.json <<-EOF || die
-		[{
-			"host": "localhost",
-			"user": "root",
-			"passwd": "",
-			"db": "test1",
-			"use_unicode": true,
-			"local_infile": true,
-			"unix_socket": "${T}/mysqld.sock"
-		}, {
-			"host": "localhost",
-			"user": "root",
-			"passwd": "",
-			"db": "test2",
-			"unix_socket": "${T}/mysqld.sock"
-		}]
-	EOF
-
-	distutils-r1_src_test
-
-	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
-		einfo "Stopping mysql test instance ..."
-		pkill -F "${PIDFILE}"
-	fi
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymysql/pymysql-0.10.1.ebuild b/dev-python/pymysql/pymysql-0.10.1.ebuild
index b58055923b2f..f01a413b1c13 100644
--- a/dev-python/pymysql/pymysql-0.10.1.ebuild
+++ b/dev-python/pymysql/pymysql-0.10.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
deleted file mode 100644
index 7346a5ab5fb2..000000000000
--- a/dev-python/pymysql/pymysql-0.9.3.ebuild
+++ /dev/null
@@ -1,96 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# TODO: support other mysql variants
-BDEPEND="
-	test? ( dev-db/mariadb[server] )"
-
-src_prepare() {
-	find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	mkdir -p "${T}"/mysql || die
-	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
-		--no-defaults \
-		--auth-root-authentication-method=normal \
-		--basedir="${BROOT}/usr" \
-		--datadir="${T}"/mysql || die
-	# TODO: random port
-	mysqld \
-		--no-defaults \
-		--character-set-server=utf8 \
-		--bind-address=127.0.0.1 \
-		--port=43306 \
-		--socket="${T}"/mysqld.sock \
-		--datadir="${T}"/mysql &
-	local pid=${!}
-
-	# wait for it to start
-	local i
-	for (( i = 0; i < 10; i++)); do
-		[[ -S ${T}/mysqld.sock ]] && break
-		sleep 1
-	done
-	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
-
-	# create test databases
-	mysql -uroot --socket="${T}"/mysqld.sock -e '
-		create database test1 DEFAULT CHARACTER SET utf8mb4;
-		create database test2 DEFAULT CHARACTER SET utf8mb4;
-
-		create user test2 identified by "some password";
-		grant all on test2.* to test2;
-
-		create user test2@localhost identified by "some password";
-		grant all on test2.* to test2@localhost;
-	' || die
-
-	cat > pymysql/tests/databases.json <<-EOF || die
-		[{
-			"host": "localhost",
-			"user": "root",
-			"passwd": "",
-			"db": "test1",
-			"use_unicode": true,
-			"local_infile": true,
-			"unix_socket": "${T}/mysqld.sock"
-		}, {
-			"host": "localhost",
-			"user": "root",
-			"passwd": "",
-			"db": "test2",
-			"unix_socket": "${T}/mysqld.sock"
-		}]
-	EOF
-
-	distutils-r1_src_test
-
-	kill "${pid}"
-	wait "${pid}"
-}
-
-python_test() {
-	${PYTHON} runtests.py || die
-}
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index f5d22f864ccd..ec2e2f89c4dc 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,5 +1,7 @@
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
 DIST pypiserver-1.4.0.tar.gz 510845 BLAKE2B e70c72780dc3c601bb8f9893df3b35385392c24b68acabf3bc56ef64074740ba6d3cd0ac844735812936dfae92ff88205cebd9a9f1f53767b9a4beafd19bd21f SHA512 f34d371134a00f8643842d8fedd4e34d533015755a5c868cf4d180fe242940a4c648ac0482c6f56d2a30f9d0f9fc5b40a23e0e6e278fb089efe2968f5df20766
+DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
 EBUILD pypiserver-1.3.2.ebuild 1217 BLAKE2B 82709cfe793d656ac79e96bc04ee307a2599169dbb4bdb834d2f806d9644646f247639b251b4eb6a3bbb1d8fc4b7d055d2c1207c6d4adc2974aa678310255543 SHA512 17b339a073f45b18e8b21830684222de20b5d89d78d11f55dfdf630b0c71f6d1c1dfa4166470f4b305c19dadf24414c7f768466ca35d721245e6d0bc768d25f4
 EBUILD pypiserver-1.4.0.ebuild 1225 BLAKE2B 1c9f5693aa2c388252523e8d59c88a351c176075fedc5f4c188a1f6ccf40c4801fedb1b09ea397135088b7132857fd763da081d16d025ebee090a834346eafe6 SHA512 a4d35d79e60ee3060dc842be3fe1cadbd0cfae6ec9c4e2b7ea019317a7854c2657594fe31a0e757892f10e2c1228c29ee01d488b74ba47f898060a2314922feb
+EBUILD pypiserver-1.4.2.ebuild 1225 BLAKE2B 1c9f5693aa2c388252523e8d59c88a351c176075fedc5f4c188a1f6ccf40c4801fedb1b09ea397135088b7132857fd763da081d16d025ebee090a834346eafe6 SHA512 a4d35d79e60ee3060dc842be3fe1cadbd0cfae6ec9c4e2b7ea019317a7854c2657594fe31a0e757892f10e2c1228c29ee01d488b74ba47f898060a2314922feb
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.4.2.ebuild b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
new file mode 100644
index 000000000000..c86e71e5c09e
--- /dev/null
+++ b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
@@ -0,0 +1,48 @@
+# 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 )
+inherit distutils-r1
+
+DESCRIPTION="Minimal PyPI server"
+HOMEPAGE="https://github.com/pypiserver/pypiserver"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/passlib[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e "/tox/d" setup.py || die
+
+	# https://github.com/pypiserver/pypiserver/issues/312
+	sed -e 's:test_root_count:_&:' \
+		-i tests/test_app.py || die
+	sed -e 's:test_hash_algos:_&:' \
+		-e 's:test_pipInstall_openOk:_&:' \
+		-e 's:test_pipInstall_authedOk:_&:' \
+		-i tests/test_server.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
deleted file mode 100644
index 791cc344896d..000000000000
--- a/dev-python/pysendfile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 541 BLAKE2B 436918a20bfdf6521736b474b9cb543812db1e3572f6e94baecdde817614d4fb97aded3e23d643be18a4db32e547037a0c3f5d848b44ede66341e0da723fb4f7 SHA512 0b0b53f8be56b958fabd92ffef15ce42fc79a07868415884a2065b828dab6e95ee38cf932694b0d85b4d2940aa27ff4c4e9ac9654983f803e5b93b2b2e618127
-MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/metadata.xml b/dev-python/pysendfile/metadata.xml
deleted file mode 100644
index 3bd59c476c5e..000000000000
--- a/dev-python/pysendfile/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pysendfile</remote-id>
-    <remote-id type="github">giampaolo/pysendfile</remote-id>
-    <bugs-to>https://github.com/giampaolo/pysendfile/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
deleted file mode 100644
index b3694e1aaa96..000000000000
--- a/dev-python/pysendfile/pysendfile-2.0.1-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=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python interface to the sendfile(2) system call"
-HOMEPAGE="https://github.com/giampaolo/pysendfile"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-python_test() {
-	"${EPYTHON}" test/test_sendfile.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 882554ca92e1..b50fa8e6ed35 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-rerunfailures-8.0.tar.gz 13207 BLAKE2B 8a086783c5b6dae311aaa943a5c0eb56f5fbce4f687faf97ea0046bbce557cb82f8acd612247d235e249ef1a97157d3c356cf546b3d25a3dc4a4122286fcc04c SHA512 538fe5ca579ec50fc1689c4b7df3a55e0bdb08f87c2dfeb219ee141ef67c6c74a324c64f183f3ff85a5289ecfb54beef0fde2105eb0ae888ed861a15194a9dc5
-EBUILD pytest-rerunfailures-8.0.ebuild 481 BLAKE2B 3522f6ae93b1b1a77990e5fff9d0e60ea579249b97884490607eb2a43264e2661a51333e128a283b7b375227131ad01d1665add51b54da5eda42a5c7a13a88e8 SHA512 b836083de50b9dc4e9f6d7a6e387db1cd727b3c85770cb3b6d412ff165152a5969903590f8c65b91e3243556fdc0cb7805338fb23cd641a3242390cacb30fe5d
+DIST pytest-rerunfailures-9.1.1.tar.gz 12435 BLAKE2B b2118fe9460ebb750c72b05762d70cf53703e4c9982c6343ef02ebcec6630598ac98998ff994268b9108bd6850e71fd5b9cde1d0abb727d33fad238e9b26fa61 SHA512 875591306ab010494ccbb865ea6445ab37422fce9105260d9495215af44057210564aca4fed3b4765b5a30c1cbef120de716d15d10a6db91dcb7d9f5b4f3b102
+EBUILD pytest-rerunfailures-8.0.ebuild 520 BLAKE2B 8b18135da0c51e6494a9aa25601a7aec3dee2d36ce0517753c0fdbc4aee3997c13acf0be9430149fc098e0d4207eebac8a184dea5f0cf889dfbd7943d7c2bb69 SHA512 034611e96af922f398e1af24587e57bff7f9f842690e4e85aa01768a1cb866177b82ebd18b26c50f41b35f1f1cb2d86c4d309dfc9b7f3161563b1059facaa559
+EBUILD pytest-rerunfailures-9.1.1.ebuild 569 BLAKE2B 58114ee842e8a067c36c01f1c815fdc4808cbac17509ea6e8ebb267f457a3d2e3dbb7447f20e7d3805689ac6286d29910852956aa58330a6a98a8b20814e8f57 SHA512 6724fe048f63d902692ed8b46b4427966e324873b2727dbba2abf8f2a03a6e0d34968d81626c82f153b6f6e29ed403dea8bb322a4b01c4b19205445924694bb1
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
index 87021d8b1795..a6aa911747dd 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
@@ -15,4 +15,8 @@ SLOT="0"
 LICENSE="MPL-2.0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
+RDEPEND="
+	<dev-python/pytest-6.1.0
+"
+
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
new file mode 100644
index 000000000000..83ea4be78fc8
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
+HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+BDEPEND="
+	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 1ed22bcdb824..2964faeeeebe 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -8,7 +8,7 @@ DIST pytest-6.1.0.tar.gz 1083563 BLAKE2B 79da2026ba6915b406a1b6a2c8d79e5f45695f3
 DIST pytest-6.1.1.tar.gz 1084076 BLAKE2B 61eb5efcffbd5a623c7021e37bbe908522fcfbf42ac56cb45fb7e10e0cd30e845bb8a6c563e86bbff47fba1f0db72f1451eb0bf86862b7e150e29be6a2e80967 SHA512 fc61028a01187f6161061a0c2fc392dd719586780a49eec037a72878de00bc33a81c1bc0e2be01be52b30c7eeea2c590d1a4ec08cb14a955bc624478118889b0
 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 1636 BLAKE2B 13b262350daf1bd5a4ffcaa600c8805f54c82d28b681eba216a6449d8c07ef0420a9543dd2fbadd31d1304008ab57a8f900b7625c8ad620ec7e1ec2087a06b26 SHA512 bb43a57dfc0a218e3269e7932748a9d92f5d864b776cc0f822be9ce1ea5a91ac75da754908a8f9b30ab737885c12ff51f86d767797b64d8149ca715898da77c4
+EBUILD pytest-6.0.1.ebuild 1634 BLAKE2B 340750372a22b1e5bcef9c6053d083f18a042a50d314b3a8c4e748740be7ce893b141065d6accf461b081eec1b666da70bc61d8642b345ce9106dedc70d9c214 SHA512 56311c376ad28690b74807d42248e37011ffaa8af48cd6348edda117608a06da65fd2b0d483d45d69ee25364ca0eef4ddb8a03a90419ba6208585b84f220572e
 EBUILD pytest-6.0.2.ebuild 1646 BLAKE2B 48fab75ea46eb167d9b608e1d61c6387bafc8776b1d29221390060ac14a5c90e7f8f79dc839b78ec46e9d1a604b444dcbc0324a7dadae892e4fb4e683e31b1d6 SHA512 cd9c7e5cd34d952188a6d0f6e07545c42fd31674eca3fac26b1ea3323734804abda3468f100f297d37c332260e2e9c5616bc5879f1ac52c1cc18f19b1860916f
 EBUILD pytest-6.1.0.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
 EBUILD pytest-6.1.1.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index 0c95994845e6..3fbfc9603c41 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/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 2660b1faa6c3..9ad9ded1545f 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-cinderclient-4.2.2.tar.gz 289041 BLAKE2B c397c530a040f340d8b39d33348299c547f4591e0046c89644014e3ecdb1163c2b7d46111609ffb6586ed4dd70ae7c1a9f2895046ac7650d101cb6581a5f758f SHA512 fbbdf3828bc13c316c148290575a5efc349c02123bde0f965e11d504cb690fdda9c18af36aa4fc7c6289dc809b45aca41721c3f30b71d088bda2733c785c5ef9
+DIST python-cinderclient-7.2.0.tar.gz 248517 BLAKE2B 8d992762d3ee69db12f51f6e4e005c6781c865274d42ba31d693854f1c5267a1a15cf5591ed262dacf463a10a719069fc1db67a4fcc95d528b964e128c50a8c8 SHA512 535be2d6e71a9fc415b17929a78cf7c8f1e5f5f2764637fbcd22c90b08da4ae477b863c913faad24439aea06e234cf26a66f392d54e5238af4c2730f4a087a13
 EBUILD python-cinderclient-4.2.2.ebuild 1105 BLAKE2B 1088a04515bd0a7e5b3848ecc5232ccb46ca2320ed473c7fac289f1f0a467ca2a1dc0d332bbbd47dd58cf1f7875228aa8819d34d90579efe2eac14aac0f90134 SHA512 8dfbb8d5739d8f3f53896a6d3b4fba40d9f2f63f231f16b80e13ed96d19bc0a33067e4736ff41f28d297c783c4d445339de1106b19643c9e90090772ed683204
+EBUILD python-cinderclient-7.2.0.ebuild 1056 BLAKE2B 62e8195021c56d48919abb24a7363e35f9f5b5bc113fef8634efad3a4e019f70fc027f579d42e6c449fe0eec04bcdd2c2b6a0ec0966ea7e4533b098838917cbc SHA512 fe48d14d31d2e6240e8b8af9d6a59ba637665cd76527e7ba3e9460843b7da75309b150bbadc78db55cddf9ff68dfe8fbb3ef60c0df5a87ddfc4143c671688116
 MISC metadata.xml 523 BLAKE2B 7326fec05abafc1316ddfef15561f63a358e7ac03eca46ba473b52998e735df59feabbd65a98a23f4c233ef675c20b6cb391752b34cf89914a03aa1cd1ba04ee SHA512 31f96809c9fdfcabaed51965bb490bc5726d0cf2d4a3b2866945a25c0a67af6b60f2e80dabe21ee015f69e810dabbd0c093a58b73f454786c363e6f6e29e975f
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
new file mode 100644
index 000000000000..31ce79935191
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
@@ -0,0 +1,34 @@
+# 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="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 69b4dd85b3f1..75cff7bb0835 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-keystoneclient-4.0.0.tar.gz 313891 BLAKE2B 886f354ea29b4bb8886bde1c337e619403f81ee608079777f1e96bf55e936fb7bef48194d721b14857043e1c878f2f2c925483dc0641bb5c25afd6af1536fce9 SHA512 6c094327b4c8bcb32c42463a3abe412230c514c59a5b45387da99689385780f530669979b6aa06ee03450a1386ff089bfc69c24c625e56ed46ab093e6f58153f
+DIST python-keystoneclient-4.1.1.tar.gz 316920 BLAKE2B f42ab0648f43fc6424cb502a996c7f81e688171aea4c94ae664d128d31eed04c6936e763ed996af990dda6dbc42d2cc7fcb0aeb8638b75133609521e704d2b55 SHA512 a88f992dfdb196a66ad3b173ac8f7c006524225d426c240e1ed27ae4007df5d5e74251e273c11316ba451f6fb31de6250e51203e70dec670f7f1e0b65d24fdd1
 EBUILD python-keystoneclient-4.0.0.ebuild 1211 BLAKE2B bc26dec4944f7cd78d9aa2c5178ad00f7046b78928c7171f2cb01642782fb64b21354035af97ee8ef660665f4cad1a9621df6354f54f94bc60d10e62fb0ba1f4 SHA512 b5e65f8ce108b98ac075826f80288856dfeeec08729269853b642e5f9ab6e54ff4a1e53fd12f6e1f115404776164648bd55c79f5292811291b1af1772a038fa6
+EBUILD python-keystoneclient-4.1.1.ebuild 1065 BLAKE2B b3e54ab0345c35235f014da56eee13d03cea2cc3ab27c438546381357d7e35b17a48c4834d8fa782bccb0898a473915153d1709c1f5b8242407ebc56d1d750e2 SHA512 14084f3ddbe8e560814445d1a01aa703531ab2708edf91e73b276b266d8fbd1a6a820b747b5a61879c3a0912e17bfe043a12e62c35d0a7da6e97d1e11f8074b6
 MISC metadata.xml 461 BLAKE2B ea083857a88ce4d65cb5b073b3510d992b5d01e73b2736136468bb43bc575389c8ef5f5f65c55e36a8bc824ccf7680a82b933be7de1040834fc7cd4206cabd63 SHA512 351ad0a37c2e424c92b4364bbb64b6f88acea9bc944a06a2e99c4f9f054c6e7cf1fe56f3a7b5584dd3894c9fa59ee8265fe597a263eefa412e234abe2514ddc3
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
new file mode 100644
index 000000000000..dc9a38671450
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
@@ -0,0 +1,34 @@
+# 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="Client Library for OpenStack Identity"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.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}]
+"
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 0bb1f01a92f5..612e857e148d 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,6 @@
 DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
+DIST python-ldap-3.3.1.tar.gz 379810 BLAKE2B bb5d4902211b70cc57d2967134d3c41768bfedbec40be0d5bb592b96523f408952ca7e9a18546cc24f8267e958f454d56d97952092bc46e02bc9954bced9ba00 SHA512 2a1222bf5bbc1d885611fc4f2a25d0b1b64b49ae379f1212f1b3b70fc12fdc547eb6c4af4060a20bf082547b7df8f1824bb1fdfafa37ab21acf2f1e231c4d2d1
 EBUILD python-ldap-3.2.0.ebuild 2181 BLAKE2B f4ee7fc8f4abbcf8c29bd8a767d4223c119fe308082c4f1b589c9499aa44176d40a7d2554b7a923954c5fde83e47a6a9b8c75f4eeed9fd545d7fac76b405410f SHA512 41b71c123d8784501b8eaa9c915d5c37254fb08c1aa16bd6032db128f5ba75b94296e27b57b55488383fb8b90a1be07b7fbe722481e8c175e55d68a74930d212
+EBUILD python-ldap-3.3.1.ebuild 2186 BLAKE2B ad8f36282fc0a641689c5b09e26bd9d1bf7200776b4324eecf30da32424e6e4c31674c8258fba6a7bd73921912b7544d829643bd868ef6a68a6545f83528a003 SHA512 accda7608fbaaff9fc277f4ae71fcdf5cea9717f87fcbe3e99eb7208371941c41be493703ae5b6345a62c5beecbcfa941d8390520bdb0f49ae12e485689f49e2
 EBUILD python-ldap-9999.ebuild 2186 BLAKE2B ad8f36282fc0a641689c5b09e26bd9d1bf7200776b4324eecf30da32424e6e4c31674c8258fba6a7bd73921912b7544d829643bd868ef6a68a6545f83528a003 SHA512 accda7608fbaaff9fc277f4ae71fcdf5cea9717f87fcbe3e99eb7208371941c41be493703ae5b6345a62c5beecbcfa941d8390520bdb0f49ae12e485689f49e2
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-3.3.1.ebuild b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
new file mode 100644
index 000000000000..7d0e119b94bd
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
@@ -0,0 +1,91 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://www.python-ldap.org/en/latest/
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+fi
+
+LICENSE="PSF-2"
+SLOT="0"
+IUSE="examples sasl ssl"
+
+# We do not need OpenSSL, it is never directly used:
+# https://github.com/python-ldap/python-ldap/issues/224
+RDEPEND="
+	!dev-python/pyldap
+	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+BDEPEND="
+	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
+python_prepare_all() {
+	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
+	# https://github.com/pypa/setuptools_scm/issues/228
+	if [[ ${PV} == *9999* ]]; then
+		rm -r .git || die
+	fi
+
+	if ! use sasl; then
+		sed -i 's/HAVE_SASL//g' setup.cfg || die
+	fi
+	if ! use ssl; then
+		sed -i 's/HAVE_TLS//g' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Run all tests which don't require slapd
+	local ignored_tests=(
+		t_bind.py
+		t_cext.py
+		t_edit.py
+		t_ldapobject.py
+		t_ldap_options.py
+		t_ldap_sasl.py
+		t_ldap_schema_subentry.py
+		t_ldap_syncrepl.py
+		t_slapdobject.py
+	)
+	pushd Tests >/dev/null || die
+	pytest -vv ${ignored_tests[@]/#/--ignore } \
+		|| die "tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index baeb52a9192f..e5be9b903045 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
-EBUILD python-levenshtein-0.12.0.ebuild 638 BLAKE2B addf8094eab80585fe6344147e9d05d5d51ec72f26571ea14bde2cc18e959c2ebcaa324a0e12acad8ca3c5cbb4798d9852800c844160b4935e634f9e465035ea SHA512 cc31b5370111262c61ce6692fcd708d9a62f6a919cbaed0f97021a55d8fc41c06479789b93885e3db5f55455c769961d7b38d80751307024b119ed10e58b2b14
+EBUILD python-levenshtein-0.12.0.ebuild 637 BLAKE2B b91b7c517dda6a143cd9344c935148043518acad62f4b60f74900c0cc022f674de32968be119042eb97981ba683d53171b544245bc5957b83848ef806d3b25a9 SHA512 d48a001d680f11f7f08d79c1b538353c42aa81be5e6e322b4e02eb854c095c72ca41fa07d16b2797babd2a46f82524e1506c1b6979003c089ebad1576cafe76d
 MISC metadata.xml 400 BLAKE2B 6cb97d53cfebfe6960f5adb6b1b10fef856a0944456e89d1f6ade86d8cf8183aa4acc33cbd4829c35a46158b6955a1454ce7143b5cd5538375ad4ab08ebf3097 SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
index 1fc1b7dce524..b6a9406fe17e 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1
-
 MY_PN="python-Levenshtein"
 MY_P="${MY_PN}-${PV}"
+inherit distutils-r1
 
 DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://github.com/ztane/python-Levenshtein/
-	https://pypi.org/project/python-Levenshtein/"
+HOMEPAGE="https://pypi.org/project/python-Levenshtein/
+	https://github.com/ztane/python-Levenshtein/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index f98b1c0c9085..e8ac112d438d 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-novaclient-17.0.0.tar.gz 325548 BLAKE2B f34bb6cb2cbb7f65f81ef410828b9c3a14b67bc4558f0175b4c9b66899c192367637d281d86f5e1a7267c2288930845f22fb389244839c2dfa76fc9a58bf3480 SHA512 4f8a789364f4a6603c67236fb61ef1ca2aabbc8e18d96d5890af137cc6d2d06c250a5202aa91c95432686ce7b5ffba8e31cc38b43032ae2420c08381751d3332
+DIST python-novaclient-17.2.1.tar.gz 323330 BLAKE2B a7dd4a7b134c09945c3549ce014060c95da07d9125d5b24e7c99369c33538cfe56cee9f90c17a1d8025ac74969af950dcdcf8b3f87197cbd099e84cca857e23a SHA512 d1a9966f7da80e0884a451b3b014c45a1b4057dbdf0d8bcd23665eee55b6f15872e8e1d2b79b3cdbfc78f51800ffa3536cf0ab4e30eebf3878ffc007c52913cd
 EBUILD python-novaclient-17.0.0.ebuild 1209 BLAKE2B 22392cee67780ea3fab60a81ece0609fc0ea6a191148739ae80d6fb29b6c90033a0c14121523e0179b732c6d491c5fb7cb8f48a9ad3f36d9ec0c9dc15bed6b65 SHA512 3de5c6521a0879e12074389ef1da1c5ae1a6c17f315d6c80325eaef4ed38d0edb49d7a60f4440fd6371f88d7623308cfbfcbe5673472b7f8ea59b083e9a53dfa
+EBUILD python-novaclient-17.2.1.ebuild 1165 BLAKE2B 0d3c6a51e5f1ff6dbe33979aa42f5afea65e4448fc2496f6bd8fb3d818e528f7127d38b783bcd8f1cf0f2a8f91e95ccece61068029c23a4bbe4dd59e426fcc6e SHA512 caf49bc605273035538cb3fad28d3c582be9fb4d26b52262589848d2bc8dd2033cd193d3a77c3e5f246a3b55a4193c016124f9406ce5e32cee18376ee3db4554
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild b/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild
new file mode 100644
index 000000000000..f9d08a9993ef
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-17.2.1.ebuild
@@ -0,0 +1,34 @@
+# 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="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index bb8e6e54de7f..e8167b4a8bd6 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-openstackclient-5.2.1.tar.gz 722343 BLAKE2B 894424f8ce8a7d0489df4ca6c4d811f489f7ae4a0933b9e0a7ff30c0bfaba8bbf783d56376de655c6cc2fece28b032063f6cddb330353f3dd78c44584061c236 SHA512 74abb72435e95070e2d9a849def79ef56a4afbf9473cf29053af3cc65ab5d936fe0c542ae9240ffd5b801964f17c9a65af8f4770c49606c180e4eef25e73c26c
+DIST python-openstackclient-5.4.0.tar.gz 727289 BLAKE2B 15aff0e53034512618ee4624031618d44f24e8d639033b22eacd791d45150180b52e5ccc0e78e6ed9a5043076259c47bbf981fec0ee00129e838efdc9d4741a1 SHA512 76370c28e27bc1aa13f772721c1efaf1e5eec931fc6bb0653989d4a38b28426bbabe1e6bc6d4be9a902c0d8fb871bc63f37c5ea0fa57d6bd96a9a9a02630ddf5
 EBUILD python-openstackclient-5.2.1.ebuild 1172 BLAKE2B a3594ea90b79208b8f2497b69a8e0b67b47f5c2de8dbeea42ab10925cc737a23af48269f2bbfd01ac10ce56ecf504917d83e7b1d4d3b6e25eae451179ae13f28 SHA512 1404bbd006b8bb2ceb8f698a7fa6b2a91c23affc4d8b07ce3ef3add73c096ae5e3674a1200df2c53364daf54125ad5ccf4ea666429e6a5cebd35039b85edd2a3
+EBUILD python-openstackclient-5.4.0.ebuild 1128 BLAKE2B e66d5b3f7ea87ed1a6a794b3dc015954114ce838f5fc683c98cafd30e882114a3f6a8cb922735b7023b6dd03be8037c09eeb4e17e7ce3f880d98f81c69b42a7c SHA512 0166da211f2eb19629498e22f9b05d106847d77f854e4b463c76ba16419bceef028e20ca621e5f0acebd2ca9f5bcf64267745a653432ae6ba2b8dcb55f4e9bc8
 MISC metadata.xml 536 BLAKE2B c76563d24c7dafcfc12b46ef9864a6e5fda3e65b0fa37b5deaef04ec8f870134e9e22c248e9c005d32a35465d2d16aed0b2f98c6c6058b42e5e10f080b8d751e SHA512 f9ead8f5d15828f9660287f651e4a0e1fc1e5442cd00e6830126af05021b2f23f5d419559ac72d5befb2cf3838a90ed5f8c90be5e41f2941e0b6cac15f0169d5
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.4.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.4.0.ebuild
new file mode 100644
index 000000000000..e94c34d5eb6e
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-5.4.0.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,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.48.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 2de739be157f..55971969cd5b 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,3 +1,5 @@
+DIST python-swiftclient-3.10.1.tar.gz 199466 BLAKE2B 4230f0fbff0e61a8172344df1cfc32f07628ac0b3784f5b8456d1b43b962e1d8561eec55c530ea94c615d46cd9454963fe0e21c54d1f4097016459e1460795c9 SHA512 f47444243f1968fdbba0643bcb4f05fc10a201b38ad83522e842bbad2221d0893a72147f9fbdc13e7f56469b049bbf11479fd9f41a9706119287543e0587f696
 DIST python-swiftclient-3.7.0.tar.gz 190256 BLAKE2B f3e4c462f05a34af8f6b7775b9e238e14a29af0970f4838dbda21c0fe43481a84ad51be1f2f62592109ac6fc5a84931fce154381129fad9e1d7a60333c44c7e9 SHA512 85b762cbc9f5e90c7d4dcbb5f016ee4bdc61fe6c869d24fb9bc5f3a3c3e336b171b0d3f384b51ed7bf0edf38df3936f778be85598e4c6a9bf165f8dde0d3333f
+EBUILD python-swiftclient-3.10.1.ebuild 1369 BLAKE2B 37a20f8d516c987963eb1bd12e45dc04d21fedd11f53bfec2498a2adc7a598ae51b55fdc4dcb118a12dda4c1b18e192f0a04bc3ad17c1f4da43a7a57aef47ffa SHA512 af66984e7310318e084a60aa69547181efd4fe2e40cb7546354a9ecda08e6c43ed3febbb81873943a032252727069faac13beb15deb4f647d2583880c90c643e
 EBUILD python-swiftclient-3.7.0.ebuild 1462 BLAKE2B 4e66be79a4eb449c0e3d15ebb1c425df2365c644a5c9963d06c43e933deb259b9057632c7edd4b6d336bc601e51abfee93688add19433171ac1374c3db17365c SHA512 df1e29186e4c056bf34fb23f1c795220681244a2d431c107483a3328067105f00faae81468d9584f58b56755595f7b370f983cf2600cb48a084138c2ae2c680f
 MISC metadata.xml 490 BLAKE2B e7834fe7f35e68048c4c27aa7ae92cb7f29fa9137eef921dd37da74864d4a9286b8b0940b7bf77f34cbaf7ec54f27765f518e62f0c33e2df0bb1829ff41a3a49 SHA512 36cbea7b5462f02da560044d000dcf88561b3a91f002f6ae0792005050e84c596b0b1dbc4d7d4b2bc11dff1a98ed02c173bff737830b26c229fb3e995b49b920
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild
new file mode 100644
index 000000000000..b0f498123406
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.10.1.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=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/stestr-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
+
+python_prepare_all() {
+	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under ${EPYTHON}"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
+}
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 5595a35d14d6..fd479a098646 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-zunclient-4.0.1.tar.gz 114913 BLAKE2B b0bf2722f67158a79b4e4673d237696564668a96e01107d33cfe13dd51ff0efd9916930277a7146bc1600cf350b41839817d496462f48162d569bfe3a7fbd26b SHA512 bdbef196053241582d0b641a6c4c25c0c167a21693e2796a2d92c6d93c6b627d19fbe14286fe469bd7067c79b2bcb298009cda763398dd2f31e9df891efa09c4
+DIST python-zunclient-4.1.1.tar.gz 114232 BLAKE2B 973ea1191b3d0ba13fc6ad368bd2a741ea3d14ddba32158421c1c72befee5bafbb01da4c2ce12e48e50991169efaf5eeaa4cd986ad34ed058e160c0308c868f5 SHA512 7569171ad620e8e84380639d0f99985b942857925a99fbf47f98196bd372a7b0333923d1ea501c3d7d76c06f6327d38b53f1f80f199c27f4bdf073eab4c1e53b
 EBUILD python-zunclient-4.0.1.ebuild 1087 BLAKE2B 1ce2d1115c1d7d57a16d349902e3b3fb46a6e2ac358223e3109421623ad506dc6011d0b259b55ccb009ba14911ccab95da1ef7cd587c341b53d3d302aaebbc27 SHA512 1479bdb9009989849316732e9b700db070b8c8d099edc1d3c14ab2bd13bfdd0990afb94e8532adb083ba94f3923abe2647c7834b26584adaf5e6782af130c099
+EBUILD python-zunclient-4.1.1.ebuild 1091 BLAKE2B 80a8d73de3e7390bce0bae1cd89a17027d9d8a1ceb6d41eb417127c80c274cef1518e5ff5c2bf0d98dcbc56e8bdc6337be7ac8e2688e02ff1a5344bd6a9c5dc2 SHA512 979ca8a4615de38dfb9c961417b3a2a308111421f831900cb6939480e17d3722ab6589d8420c49cfbc6819e489bd9cf3151b10f3d4ec212c4291ad256808b25a
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-4.1.1.ebuild b/dev-python/python-zunclient/python-zunclient-4.1.1.ebuild
new file mode 100644
index 000000000000..2af2f91181de
--- /dev/null
+++ b/dev-python/python-zunclient/python-zunclient-4.1.1.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_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Zun API"
+HOMEPAGE="https://github.com/openstack/python-zunclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.44.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 1438e96022f4..4fdf00e60874 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
 DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
+DIST readme_renderer-27.0.tar.gz 27346 BLAKE2B ae9ce20419facf0d240f390e9253901d42fe0731628e73817147db83e21687adc6df132e40d48b223e7df39b3adaa8f16208d263de57274d10d1b69209c8e561 SHA512 17a76484cda5da38f45c3aa15776a3d310a0d22520d43505a00adaf37de7d6d3d9ef355553cd5e72e841ffb555d7b4ca9a73cb38f88d013e46cc2a5ba3033c00
 EBUILD readme_renderer-26.0.ebuild 824 BLAKE2B b8f822fb13a631cd6d6ac07a65c5e34bb3795c5cae4ab0d06f42a97692e70c41daa4bef1b2c6c6a365718b74edb7a151bb4361f141a291a9b27f5704929187f5 SHA512 6367493101d816179c9e839724093b4fa5f4ff0f8eba302610d5d39d3620606d619bfdba31e6ad5c9177a55a50b51c039689d34e7f58aa34ae3ea3d5598090cf
+EBUILD readme_renderer-27.0.ebuild 799 BLAKE2B f35995e9bb9252ad88e897fca22dc37c1d3120443c1266efc0222fa35054828c352fc954625f300c64335ede0e9f602dd5ed6c570ac74fcf5eb64aac77afd42a SHA512 7f04257b20273de4da044e24d664575f5febf61e1fe3f6e2e3ab43d285dabb5fd4d896b178fd3fc54954aff10953b3b9f109cd0e23c6815729728191dbdf531f
 MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/readme_renderer-27.0.ebuild b/dev-python/readme_renderer/readme_renderer-27.0.ebuild
new file mode 100644
index 000000000000..c2f59cdbbe6b
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-27.0.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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
+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 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/redlock-py/Manifest b/dev-python/redlock-py/Manifest
deleted file mode 100644
index 1e1bc14c8f52..000000000000
--- a/dev-python/redlock-py/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST redlock-py-1.0.8.tar.gz 6035 BLAKE2B c728aa262b0c0a8b87829edef4819a35700423500cdde7abf2ea8dae99451055006649ea6f52325ce632178f746639af0c716ab8998a815a22709d3b5b0ba202 SHA512 16c5e52019baddf0ff2a996e227d9a469be19dc4cb16a6f33df873c121717f9338ca180f264171e9e0de34c2c9dbc592e47a5c7272b646ec6dd047f46b1349a1
-EBUILD redlock-py-1.0.8.ebuild 545 BLAKE2B cda6cefe9de8e35c13671eadaa32595ee9df584c9cb5bc04aa9687228595c66723fdf46b94ea886bb481cc156d70370df297d6221750983734d74bb41c1a654b SHA512 c059d68b6c472b20498b8997b20fbab51ad8af6a3e3424d0fd0a326b6b5a41434df5357bfb0813e7474d7e9bee677e2de2e022cb5d6c6c4225c3d44b66e2af06
-MISC metadata.xml 302 BLAKE2B d1520bf48d7d2b438d640af4928bd3a357a2149b6f62ce2a4289223dc8fb57f47e4ee6365c1fd010f0cbb6c3a5a1dd5b6d02196bfe67b9a60468447392a373ff SHA512 d2d74da9cf600c75f8a482bd9fff9e300352910615dcf3185d0cd2fb513b7a46fadf425bb8056900c3d4e2c7bf26767ba2c4f032bf459f0afbd01dfa8f3df3d9
diff --git a/dev-python/redlock-py/metadata.xml b/dev-python/redlock-py/metadata.xml
deleted file mode 100644
index 5f11f0716639..000000000000
--- a/dev-python/redlock-py/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">redlock-py</remote-id>
-		<remote-id type="github">SPSCommerce/redlock-py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/redlock-py/redlock-py-1.0.8.ebuild b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
deleted file mode 100644
index 14102dbb1d3c..000000000000
--- a/dev-python/redlock-py/redlock-py-1.0.8.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
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Redis distributed locks in Python"
-HOMEPAGE="https://github.com/SPSCommerce/redlock-py https://pypi.org/project/redlock-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index d5194c4fcfd0..ef29f5fdf4f8 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,7 +1,5 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-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 1431 BLAKE2B dcf9312a88dd385560af1103d03cd62bf21b08c915f970e19abe11360eab83fc4ac34a45c3dd4b99ec9eff37498651d9797dd0e7bfe29fbb7c1707bd4ad47e82 SHA512 1f46ccfcfbbfea824536b8d2d289cc38944dab186de604fcdf16132bc2ad4125cf4231d7607ba18c1e735243e207e88fb745b9e1ee2e54eb9b574a6904e63b65
+EBUILD reportlab-3.5.48.ebuild 1430 BLAKE2B 2f1ce1e0689bcf583f179c753439b7e434c6ce79148b1c1eb095970320cae46a9c78a34cbd4dfd0d0effde18f6286c06a23f6be41810c514d37a1da72f9b633e SHA512 6ceb40f8f1bee537767df4f502bf131ff3aba52d50a4665a07a369f64dc7593dcadbc67ff8798fa7853dc22abe995dfc5fb3483c669ec5e357e3880c6debe5d2
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.42.ebuild b/dev-python/reportlab/reportlab-3.5.42.ebuild
deleted file mode 100644
index 5d22adf0bae2..000000000000
--- a/dev-python/reportlab/reportlab-3.5.42.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=( python{3_6,3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-	https://bitbucket.org/rptlab/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	media-libs/libart_lgpl:=
-	sys-libs/zlib:=
-"
-RDEPEND="
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND} )
-	app-arch/unzip
-"
-RDEPEND+=${DEPEND}
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_prepare() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
index 98a10d1983ea..e7326add07e9 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/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 1df4efeaede4..035b314476af 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 565 BLAKE2B 98e4fa751eb2d299c10d3347399d9785559a31d9dc3cd456bd150f27f5b4285f0e844f75aa88afdb30b23ed9282cfe0e1865170cb118fec5c2d46c4b31036cf2 SHA512 7951590bb598fa4dfff3f7f293923df002258395cddfaeb0bc3be20ad83b8ee59f901fb2663491e10bbccbf810d3dde102fd785b565e2b80ccb8dcaa5de27467
+EBUILD requestsexceptions-1.4.0.ebuild 568 BLAKE2B dfe799ec376f40ac076a8352691a64fbfa6c06af9bd73cfff9d65385d1269b0f3051585b3169dd464d342a8e7eecbe00f1183d8343dcaa2a83d1005761beb983 SHA512 a7a4c28a54382245bdad22343ce8860efa28455409973b4b6a5bff65bddc4a1f71d7987e3a6a28737ad47ceb3f1aef71b3eadeb1522fbe242e98b6d318340794
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 5c3d976f6a4b..10c18dd20248 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -15,7 +16,5 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}"
+DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
deleted file mode 100644
index ca236a10cf9d..000000000000
--- a/dev-python/root_numpy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST root_numpy-4.7.3.tar.gz 522432 BLAKE2B 9aab3090c894d8917218a68d83269c0f426ee4e7f81628081e9e710c4239bba5e8f88dcb1d91156cf02c7c36b1ee5d03cdd0c3931ca6e2f3eee6c78201386705 SHA512 7c2684ac0e4e68676304e2a72c7169e0299cfea5b4b63f2525a422974ca83f9c9b4f9f11d992acef7d8565cda7f7a85bd13621513cd7c47f1887aaa0cc46d6e7
-EBUILD root_numpy-4.7.3-r1.ebuild 969 BLAKE2B 34b7c519eb1b88664c282bc37a6aa005d4eb0ee82fd2dab131b50953419f24a614aec61fdfd71aa1d916a9709ddebfdf763b38fa0793f0abd1098298d32e9cc5 SHA512 141081412bdfe63e327961d0c2887f62fb302a9c77bd55456bce93dbdb8ee4e14983adbbeedbbd8c905900b6a0117493bac7a69d6cc706c9e7391137ed9efd97
-MISC metadata.xml 898 BLAKE2B f9b4c5ea3d9d901488196239d8076a31acce527480fe3775d1c83545b3436c3c78c21032b7e25d4f8ebe8634dd6c906fa959abe9e68a2b92705aa9864a5afcf3 SHA512 f013cc8dfb3cb8887bb87195d69c765c39262b4d71fbf92bb46a39915b609469a351efc31e130b313bd8379b2a3c41b5927bcd86be5cad8933acf282fad20cb7
diff --git a/dev-python/root_numpy/metadata.xml b/dev-python/root_numpy/metadata.xml
deleted file mode 100644
index 07c071353ab4..000000000000
--- a/dev-python/root_numpy/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-physics@gentoo.org</email>
-    <name>Gentoo Physics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  root_numpy is a Python extension for converting ROOT TTrees into
-  NumPy recarrays or structured arrays. With the core internals
-  written in C++, root_numpy can efficiently handle large amounts of
-  data (limited only by the available memory). 
-  Now that your ROOT data is in NumPy form, you can make use of the many
-  powerful scientific Python packages or perform quick exploratory data
-  analysis in interactive environments like IPython.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">root_numpy</remote-id>
-    <remote-id type="github">rootpy/root_numpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
deleted file mode 100644
index 8333f8841970..000000000000
--- a/dev-python/root_numpy/root_numpy-4.7.3-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=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface between ROOT and numpy"
-HOMEPAGE="https://github.com/rootpy/root_numpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	sci-physics/root:=[python,${PYTHON_SINGLE_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}] )
-		')"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r tutorial/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rootpy/Manifest b/dev-python/rootpy/Manifest
deleted file mode 100644
index 13ca8bde87a5..000000000000
--- a/dev-python/rootpy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rootpy-1.0.1.tar.gz 418618 BLAKE2B ce321e69d7e202877697d133ad2ba90df71cd261b206211718cb6a9ec8ee3ec085cac49526b9bb75166fafeb43f83b3f53bf231d9353f3d63fa7e4be381ce454 SHA512 db1c7edc02d1cd5a4a1940237c1e1c63d892bb92e612bdad028d14f9723a4bdc5f9b6711a135b0e099ce1895b2564b29aeb21ef0d2c3681354bf4edc9c6a325f
-EBUILD rootpy-1.0.1-r1.ebuild 1142 BLAKE2B fbc07222f4504d812ca4848665ddea4b149f92b437113d0e7c0179b49b55ac296b3f74f200c19715945c6d6f93970664ab1ee067e7ad0bf112fd29bb160d185c SHA512 9798d67ccd79888d8d82483a051511da29ef4a49390258126f992ad8d4184dd7bbb2332e9baa03509a17ffd3e42e079e8321f901298aa6dcfb525f2f5f4375c3
-MISC metadata.xml 525 BLAKE2B add8ec7423df97b01b5b9cad45c04339bd8aa2fcd62be3bbae15b66d9520603d7ad9c31232a7215fe68cf706f28348be54b38ca8bd05923a677b6c26ecafa7fa SHA512 6987f42215b8a3160a7e292499f63e26c05c8ffef69f7ade03fb4b539fb0116f14d7204602264e237d5c4e75436794770061c4d0d508072c06e24c1eec500094
diff --git a/dev-python/rootpy/metadata.xml b/dev-python/rootpy/metadata.xml
deleted file mode 100644
index 3728d7ab174f..000000000000
--- a/dev-python/rootpy/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>sci-physics@gentoo.org</email>
-  <name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  The rootpy project is a community-driven initiative aiming to provide
-  a more pythonic interface with ROOT on top of the existing PyROOT
-  bindings.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">rootpy</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/rootpy/rootpy-1.0.1-r1.ebuild b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild
deleted file mode 100644
index 6b13cc9333d3..000000000000
--- a/dev-python/rootpy/rootpy-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="readline"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
-HOMEPAGE="http://rootpy.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
-	sci-physics/root:=[${PYTHON_SINGLE_USEDEP}]
-	dev-python/root_numpy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pytables[${PYTHON_MULTI_USEDEP}]
-		dev-python/termcolor[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="
-	sci-physics/root[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-# TOFIX: tests go in an infinite loop error
-RESTRICT=test
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 64532a9e093f..46a48f0d032c 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -2,5 +2,5 @@ AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd
 DIST rq-1.5.0.tar.gz 569320 BLAKE2B 5349f6e806c5348e584513bf8fe8828c44909b8f4e53fcdfe40e0c617f162859dbc89d4595993c29227a25cef5b6ddbb758c51c3e50b442ada62eaca0585490a SHA512 87eb83de529afe3a1e0a9f2b1727aba97482e3e55024aede29ad6e12ed5b92ca147bef8d720a09b34939c04ac5e37642147aea5b1b7686ed4b2aaacdcf998f6d
 DIST rq-1.5.2.tar.gz 570138 BLAKE2B de1f9b9b1d790d0ea3efcd93e916f79b2f28521571652ba048adc725bd53b657cab5a7b2bc65b320a1c2766f77dba399ae62e90fa0a2514fc59565b8949c0327 SHA512 2e2cfe97d427057281415cfb1593ad504485b0398b72f55a93cfa48c7bae8f800ed1b1ad2aa447fe3f6baabd7bb112af29181577d31b270aee58cf4558d15a5b
 EBUILD rq-1.5.0.ebuild 1701 BLAKE2B 820a93a33aa4aadb3651e1390825b3a5cb97a82683d63018b4e37654aec7aeac3f4341cb95cc123eda1b1e58b4bdb218b4fa4f4a067bea6d3620839d1a50bd7a SHA512 1bee4738d4726293394aa81252f5ac35e43afd32760c54efa50f3884b2425c2304b69c31421cf351f85ac86ebb82373bb35308e7e74ef1b14a66bd7f43089443
-EBUILD rq-1.5.2.ebuild 1706 BLAKE2B 6da88de91e0fc4a6d2a7b4d9927a9facd49d42db6b547628bc7416ab7c058bf0ca2eea534d4f2f8b829828d222ea4cdfe3a749a82596a719d3d3d59e7dae4b9c SHA512 07b51057ab62b5a7c421e9b5b24ef809af721e30f42bf08aaf6d6c11247500d78ecd43fcc6a0ec0ddf060e891947068ee8c6a18bc66e0f4da7153511071994ef
+EBUILD rq-1.5.2.ebuild 1700 BLAKE2B 4e305d2b66a5c11547fbf841cc43593d756e54cdd132079301ca6c535a62e827ab352e65dbc5542b2f92893396422764db7f3b8d7e069d4ba7908c5bba833186 SHA512 a94d0cf4e74f806618147850e8e28f56ce4893aa08a66502e7f65594fce0080709d82f45543fae9f4e939ccf1991b15797ffc61b13b06bf2838f22a1a2db7534
 MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.5.2.ebuild b/dev-python/rq/rq-1.5.2.ebuild
index 7c976453a10c..882398e46f9d 100644
--- a/dev-python/rq/rq-1.5.2.ebuild
+++ b/dev-python/rq/rq-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 19e1a45c2cee..36ddc6f8770e 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-prompt-1.2.0.tar.gz 7506 BLAKE2B babff99a29b87ba9529d7811a5b34280b1d30a4f7dbde8cea28a3c2ec687d1d4443b6bd8b0fb3ab5bdd002066ef1d3117768a529e46691fbec9de59d5c8771a8 SHA512 e3fe2740bee8a0107a12e131d3a4f90ed22c4bcceab7cb94fc869a534725552d4d3a9d8519a54782c5a1913a2e3bee088fa14db7b3a37f256be3243c7f6a9a1f
 DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
 EBUILD sphinx-prompt-1.2.0.ebuild 496 BLAKE2B edae0ed6f5ef2c3309e53da355f1b80d19053579d91c10c76f26d213266859333055ed82a6cdd2cb6c81c2fc16d8ffe07c4362437b09f4f8f4d1d4b4468374d0 SHA512 c7092a5378be39bc5ab4bc8feb28ce06f19126dc0805d61973328e508b1d290fd06bfd18e0c7103c428f60ff5dd0349309c4c43b22b04289abaf34ab9d815ee6
-EBUILD sphinx-prompt-1.3.0.ebuild 534 BLAKE2B fb09b03b3bc277dce2ae0c10543a40736708f1ad79da8f2783250a5f11a23cf601bf249543b948adfd3fae3bdf9433d260c4a01f4b29ba99bf9a84d604fcc543 SHA512 c285af414aab33dbdd84a96d189a17dfa3b04cad964f511011f8de416d4a045fa6d80722f29547d3f628f2bffb4e78a604b7b0f09962eaec93ce6293c83a91a6
+EBUILD sphinx-prompt-1.3.0.ebuild 546 BLAKE2B 6bdecce5edc122100de8a31f60f7181ce583523cc8a190b5a84cdbc459897675c213dfb02a15e361bd1886d6b15c7ecfc4d9a9cabd23688b62ec40fa959dcbaf SHA512 5be587d01d2111b80000291ea56af7a87c3f04f616830a4177969c28ea43ca50ebc0754c9a04884b313747b8e7182ecd2bedcf0eb486a4b9e99b3d00f7287d27
 MISC metadata.xml 390 BLAKE2B e8d1c8b9b67dbd199a1bfa44a6806ccf9f32601cf872d977a378b6331f5964ac454a932dcba9995c546dd2e3297765992e55300d3af964817481c955281ca117 SHA512 021b79d7cbc8b37da6c80f6c6555909085e796f37dbf50843100bba64348a4e036193bff6ed0f9d825494cca58b4225aab39e2b0b7bb6a1a3bfab4b9712a31e6
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
index 34fc7f72b40f..119fe0771304 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index c5452b9eefa6..19561a2b0210 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,3 +1,5 @@
 DIST spur.py-0.3.21.gh.tar.gz 17666 BLAKE2B 0628417e6b5f4c744041693445113a59daac4f89776bc39849a2e1fab21826f3c6783bf72bf528a262f05df08d0680044e69f119c367f29ca4d6f0df554fa49d SHA512 7cd49690b989952707629fad5682201dc7f00865d8120da9e84eb9046e7a8fe7b7183785b4c2eac996d2743025cc09508b0ceb7b762b7bddb5447ecbc42d00a4
+DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
 EBUILD spur-0.3.21.ebuild 1175 BLAKE2B d2e7d602a67fc0d1e9efbf8608cc52a637dedec643ec8e5cca1c34f1407037f10b6f9f9ffab4cd4e3faa205c03054d44fa34337fbe113094355b048fe18c6700 SHA512 1e7e2656be35f31865faa8bdc17168714153784db6d97771811b610104f057a3a5bd51c13e990ab91f768e22dee9ac1556bb698efeafb9ed98d0ebfb0ce43742
+EBUILD spur-0.3.22.ebuild 1177 BLAKE2B bac7bce33375cf3c06ab6c281e35fd89a3bd0dfe927c74fdf6eb9f5760adb9135be266a6acac32b9d1bccd398f383a5d3a608300dd6d316b3102ca411ac832ef SHA512 fac78df3127e745f795e68badc70a0545b26c94204dcaf155c2ce8f226b6cad8493b6f05d41b7a04423db0a29e81b9836c7ecb7ecf714251015e29e1ac617d77
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/spur/spur-0.3.22.ebuild b/dev-python/spur/spur-0.3.22.ebuild
new file mode 100644
index 000000000000..03fee9aa9257
--- /dev/null
+++ b/dev-python/spur/spur-0.3.22.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_P=spur.py-${PV}
+DESCRIPTION="Run commands locally or over SSH using the same interface"
+HOMEPAGE="https://github.com/mwilliamson/spur.py"
+SRC_URI="
+	https://github.com/mwilliamson/spur.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# TODO: set up a local SSH server?
+	rm tests/{ssh_tests,testing}.py || die
+
+	# does random guesswork on top of exceptions that stopped working
+	# in py3.8;  this only causes a different exception to be raised
+	# https://github.com/mwilliamson/spur.py/issues/85
+	sed -e 's:spawning_command_that_uses_path_env_variable_asks_if_command_is_installed:_&:' \
+		-e 's:spawning_non_existent_command_raises_specific_no_such_command_exception:_&:' \
+		-e 's:using_non_existent_command_and_correct_cwd_raises_no_such_command_exception:_&:' \
+		-i tests/process_test_set.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index 9f6e0f6a9375..886af86195c9 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,7 @@
 DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
 DIST sqlparse-0.4.0.tar.gz 67191 BLAKE2B 748a30102b104ecd951d2e39b626e7351a7d141c756b3ae47451ccbbcef16f32201592aeee5bbf7a82a601e02f2faae8a569134b37b0660e54149e9ba56e096f SHA512 3314fe6ee7694a01c7ab00469ca6de90d3e954c5da39d2d8e2e085608b0b1ff304757378aa473d0687a16d064d952d0cd987237340e2f169604533d6757a61f3
+DIST sqlparse-0.4.1.tar.gz 67228 BLAKE2B 677b592af263e94e1f6d36242f4bf75d28d0466636c0c578b83f472acf05c357b6899150ce01b594db89f2844c1b85220429857583c79e6dbba34a75bdf54e47 SHA512 49f02a63ef490c2e900cea6a0882891cd1381e0f398c4e38688444300b0f0e961c91c4f1a2355704bba7f170083594bd9e26c2a6cac934da9d87ab291accd27c
 EBUILD sqlparse-0.3.1.ebuild 697 BLAKE2B 7691daee92bc6bd2a334bc65aa8c2725c2dc2c83abcd39b753c64cfa00d10b73b625e559dfcb9bbbee3d09c01483014981833e794f9c3e1d4f51c65639d32129 SHA512 722d1608d0f5c8c291e76d2478fdf9fba4a49a99ff9ab3580d48657e91da9c45d3a35c342a5c6b291a27d78a70653ccf31394f1d37a47eca0dcbd9b2f30fb520
 EBUILD sqlparse-0.4.0.ebuild 643 BLAKE2B dfc4e3e31f25476ee6727a2ab64ca2a2c84d881e8d48164fcc0efadf55d7aa497d8fc58459166cccc2159f68f98c430c70f500051d01ae42a72bb22b63f13267 SHA512 1c3238a1459c5acf2850596a2b8c7a8febf7b0e214097964a2cc13d106a963a891c0cbecf44475fa11b03e908741e8d0b56dc2b61aa384ff45c8fffdc706da9b
+EBUILD sqlparse-0.4.1.ebuild 643 BLAKE2B dfc4e3e31f25476ee6727a2ab64ca2a2c84d881e8d48164fcc0efadf55d7aa497d8fc58459166cccc2159f68f98c430c70f500051d01ae42a72bb22b63f13267 SHA512 1c3238a1459c5acf2850596a2b8c7a8febf7b0e214097964a2cc13d106a963a891c0cbecf44475fa11b03e908741e8d0b56dc2b61aa384ff45c8fffdc706da9b
 MISC metadata.xml 384 BLAKE2B b35ba3bdebba668141b296a8e2c0d54b68015d6a6fbb0daa682e115ae0544da0fd588b3197dbc26e798214e5caf09dd01a46cbad9ced306a1052912826c41f08 SHA512 b54567937860fe8b488bdc27710f66692efe134520e32070734fcee1fcdb25e96a09117f43a5edc9f70bc6d7213814344fecb98b5576cf46ea85a3b5fd90b51f
diff --git a/dev-python/sqlparse/sqlparse-0.4.1.ebuild b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
new file mode 100644
index 000000000000..45594ba40a24
--- /dev/null
+++ b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
@@ -0,0 +1,22 @@
+# 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_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${P#python-}
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index e28ffec60e90..2546b97c52e9 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-1.4.0.tar.gz 30062 BLAKE2B 86a01b4c8c10512f3e2b067f4d1007e60ba46f23f22ad80ff7a30a4503db06fd91d841b33bc54f0f7acbd2539e595f8b0201f9a8e8ccb7577f8e9f422562e02d SHA512 f385b4e67cc5a4b32c7563d98f36dab6e5320966563eb341395e9327c16f92a63863558bfa795b6531819fa6038234492d4d19c1d9286e6306039e8d4abec0b8
-EBUILD sybil-1.4.0.ebuild 546 BLAKE2B 6280824f7e99a0bce279d149789def456c1f56fbcbb8eb5e2ea38235a47dcdcd74cf8294b66467821120982a76c1fa7bb61ad3b0ff4f09bb7089d1b6eaa05364 SHA512 e94a848bd73e0ef36fb68e2c87f3ab76916f2358b935071e766ac18de72add7a950cdc78d85a75487b2e34c784ddb768f556a54f4333d76682f5a63ab1c2aa0d
+EBUILD sybil-1.4.0.ebuild 545 BLAKE2B 99371afa7bccd3c5805f12f9cd3d7498aec39eb1d2aba71f20b5e3b491dfe87e5f5f463f0f91b996cfc201ea403a84d59eae66b057dc6bc9fd730fb3a9c5576d SHA512 1c0e2fe206f4dab382dd83e96d076201ab780b3a927b000e3d817e17f5f76e86a29676eee400d7a0eecf47efe263f76ad1765d64855591ac7f714c0d8263aae6
 MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/sybil-1.4.0.ebuild b/dev-python/sybil/sybil-1.4.0.ebuild
index 3e88978fa0f7..b88b887ee526 100644
--- a/dev-python/sybil/sybil-1.4.0.ebuild
+++ b/dev-python/sybil/sybil-1.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Automated testing for the examples in your documentation"
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index cd227675804b..cf4893deb114 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,7 @@
 DIST testfixtures-6.14.1.tar.gz 114969 BLAKE2B 21e6b377e24240cb275feed2e160da256ca75884c5a6dc842364986031c3cd21fb1b5bc13f3e8780354d47179e6c038cb461a39a04d34bfc8beebbf9809d6431 SHA512 0da31d5e382984c22ada846c07570d4a179ba819005dd29891e551b99190fabaaf17174456f7ed4864e9c4aa25f7d5d8b86aa123b4628328610d6930c9c5d6bd
 DIST testfixtures-6.14.2.tar.gz 115229 BLAKE2B 311ef13cc6f596aa9d4c54c0cc02e25c412704eefa3474c3a078f4f50ba556e9872d3ecff3d122443986f0917b2e1c6fff8315d20bd319dec1148fd9851321ba SHA512 fbaeefc439a755d9f9e5ee223c6ce00288adfc2d12c9bef70ab06ea7bc4e9757d7a2429ac8046f7171aca1ac7d667f8a26168cd711f1cc4c719d66bbe8210cc6
+DIST testfixtures-6.15.0.tar.gz 116119 BLAKE2B cc0e351bd6778393cf061b741d7d593f56bc1b6a3d53d2e34baa006f7edd718c86f1b16c094e42cf116805a5c6652ac6827f71c1ebbb160d48c071317603c151 SHA512 34b9f1b9a5e76c5e20acf9abae2961694817de3822361cd5afc4a405ccdbcf26c617a01fbd8d2d977c2a0bc696232c2363df4a9fb7ba9187e0743cf2a6fe98e1
 EBUILD testfixtures-6.14.1.ebuild 1497 BLAKE2B c70168019185c9e49824e4e3cffb3f45fe28ab3a8782bb35f7b7aa4089b824b62fb05c5041bd0bddc3507adc2b4863a5d15901599ee4e0a21386907a8406568d SHA512 4b0f50aecf8a3da34701e52f7b3009df706f5beb69624748d32309868a77e767b31c119db501a37b550f2459708aa4167b19719b2815d3c910b94f9d7ca2411b
 EBUILD testfixtures-6.14.2.ebuild 1499 BLAKE2B 0b2bdf8ea2c2b75d1a0e45f160c51ae2fa9e3c969241ab8f58b6967295e06561f902624b91c8a2e9c330e89680788b7f40303b49a4c68dfb6898dfbedf9d9fc6 SHA512 20d27749bf48dd38b979015c9360592c3bf4e49bf726f4b99e268530c6ac4fcaf6668c0b8b658481c1a4a4f3c452e8dd3cd96da07e8e958f576ebac504ea12c5
+EBUILD testfixtures-6.15.0.ebuild 1058 BLAKE2B 5b55f4d00447392d8181bc60828f089c2974153ce47eb566574def3bdfec953ee542f4c25ed060f8b63e23354806aa46151db7723336997c764a3536110656c3 SHA512 a5b0e58e31fd8db5d08b2b3ab69fc1f2c791693625802987b174ed181af62b89af140e5b32c05c2b0069934ff5551d1f5000d039c7b7a2a622c97277585cec9a
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.15.0.ebuild b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
new file mode 100644
index 000000000000..9d7fc72c7ede
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
@@ -0,0 +1,42 @@
+# 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="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 9a4898db9dbd..815036d69381 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,7 @@
 DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
 DIST tox-3.20.0.tar.gz 297432 BLAKE2B 279a6d407c4a490309843ba30e62fe2f0c6ace63af2dfd5b5c2fc8ee6ab784b99da56e9d7d76cd0170f85432bef500c31b824fee32558f7f21d4491385d13b4a SHA512 eb8e55eb3c232356cdb3e1477399ef055df497f1276f0b5c5423f30c780e2619067d1e44c2d6702016e63f96a76d04d0c5e7b6c6f1faa1a98f1dcc5b1cbeae39
+DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6
 EBUILD tox-3.19.0.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
-EBUILD tox-3.20.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+EBUILD tox-3.20.0-r1.ebuild 2352 BLAKE2B 608645b1dbf844bbd2f123fb9b9fd03d6e91e3aea6005750382c13a7678f60d7fcbe67e459514a3f6fa014a26acf6ec27052c3f9e3e27f47613da2ac514c20e7 SHA512 0012c5dd09ad49feeb8121f787d1baf2705a8f42c1dd83bd6ec1147111d962e8020b655ef25cd2a37c14ada58c74fe55b3b24e571d228a0b7c1d2ecdc9941529
+EBUILD tox-3.20.1.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.20.0-r1.ebuild b/dev-python/tox/tox-3.20.0-r1.ebuild
new file mode 100644
index 000000000000..e4896d972c07
--- /dev/null
+++ b/dev-python/tox/tox-3.20.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+	# ignore importlib_metadata version constraints
+	sed -i -e '/^[[:space:]]*importlib-metadata\b/d' setup.cfg || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-3.20.0.ebuild b/dev-python/tox/tox-3.20.1.ebuild
similarity index 100%
rename from dev-python/tox/tox-3.20.0.ebuild
rename to dev-python/tox/tox-3.20.1.ebuild
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 1cae9cc3b0e8..6fd2e9e3d27a 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,10 @@
 DIST tqdm-4.48.2.tar.gz 148978 BLAKE2B 2423a3d23b86ec6b535a2157d0fbaea6921f95873fb2507a08ff57de0fdcf8fcbfb030210393f5410437ee9977da3ad2011f07a866b3f91a057e338082325976 SHA512 849e4dad4bd0819b328e906af8a8f7acf2ebfd559c9ae3ebf822bc64c1b1a5c96e44b9b69d3dedf6387c44cf9eed559f1377ea29f71fadfc8f056c52685425e9
 DIST tqdm-4.49.0.tar.gz 151935 BLAKE2B 790e2912a402795af9aba2e4db80cf41a7cb08267dad5946d89b4d9fb8b8c7a1dd65f33dcaf315bbe82862c0c2934b2dd2b8cee894c592d5a61ac61dd8c5126f SHA512 44197eb09b90551eb66c8b2e0dc97f6864fc91654465e7d478ece6ecd610242d8e378c6814f9d3e1cf05b2db1aa533743535051ad456ec5ef6d477be906ee217
 DIST tqdm-4.50.1.tar.gz 153435 BLAKE2B 5dda14bc4007e2820dc1899d352dccfd72988ce0ec84b556404d4a92f13cf51f340b7e745c39d01076485adcc6331eaf86e49c37d441ab667e4ee9e07019b238 SHA512 4db3ab73ca387961e0522fb5521bbad0420f1cf99a38a5192f048e08a30aeddd20d39ca2d7cd24dbd29e2342018fe65d55a2d0b275d188bf41f7592b8b77cd32
+DIST tqdm-4.50.2.tar.gz 153853 BLAKE2B 12eccead810b8434ac1c7787b34ee54e78f6f2fa566e7ad10bbb428bb48af723e75126955e6af5262062d9a98621b5e70ca08925a2024c09488579c128ff5d00 SHA512 2d13473d3f7e85de1c62cc753bca2c2971acbfb8c1a0f99cebf248e9e384b5875ae655c41438abb9861d6c90051eec0d1a23af849f157359fa88c730718ecd33
 EBUILD tqdm-4.48.2.ebuild 1324 BLAKE2B 2b8486f5732dab05928a461aae1d86f1ba63eab9cb9546b39243a7de9db6a4ad5bcadbac19cdb2614329848816cdb47f1dd25d6bc2ac870c8dbc68cac406ae43 SHA512 5a8e146ac5df40e3289afbb8af6dfa3501951278dd470a2cccdfaee4bd683445296f0c1311aafa4dc316e45af15529fdc922875fa0c4b29a1bd0ae4692c6cb30
 EBUILD tqdm-4.49.0.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
 EBUILD tqdm-4.50.1.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
+EBUILD tqdm-4.50.2.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
 EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
 MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
diff --git a/dev-python/tqdm/tqdm-4.50.2.ebuild b/dev-python/tqdm/tqdm-4.50.2.ebuild
new file mode 100644
index 000000000000..27373f57ea4f
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.50.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 6a633f7f0d17..d432cc0458b3 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST translate-toolkit-2.5.0.tar.gz 7679224 BLAKE2B 927b0dcfc0836ed2f2589d70f5789fc6d8b23a3e80bf4ef0054704ca12e4b5287a7e3b2a90992197bae6fc0acee1ea9d93a8eff05f6e5182f9269ca2aa9e5a66 SHA512 c4ff8fe9e7cc5b44a5448391ecbcfc454bf32d3794267e67824b020ca78cfbeba1283287a42f07859cd197a413fe8171ad5e31375f60fec77f334642ed2ad13e
+DIST translate-toolkit-2.5.1.tar.gz 5984081 BLAKE2B 55e158d0d354f181a4e23d9638306eb82bda0dd3133a507de682a54c4197d36ae6ad6bf3d733eb841d9406933407eb98c5874a13e55c7840a672971e87721d94 SHA512 57bdd7f824527955fde6db3a69ffadc27814336c6f792d08bb70e56e95a646d0366e8a3a48ac187ef62804f79dd8a61a4a0b76c8a28e57047c310fcfdf79e999
 EBUILD translate-toolkit-2.5.0.ebuild 1930 BLAKE2B d14340824d56742941d5ec3be728f79308e59a8ac8e6a5c646609f5075036467831d493b00f56f96563d5889d61cb28b287ff45583578511d85357ccf3b39946 SHA512 e95b1509e9575c3aeca90087aba030296fb60d4b32c52b8c6c5e6d46de2567f843bd220bb3533f365673033a63b118237fc8ff15a33ab52abbf877b990245e06
+EBUILD translate-toolkit-2.5.1.ebuild 1939 BLAKE2B 37a01212efcb6c26cc254ff747343bf69e40ed7e4a6a427a6adba2a92aaa27361e8b213b3ed5f89f0a07f9a35a39e90a036689fce9001ba4b6503b1dbc0fb348 SHA512 fb7eaa86df69b7cb6ea5398fa845d73f665f77744b5d674e01238e7aab9b0aee14a6b82cf6b7682e3c565878269578dbd54dfb01b83a534d2c85f649fb67cc8e
 MISC metadata.xml 666 BLAKE2B 8f550fcb2d34ecd84e4125645f127260c154022bd7cf03b7742313632627c207a476f1e4a98c83b5d5890beff7558ec548f16c675135822d790146c842bec04b SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
new file mode 100644
index 000000000000..198e83e0ddd2
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +html +ical +ini +subtitles +yaml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	doc? ( >=dev-python/sphinx-3.0.2 )
+"
+DEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# Prevent unwanted d'loading in doc build
+	sed -e "/^    'sphinx.ext.intersphinx',/d" \
+		-e "/html_theme/ s/sphinx-bootstrap/classic/" \
+		-i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( "${S}"/docs/_build/html/. )
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -Rf docs || die
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 9d24abefa76f..e65738ffff79 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,3 +1,5 @@
 DIST treq-20.4.1.tar.gz 59116 BLAKE2B 1370748d8bde407a8802d54786b45fbbc65525efba14cd5a33d741573b9fca7b36629deea65672669c4da45347bb40d975a063430ffd18f50d5ef896ce6dae66 SHA512 ca24ca7ad6bcf3fe6cba490d05eea4d71727a84bb2caf0a019edc01f91f7c25d87dc8208fc7cc816d18ef42db4dc66884475f0baa6b2cf39714e4422d0d67d3b
+DIST treq-20.9.0.tar.gz 60142 BLAKE2B a495b73221ee86163a5fefd03c8019f4b671a1f32d2ab304b89566339a36aaec7245d33b738b646fa48c42f4db9744938637ece058e067ee3f747e53ce442ab8 SHA512 c595ad69d5a9c688ca966cc897db669a57d14027e0bdc345d550f791390099743749be4a41294e61428cdc7bc0fa197474be780323b00f17a712505e081e7073
 EBUILD treq-20.4.1.ebuild 1553 BLAKE2B 17c437ce8dcb71c013e710abafb805b36151b1d729369871ae94716b0cc1c3e187a9d991e0be90e6db087899e45e02bb1ea9f0c0811da0d6c4d459d6324a0ca5 SHA512 dc515b505296adfa0ae4bd0064eda47fbd0cf2310866ddc9ea5b6ab72aef30bbd666b367b28a6e385fc90d552459920d5bf6b29e49bbfca0a89b7b8b19c777ed
+EBUILD treq-20.9.0.ebuild 1553 BLAKE2B 551fac7f2eea2daad82d29de7555cc46baeda002a00db1f521d2e6fd762d8263b7128074913ce2251da9b5a3f4e7d5f54ccb987c5a47a8224913638475b00711 SHA512 bcf0657d0b228b9502933c18932439f647404f074bf0bbcb057b8be21266fe4f253bf77897f90f569b634111eeec276af65f0c1a5712a56cd9b9442609481165
 MISC metadata.xml 679 BLAKE2B 1218e13a10ef3e4b63b892d3ba444116d8ae3bdc625c9b95ef73f9c4d59dc7bad527e919568306e7744b79a9bb00dea90ee0b83146bc4314d224e2dc7657cb7d SHA512 b3d2aadc2c43d03d80d50fd67830e62ba7543dc7ea7e0f834b32a7738031a49a8ab57069b8d5c7a9b0f88405bae8d59333e50ecab87286f8be5504141081914e
diff --git a/dev-python/treq/treq-20.9.0.ebuild b/dev-python/treq/treq-20.9.0.ebuild
new file mode 100644
index 000000000000..34acd45f6492
--- /dev/null
+++ b/dev-python/treq/treq-20.9.0.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} )
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/incremental[${PYTHON_USEDEP}]
+	dev-python/hyperlink[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx
+		${RDEPEND} )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/httpbin[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/ )
+
+	distutils-r1_python_install_all
+}
+
+test_instructions(){
+	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
+	ewarn "dependenciess are installed for this package."
+	ewarn "Please run eg:"
+	ewarn "$ python3.7 /usr/bin/trial treq"
+	ewarn "as a user for each of the python versions it is installed to"
+	ewarn "to correctly test this package."
+}
+
+python_test() {
+	# Tests fail when run via emerge
+	# they need proper network access
+	test_instructions
+}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 305b672f8a04..a827a1fbe4ad 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -8,8 +8,10 @@ DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc8
 DIST ujson-3.1.0.tar.gz 7128419 BLAKE2B 544afb68e23fe942a6bb241f6948998d61a42d61799dff257f139510e4e97e9bba5c4742e1ed1f0b0e78dfcde0589f0b255c92fc5f3059b6cdd86279aabfe141 SHA512 c40953a4b5b55e894e42fccded618a9f2ed771904e1d1e90a28f4691a53fbd8b2fab3dc98a36b6e0637d2ef40ac87ebf9f2d8fce33cd3bc4e68bf7c18c7a33c3
 DIST ujson-3.2.0.tar.gz 7128952 BLAKE2B 7e4c409eb8e87d542d37595439ded5c85e934e87a18987e18dce5ab0aebd5f9431b8a2c12ebaa467da928c3158d03325a40a9ae65230e39c93106d65b098c407 SHA512 8915e17acbd9650964dc9ae4f8a89021af921fac8f77f5456fdb8c0d6ceaa02767891d070c515c926deef76efb210a969c573e387ae62c15b2c8be761f6adb70
 DIST ujson-4.0.0.tar.gz 7128856 BLAKE2B 48b487e056dc6972b456b09458ac246baf80e9069187e76e59de9e36d67676d0e13e4efc13f8214bac5bde89e4b393b24c7d471d4ac42bfbbe224965512720bb SHA512 fdd0c3c829a5c082edf5441028d608c828f5301c97228e8ca80ce483d7e52c438e9f8995c948e4e82f0e7e4bc4e757e391d0adea5f59e3a97f9f28625fdb0914
+DIST ujson-4.0.1.tar.gz 7128868 BLAKE2B 159496bfa2b7efff744c1f725c5a8c362c6baac20518d440e5827ec8af1a9a77b4e060126d9b35b39baae079f7092e64d49d0cd23a637174a4bca261203939d6 SHA512 11fb28166afab30e29d71070c91cfb78245eed704a769bf6fb0871c267135fac3fa1042c4ac875dcb870f8a00615e6bcc8fdcd0168edd5ccbae6437605b4df0d
 EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B b2edaafecfbdb678a1c9ef17d65d4e03557bd2485ada4b8ea1d72fa89795be9b1b6fa18da8f2749b114d9bbd44733be1309263fc2444e227eaaadc8f5598b2b7 SHA512 bab8dc178469c09f459a4f83b0f8403914137a372ca31fe5f200d85871617aec439a223453cc6b77cd3ceda0ad7322ce272f30811dde02169257f5675b2cf432
 EBUILD ujson-3.1.0.ebuild 581 BLAKE2B d9d0f77fbbce79d1d304a1d92e34bca57ee0aee64128512a279e61bb32045beef379605a15a16644ec05c1b20999e87ea2ca8cb7c1b99b548040f48ea92cae74 SHA512 848f4200133797f1bcca94f07dd089f8f1f2b8f83253b6f4fb260c0a13dd568dd8c15cda7a0fb524dbffec632b66dff15ce1508fa2421189707d4a2a0ecc33e0
-EBUILD ujson-3.2.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
+EBUILD ujson-3.2.0.ebuild 583 BLAKE2B 37bc5a98c5e8fa348177255ae571d320ca247794eeca5d55b2b88d1a104d87aee32b90178a0cbcf61e8e3be55c5e9501e1279c51b3b7f37da324d7470f044394 SHA512 91b25f5311c437ced258f23724660d1b77ad39ea3671d7c0326f1ae0c8cd486c29af5e56870ab0907e5d5137c5a60e4b27211a02c7a1e03ac96313194eb54ca4
 EBUILD ujson-4.0.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
+EBUILD ujson-4.0.1.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
index 18e434f25cf1..580474477867 100644
--- a/dev-python/ujson/ujson-3.2.0.ebuild
+++ b/dev-python/ujson/ujson-3.2.0.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"
+KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-4.0.1.ebuild b/dev-python/ujson/ujson-4.0.1.ebuild
new file mode 100644
index 000000000000..18e434f25cf1
--- /dev/null
+++ b/dev-python/ujson/ujson-4.0.1.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index c0c0e3f8437b..5dc9bd0aa10f 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,3 +1,3 @@
 DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
-EBUILD utidylib-0.6-r1.ebuild 1023 BLAKE2B f4f99cdeb08b4d106c419d77625b2d3ac5fbe186bf5a9fe133938e3019681fa64e8147b9373c95541b9312f80be077dac60cbdd5ba8b4404a724af66f1678c0e SHA512 c2b5341bd13d323b2734be3a8335df330cf73a0d661067b174cbf1a160a88225dad53e2fbe15dfeedd3e597c016953ec31b448dc2d601b9eb46e116a361f8464
+EBUILD utidylib-0.6-r1.ebuild 945 BLAKE2B 91010116ade26a22e77e1988bf1a5b4f4d3376f086e076b9e2a24f405a840712d3f3da02ec68ffe6dcdc96cee2f15d03a211ec68c65a0bf353914a1747c2d496 SHA512 a4179dc23312b4268ca35cfe45c5de74e864ec81033faf4dd0cd486b1571ede7a8d6e23c7c0ec04b4db3b357004bfb5bdd24946abfd7dd03211767edd3d72a94
 MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
diff --git a/dev-python/utidylib/utidylib-0.6-r1.ebuild b/dev-python/utidylib/utidylib-0.6-r1.ebuild
index 65cb24ad7ccb..64873389cd02 100644
--- a/dev-python/utidylib/utidylib-0.6-r1.ebuild
+++ b/dev-python/utidylib/utidylib-0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 MY_P="uTidylib-${PV}"
 inherit distutils-r1
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ppc ppc64 x86"
 IUSE="doc test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( || ( $(python_gen_useflags 'python2*' python3_6 python3_7) ) )
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -33,7 +31,7 @@ RDEPEND="
 	app-text/tidy-html5
 "
 
-RESTRICT="test" # 1/11 tests fail
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index d11aeb3939a6..31d647881cd7 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,5 @@
 DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
+DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
 EBUILD vcrpy-4.1.0.ebuild 1385 BLAKE2B ae7515f0660eb331f2ac40f7644a5438bb1c2170c3444b4866935b70514b81f8481c58e010988196dfe7c718be84f1759865c88a7c19aeba5343594b10a44644 SHA512 7458a9a48a4d11f01eb4058450070716e5d96c11b6260fb426ced67cfdf944a699a9a1ee79bba467fc6628860737ab2a77e616416a40d5ec2f603d3e548dd6a5
+EBUILD vcrpy-4.1.1.ebuild 1435 BLAKE2B 567762af0672b67a8c2d5962ec3556f7a04e2aef28a166eeb73ab6691e44e140509fe89ec5653702ac50965ee2ccf94aa8fa79d33f8bf06f88ebb9511cbf9ad6 SHA512 61d2ce6b8ae0434530ecbdefce063e059a4d7f15d47cfda9e760357ea728420b85fd7c63a06f27d2ddc6c1723093f8324a0716c478a649ca01a77c9239641048
 MISC metadata.xml 387 BLAKE2B 09c086ca73a9932b1ac06f46f7c7ef216db357fe831fd6d8f996acedcf24a636420752130597318f4cc0a8d11a584d2162a892ca412403d1bbf15cdd86a1fbaa SHA512 09ba6aaf53089115dc98031b4dba4d526864b6d38ba7950fc3fccd9c2b1a0e14702f5235b3923a41300fabd4152e06eae22e20e86b54795bee453a184bd8828e
diff --git a/dev-python/vcrpy/vcrpy-4.1.1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
new file mode 100644
index 000000000000..e28175b7cb17
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
@@ -0,0 +1,51 @@
+# 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="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# tests requiring Internet
+	rm tests/integration/test_aiohttp.py || die
+	rm tests/integration/test_boto.py || die
+	sed -e 's:test_flickr_should_respond_with_200:_&:' \
+		-e 's:test_amazon_doctype:_&:' \
+		-i tests/integration/test_wild.py || die
+	sed -e 's:testing_connect:_&:' \
+		-i tests/unit/test_stubs.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index e7499d066143..9907a43dce78 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,3 +1,3 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.4.1.ebuild 991 BLAKE2B 99c29354f3323789d2797f699de37739c3a786af16d510bc55e15838e12400c60c82f289da0bbebb7ae2ce7244b637dd7162399e6ef78557294f18a44cf81664 SHA512 562dd04faf46b1f1e6e9b4331f190aad6857d0202c3153f871021fdbbf46996870e506f69199d12f5d23a8338bdbc5a36c94676c0897969d4168d248f465e74e
+EBUILD zope-component-4.4.1.ebuild 986 BLAKE2B ca7080cdb86608435b8e40a4829121a6be247bca855721709cc9e46d1967c1f6367370c2fe5cdf0ee96269a86263779dbe382295f15507bd3f16203837829f7d SHA512 49ad1f965ad9092bc654492ea02f4ac4c1220f6d039878ba77ccf5d1507b44ff296645e7dabf4c798272317cd36dbd23d86e40bb8a69c75ac8dfae34366c42f7
 MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 2dd6b633d078..0fb9299678a5 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python3_{6..9})
 
 inherit distutils-r1
 MY_PN=zope.component
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 4c4985ad096b..d7d1ce3dcd39 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index c5e8e66d6abd..12a7edf755fc 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,7 +1,10 @@
 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
+AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
+AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 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.1-r1.ebuild 2335 BLAKE2B 00ade94f3f8d10e2eef84944c11433ebea3cc7b2e6e887d2c1e975b5d964fbce244c3ee8d6760a73993230eda09ad4e83014aaa6b532498bac6dc63840a2731f SHA512 94d9404e139ccffadaa6d840d80b26993efa6db7db035423e18f574feea9ed1812b71b0cf16b28f59eb2ff831339f48f942dc027aa7966c0575e77134a27a205
 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/files/qtcore-5.15.1-timezone-1.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
new file mode 100644
index 000000000000..1c8f1e89e7d5
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
@@ -0,0 +1,271 @@
+From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 10 Oct 2020 19:26:13 +0200
+Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
+ file-system"
+
+This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
+---
+ src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++++++----------------
+ 1 file changed, 64 insertions(+), 141 deletions(-)
+
+diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
+index c5c70b7364..01f9a6cce0 100644
+--- a/src/corelib/time/qtimezoneprivate_tz.cpp
++++ b/src/corelib/time/qtimezoneprivate_tz.cpp
+@@ -1,6 +1,5 @@
+ /****************************************************************************
+ **
+-** Copyright (C) 2020 The Qt Company Ltd.
+ ** Copyright (C) 2019 Crimson AS <info@crimson.no>
+ ** Copyright (C) 2013 John Layt <jlayt@kde.org>
+ ** Contact: https://www.qt.io/licensing/
+@@ -43,19 +42,18 @@
+ #include "qtimezoneprivate_p.h"
+ #include "private/qlocale_tools_p.h"
+ 
+-#include <QtCore/QDataStream>
+-#include <QtCore/QDateTime>
+ #include <QtCore/QFile>
+-#include <QtCore/QHash>
+ #include <QtCore/QMutex>
++#include <QtCore/QHash>
++#include <QtCore/QDataStream>
++#include <QtCore/QDateTime>
+ 
+ #include <qdebug.h>
+-#include <qplatformdefs.h>
+ 
+ #include <algorithm>
+ #include <errno.h>
+ #include <limits.h>
+-#ifndef Q_OS_INTEGRITY
++#if !defined(Q_OS_INTEGRITY)
+ #include <sys/param.h> // to use MAXSYMLINKS constant
+ #endif
+ #include <unistd.h>    // to use _SC_SYMLOOP_MAX constant
+@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
+     return last > tranCache().cbegin() ? dataForTzTransition(*--last) : invalidData();
+ }
+ 
+-bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
+-{
+-    return tzZones->contains(ianaId);
+-}
+-
+-QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
+-{
+-    QList<QByteArray> result = tzZones->keys();
+-    std::sort(result.begin(), result.end());
+-    return result;
+-}
+-
+-QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
++static long getSymloopMax()
+ {
+-    // TODO AnyCountry
+-    QList<QByteArray> result;
+-    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
+-        if (it.value().country == country)
+-            result << it.key();
+-    }
+-    std::sort(result.begin(), result.end());
+-    return result;
+-}
+-
+-// Getting the system zone's ID:
+-
+-namespace {
+-class ZoneNameReader : public QObject
+-{
+-public:
+-    QByteArray name()
+-    {
+-        /* Assumptions:
+-           a) Systems don't change which of localtime and TZ they use without a
+-              reboot.
+-           b) When they change, they use atomic renames, hence a new device and
+-              inode for the new file.
+-           c) If we change which *name* is used for a zone, while referencing
+-              the same final zoneinfo file, we don't care about the change of
+-              name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
+-              the same CET file, continuing to use the old name, after
+-              /etc/localtime changes which of the two it points to, is
+-              harmless).
+-
+-           The alternative would be to use a file-system watcher, but they are a
+-           scarce resource.
+-         */
+-        const StatIdent local = identify("/etc/localtime");
+-        const StatIdent tz = identify("/etc/TZ");
+-        if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || m_last == tz))
+-            return m_name;
+-
+-        m_name = etcLocalTime();
+-        if (!m_name.isEmpty()) {
+-            m_last = local;
+-            return m_name;
+-        }
+-
+-        m_name = etcTZ();
+-        m_last = m_name.isEmpty() ? StatIdent() : tz;
+-        return m_name;
+-    }
+-
+-
+-private:
+-    QByteArray m_name;
+-    struct StatIdent
+-    {
+-        static constexpr unsigned long bad = ~0ul;
+-        unsigned long m_dev, m_ino;
+-        StatIdent() : m_dev(bad), m_ino(bad) {}
+-        StatIdent(const QT_STATBUF &data) : m_dev(data.st_dev), m_ino(data.st_ino) {}
+-        bool isValid() { return m_dev != bad || m_ino != bad; }
+-        bool operator==(const StatIdent &other)
+-        { return other.m_dev == m_dev && other.m_ino == m_ino; }
+-    };
+-    StatIdent m_last;
+-
+-    static StatIdent identify(const char *path)
+-    {
+-        QT_STATBUF data;
+-        return QT_STAT(path, &data) == -1 ? StatIdent() : StatIdent(data);
+-    }
+-
+-    static QByteArray etcLocalTime()
+-    {
+-        // On most distros /etc/localtime is a symlink to a real file so extract
+-        // name from the path
+-        const QLatin1String zoneinfo("/zoneinfo/");
+-        QString path = QStringLiteral("/etc/localtime");
+-        long iteration = getSymloopMax();
+-        // Symlink may point to another symlink etc. before being under zoneinfo/
+-        // We stop on the first path under /zoneinfo/, even if it is itself a
+-        // symlink, like America/Montreal pointing to America/Toronto
+-        do {
+-            path = QFile::symLinkTarget(path);
+-            int index = path.indexOf(zoneinfo);
+-            if (index >= 0) // Found zoneinfo file; extract zone name from path:
+-                return path.midRef(index + zoneinfo.size()).toUtf8();
+-        } while (!path.isEmpty() && --iteration > 0);
+-
+-        return QByteArray();
+-    }
+-
+-    static QByteArray etcTZ()
+-    {
+-        // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+-        const QString path = QStringLiteral("/etc/TZ");
+-        QFile zone(path);
+-        if (zone.open(QIODevice::ReadOnly))
+-            return zone.readAll().trimmed();
+-
+-        return QByteArray();
+-    }
+-
+-    // Any chain of symlinks longer than this is assumed to be a loop:
+-    static long getSymloopMax()
+-    {
+-#ifdef SYMLOOP_MAX
+-        // If defined, at runtime it can only be greater than this, so this is a safe bet:
+-        return SYMLOOP_MAX;
++#if defined(SYMLOOP_MAX)
++    return SYMLOOP_MAX; // if defined, at runtime it can only be greater than this, so this is a safe bet
+ #else
+-        errno = 0;
+-        long result = sysconf(_SC_SYMLOOP_MAX);
+-        if (result >= 0)
+-            return result;
+-        // result is -1, meaning either error or no limit
+-        Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
+-
+-        // therefore we can make up our own limit
+-#  ifdef MAXSYMLINKS
+-        return MAXSYMLINKS;
++    errno = 0;
++    long result = sysconf(_SC_SYMLOOP_MAX);
++    if (result >= 0)
++        return result;
++    // result is -1, meaning either error or no limit
++    Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
++
++    // therefore we can make up our own limit
++#  if defined(MAXSYMLINKS)
++    return MAXSYMLINKS;
+ #  else
+-        return 8;
++    return 8;
+ #  endif
+ #endif
+-    }
+-};
+ }
+ 
++// TODO Could cache the value and monitor the required files for any changes
+ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+ {
+     // Check TZ env var first, if not populated try find it
+@@ -1256,9 +1136,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+     else if (ianaId.startsWith(':'))
+         ianaId = ianaId.mid(1);
+ 
++    // On most distros /etc/localtime is a symlink to a real file so extract name from the path
++    if (ianaId.isEmpty()) {
++        const QLatin1String zoneinfo("/zoneinfo/");
++        QString path = QFile::symLinkTarget(QStringLiteral("/etc/localtime"));
++        int index = -1;
++        long iteration = getSymloopMax();
++        // Symlink may point to another symlink etc. before being under zoneinfo/
++        // We stop on the first path under /zoneinfo/, even if it is itself a
++        // symlink, like America/Montreal pointing to America/Toronto
++        while (iteration-- > 0 && !path.isEmpty() && (index = path.indexOf(zoneinfo)) < 0)
++            path = QFile::symLinkTarget(path);
++        if (index >= 0) {
++            // /etc/localtime is a symlink to the current TZ file, so extract from path
++            ianaId = path.midRef(index + zoneinfo.size()).toUtf8();
++        }
++    }
++
++    // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+     if (ianaId.isEmpty()) {
+-        thread_local static ZoneNameReader reader;
+-        ianaId = reader.name();
++        QFile zone(QStringLiteral("/etc/TZ"));
++        if (zone.open(QIODevice::ReadOnly))
++            ianaId = zone.readAll().trimmed();
+     }
+ 
+     // Give up for now and return UTC
+@@ -1268,4 +1167,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+     return ianaId;
+ }
+ 
++bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
++{
++    return tzZones->contains(ianaId);
++}
++
++QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
++{
++    QList<QByteArray> result = tzZones->keys();
++    std::sort(result.begin(), result.end());
++    return result;
++}
++
++QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
++{
++    // TODO AnyCountry
++    QList<QByteArray> result;
++    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
++        if (it.value().country == country)
++            result << it.key();
++    }
++    std::sort(result.begin(), result.end());
++    return result;
++}
++
+ QT_END_NAMESPACE
+-- 
+2.28.0
+
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
new file mode 100644
index 000000000000..611c979a469c
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
@@ -0,0 +1,47 @@
+From ffc9093a199a542791920b30d1835c3248920aa0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 10 Oct 2020 19:26:35 +0200
+Subject: [PATCH 2/2] Revert "Purge two old time-zone lookup fallbacks"
+
+This reverts commit b0383cbd388336f698ceeac11a4f50cdff931dd9.
+---
+ src/corelib/time/qtimezoneprivate_tz.cpp | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
+index 01f9a6cce0..eea6f5e962 100644
+--- a/src/corelib/time/qtimezoneprivate_tz.cpp
++++ b/src/corelib/time/qtimezoneprivate_tz.cpp
+@@ -1153,6 +1153,29 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+         }
+     }
+ 
++    // On Debian Etch up to Jessie, /etc/localtime is a copy of the relevant
++    // zoneinfo file, whose name is recorded in /etc/timezone:
++    if (ianaId.isEmpty()) {
++        QFile tzif(QStringLiteral("/etc/timezone"));
++        if (tzif.open(QIODevice::ReadOnly))
++            ianaId = tzif.readAll().trimmed();
++    }
++
++    // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
++    // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
++    if (ianaId.isEmpty()) {
++        QFile tzif(QStringLiteral("/etc/sysconfig/clock"));
++        if (tzif.open(QIODevice::ReadOnly)) {
++            while (ianaId.isEmpty() && !tzif.atEnd()) {
++                const QByteArray line(tzif.readLine().trimmed());
++                if (line.startsWith("ZONE="))
++                    ianaId = line.mid(6, line.length() - 7);
++                else if (line.startsWith("TIMEZONE="))
++                    ianaId = line.mid(10, line.length() - 11);
++            }
++        }
++    }
++
+     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+     if (ianaId.isEmpty()) {
+         QFile zone(QStringLiteral("/etc/TZ"));
+-- 
+2.28.0
+
diff --git a/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
new file mode 100644
index 000000000000..e5a80a34d433
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
@@ -0,0 +1,104 @@
+# 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
+	"${FILESDIR}/${PN}-5.15.1-timezone-1.patch"                   # bug 737914
+	"${FILESDIR}/${PN}-5.15.1-timezone-2.patch"
+)
+
+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/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 33948ab627ad..e978fb816936 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -6,5 +6,4 @@ DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e998324865
 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.1-r1.ebuild 4070 BLAKE2B 3b58d680cefbc5204ec8da962fc066f2ec4e7ebcf32b5a21517f37b51a8d15b01418ca511244f2aa2fd8c02097b8fe22981b7591a95ecbd3728f615ad98dab8d SHA512 4788fd1d82271ccaa4334365ffa4c26e380223d1911a3dc5b53f69cc194787cf1ac9845cfce31427bff39e4fc00fbd91165af9196a78623de61d7a45bc90c54c
-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.1.ebuild b/dev-qt/qtgui/qtgui-5.15.1.ebuild
deleted file mode 100644
index e6fed6656239..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.1.ebuild
+++ /dev/null
@@ -1,184 +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
-)
-
-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/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3258d161033f..32e960f30c2a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,5 +7,5 @@ DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd2
 DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
 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.1.ebuild 4652 BLAKE2B c6027e6c800d954ca0d9d9d7f3c1aa961a8a431f33f4bf23c774ec51513e2996a5bca2c390a6e201f30953193288ebbe85129879d57b7ac5eb4b0faee232379e SHA512 e3fae1620f21461b3bfe7af671c8cdf8e170bfaca7403ba042f6e030764fbe69d0fa8056c69e49df0d80fe7cf5ad1bc697eeada7c37dceb72b805970611c5952
+EBUILD qtwebengine-5.15.1.ebuild 4655 BLAKE2B 92d03f8320ea315b95b6a44a78a7825365bcc62634347d2b127badb07d42628c5400e78fa8116234e46d24c1f0249d4fa4c2d4f07713ce2abd907c5f10d5cb54 SHA512 34d2099fae9cbc8de9d4ec792f3ef116f0a3155f26903ad6e8db02b473a02fd40c5452c7b48751896237e9ca296cfffe3338664ed8401bfff5df1e1a28ef1013
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
index 2fa0f1bc3406..689f6885127e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	media-libs/lcms:2
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
+	>=media-libs/libvpx-1.5:=[svc(+)]
 	media-libs/libwebp:=
 	media-libs/mesa[egl,X(+)]
 	media-libs/opus
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 08807df5f3ab..4a80a5d52190 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index d2a51cf3e105..5b120310f177 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,6 @@
+AUX kdtree.patch 433 BLAKE2B 5c390ed1a44e474ec98eadff0dac4e87dd53e321da58567ad541cd7f9380da53fb464c3888e3c2829b94e152a508836f38f00a017713fb65650fdfe3c023e351 SHA512 ef26f59d7d7ed7c25a7dfe36588d587331c8d391be60c99640f40961512d9247640ba04007bed7bec927df53cbbbd2f83f091bc5a9170afe9198bc234bb99d2e
 AUX pcl111.patch 38649 BLAKE2B 8895cde34c315ba81f522d55fd6b692725ded70f7dbfd38d7e502b2303dd48041cd1e0bef1a685f204d82c9d42f76f3bf4b957c2859a97b761ee4b2790224ff0 SHA512 b745640d86c9b01a0c7d2777ac8c6a8ce81c9544ae7f74ea0aff7d31823c66eca47ac82ad150980b009d702113412501deed7c700d55a44d2307f4dce444be03
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_ros-1.7.1.ebuild 1033 BLAKE2B ef5a8708cf349a21b0956f8bcb8cab54955efb6ff57298979eb9c903534dbced365b2349e6694df0149871126583c78815c942d6d8459f76f8bb7c67d2977be4 SHA512 5e160e32e0d85079a670ed4d34a982a728cc0ad58245e6cfe1df5a827327551d7396f9f0e02f020ccbf414dd7b35da697c5d23b95c50de7f96640d0d2c2b7d78
+EBUILD pcl_ros-1.7.1.ebuild 1060 BLAKE2B b6a350f0a69e2f130aff3f250ae127fc101fe680aad813513c88b641990390ad236c71ec0cf1bcbcec9b536080d8e69b2fdd8297f725e5fb11ba73d8a54ab2b6 SHA512 f2ccfb8a3be08109ddf12c5ccef09a99c4f7b1079582fa3f750019027cfea75f735504da8ecce4b16335b7e5aad0442a62dcea2805eca8dfda7eadafadcc2269
 EBUILD pcl_ros-9999.ebuild 994 BLAKE2B 1c511a19b65338b27ecbe38ed5dc2301b0571271b56dc5d9b873ae6b43cdd6d385dae70fa7b4f33ddfb96aa40c3d42e30bb6fc8d74d047a0138b85f5cf8ce6f6 SHA512 8e642915515fd6b7016f8e23306f1cb95b6f753c80d7aebdd6531f398f9b1b2168ef932f00b717fbce5192f3c55039a53f7a8ee5f17d1115cc1346471050ebd4
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/kdtree.patch b/dev-ros/pcl_ros/files/kdtree.patch
new file mode 100644
index 000000000000..ee5571f07151
--- /dev/null
+++ b/dev-ros/pcl_ros/files/kdtree.patch
@@ -0,0 +1,12 @@
+Index: pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+===================================================================
+--- pcl_ros.orig/include/pcl_ros/surface/moving_least_squares.h
++++ pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+@@ -42,6 +42,7 @@
+ 
+ // PCL includes
+ #include <pcl/surface/mls.h>
++#include <pcl/search/kdtree.h> // for KdTree
+ 
+ // Dynamic reconfigure
+ #include <dynamic_reconfigure/server.h>
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
index 5d3ff3e64a29..a656236b0bc0 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
@@ -42,4 +42,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
-PATCHES=( "${FILESDIR}/pcl111.patch" )
+PATCHES=( "${FILESDIR}/pcl111.patch" "${FILESDIR}/kdtree.patch" )
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f550b63246a4..e5d0f55603d1 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
deleted file mode 100644
index a3069f0e7a08..000000000000
--- a/dev-ruby/pygments_rb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygments.rb-1.2.1.gem 1176064 BLAKE2B 7a6651606a433a9f15853ee06c3fe9a02d266f9441a08cc92c0db4ba679a97a2a25aaa4e96a621fbda0553e9b0c995ce53c6f828793f4937de12b3089f12963c SHA512 f0fc63ec028169872e28e2181c6a10c8a3f5e7f07074ba9f43475a0b5aa403a03d7045abb03433b600ef3d74c460556355b4ee64be598d3b93ddb1e0bb306259
-EBUILD pygments_rb-1.2.1-r1.ebuild 1587 BLAKE2B 978060ba494fae2ac94dd20fa4e5be0dab96ad632c6b3d9ca5ae3d47a24a8817548b0c63e9aa0121fec5937d69498daa8c42f5aa2ebd27e3223f8255dcf6282f SHA512 d9d1c730178f89971302092d7ad75fbfdb4c6a6bb2190ab7c58bab75230b11e193f1359f1ca4395dcc63a08b4f1bc06a1f22073e81d36f587357828c7892e8da
-MISC metadata.xml 342 BLAKE2B c4cab71f5d398ab14a8e95598f510c092fa2cb34fd6facf4c59289c8f78f601d585207eba1ba4822ac6552ae12375e4e786873a55d2a34d2e36c02fa72ab5b02 SHA512 aa104434e5ba9d5a27409be91ee791f898e72aa38632b3c185c09071632915686dd5a3ccb46c24c911468d29cdfed6c6421bdfb0119c28bd5c404be4b55bf789
diff --git a/dev-ruby/pygments_rb/metadata.xml b/dev-ruby/pygments_rb/metadata.xml
deleted file mode 100644
index 29c1a796cb32..000000000000
--- a/dev-ruby/pygments_rb/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>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tmm1/pygments.rb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
deleted file mode 100644
index c85551346487..000000000000
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-PYTHON_COMPAT=( python2_7 )
-
-RUBY_FAKEGEM_NAME="pygments.rb"
-MY_P="${RUBY_FAKEGEM_NAME}-${PV}"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
-
-inherit ruby-fakegem python-single-r1
-
-DESCRIPTION="Pygments syntax highlighting in ruby"
-HOMEPAGE="https://github.com/tmm1/pygments.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
-
-RUBY_S="${MY_P}"
-
-RDEPEND+="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND+=" test? ( ${RDEPEND} )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0.0"
-ruby_add_bdepend "dev-ruby/rake-compiler"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/s.files/d' pygments.rb.gemspec || die
-	python_fix_shebang lib/pygments/mentos.py
-	# we are loosing a "custom github lexer here", no idea what it is,
-	# but if we need it, it should go into dev-python/pygments
-	rm -r vendor lexers || die "removing bundled libs failed"
-}
-
-each_ruby_compile() {
-	# regenerate the lexer cache, based on the system pygments pkg
-	${RUBY} cache-lexers.rb || die "regenerating lexer cache failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins lexers
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index fd4a32d50cfd..52554f27163d 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -2,8 +2,10 @@ DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f469
 DIST tins-1.22.2.gem 306688 BLAKE2B c5b0aed29b763d37707de47a57419d9af934a0949417003707fd13a7e9e4a0d82fb905843ceac75a384c6ca9592471c15bc28ea63af4890ce54076f5c2f67d7c SHA512 6b93242d9c63a84de690c381086fd454714cdb0e82ce6eda4deb5d66a8b9ca4bbc5e2c502c258045b06aecb76487eddd019ca267b872717df36cdaf840ae97e7
 DIST tins-1.24.1.gem 306688 BLAKE2B 64020840eca05dc90402310d2f66a8af2a029954ae8f7b37275c257fc402cc7a6c4f75d8a8f506edf49531b6e1d16112db63094f76736e2e3ee213fb88c92b98 SHA512 3df7a43e63f42d48033410affc5b5990864c563c294678b9070bb4dc9c9d47d3783d4e8fc9c4280f6e00304781dae40585df73a8deaac1f228bfc5dadb961b38
 DIST tins-1.25.0.gem 306688 BLAKE2B 1dfbcfeea4fa88d1a227c5b15dce5f8fbf2bdd8b526d6ec6aae14a309bb8267c89e02b861e0f89c6b0f22638cfce5fde53b07f4bc61838530672b6c9dda2b95a SHA512 e8afd89f39647f0722db3128fdb4e826f8beac5f4c081a4fc95c6e8c9a59129f523af81f953dcffd513172c17173c6ffdc0ce2c215b6073c3b94659c998dc3d0
+DIST tins-1.26.0.gem 306688 BLAKE2B 0e3dc0a2493d95d4d32fd0f37c462cf37ad736b186ae5ee421570a9be7b8155b9d7b10d66ec748b22df99eefc31ccd8d1d7c22f8552d1e62a82f94991ee85149 SHA512 adb5e29420d13a0c147262bb4eaf5289c793795ea929a0e4e9e611658bf97e76edfdb008cff657719f497b0b146a23c497c8adb128014fba390389483e533cfd
 EBUILD tins-1.20.2.ebuild 624 BLAKE2B e01cc5c9685cc233eef19fbda20bc71eece5224684868b6e4cb5994b61540e90a8c75dbea2a69186d127fbc98489d08b08a7045941a6dd1002445bce5482974f SHA512 e4da5368edbc0f6efa2c0f6ceeaa26921bc4ac2fe89f8721daa90986b4b4444fc684c1b2ad515274a8110fabce6f89ca243e9400c816bae1d45575eec73fea87
 EBUILD tins-1.22.2.ebuild 598 BLAKE2B e07a09b9a60ff60d623ca8ed3ee86c0053566aff02610271b776aa0c90e78e1d5252e6bcc502cea6b989ec691d50b34fe68d8eb8e12d525a41c60abd6ef95f18 SHA512 1957b049fdef634bb43bdc3b197e5445cf70608dddac80190d1270e991de8eedcb949da4ab209658c96fd5b11b022c198ff37a1a5eed3d183c5f6508c9ead330
 EBUILD tins-1.24.1.ebuild 842 BLAKE2B 8d7a0334cbca086b1c1ffebd2f6ed0db3f302b6a670c6eaf12b21472b91ba4e02b32e9bff0e85f9c10483bdd2429e8e77ce615d572fb45e2309d8c1d6e53ff19 SHA512 8a404b386187e2ac21abb936c31f8d91dfaa282b0bf79fdb7ac7f8999e246fa5e58f46d0111f8c5285b8a983a1757731cf922b515eba34bbf52d586f1a09f8c7
 EBUILD tins-1.25.0.ebuild 849 BLAKE2B 8e2a3dadda4cda9331901acb3483ced17b1c17eaa3d5e46a98aea07203d218d7c0247617f13f1feb6936bb29f02deac44cefe641fa78dc661f3d2b45a86db605 SHA512 ca2cc4214b8c8a4f214c893af129aed0334aa5510bbc34cd3b49adfa31aa862e4f648af7da8eb76253a3c3739dc7760b2317abac53d6316fc07588124e36a114
+EBUILD tins-1.26.0.ebuild 842 BLAKE2B d52c83625b5dd10d7bfe866c252f1ec68254c170a50760f389008239171336e7ac8f5bf525067bba025d40765ac99fdf71726f691b78c88b81b3175d2af262d5 SHA512 db5fa43ec2f62233406e94b821b948d168e5d1ecea5253358adefab192f972577a231a923bdcfc8ddf7ca245b45e1733dcda7adc9f2436d01f555dbe14d4593e
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.26.0.ebuild b/dev-ruby/tins/tins-1.26.0.ebuild
new file mode 100644
index 000000000000..6b8cb7458da3
--- /dev/null
+++ b/dev-ruby/tins/tins-1.26.0.ebuild
@@ -0,0 +1,38 @@
+# 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="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Earlier versions of ruby bundled this dependency
+USE_RUBY="ruby26 ruby27" ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby24|*ruby25)
+			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index bfdc6b175ec8..3dcd07291da7 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/dvi2tty/Manifest b/dev-tex/dvi2tty/Manifest
deleted file mode 100644
index a03006e0bfcc..000000000000
--- a/dev-tex/dvi2tty/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dvi2tty-5.3.4-cflags.patch 619 BLAKE2B b8ee2f1eea314d5b0abd58ad49263969c55ed79cb801377dfbb16a18b9094e7fcef8f788bc7faa1b039f21cdb250268191135231849342f63ad1540667c2297e SHA512 3101de49093658beafa0c5c8aaea6c9f1228782e240dbf6f0040902b54beeb61ea6195cba939688bcb71c693ed90498f2bc400350c88280a0ddddeec6b6985db
-DIST dvi2tty-5.3.4.tgz 59519 BLAKE2B 0de24efec80a1d6254db904c498ebf4d6e638a19e3ca85f1092725050d4020a904bb8088946e10603ec4e6a0e6a0938245210af6af86dd2f03a42ab3994fa80f SHA512 5ad91f346d882cbe8a64e746aafec51dce208a01f83a058a86669a3eecb9546804831bf0b283553c54cfd751f0b08fda80343de0ebe78c6f86360d606a839877
-EBUILD dvi2tty-5.3.4-r1.ebuild 607 BLAKE2B 374a1c8dbf4156441ea499d0c9f4f2cb42448680347a6e6ad2ca34c19c962bb671f923f6c7f23575179262b8a5a61e663d126107e7608fb6a7a9fa7064111de7 SHA512 6080800ce2e339c84bdd7cf62da2ef557beceaa73a33a336ec17f93720c903bf667c4134c1e9881b52bb3fb2601293b84b7fa4a7e428defdbe0243776d507981
-MISC metadata.xml 351 BLAKE2B c005a720042536cdad9089ad0e8d4a96dc3c7519f469691b5e2388197211d024a90d476066efea3dc3ce6bfa367ca9f188270f910abaf9c37e283b123d967ea1 SHA512 0101264deff11ad3ac6f600aebb219fd8050ce76392655af100c280f68d1161cd5ef5827ccc395b7fdb74699eb8c30e174c79854e583ac1c0b953c868b70376d
diff --git a/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild b/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
deleted file mode 100644
index 12adae3a4ec4..000000000000
--- a/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.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 toolchain-funcs
-
-DESCRIPTION="Preview dvi-files on text-only devices"
-HOMEPAGE="http://www.ctan.org/tex-archive/dviware/"
-SRC_URI="ftp://ftp.mesa.nl/pub/dvi2tty/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-cflags.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin dvi2tty disdvi
-	doman dvi2tty.1 disdvi.1
-	dodoc README TODO
-}
diff --git a/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch b/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
deleted file mode 100644
index 3f1449012ca6..000000000000
--- a/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -6,11 +6,10 @@
- # This Makefile does not work for MSDOS. Make your 
- # own one, or compile by hand.
- #
--CC = gcc
-+CC ?= gcc
- 
--CFLAGS = -Wall -O2
-+CFLAGS += -Wall
- # CFLAGS = -Wall -O2 -fomit-frame-pointer
--LDFLAGS = -s
- 
- prefix = ${DESTDIR}/usr
- mandir = $(prefix)/share/man/man1
-@@ -20,10 +19,10 @@
- all:	dvi2tty disdvi
- 
- dvi2tty:dvi2tty.o dvistuff.o
--	$(CC) $(LFLAGS) -o dvi2tty dvi2tty.o dvistuff.o
-+	$(CC) $(LDFLAGS) -o dvi2tty dvi2tty.o dvistuff.o
- 
- disdvi:disdvi.o
--	$(CC) $(LFLAGS) -o disdvi disdvi.o
-+	$(CC) $(LDFLAGS) -o disdvi disdvi.o
- 
- dvi2tty.o: dvi2tty.c dvi2tty.h
- 
diff --git a/dev-tex/dvi2tty/metadata.xml b/dev-tex/dvi2tty/metadata.xml
deleted file mode 100644
index eba585c71c15..000000000000
--- a/dev-tex/dvi2tty/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d3a27e718f13..423d701726bc 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 3c45889fe4f4..a1751493d094 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -13,5 +13,5 @@ DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca9
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 EBUILD boost-build-1.72.0.ebuild 1997 BLAKE2B 3324ba02b442f04e3a5d46c42aeff5c860670797397f6d854590d7d63333e2feb9bf45b7a6ef8e36a520fcea8fd90f72123a13383cde2e61183577e76e44531a SHA512 3d5202a851bfccda98c8c72a080fc2e140b242640364dbdccba448de4a0cc0945a7b1d3ffc568e09e44eac1157168b0c36d9559bd1f8e561b369f71a3d79d72e
 EBUILD boost-build-1.73.0.ebuild 2005 BLAKE2B 65d0a35b6f6b602a58121b2a523c7ca0f585b68480a6dfef08bfa664bf11fc899810cfaac178429d81652162fadc55558b47d15a069099f2621fcc6575415749 SHA512 6749a4ebff4a09f8d6ab0db1299e0292f268c3a7b2f7f2fbdfd86861df1c152923a4e275d3284253a476dc74d7f7f92b46f5f424531d5eaee1b30268c79d20ae
-EBUILD boost-build-1.74.0.ebuild 2005 BLAKE2B 94ac8f0d07a8ca25a8ee5d21f659a4b7ed7d7537afbe38691c3e75675cfad25edd82893b553a8c2f720ef5590dc236266b3bf4709d6739a141fe1a946cf7d85b SHA512 f5ff365d0b832bdba137f463ae3c362ee412673cde9ce085ed664cb8b5f92aeb85830613ab337c50a1e26e110b8b3251284e96571f16ef338c325f37886bda40
+EBUILD boost-build-1.74.0.ebuild 1978 BLAKE2B e19a16ea85dbbf7c59f0430217718f9a23b38675b696aaccc73546e895519fed1970787774efb8b92f8a95e01538cff826f2f0c2fb690210fe05c8b07828f01b SHA512 afb34cf2f9141a3502bdaba09b80f130374673ba7ca39f3f95c946764127499dbeec56eabefc141786748f6ec46975f078251f4d3e47e80c56b844e59d55c5c1
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.74.0.ebuild b/dev-util/boost-build/boost-build-1.74.0.ebuild
index 40e1b4993f78..8801fdb3a595 100644
--- a/dev-util/boost-build/boost-build-1.74.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.74.0.ebuild
@@ -40,7 +40,6 @@ src_prepare() {
 }
 
 src_configure() {
-	hprefixify engine/Jambase
 	tc-export CXX
 }
 
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 7f42e7495854..4c6942e893fb 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
+DIST buildbot-badges-2.8.4.tar.gz 3983 BLAKE2B 24d77c179a2f3287f80b46b66abcc42897016f1094a0b5cfa36dc691be1e7d3c3c709f2c7f13c789bfcecb50d59788e5c8d660f45414855831f31892d34b63af SHA512 bfd11c0dedcf4586e73eff3cc158953d2d3eb8f75c7d900354381e962b5215ca52d2e14c5f20d558c3ae6068a680a4af17967ee7dd7d677a2ba8af2d9cf4e725
 EBUILD buildbot-badges-2.8.2.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
+EBUILD buildbot-badges-2.8.4.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
 MISC metadata.xml 761 BLAKE2B 5e3b300c2266a8f89672880260926a73744b83141b265f5a6e5ab11f9e2256165762d4371255d58a97c704479f281e160cb42e74269f35d4d623b2937fe8ff05 SHA512 72b794413f121ae9246da5fdf07b730c72949d84cac8fb881dabe31ef283d283afd83b62bcd71de7a6f92f247d07fb5d134f9945273032e2f21469bf9a030f73
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
new file mode 100644
index 000000000000..c59f1ad4227a
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 5da730e89d96..6c5c76b3707c 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
+DIST buildbot-console-view-2.8.4.tar.gz 18531 BLAKE2B 8d997e34eefea4be6bbbb33902b992a4864b601ef689cedbd7051667e5cab1ee45b13e2d5ad888af4a805ab1a60f0bc79439580583b3c3e233d321b52b28e0d9 SHA512 ccaa8b9ab18bd6e6609ab017ce4f2d447f99310b3448584decb8a572c573426bf84e6b86837f68b715863c66de013a8cad546e35dbbfb051c1c8d32a3825fe7f
 EBUILD buildbot-console-view-2.8.2.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
+EBUILD buildbot-console-view-2.8.4.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
new file mode 100644
index 000000000000..461db8d8fd20
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index bc281d9867aa..87d7308654ba 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
+DIST buildbot-grid-view-2.8.4.tar.gz 13510 BLAKE2B 97816ae90c06cbc3ac63920da4dd2e1152750181a5c23c59d3f227f46131228140e676328aa80741626ff071679dd8c9385f3895ce92d27ce6d0264afe299872 SHA512 dfeb454f9d9162e30e0ea8555a0978ecfad2266e1a9412e0633924ad44ae404144ae4a51b58fdca31fa54b67fe53bab57cac1f54926fee346decf90623f91f89
 EBUILD buildbot-grid-view-2.8.2.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
+EBUILD buildbot-grid-view-2.8.4.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
new file mode 100644
index 000000000000..d598731012b9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 821b254c9730..574118f3591f 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
+DIST buildbot-pkg-2.8.4.tar.gz 4772 BLAKE2B 08e1bdf7db8a4b1f007b12475937638575afa3e16511c28f24dab59fda88d83b03420b84d4e674aaf8e2e7962e80291f759fc7083424d3d96df2643946e8d2d5 SHA512 c5ca0c36315807bb458e16f4bdc015659b32e0c6047a067d5717251e6054249aa8a162873aa196b4fb6367c68a9a99ec3a698e861a5c70de1f81e90601b3467f
 EBUILD buildbot-pkg-2.8.2.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
+EBUILD buildbot-pkg-2.8.4.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
new file mode 100644
index 000000000000..24f94f8cc0d5
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 98b63aef0fce..2693581b5eeb 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
+DIST buildbot-waterfall-view-2.8.4.tar.gz 191026 BLAKE2B f81dea767bf881182eeb6eb750cdcf4bc289ac92097b9b8e13a5b5a237873aa4ea16f48625e56de2dc69fe849e5602d96a3d7991cdeb427dae169de5740f0bcb SHA512 c15b7bd23193742b50deaceb1810f8dbeedb77768f0d8a3d0a7bf72c89d914b963aa2141475464f9f3701881da6abed49e730ccb39d824a755ad9c567590dd7f
 EBUILD buildbot-waterfall-view-2.8.2.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
+EBUILD buildbot-waterfall-view-2.8.4.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
new file mode 100644
index 000000000000..8e4b9cc0d871
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+	KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 1ca9c4bdec2c..5bbd15c162f7 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -2,6 +2,8 @@ AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
+DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
 EBUILD buildbot-worker-2.8.2.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
+EBUILD buildbot-worker-2.8.4.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
 EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B a88900d63e3fb4e3b51e31b4736cacd7bc8f60a3aa7f27f6bd6200e9fa788147ad4073d5aea22ec55cc1a54148f87dda3de5f0953cac31f3152fba10d8399012 SHA512 79bdf14db42b15492932d100ee01c3bf043f7ad01dc72d35d68152d95601359aaee73b8661ada31d490218f5081465b7dac5c649aa2a704373e9bbe18426fa3f
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
new file mode 100644
index 000000000000..3bd934a50342
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
@@ -0,0 +1,126 @@
+# 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 readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 5c2abd7f7201..fa8f5037b364 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
+DIST buildbot-wsgi-dashboards-2.8.4.tar.gz 5588 BLAKE2B 3298edaebe2f9eb5e31f8298598e892d64d653648843e3c107710d4df3a24977bd3e77db06f7edecdf8d85bbbdeedfc66a75c6f3eef93ec8374d0df1973790dc SHA512 656f0626c8cad2c21d64ebc3eb4d6e1ac24a10909afc28819e54046be8e843a7383f3648a00a908cfddd9543767e1c3293825170d7c6c64c40a61bdcd55245bd
 EBUILD buildbot-wsgi-dashboards-2.8.2.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
+EBUILD buildbot-wsgi-dashboards-2.8.4.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
new file mode 100644
index 000000000000..f124a0ef5c54
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 0f2708e7f07f..eee71866de69 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
+DIST buildbot-www-2.8.4.tar.gz 3170166 BLAKE2B d3d5c8a6b4b963cffaa75035e2f4a076af27c9f816a8e80b346bdeade55f01c7c8403612b8e6d12036261dabe6ab4f05ddb7ffce4e7369565d361fe7b062f691 SHA512 8b698b8b99b3f9b51df0ce230c3d6e5dea8d1c1278cb7372edd170844ec46f7fe213be20db628da244cd38daaa53b1e2fcbffd3ab3980eee35ccc6a9824c7ae5
 EBUILD buildbot-www-2.8.2.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
+EBUILD buildbot-www-2.8.4.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
new file mode 100644
index 000000000000..c5f7aebcb28c
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 3a4da2068b49..984bf27784f5 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -6,6 +6,8 @@ AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f3
 AUX pypugjs-2.8.0.patch 3633 BLAKE2B de243262e4631e7ce3b3208d4f3acc7c7857375c4e938809d18ed65c1dcd2aa8abbdf0339fe278a329bc734220a21cf85f772b81e0284d42cf3c66599902a0e1 SHA512 c847026d0658d61ac617b7471a09fc0ae4f70fdf82bd1c79d460c0dfc9beb060081073b260aed2cdb5f2092746146dbe12787589f311bce6857a2769ccfa1e13
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
+DIST buildbot-2.8.4.tar.gz 3134447 BLAKE2B 67052a060c9951e584a5e94f36b92262b9a1956c22efbce7ac17d83f93edde3d9443b00a7bc3afc5918006d68cc023ea0ae913e7bbf0e7cede0d9345992f83ae SHA512 45a6e6116ab5fec18b9b3a6d54886bcf86d3a821a79fd151f9311c8c3646c61051a194250395e203f02b9aa0161e12a9ca54b623897c74eee6133df752f1742c
 EBUILD buildbot-2.8.2-r1.ebuild 7150 BLAKE2B ce82918388f2e96e42448bfab5e1ce342ba5399d6cef53d0143132413bc4740622c8902431d4f603ea2b8c6c6c73be682e15ac07b4da12892654f779fc417602 SHA512 ecbd1a1a60a7492e0390006360e790aff3df2b454131da427876595748b6f0d0afd4caab5aef993aed1e38b54271e04626c340830c35cdf7b450a70be019cf37
-EBUILD buildbot-9999.ebuild 7065 BLAKE2B 582634c656ab3f3b211c0894c3be6b7e96804fd4ce88fc0a3d640c5f40a4a01ee436cab144541ae3f0208b4ac8122ad5b0aff8605fc40b29b20e759e1bfa8aec SHA512 5f3182f5aed253d0605234d53879ef99fd23938033c50a86d5a3a96424a595720f4bbd91dcc2059954b0917f1c18624de345cbd6bc484df1f0b7178a67710a52
+EBUILD buildbot-2.8.4.ebuild 7245 BLAKE2B 78eecca70f1d93f2721bd7ec2d0dbd51b6881a0c742c56bcbbe79daad8c433d2716978281862021cb461d7a8275949786569580cb0d902a09ba8fa41a01d4282 SHA512 726abd002b948f8b3fcf5f7554825ea63aec36916a606bc3d5048852bb15bdcb7ecd112a32739dcea7c918d1718f8cace24d2957bc5cb13be4ab21580b60b44d
+EBUILD buildbot-9999.ebuild 7076 BLAKE2B c21d9658a745a9390000f3af726e6867308f697feedfed799ae2fc84c7887a7acf273d2371d596cd1301e5c5dae183ad77c2cbbf0207251da4936317adaaf3f7 SHA512 6a683e2d003b48052b1dac3cb912a8a9b3a4c99e0a4cabb8318c70bc8dca052dba439b5bc2f05039e47c66a4127f1d0c5d602073a470012dabde0f4943b53a08
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.8.4.ebuild b/dev-util/buildbot/buildbot-2.8.4.ebuild
new file mode 100644
index 000000000000..1912aad93d96
--- /dev/null
+++ b/dev-util/buildbot/buildbot-2.8.4.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+
+IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+		"${FILESDIR}/pypugjs-2.8.0.patch"
+)
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	# missing files, so skip building
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html || die "Docs generation failed"
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		HTML_DOCS=( docs/_build/html/ )
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index aab7babe0e90..5929de5695ce 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -55,10 +55,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		dev-python/pyenchant[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 47653be0f797..d30b5cb1f930 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -131,5 +131,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cargo-c-0.6.2.ebuild 3052 BLAKE2B 11938bbc982d09f87a2188fb9753de9a587db88f9bf5fb599a1b9d054844e4485442e46f28d6c52f098373e024a3dbf4e460f34c1a7152be0d7a9f0c252dfdd1 SHA512 6fc966ddd69206fdd868c29aa823ae12b76706c9f7cf596bbdbbe69eaabadd9467a564631b77615dd1554b2c061071083d526df7f0df113fe766bcceb3768ea0
+EBUILD cargo-c-0.6.2.ebuild 3051 BLAKE2B 049145dfd1f0ba27a92845082e12221cc9b04b5e6238ecff6490792ceb1861db0959224bba6e5c25bea273012724e420a23c95b4e6243d77c912e13b00936c35 SHA512 8b789d8bba907d3a46b17efc1471e8e8e25941b903727d5177994a0bee7904c5f5d73d332a9a940f37c1617c7d7879b5b4cc7c1f4ffa5d9c033d9b522f3e38d7
 MISC metadata.xml 326 BLAKE2B ec5622ca2c87640dfe5c409704f1674bc53ef0ce4d0778227d3816cd4a151f5f09e3de1f09814ce98f5e208e04a5cc0a6c28dd1b9bd81fa3857b688d8e9eebb9 SHA512 f28238739f1c2d04cb617ac31c2965fb110b560e5b9bbc6fa2749f22cd4cb353ef6cda1df1d718f165e4ae56f5bdf66da9104f6440d7d0009ba352a877c1f3c8
diff --git a/dev-util/cargo-c/cargo-c-0.6.2.ebuild b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
index 8888aa47a35b..9407e488e670 100644
--- a/dev-util/cargo-c/cargo-c-0.6.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
@@ -153,7 +153,7 @@ RESTRICT="mirror"
 # use cargo-license for a more accurate license picture
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="libressl"
 
 DEPEND=""
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 84340f7e012d..ba47c068ef0e 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,10 +1,4 @@
-DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
-DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
-DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309
-EBUILD catalyst-3.0.12.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
-EBUILD catalyst-3.0.13.ebuild 1921 BLAKE2B 4722d977737cd728eba8b6170c1a7a52a51b907db54dd2555332e2ebb0e0979d484a5292ad35f67110080570bfc09bf256e14c8c60ba1ab08bbd8bc838e51d55 SHA512 1c3a43f3df8d90fbf3572ef655a34b74563d2ead70b62b4cdf61be25deb58713037a813c622ee041d4071282901d6ee65b29e2fb1c6dcc15d43bc5d089c9d4d4
-EBUILD catalyst-3.0.14.ebuild 1921 BLAKE2B 4722d977737cd728eba8b6170c1a7a52a51b907db54dd2555332e2ebb0e0979d484a5292ad35f67110080570bfc09bf256e14c8c60ba1ab08bbd8bc838e51d55 SHA512 1c3a43f3df8d90fbf3572ef655a34b74563d2ead70b62b4cdf61be25deb58713037a813c622ee041d4071282901d6ee65b29e2fb1c6dcc15d43bc5d089c9d4d4
-EBUILD catalyst-3.0.9.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
-EBUILD catalyst-9999.ebuild 2197 BLAKE2B 4744840b79871f9a804cb70d550d99f7e98d6c37b8c6117457d1aefd99f00948e5be6bcd50e3f12b304d766acc8399db9061b5fe726a4e048f6ef2f5385f68a7 SHA512 9591efe950983a2c876f725af2cde13447206ea178bf1a62e8aa3365feaff7ae73aabc7e5c702c821b0ec3419d1951ac7b1ca0fcbb9d623ba5f0c561388ad1c7
+EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 76c621805e4cbb86e2bd52537091309fea71a6abef1190b274180210dbd6c363502d478d9c27f2981143e5068264e5b0b05633b857184e053669f11e44eba913 SHA512 be473d81fb31ae9aec8aa25608c426f98c877d4115a091c7fd7561e45e2dca3805c076b6eb088dee3988dc6925f186a67f3f951b5e75f2ea5d66014290d981f3
+EBUILD catalyst-9999.ebuild 2040 BLAKE2B 37f85c9694b24c5afe7c395b74c5da63f41822cf59d15f0e72397a5cec921da74711ff9d680c5ab6974f29a0e554ba83fad0fbbd8440c7015d4079ffbb508676 SHA512 8f97873e7b2f8c715ec2ba1f3ab3ba719307744f0c21662b9c304f0f0acafc05e1a20124d6627021bc66f0034eb6ff82e7e3ae91a1d44765077a4952935ee17c
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild b/dev-util/catalyst/catalyst-3.0.12.ebuild
deleted file mode 100644
index 39bbd3250f4c..000000000000
--- a/dev-util/catalyst/catalyst-3.0.12.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.13.ebuild b/dev-util/catalyst/catalyst-3.0.13.ebuild
deleted file mode 100644
index 644bdda69629..000000000000
--- a/dev-util/catalyst/catalyst-3.0.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 644bdda69629..09099da1323e 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
@@ -20,7 +20,7 @@ inherit distutils-r1 ${SRC_ECLASS}
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
deleted file mode 100644
index 39bbd3250f4c..000000000000
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2c7b1791e8cd..1edccfd19e6f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-r3"
@@ -15,36 +15,39 @@ fi
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 ${SRC_ECLASS}
+inherit distutils-r1 optfeature ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
+IUSE="doc +iso"
 
-COMMON_DEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+BDEPEND="
+	app-text/asciidoc
 "
 DEPEND="
-	${COMMON_DEPEND}
-	app-text/asciidoc
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
+	app-arch/pixz
 	app-arch/tar[xattr]
 	dev-vcs/git
 	sys-fs/dosfstools
 	sys-fs/squashfs-tools-ng
-	ccache? ( dev-util/ccache )
 
 	iso? (
 		virtual/cdrtools
 
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+		)
 		alpha? (
 			dev-libs/libisoburn
 		)
@@ -65,20 +68,9 @@ RDEPEND="
 			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
-	)
-
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86?   ( >=sys-boot/syslinux-3.72 )
-"
-PDEPEND="
-	system-bootloader? (
-		>=sys-apps/memtest86+-5.01-r4
-		sys-boot/grub:2
-		sys-boot/shim
-		sys-boot/syslinux
-
-		amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-		x86?   ( sys-boot/grub[grub_platforms_efi-32] )
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
 	)
 "
 
@@ -100,3 +92,7 @@ python_install_all() {
 		dodoc files/HOWTO.html files/docbook-xsl.css
 	fi
 }
+
+pkg_postinst() {
+	optfeature "ccache support" "dev-util/ccache"
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 325f1a2aed79..ddb995986711 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -24,7 +24,7 @@ DIST cmake-3.18.3.tar.gz 8976093 BLAKE2B 266432f8647828359e0f1a4390d62ac6449fcee
 DIST cmake-3.18.4.tar.gz 8976659 BLAKE2B b121a641f5470c5e210bd0ee5506cdc2165ad186074b54bc81de72f36ff6b5748fe846794eff16a13c52e98ce246561fb1aab0f0fd1fdcf9173c4bdacd9cbb8f SHA512 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
 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 6137 BLAKE2B a737ed4c77660114663add7e6323f4746b115be55b6071eed6c25f18fbf01b46048a421a86540b70926d95cccf9d3de9beb48c9410c81c8d1d5e062b9873783b SHA512 6090ef6fc1599d75cab84eb6c4a1b0a32272c7e6121dfb0064e08af7501c4f0a2737328a58532fcf7cb2b0e45a79e4cdbb12a38c4f7ba46d09a8e1fa90685ca8
+EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185ff2aa25e8b5ca9f12ffc57ba65a2906de692977c722c8a29f524169b72ff46ee7226ec8ba9d81f36c90357ae149 SHA512 c836b5851c424b9880967c248605cc1ba1e992946a1ba96f0622695902303bb40b1c0d6d015fb17dac7778b1fa388d277c9dfe964cfd0796b48c93fe8badd426
 EBUILD cmake-3.18.3.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.18.4.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 51f29857f87c..27718c8a18dd 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/doxy-coverage/Manifest b/dev-util/doxy-coverage/Manifest
deleted file mode 100644
index d2b0fd6de1de..000000000000
--- a/dev-util/doxy-coverage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doxy-coverage-151229.tar.gz 3633 BLAKE2B 02e99a841294ec9acdef1a85948d39bd1c8c5a39cc66e1ed48734ba3fd57a5bb027b4b44675d1bafc0cb42777ddd94f17cf99b8c8cc86c61f23c331653e43b53 SHA512 897c36adb6551ad177429d771b6eb7871a8b024d3cb5915d412b13f92cf8e52b87ba3237093345d51fa5dfbf80a800ab69907518b1a5570d1f056a2de43353fe
-EBUILD doxy-coverage-151229.ebuild 639 BLAKE2B b23e7faf5457d00accd5cf86f97601aef1347371291aa9db9be81166dac7e50a311bee946e222caabf430bd4a18f790f34ded7085a75812d023fb7e679ed5b3a SHA512 31dfa6b729ab9a69a6ef53a354c63388fd57dd66275112dda4f5fbab29d7191821d2fd80b5261f3c3ad667709f0848562d028f5c42e8d25521e587bf2eab2156
-MISC metadata.xml 405 BLAKE2B 90494442a57563acf15505d646a7311b568980bfeb0f02a09d079e0be2f83d2e0d04331a3f18c38db6e06f3f89ce8256f586af9497431a3e57e7c2c2e517e8ee SHA512 770c698b430f7c7bd93f0dcdbcdb21128da96680825c72e00e7607e8b68e4d159e63bb3f752e168b94041e1e1257bbacaeef11ce0161ad7c1803b211e1ed1580
diff --git a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild b/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
deleted file mode 100644
index 06ba7c658193..000000000000
--- a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
+++ /dev/null
@@ -1,27 +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-r1 vcs-snapshot
-
-COMMIT="29a0bbf43bfecb6872cdca0e4a11733954d25196"
-DESCRIPTION="Source Code Documentation Coverage Measurement"
-HOMEPAGE="https://github.com/alobbs/doxy-coverage"
-SRC_URI="https://github.com/alobbs/doxy-coverage/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	default
-	python_foreach_impl python_newexe "${PN}"{.py,}
-}
diff --git a/dev-util/doxy-coverage/metadata.xml b/dev-util/doxy-coverage/metadata.xml
deleted file mode 100644
index 9e05095ffffb..000000000000
--- a/dev-util/doxy-coverage/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lobbs/doxy-coverage</remote-id>
-		<bugs-to>https://github.com/alobbs/doxy-coverage/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 0e3a8cc26211..6b67ae6cd9ec 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
-EBUILD gdbus-codegen-2.64.4.ebuild 2203 BLAKE2B 0a90d086b969979fe5a05fdc64b2024e40a1ab7b324511d99938b9eba2411fea9143e065425d35d6ed4d51ba35aa8c038931087149fd2ad342e99219d0a26586 SHA512 6203b819948ec11d8f7c54720fb486d02bc32c2cf03485d8000ae7769238fd81885d5cec4b04a8afe613635329923779b2a31457cfd89035e9b15ba82899aeb0
+EBUILD gdbus-codegen-2.64.4.ebuild 2202 BLAKE2B c573e0cb2cb75f7642164fe4fbf774080d00c3fe9bc7131a0ba74a1af52d7f29ca9f8854790f5e7066b67ae43066a64dc7175fefd690a9365fee09156a3a9c0c SHA512 7ec764552733548b922beb3f657bfa9f1c264578bdaaa76f47dd0f8a668d9c6447bcfd1e2d169ac20642d512af6c84bb86e0c80c652e4168ee274cf1e199c4ce
 EBUILD gdbus-codegen-2.64.5.ebuild 2205 BLAKE2B 872daa764448aa62fc772b093925a728e93753eba5fc5f744a538a54c9bd768327c39c8213ccd4345b82c4d10e850a408be4a376d34245ff45aa6969bd0bd3bc SHA512 693855710cd8d6aa0bb0df70357b45766e195411f736184583e4185dcd5bfe7b24dc5fae334923b81501310c0edf07defd715412c7689adc1efc23bcc53240ef
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
index 89884a3a7129..76616a6792ac 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 442997eac389..e30e64033f09 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.4.ebuild 2392 BLAKE2B 476a8576c9fefdee405d0b50dff35b0f8a129bfafee709f76183a2fc291571f0979d7e02a4d0eaaa03e26387c42eda2b5af41293bf7ec5edd3ef816998a98b61 SHA512 68a0504dc5838d35df675774b5f862e7c7cde323f3060576f0200469d21134daf84404618844ea501812d081a9826e9f9b42aacb0ff5ecd3149bacd24ec9fb69
+EBUILD glib-utils-2.64.4.ebuild 2391 BLAKE2B e44548f92f09f02221f4bea2aa072fb288e465deb85157377d8ec0c540e0e5b9c3b81823755a6621032e944a5dafe1da791ea28d0837fbeb90ecb488da4d23a2 SHA512 9b03b387b3e8a422393cf82f5ffb8da15080d56359f89586650be72bed5bb59b5d0e3b5b44f4994df9ac0c93d4c59224e898a2eec71344fe497441fba7a784f0
 EBUILD glib-utils-2.64.5.ebuild 2396 BLAKE2B df033f1b3075ad88cb03ab9f275f56b7651307c654ec3483c254406f9ed0c0abf1c5b2b9d05408d58779db204e73870f7da6df8005c4bce79528945e465ed508 SHA512 178ab27c2ea2e44506ed55f82f816efa78da7f5141e3705cbc895bd4afd3c2e7606e3155d5d764ea2d9b5d3884aaf1ea10fc7201e66f8418874ee74095579c51
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.64.4.ebuild b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
index 9ca1d0e8da9d..9b7ee5fd695e 100644
--- a/dev-util/glib-utils/glib-utils-2.64.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6b7dcf468656..d0839d5dfacf 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -7,6 +7,6 @@ DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
 EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
 EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
-EBUILD glslang-8.13.3743-r1.ebuild 850 BLAKE2B ca39084529e1abb033d376c0a14a8855dc025ba38923c57edcfd3e639996bf9185f9470ac56e9c3e9003e326e355b28b5cbda2088aede1b1edd431e7fdc0b608 SHA512 110e13357d76751885006de01def023452f87dffb044b61220199c7074ebca21a5d849f45e423cef675c616738fa6a088e0bec4ec4117202bcb70924dd7e4230
+EBUILD glslang-8.13.3743-r1.ebuild 849 BLAKE2B 1d1c72d989d355232f47950c46c56ce92b3b78c12f1d6d9bbbc382f868b5534723037a8e03f1b65add39ee352fe37559a48092577b41b60e230cf9574b017c58 SHA512 e4bc4ecace4c588b787c40b959660e7fb93be18210aedb712e7cdc4ab0153067124d138286747f99f7eaa68083e3be977d5605349dca54ff1710963578cceb85
 EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
 MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
index 2714fd704bc0..09634fb83a93 100644
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index c5ace0c630ea..79294279ddd9 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2553 BLAKE2B 6f61412042686035c1bee011016aa814a35a9af1071d783fafbf6da5c277e0af41463dfaff1ac4c9fed4034f5af9126b88f15b67f0bf4659fdae80a188140a54 SHA512 b5bcc057ca0d04ed452b97a8bc73df0cdbd4853c619cb1a6b65d6a406e0631c1e85b243df688b9f7c82f1fbcd56cc2c8c84a15a13192aaeec52403e406453052
+EBUILD gtk-doc-1.32-r2.ebuild 2552 BLAKE2B aeb6c06895c254a4f7eb08667960384cf6f9d0ced0398a13b4d2081239875d33da45e7ca24999e5e34aa628aa5e0544a700f516aed87de060645ecf6a22b5c0e SHA512 18ff21592cef9984cf265129618b8e7d851c704e4b417f0d53d44efc2839f1dd61d1c00d322ff2e6a5671028a2ed96077f6771daaf185b975e8c022084ec91db
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index a772e4e095ff..e9d4fcf797ab 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 75e83775e43b..a5a917dba8fd 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,7 +1,9 @@
 DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
 DIST howdoi-2.0.5.tar.gz 23910 BLAKE2B aace040311845cd8c958d5186ea804a9b0d746694563e2acebd2dbc5630ccbeff66c8a1848245b0f4c127ca611218a0b56e4051d6991e8cd796017a8b5022c46 SHA512 5ad8a99758774c28b26afe5a5ee0f1d2fd6f8ea1afcae5f29b3a02ab3c25758b8cd8aaeccd3afd10a3d02495c6616966cad5da03327c94979e89fc3c601bd367
 DIST howdoi-2.0.6.tar.gz 25113 BLAKE2B 0b83b28d1d0a75a20e49fea0bdd0b3eebae10fee17b2ca195289b8ed014befa7bf17a3c8221dd90d0a2de166f9fab9be24619aa24c886120f2f1d2ee4afe0d84 SHA512 3153ec28f5c3c1c78b786a50da3a328586dc05f5a6fe0bcb33621baf13ae8cda55e15c3538c772dba309cd5a24f631c36c09924ff535cfc8494743b631e01fb5
+DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
 EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
 EBUILD howdoi-2.0.5.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
 EBUILD howdoi-2.0.6.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
+EBUILD howdoi-2.0.7.ebuild 689 BLAKE2B 29f1642be822e240bfb107a4e537dd767c3913312ef1ebb95531c8279ead5fcbe4a699d42b5cfa8fe88b6ad5299fed798beb1d45a369eda918ca185bfd706031 SHA512 45c2c8b3bc67b23c6297156da4d26592e5aba510baf5ec315aad927d55c60f2eda99ea967b04afc0feb3a5c2d3fcdfced5916e8a437dd58f45650561cdb1d6a8
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
new file mode 100644
index 000000000000..ded420b714d1
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="https://pypi.org/project/howdoi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cachelib[${PYTHON_USEDEP}]
+	dev-python/keep[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 8508a42803e7..56f94e2a510e 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 1734 BLAKE2B 9e451e9732dc6f034c8427d92b14edb0c10259286ac821eaaf7f11decabff54861db7e939ca6dd46744e3bf438d0e24f5962952debf8d2db00050e1e0f6cbaef SHA512 cc2a319dad42642666e36c32dcf93740bf1f124c5becb90773564a3db49be49c08e970152ba0763acb0365f43355ae33d309f0d0e6f159065411697cd6ae90da
+EBUILD kbuild-0.1.9998.3407.ebuild 1733 BLAKE2B dc5061e34ec9a0029cf9e3ef2b5dfb5febeec4b0aa7dccf0ccfe3f23453f518cf8f8d38755b100428eee7904e7eb2ab5d335d63ed40e3483c9752cf65fa1be80 SHA512 2a9068af1f65acf8e92977f9610db700a9dfc42475a83d8a9dc1234d260eb80464cc83f7452886b3012a99cde773893660dfc80f85fa701975e54bd92f6ddbda
 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 80d8104de03a..bad5450abfbb 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/meson/Manifest b/dev-util/meson/Manifest
index 21291771dab5..f04734c840d6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,8 +1,4 @@
-AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd49c23867440d182d427a9a569bcd6852c5007675fde77724f6e05d1a4beb371fb0b474e8aeec2dbae0a7e8ca3a78b8 SHA512 1251222bc107abc1b5b0acfa6c52b4bfcdd47baf2651b291f162b39d384b61383627a7ab4d925ad2df1f36307e79e4806c6e05eb889e98a58688657e40ada29a
-AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed
-DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
 DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
-EBUILD meson-0.54.3.ebuild 2405 BLAKE2B 3aa48813a3a17a008558606a36b8bb96bc8476e5d6de900b112e3511508f894692e600670383ce3920c6690df1e785cce39ded1589c034a092b564f9bfac03e8 SHA512 41aff80d144a6b19efb255bc1c2a05039256e4423b0bfb0f6f1f098bed677fdd554cd3498e6cf2d01d35f81f2a302ce1424b7b8d0860aed21aa984ea52c9296d
-EBUILD meson-0.55.3.ebuild 2278 BLAKE2B 045f107ffb222bf43c03cbb411185f01a2884487be582f71145e8825f58a2ea5c276fdc0abb8a56482bc5b434c469defdd3d41930fcb54bbd41c237a6cf18dc2 SHA512 ee61bbb5c59b2196f19b90f16df495a91161a20b682cbc861f24cfedd10544e22be0c182512811b548cc6477e9a6e6afc761390dedaf9d9a64a0c342016b22ce
+EBUILD meson-0.55.3.ebuild 2277 BLAKE2B 7a1ce68178a9fa08fcc8138c5b4fb914236e8673c66a9a55c23f86c6ec3c1ac09e46abe9ef4d069d08566c9c87308891886267552014cd8ea387068f4664cd24 SHA512 0e8164a4ce931f22ea681dc968b5d398a6dd28965487a065819e647d41e89f556620367eba58168caf095f439db1c55bf0e55f6a8c8bcaea0690bc0a83e01d83
 EBUILD meson-9999.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/files/0.54.2-multilib-clang.patch b/dev-util/meson/files/0.54.2-multilib-clang.patch
deleted file mode 100644
index b3aa3693e697..000000000000
--- a/dev-util/meson/files/0.54.2-multilib-clang.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 9dc3ca2c1c9fbb47e731551c6432df144f725261 Mon Sep 17 00:00:00 2001
-From: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
-Date: Thu, 21 May 2020 18:58:47 +0300
-Subject: [PATCH] compilers: add fetching of define list for clang
-
-Simmilar to gcc, the list of pre-processor defines can be fetched with
-`-dM -E` option. The way cpu_family is determined on linux relies on
-this list.
-
-Fixes incorrect value of cpu_family on linux, when crosscompiling:
-
-```
-CC="clang -m32" meson ./build
-```
-
-Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
-Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
----
- mesonbuild/compilers/c.py            |  5 +++--
- mesonbuild/compilers/cpp.py          |  5 +++--
- mesonbuild/compilers/fortran.py      |  2 +-
- mesonbuild/compilers/mixins/clang.py |  9 ++++++++-
- mesonbuild/compilers/objc.py         |  2 +-
- mesonbuild/compilers/objcpp.py       |  2 +-
- mesonbuild/environment.py            | 26 +++++++++++++++++++++++++-
- 7 files changed, 42 insertions(+), 9 deletions(-)
-
-diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
-index 1bc9e84998..aac99b4269 100644
---- a/mesonbuild/compilers/c.py
-+++ b/mesonbuild/compilers/c.py
-@@ -86,9 +86,10 @@ class ClangCCompiler(ClangCompiler, CCompiler):
-     _C18_VERSION = '>=8.0.0'
- 
-     def __init__(self, exelist, version, for_machine: MachineChoice,
--                 is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
-+                 is_cross, info: 'MachineInfo', exe_wrapper=None,
-+                 defines: T.Optional[T.List[str]] = None, **kwargs):
-         CCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, defines)
-         default_warn_args = ['-Wall', '-Winvalid-pch']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
-index f4bcfa9f89..478a68c13c 100644
---- a/mesonbuild/compilers/cpp.py
-+++ b/mesonbuild/compilers/cpp.py
-@@ -155,10 +155,11 @@ def _find_best_cpp_std(self, cpp_std):
- 
- class ClangCPPCompiler(ClangCompiler, CPPCompiler):
-     def __init__(self, exelist, version, for_machine: MachineChoice,
--                 is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
-+                 is_cross, info: 'MachineInfo', exe_wrapper=None,
-+                 defines : T.Optional[T.List[str]] = None, **kwargs):
-         CPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
-                              info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, defines)
-         default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
-index c155b5b4f3..af83c0e564 100644
---- a/mesonbuild/compilers/fortran.py
-+++ b/mesonbuild/compilers/fortran.py
-@@ -424,7 +424,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
-                  **kwargs):
-         FortranCompiler.__init__(self, exelist, version, for_machine,
-                                  is_cross, info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, [])
-         self.id = 'flang'
-         default_warn_args = ['-Minform=inform']
-         self.warn_args = {'0': [],
-diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
-index 1c0ee452f4..0ee10ad5d5 100644
---- a/mesonbuild/compilers/mixins/clang.py
-+++ b/mesonbuild/compilers/mixins/clang.py
-@@ -42,9 +42,10 @@
- }  # type: T.Dict[str, T.List[str]]
- 
- class ClangCompiler(GnuLikeCompiler):
--    def __init__(self):
-+    def __init__(self, defines: T.Optional[T.Dict[str, str]]):
-         super().__init__()
-         self.id = 'clang'
-+        self.defines = defines or {}
-         self.base_options.append('b_colorout')
-         # TODO: this really should be part of the linker base_options, but
-         # linkers don't have base_options.
-@@ -56,6 +57,12 @@ def __init__(self):
-     def get_colorout_args(self, colortype: str) -> T.List[str]:
-         return clang_color_args[colortype][:]
- 
-+    def has_builtin_define(self, define: str) -> bool:
-+        return define in self.defines
-+
-+    def get_builtin_define(self, define: str) -> T.Optional[str]:
-+        return self.defines.get(define)
-+
-     def get_optimization_args(self, optimization_level: str) -> T.List[str]:
-         return clang_optimization_args[optimization_level]
- 
-diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py
-index 52d258dcdb..d351c8826a 100644
---- a/mesonbuild/compilers/objc.py
-+++ b/mesonbuild/compilers/objc.py
-@@ -86,7 +86,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
-                  **kwargs):
-         ObjCCompiler.__init__(self, exelist, version, for_machine, is_cross,
-                               info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, [])
-         default_warn_args = ['-Wall', '-Winvalid-pch']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py
-index c8b422b35d..10555b4551 100644
---- a/mesonbuild/compilers/objcpp.py
-+++ b/mesonbuild/compilers/objcpp.py
-@@ -84,7 +84,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
-                  is_cross, info: 'MachineInfo', exe_wrapper=None,
-                  **kwargs):
-         ObjCPPCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, [])
-         default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 8fad6288b1..cb6ae7d514 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -726,6 +726,28 @@ def get_lcc_version_from_defines(defines):
-         minor = defines.get('__LCC_MINOR__', '0')
-         return dot.join((generation, major, minor))
- 
-+    @staticmethod
-+    def get_clang_compiler_defines(compiler):
-+        """
-+        Get the list of Clang pre-processor defines
-+        """
-+        args = compiler + ['-E', '-dM', '-']
-+        p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
-+        if p.returncode != 0:
-+            raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)
-+        defines = {}
-+        for line in output.split('\n'):
-+            if not line:
-+                continue
-+            d, *rest = line.split(' ', 2)
-+            if d != '#define':
-+                continue
-+            if len(rest) == 1:
-+                defines[rest] = True
-+            if len(rest) == 2:
-+                defines[rest[0]] = rest[1]
-+        return defines
-+
-     def _get_compilers(self, lang, for_machine):
-         '''
-         The list of compilers is detected in the exact same way for
-@@ -1043,6 +1065,8 @@ def sanitize(p):
-             if 'clang' in out:
-                 linker = None
- 
-+                defines = self.get_clang_compiler_defines(compiler)
-+
-                 # Even if the for_machine is darwin, we could be using vanilla
-                 # clang.
-                 if 'Apple' in out:
-@@ -1063,7 +1087,7 @@ def sanitize(p):
- 
-                 return cls(
-                     ccache + compiler, version, for_machine, is_cross, info,
--                    exe_wrap, full_version=full_version, linker=linker)
-+                    exe_wrap, defines, full_version=full_version, linker=linker)
- 
-             if 'Intel(R) C++ Intel(R)' in err:
-                 version = search_version(err)
diff --git a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
deleted file mode 100644
index 1fe2e1ac4cc1..000000000000
--- a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bz-attachments.freebsd.org/attachment.cgi?id=204611
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238128
-
-Stripping RPATH on Prefix is really bad, because it means the default
-RPATH entries disappear, and any installed binaries don't work (get
-kernel traps).
-
-Extracted the minstall patch from the FreeBSD full patch.
-
---- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -488,8 +488,11 @@
-                         printed_symlink_error = True
-             if os.path.isfile(outname):
-                 try:
--                    depfixer.fix_rpath(outname, install_rpath, final_path,
--                                       install_name_mappings, verbose=False)
-+                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath, final_path,
-+                                           install_name_mappings, verbose=False)
-+                    else:
-+                        print("RPATH changes at install time disabled")
-                 except SystemExit as e:
-                     if isinstance(e.code, int) and e.code == 0:
-                         pass
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
deleted file mode 100644
index e91ba990d3a4..000000000000
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2016-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"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.54.2-multilib-clang.patch
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3.ebuild
index 5c297d702c6e..ddf27ccdc725 100644
--- a/dev-util/meson/meson-0.55.3.ebuild
+++ b/dev-util/meson/meson-0.55.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/mpatch/Manifest b/dev-util/mpatch/Manifest
deleted file mode 100644
index 3ed4a2b9cd85..000000000000
--- a/dev-util/mpatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mpatch-0.8.tar.bz2 115774 BLAKE2B 3fc3f14e3ee4e8506685b04fcaa434326f550d07f247a8fa2b8afacd7496566fad70a479049f6b65ae572ff77326eb4a506ec458b2c6b7ce73b7afb9f463e6eb SHA512 1a05d23c923e29cc87dcc0994affd87b9b0b9257f2d410fb28ed2fe5337676274e9c8548df286a81479afa231a80805ac09f3e0e9b6c8942ebef443fbc4f96f1
-EBUILD mpatch-0.8-r1.ebuild 583 BLAKE2B 5f05f06c56afff602ec573b916d89cac57c6bc6d0c460315b1b2e90eafb25bb1dd4bb5a855f396bde321a705f124fbcc9325331b0ab3de9959b8281dde4090c1 SHA512 d4f0431040ace5d36ef47ebbda0f6de511f1ba6cc05a99db812ef32d5934bcde6502089d1628f3dcf6112b5f86e306c8e1cba66dd27693182cc4b524d37fd27b
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-util/mpatch/metadata.xml b/dev-util/mpatch/metadata.xml
deleted file mode 100644
index a4e0d354f696..000000000000
--- a/dev-util/mpatch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
deleted file mode 100644
index ae679e718905..000000000000
--- a/dev-util/mpatch/mpatch-0.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Patch-like tool which can resolve common causes of patch rejects when applying"
-HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
-SRC_URI="http://oss.oracle.com/~mason/mpatch/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	dobin cmd/qp cmd/mp
-}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 2a2497d58d11..75f1424b4aaf 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,6 +1,3 @@
-AUX re2c-1.3-lexer-overflow.patch 1244 BLAKE2B d9f51ea520ca437f4a1cb9c9f788d0c5c76d48358ee2c9d8a821c40c53d7df8e34f97cfda0ccd17e4220600043349afb9d737a2444d58ece8d381f1d30807855 SHA512 19a9011c58107c136ef49a51a712125274f841f884ca76c5f2e25464b24c3a6477ff45752df20c5f508e21a2a55c7f4ce19bc6c7d9b7baecc07fced76ce87de1
-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 774 BLAKE2B c681d0ccadf62ce7c32c04c46c73465c987a1818923815105b8f2ce1d23868ff044a2fb563db5f6e3c5d4ac0def1bbc2555268b65bfc74e4b061b527f2ad5e26 SHA512 5f31f447e7fc23c2cd0b9877f3664a58db197456a7342f1d31974ef79a270d10db0c1db5c4901ac13f16c32b5af0e19bd6626e1f492902bf80580a8d21c3dd63
+EBUILD re2c-2.0.3.ebuild 773 BLAKE2B fcf5a6abb8c8cc2f660f66c8ffde26869b3083ee0e4d194d8f789d123c8dbc9134b3b0fa24f568b27ef08db2043395aeff3e6eb0291587c7e8c4934c50e09da4 SHA512 2f36266f0db7c19e75bf10ac7c92a0da6568b64db782afe13cee0852fed1733b7e66d0189ed4eb8cabe7449c3f91b83144c648e52df39569b0c1f450bff12d8c
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch b/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
deleted file mode 100644
index 4222ef430c32..000000000000
--- a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/718350
-
-From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001
-From: Ulya Trofimovich <skvadrik@gmail.com>
-Date: Fri, 17 Apr 2020 22:47:14 +0100
-Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo).
-
-The crash happened in a rare case of a very long lexeme that doen't fit
-into the buffer, forcing buffer reallocation.
-
-The crash was caused by an incorrect calculation of the shift offset
-(it was smaller than necessary). As a consequence, the data from buffer
-start and up to the beginning of the current lexeme was not discarded
-(as it should have been), resulting in less free space for new data than
-expected.
----
- src/parse/scanner.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/parse/scanner.cc
-+++ b/src/parse/scanner.cc
-@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need)
-         if (!buf) fatal("out of memory");
- 
-         memmove(buf, tok, copy);
--        shift_ptrs_and_fpos(buf - bot);
-+        shift_ptrs_and_fpos(buf - tok);
-         delete [] bot;
-         bot = buf;
- 
-         free = BSIZE - copy;
-     }
- 
-+    DASSERT(lim + free <= bot + BSIZE);
-     if (!read(free)) {
-         eof = lim;
-         memset(lim, 0, YYMAXFILL);
--- 
-2.26.1
-
diff --git a/dev-util/re2c/re2c-1.3-r1.ebuild b/dev-util/re2c/re2c-1.3-r1.ebuild
deleted file mode 100644
index d90e052b5214..000000000000
--- a/dev-util/re2c/re2c-1.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=7
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-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 ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-PATCHES=("${FILESDIR}"/${P}-lexer-overflow.patch)
-
-src_configure() {
-	econf \
-		ac_cv_path_BISON="no" \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r README.md CHANGELOG examples
-}
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
index e8aa23e7afd3..aba4c616a4d6 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/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index 34173fe32d46..ca9348f1d584 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,5 @@
 DIST rpmdevtools-8.10.tar.xz 94976 BLAKE2B 290044a511f77111487cef40b6b9bd706f0bf6b2b65681a931839f1fd00aa490c106492de35643c8a7218762e4e92c9bd44a42d8976472c15748d9ad94f0d5c0 SHA512 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57
+DIST rpmdevtools-9.2.tar.xz 95528 BLAKE2B 2485b4a1f27bc07b2c865804829fe2692383d54ce976d32919ee717b52b32aec93c1e50382e8e74cdbb630fda1655d68c840057e61428a45ab40ac31bc5b4ae1 SHA512 fbfe1123421775eb892776362f39144ce0e7c6519bdf23c7d9eb746c867d998d6a0ecce376ceaffec82e786040e41f2494dbec3170af1fa74a204447a4965fff
 EBUILD rpmdevtools-8.10-r2.ebuild 779 BLAKE2B b44952742569fdeb7514f68cf42ef252b7c5d5050cd240197ca644dc7b8c888f35b12e41463774ad2e4103a73946fb296d853cb4b4a1e7c39479b8a8454c05a6 SHA512 9d75dbbe5faa94447d143724235fb16e3d07f1fe95720e5ba6af9a2355bbe3c02b1ec538c2b1cb2472c593459c7eadd7f1dfb3981c2013055ddb316f5cd45bb7
+EBUILD rpmdevtools-9.2.ebuild 891 BLAKE2B 91f841ff8aa752ace9cd06f3c9928151eec8116bcac01fe8c6b6b9a16fa9ca4c312e7fa49aecef85854822449d6b5355a9e8dbac6afee8743adf990a683f6cb7 SHA512 a6b1e1fbf2c8647f38cbb68012fe2eae7a3ab3b475585554a1229047d62f0b3cc9b72fde8e211564fab96eb6f5273dcc1c14f79def884e1b13e4a5f2b4d6d557
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.2.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.2.ebuild
new file mode 100644
index 000000000000..d3360b839191
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-9.2.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} )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+	$(python_gen_cond_dep 'dev-python/progressbar2[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/requests_download[${PYTHON_USEDEP}]')
+"
+RDEPEND="${DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+BDEPEND="sys-apps/help2man"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{bumpspec,checksig,rmdevelrpms.py,sort,spectool,vercmp}
+}
diff --git a/dev-util/setconf/Manifest b/dev-util/setconf/Manifest
deleted file mode 100644
index 32757713abd4..000000000000
--- a/dev-util/setconf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST setconf-0.6.6.tar.xz 12620 BLAKE2B 2882c50430a65e6947135808f87674c19bb8a57d0f5ecbb9d3e316b203b359bb79503b1e68931bfac04e52d3d0686fc11f0c74aa4d84797a0d44f8989c26b4cf SHA512 28f62b4dbc5883763cd11480ca059dd8ba120d6dfd964bbf1746ec5cb23fb0f0fd949249f77673d150cb6abd0039ff6f34d79ad744f8abcc765e0af37fbb85ff
-DIST setconf-0.6.7.tar.xz 12700 BLAKE2B 9dd3625f3fa2345ba6f9cb21fffae770a257928c2287e1772f92d831e9b6c09d8c5b09118a146b6704bb5003dd02fb0793ecabc7d8a2410f4f3941bd687b3a14 SHA512 8b247de9f7ac06f77e6251e95c045886cde5b6ca21b0152cb6fdc1456381aacd9051d5221c9fc8149608555e14f85ee2b51acbe65f78d129b1c8b732e093236d
-EBUILD setconf-0.6.6.ebuild 825 BLAKE2B dfc3a1db922cac2b04b22f9cfc91c950ba671ad50babc0ee5f3c6b8661aa238b962c11b3122191544cd1a4430eaa9f85ff3cee4a79c9d05cd1fa7f3477776c43 SHA512 6bb53533220f833457ffe5eac1a45f70d0d52349d3f9a9af9778fd167d057764d0f7b812e9b732fab164a167b916ca07aff87c8944437a4f23e62f4a25d28675
-EBUILD setconf-0.6.7.ebuild 825 BLAKE2B 4b7c495886dfdf86c886c7c510a1a1215851494dd3a22bd3b9c837e936ec1d5e41ab5f59a5e34c1470b2540c495fe633eefe07c317054c798d97579608af86cb SHA512 0c81b23aaa86b2f979681fb6535c20cd8ae24e2b8c9fc9836d62852ece602af76daee6619c4fa0645835c69ab9fa99d3a1a3fdc97fff47ebf9ebabd202ccd169
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
deleted file mode 100644
index 3cf14bf74636..000000000000
--- a/dev-util/setconf/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/setconf/setconf-0.6.6.ebuild b/dev-util/setconf/setconf-0.6.6.ebuild
deleted file mode 100644
index 28c40e11ff30..000000000000
--- a/dev-util/setconf/setconf-0.6.6.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
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="A small python based utility used to change configuration files"
-HOMEPAGE="http://setconf.roboticoverlords.org/"
-SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=${PYTHON_DEPS}
-
-# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack "./${PN}.1.gz"
-}
-
-src_prepare() {
-	python_fix_shebang -f "${PN}.py"
-}
-
-src_install() {
-	python_doscript "${PN}.py"
-	dosym "${PN}.py" "/usr/bin/${PN}"
-	doman "${PN}.1"
-}
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
deleted file mode 100644
index 9152802536d1..000000000000
--- a/dev-util/setconf/setconf-0.6.7.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="A small python based utility used to change configuration files"
-HOMEPAGE="http://setconf.roboticoverlords.org/"
-SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=${PYTHON_DEPS}
-
-# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack "./${PN}.1.gz"
-}
-
-src_prepare() {
-	python_fix_shebang -f "${PN}.py"
-}
-
-src_install() {
-	python_doscript "${PN}.py"
-	dosym "${PN}.py" "/usr/bin/${PN}"
-	doman "${PN}.1"
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 34dfc9345534..45532de763e8 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
-EBUILD spirv-headers-1.5.3.ebuild 515 BLAKE2B 6d88cd58d419493b80469af14c5ba36766164557f5a448433e0b48daedaf7be25281aa8282c4d18f4dddc879c2453f890cbcb23dbc774928bd643840917f0a68 SHA512 0e833a006e64166860e2fcfbf5ee641d6388443dbb3bca2c375a5e8671ea690cb4310bd91c721089b8d9d9357e52b6880f059975ff0810e5261d0bae14137b54
+EBUILD spirv-headers-1.5.3.ebuild 514 BLAKE2B e5d846bf7b3aaf4b39a254e17b55926ca91c016bea43f57f52a8c30ab5152013f5f4b96a9d25981b32e0c58091626704ee4bc79088d9447f72ad9af0897d3ee8 SHA512 8edf411df280b4c0d143263d7eca5f3a1866972c4df4f8b62c899f7e2c1d3975a3d6bc80ab570d36f7dcbe1131529c2fadf658349167a15494affde48a7e5679
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
index 9b850547b21e..4f2bba2c5394 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 6adda9f9e4a6..18ac9a1a5c39 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
-EBUILD spirv-tools-2020.3.ebuild 1089 BLAKE2B ac68a1a7a1a14c98701c4d30d9802743450c4129c23571cfff9df5779a59ae0f65e49969b2ce69adeb3b8e4fb7e588a4d39427a0df2447d10af70c7d2c65cf70 SHA512 49b08b9add46c47a318455cf0f3aa4424865d15c542af6798b06c72732f37912ddd984b0c2bf004a1397f82f838b31a83331b45eca80853da3ce89bd1ebeb720
+EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64
 EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B f2b331dad1276fcdb1ae4029c75bca06be7136fe8f543053d8a7c0bd025d383132c756397cdab4f6c4cbebddd54f82d8a469802e66cd5906867768a952974256 SHA512 32b887f0b40bb37b1c6d63f93eb787c8982996ca94e293e531904870484ad811ea36f4c124101c6cbf33e95d3984f44fd6d013c3043632d75716356a3f5e0faf
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
index b51889841437..16c82fcd1bd9 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index fa1088e23c3d..96912efafe57 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -2,5 +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 1228 BLAKE2B bed2a64bbe3d79191a6073cbe2d8ecb8ae5163807ecdaf4426186608b593a4a227905cbdce76bef5f1419cd81d58b129ba3e3a3beb2cbc37cc58feee95e11ed5 SHA512 054f3b3821e844c271e083d5cf33cc21979684f66987ea049da7e1591c49da8cf002a55fb887baa77e56e715ab031f7c305c4c9d9cc76482d38b90fcd2c06a85
+EBUILD statifier-1.7.4-r1.ebuild 1232 BLAKE2B 48e6dfbda2e8ecc8ae459f3281b91b4474ed54ee2236acfdb50df5b3f2a062fd1faedaaaa46811e5422b0cd781906bee62495c48d19eafbb46b5b2708e7946bb SHA512 a33b5ef90f935d8a9933a901fc43201f96ee9bb5652387fb1eb60c46302efbab069cb78411e76d805210f5179ad37faf237a379d9fc4659f49831c8dd60bd1b6
 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 553d4ee5f440..1899394b0d7b 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-MULTILIB_COMPAT=( abi_x86_{32,64} )
+MULTILIB_COMPAT=( abi_x86_{32,x32,64} )
 
 inherit flag-o-matic multilib-build toolchain-funcs
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index a071a8d9248c..478fff1939b6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
-EBUILD vulkan-headers-1.2.143.ebuild 606 BLAKE2B c19a9d9aa24bd265c9aa648f16ec543fc4dac032fdff2939fc036e79daf0d3ebefff796338586b24838903efa579f487f0e8911a1362b48392fe45ddc6503878 SHA512 eff87378f05a182dcd985566b3491f94545fe2839a1cf455552df33deaec388c0d51850d851ebb5bb175cab4931e00c84c8c4ffcfa28d2d7bd6c16ac3104a7b5
+EBUILD vulkan-headers-1.2.143.ebuild 605 BLAKE2B caf8d1eff6c89b36ca7e4a544a97699aa257bd306b69bb40e3522a743469f079c3fdbcb26e79bcee137267eccf2de8f7886a3282e6d0582e3a33bd3cfade49ee SHA512 211cf1ac07e4dd0bcdf133cc9cf288bf4613ee91cf1358c406a7534584aa117a72e0d2a51a45afed59e5884c05ce87d2acfe49995ad91b3e20fa15b54cd5d6ed
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
index 0f168cbffea2..3c7d217ae9fa 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c2b521b555c4..ce4ae1e80629 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest
deleted file mode 100644
index 609c86a6c1c8..000000000000
--- a/dev-vcs/cvs2svn/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cvs2svn-2.4.0.tar.gz 514891 BLAKE2B 0dd0d15ab28f96e56854295a789284a00ad8d172dbd849068fb05811a728f854d83b52856b6254ee0ac947425d972fb810b627aab95116040d4370bb98de6e0c SHA512 726fb8a3b3261eeb6d8097973f2741aa7a433f847bcef6701a6c0b7dc3d8fb5da1726e40f008d1dffac71791b953ddb9ade5db5809c98731d78e94da6465506a
-DIST cvs2svn-2.5.0.tar.gz 539332 BLAKE2B 54d70750c601c1d5c701f853686d958e9b8b92c4109d9294ec139d3cc8d4c9e102abed976fe9f845d0d0a1ccb65f504a08ef27f48bdf001254cf6e26087e50e2 SHA512 226972553c9d9cbae81c6e85079f4201944cf77ce68ebd6020ef2cd88bf457241739cef401c4bd3bf656b1992fbf84639b8df72d1921eee9d043fde94fba1c6a
-EBUILD cvs2svn-2.4.0-r1.ebuild 1227 BLAKE2B 51ccbfeede22aecbcdde0a6379e2193a0adcb0e3245df77b1e21e6cae89799bf378de91cf1a472f530571a2a343c25f0e0393e35c4ad7c6b9e6e28ea53044eed SHA512 0ec1502d537a58054fae87cdac805f22b8e83467f105bf801b1fff05818f16e28dd38b7aaa5abe3ff61d94c9aff9ea3027a97d4a81ce03066578819bce8c0fc8
-EBUILD cvs2svn-2.5.0.ebuild 1230 BLAKE2B 3f5cf3f21162a01e47d7126659ae491fe9d6b179454750321a5b9960c66c4c34e9b6e4849cfb5784e218e2658f246050d927e4d16d84c6b3e321fdffdb389eb8 SHA512 87e96e0cc7377b10aab333642941d1f23d90d2595a95e668a1d08a1afe634bbfd14bf474a471273a381482185d94f5b26bb1d8d35ca61807d1ebe1cdf712dddb
-MISC metadata.xml 282 BLAKE2B 19bc0e385352904411b33830410bfc0a9a9c2b67c37b253f7c336dd455d413d34fd89569430a4016e4bef1660b9b710e6c08fb192584915fcf911b15593cf694 SHA512 165091ed860bbc62f00932c46e6d4944fe7444ac8bdfd1014a9781b8769d1a9d234578937b63ac7b90bdd8f57b21de50f74e759a44fa2b2d1e8edd854aa17ae3
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
deleted file mode 100644
index 57f5bc918112..000000000000
--- a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-FILEVER="49237"
-
-DESCRIPTION="Convert a CVS repository to a Subversion repository"
-HOMEPAGE="http://cvs2svn.tigris.org/"
-SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bazaar git test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-vcs/subversion-1.0.9"
-RDEPEND="${DEPEND}
-	bazaar? ( >=dev-vcs/bzr-1.13 )
-	git? ( >=dev-vcs/git-1.5.4.4 )
-	dev-vcs/rcs"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-	python_fix_shebang .
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake man
-}
-
-src_install() {
-	distutils-r1_src_install
-	insinto "/usr/share/${PN}"
-	doins -r contrib cvs2{svn,git,bzr}-example.options
-	doman *.1
-}
-
-python_test() {
-	# Need this because subversion is localized, but the tests aren't
-	export LC_ALL=C
-	"${PYTHON}" -W ignore run-tests.py
-}
-
-pkg_postinst() {
-	elog "Additional scripts and examples have been installed to:"
-	elog "  /usr/share/${PN}/"
-}
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
deleted file mode 100644
index 54254fc1f2ff..000000000000
--- a/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-FILEVER="49543"
-
-DESCRIPTION="Convert a CVS repository to a Subversion repository"
-HOMEPAGE="http://cvs2svn.tigris.org/"
-SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bazaar git test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-vcs/subversion-1.0.9"
-RDEPEND="${DEPEND}
-	bazaar? ( >=dev-vcs/bzr-1.13 )
-	git? ( >=dev-vcs/git-1.5.4.4 )
-	dev-vcs/rcs"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-	python_fix_shebang .
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake man
-}
-
-src_install() {
-	distutils-r1_src_install
-	insinto "/usr/share/${PN}"
-	doins -r contrib cvs2{svn,git,bzr}-example.options
-	doman *.1
-}
-
-python_test() {
-	# Need this because subversion is localized, but the tests aren't
-	export LC_ALL=C
-	"${PYTHON}" -W ignore run-tests.py
-}
-
-pkg_postinst() {
-	elog "Additional scripts and examples have been installed to:"
-	elog "  /usr/share/${PN}/"
-}
diff --git a/dev-vcs/cvs2svn/metadata.xml b/dev-vcs/cvs2svn/metadata.xml
deleted file mode 100644
index 3531d7d2985b..000000000000
--- a/dev-vcs/cvs2svn/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="bazaar">Support for dev-vcs/bzr</flag>
-</use>
-</pkgmetadata>
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 817a69a28921..f942b0877bae 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index d099b128918c..b8fec445755c 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,11 +128,9 @@ _kde.org_calculate_src_uri() {
 				kjs | \
 				kjsembed | \
 				kmediaplayer | \
-				kross)
-					_src_uri+="portingAids/"
-					;;
+				kross | \
 				kxmlrpcclient)
-					[[ ${PV} = 5.70.* ]] || _src_uri+="portingAids/"
+					_src_uri+="portingAids/"
 					;;
 			esac
 			;;
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index b47f2160cbbc..2779a0353ecb 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -45,8 +45,8 @@ fi
 
 # ROS only really works with one global python version and the target
 # version depends on the release. Noetic targets 3.7 and 3.8.
-# py3.8 or later are ok to add there as long as dev-ros/* have their deps satisfied.
-PYTHON_COMPAT=( python3_7 )
+# py3.9 or later are ok to add there as long as dev-ros/* have their deps satisfied.
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit ${SCM} python-single-r1 cmake flag-o-matic
 
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
new file mode 100644
index 000000000000..2c9708f24593
--- /dev/null
+++ b/eclass/verify-sig.eclass
@@ -0,0 +1,175 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: verify-sig.eclass
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Eclass to verify upstream signatures on distfiles
+# @DESCRIPTION:
+# verify-sig eclass provides a streamlined approach to verifying
+# upstream signatures on distfiles.  Its primary purpose is to permit
+# developers to easily verify signatures while bumping packages.
+# The eclass removes the risk of developer forgetting to perform
+# the verification, or performing it incorrectly, e.g. due to additional
+# keys in the local keyring.  It also permits users to verify
+# the developer's work.
+#
+# To use the eclass, start by packaging the upstream's key
+# as app-crypt/openpgp-keys-*.  Then inherit the eclass, add detached
+# signatures to SRC_URI and set VERIFY_SIG_OPENPGP_KEY_PATH.  The eclass
+# provides verify-sig USE flag to toggle the verification.
+#
+# Example use:
+# @CODE
+# inherit verify-sig
+#
+# SRC_URI="https://example.org/${P}.tar.gz
+#   verify-sig? ( https://example.org/${P}.tar.gz.sig )"
+# BDEPEND="
+#   verify-sig? ( app-crypt/openpgp-keys-example )"
+#
+# VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/example.asc
+# @CODE
+
+case "${EAPI:-0}" in
+	0|1|2|3|4|5|6)
+		die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
+		;;
+	7)
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
+esac
+
+EXPORT_FUNCTIONS src_unpack
+
+if [[ ! ${_VERIFY_SIG_ECLASS} ]]; then
+
+IUSE="verify-sig"
+
+BDEPEND="
+	verify-sig? (
+		app-crypt/gnupg
+		>=app-portage/gemato-16
+	)"
+
+# @ECLASS-VARIABLE: VERIFY_SIG_OPENPGP_KEY_PATH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Path to key bundle used to perform the verification.  This is required
+# when using default src_unpack.  Alternatively, the key path can be
+# passed directly to the verification functions.
+
+# @ECLASS-VARIABLE: VERIFY_SIG_OPENPGP_KEYSERVER
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Keyserver used to refresh keys.  If not specified, the keyserver
+# preference from the key will be respected.  If no preference
+# is specified by the key, the GnuPG default will be used.
+
+# @ECLASS-VARIABLE: VERIFY_SIG_OPENPGP_KEY_REFRESH
+# @USER_VARIABLE
+# @DESCRIPTION:
+# Attempt to refresh keys via WKD/keyserver.  Set it to "yes"
+# in make.conf to enable.  Note that this requires working Internet
+# connection.
+: ${VERIFY_SIG_OPENPGP_KEY_REFRESH:=no}
+
+# @FUNCTION: verify-sig_verify_detached
+# @USAGE: <file> <sig-file> [<key-file>]
+# @DESCRIPTION:
+# Read the detached signature from <sig-file> and verify <file> against
+# it.  <key-file> can either be passed directly, or it defaults
+# to VERIFY_SIG_OPENPGP_KEY_PATH.  The function dies if verification
+# fails.
+verify-sig_verify_detached() {
+	local file=${1}
+	local sig=${2}
+	local key=${3:-${VERIFY_SIG_OPENPGP_KEY_PATH}}
+
+	[[ -n ${key} ]] ||
+		die "${FUNCNAME}: no key passed and VERIFY_SIG_OPENPGP_KEY_PATH unset"
+
+	local extra_args=()
+	[[ ${VERIFY_SIG_OPENPGP_KEY_REFRESH} == yes ]] || extra_args+=( -R )
+	[[ -n ${VERIFY_SIG_OPENPGP_KEYSERVER+1} ]] && extra_args+=(
+		--keyserver "${VERIFY_SIG_OPENPGP_KEYSERVER}"
+	)
+
+	einfo "Verifying ${file##*/} ..."
+	gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
+		gpg --verify "${sig}" "${file}" ||
+		die "PGP signature verification failed"
+}
+
+# @FUNCTION: verify-sig_src_unpack
+# @DESCRIPTION:
+# Default src_unpack override that verifies signatures for all
+# distfiles if 'verify-sig' flag is enabled.  The function dies if any
+# of the signatures fails to verify or if any distfiles are not signed.
+# Please write src_unpack() yourself if you need to perform partial
+# verification.
+verify-sig_src_unpack() {
+	if use verify-sig; then
+		local f suffix found
+		local distfiles=() signatures=() nosigfound=() straysigs=()
+
+		# find all distfiles and signatures, and combine them
+		for f in ${A}; do
+			found=
+			for suffix in .sig; do
+				if [[ ${f} == *${suffix} ]]; then
+					signatures+=( "${f}" )
+					found=sig
+					break
+				else
+					if has "${f}${suffix}" ${A}; then
+						distfiles+=( "${f}" )
+						found=dist+sig
+						break
+					fi
+				fi
+			done
+			if [[ ! ${found} ]]; then
+				nosigfound+=( "${f}" )
+			fi
+		done
+
+		# check if all distfiles are signed
+		if [[ ${#nosigfound[@]} -gt 0 ]]; then
+			eerror "The following distfiles lack detached signatures:"
+			for f in "${nosigfound[@]}"; do
+				eerror "  ${f}"
+			done
+			die "Unsigned distfiles found"
+		fi
+
+		# check if there are no stray signatures
+		for f in "${signatures[@]}"; do
+			if ! has "${f%.*}" "${distfiles[@]}"; then
+				straysigs+=( "${f}" )
+			fi
+		done
+		if [[ ${#straysigs[@]} -gt 0 ]]; then
+			eerror "The following signatures do not match any distfiles:"
+			for f in "${straysigs[@]}"; do
+				eerror "  ${f}"
+			done
+			die "Unused signatures found"
+		fi
+
+		# now perform the verification
+		for f in "${signatures[@]}"; do
+			verify-sig_verify_detached \
+				"${DISTDIR}/${f%.*}" "${DISTDIR}/${f}"
+		done
+	fi
+
+	# finally, unpack the distfiles
+	default_src_unpack
+}
+
+_VERIFY_SIG_ECLASS=1
+fi
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index cb009fec9762..d595c338a55b 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index b7ea624108be..38159af91757 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,6 +1,6 @@
-DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
 DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
-EBUILD devilutionx-1.0.0-r1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
 EBUILD devilutionx-1.0.1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
-EBUILD devilutionx-9999.ebuild 1820 BLAKE2B 91ff7876c9ecf4797d52d0e8a264f99e5c8dd8c6bf5ccc278aa17cd8add404266350716f8e9b46daec7fbb29ed6f421b687a8f1d495c11ffcd7b70bc67ba2e53 SHA512 bf00756e29a2ef5b8c7a4a19164b23b176f886c99295840c5f10a33a5454a3a80f1d2b885f7edea9eb83ceff1f22235220a1382e272bcf47fa650f7b84dd34f9
+EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
+EBUILD devilutionx-9999.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
 MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
deleted file mode 100644
index b363bc7378ac..000000000000
--- a/games-engines/devilutionx/devilutionx-1.0.0-r1.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
-
-# Sometimes build with ninja fails.
-# Please check occasionally if we can revert back to ninja.
-# Latest known issue:
-#   https://github.com/diasurgical/devilutionX/issues/490
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake desktop
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
-else
-	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/devilutionX-${PV}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-
-IUSE="debug lto"
-
-RDEPEND="
-	dev-libs/libsodium
-	media-fonts/sil-charis
-	media-libs/libsdl2[haptic]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \
-		-i SourceS/config.h.in || die
-	sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \
-		-i SourceX/DiabloUI/fonts.h || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASAN="OFF"
-		-DDEBUG="$(usex debug)"
-		-DDIST="ON"
-		-DFASTER="OFF"
-		-DLTO="$(usex lto)"
-		-DUBSAN="OFF"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-
-	newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
-	newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
-	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
-}
-
-pkg_postinst() {
-	einfo "In order to play the game you need to install the file"
-	einfo "  diabdat.mpq"
-	einfo "from the original game CD into the following directory:"
-	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
-	einfo "and make sure it's writeable (chmod u+w)."
-}
diff --git a/games-engines/devilutionx/devilutionx-1.0.3.ebuild b/games-engines/devilutionx/devilutionx-1.0.3.ebuild
new file mode 100644
index 000000000000..90302aa10ef4
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.0.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
+else
+	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/devilutionX-${PV}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug lto"
+
+RDEPEND="
+	dev-libs/libsodium
+	media-fonts/sil-charis
+	media-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \
+		-i SourceS/config.h.in || die
+	sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \
+		-i SourceX/DiabloUI/fonts.h || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN="OFF"
+		-DDEBUG="$(usex debug)"
+		-DDIST="ON"
+		-DFASTER="OFF"
+		-DLTO="$(usex lto)"
+		-DUBSAN="OFF"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+
+	local size
+	for size in 32 48 ; do
+		newicon -s ${size} Packaging/resources/Diablo_${size}.png ${PN}.png
+	done
+	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
+}
+
+pkg_postinst() {
+	einfo "In order to play the game you need to install the file"
+	einfo "  diabdat.mpq"
+	einfo "from the original game CD into the following directory:"
+	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 829fcf1b68b3..90302aa10ef4 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -74,5 +74,4 @@ pkg_postinst() {
 	einfo "  diabdat.mpq"
 	einfo "from the original game CD into the following directory:"
 	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
-	einfo "and make sure it's writeable (chmod u+w)."
 }
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index e69836abe317..052fef80f92d 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 0aec595597d2..eff10cbde244 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -4,10 +4,8 @@ AUX pyyaml-safe-load.patch 460 BLAKE2B 39fdb2753539c7e973afcd23b86b89623c14b37d9
 AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287
 DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.23.2.tar.xz 30157732 BLAKE2B 5d264fa33abeb2254efbdef461774c987f65ef28160d43d90848b77d46a8f0e63c4e59a9cb7257257551a08c509e53758d72acbb0edf5a0e8b70e5d3ca09ea14 SHA512 61ccb0ac262a798e7c06fdb5e821c9885a690e082c33f6255358561929d6800b272106632279d27320e8ae240d903e2002f59d908d5db4841065a5cfa97bbee8
-DIST stone_soup-0.24.0.tar.xz 29746940 BLAKE2B 429fd9bb5a5bcd36d11f66ac93a96c4d378a50bb9197edcd92d9bd7d7c463ace60c5c59c4bb762fb61555e6612ecca2267b6d68b6bba8afa79861d7b8d4ea6a1 SHA512 d43d3c43551394c0730427a1adf561bc29ac679c13475292908f942aa8b6e077861245536ff3c932c7478f1ec1c72cf51c9aca8b8ce30f3a99c311c292765194
 DIST stone_soup-0.25.0.tar.xz 30247768 BLAKE2B 1e6595ae895beb8a4eede97002d5085e710de93726034a3ab9bd4d44fc9d03fc6cc22ff8878c2e6f825ffd0b28e73bbd1d9a087fc5eae9ffd2bc36403edf5b27 SHA512 387bce2c0491bf88c267af8e37afb1037dfc98d4ba4fb4dd3fe442f3446b6bf6f23c10f32483fb7d27e90c6045033bd70fb9e88e0bbe486489bc38ab71e62529
-EBUILD stone-soup-0.23.2.ebuild 3649 BLAKE2B e82fd68687a6676400622592713ad77787db37ec07db59d1f2b7272c9797b8d5a9bc021b4301a4080da1dc5af66cbb36c09bad9db666d80724c442c4bdb9170f SHA512 d8fcec168ac91676c50016fbb0b695006d783d390214e092fcabed92950a2efef36e7e986fb45303fc562cfd5872a3613429b4c829f243a4032323c58dc03501
-EBUILD stone-soup-0.24.0.ebuild 3764 BLAKE2B 5a2440621427311954b2255e179c566a107828247cb944fb5cb934c6902a07b971b8b07fa3676d7fc59957a34b9994c3459bab1c796ba0dcade7897d7c8b5fb3 SHA512 07310e0357a64822ed907dd2450ad6c81d143d14f68f55812eea6cdad5ad585737b26d6f295ed117b5d583cd3ad8e79b682f6c42e2ee581259b666de340b24bc
-EBUILD stone-soup-0.25.0.ebuild 4299 BLAKE2B 1470101261f04f10b62a53fdcc75d4b81295980563e75474bc983deefadc5c665030a4868c02a2cc12caa7187f87b4139db545bd26506fffdd67421d54bdbb04 SHA512 ad15d79d3996bd13eab844f8f77576a8b64be081e73f5b2d9d300d80ce74f46b01749afc07083e24afe86fee42666315b9170b03cee5408bb692ff362ea7825a
+DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
+EBUILD stone-soup-0.25.0.ebuild 4297 BLAKE2B a259dc5bb82653086b8e12a237ffb714b32cc26b93be8676f6baf47c34bba668b3a6ad430dafbb1a5e8d0b6394c8645a8551845e49de81c65645cdd4bff31a85 SHA512 8e25cadc78b7455266de59cfa13b700f35dc9afb74b15e5640d2905a6dc78cb6b56cd428e54b7d6dda7c75994047bf2a0ca1ebd0b636c1555b5c317f36ab35a6
+EBUILD stone-soup-0.25.1.ebuild 3735 BLAKE2B a9d6a302178711e7b8cac7b61867dcfd651b4d367ddfdce50546ca275e8181b2bc3bbf1387e20bf6db9168444af56e550f9df84f223148b228b7f3dcac2df21a SHA512 9274f69753a6acead708909090d0f8f25ad3f4751d651bec1bf7a13102463cba40c77002e3c6c88b598f228b0d409c318fdbe72a0cb14b2b58dfdab24c1afcee
 MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662
diff --git a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
deleted file mode 100644
index 2cc1569df21b..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="
-	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
-"
-
-# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
-# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-# Public Domain|CC0: most of tiles
-# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
-LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	=dev-lang/lua-5.1*:0=
-	sys-libs/zlib
-	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
-	ncurses? ( sys-libs/ncurses:0 )
-	tiles? (
-		media-fonts/dejavu
-		media-libs/freetype:2
-		media-libs/libpng:0
-		sound? (
-			   media-libs/libsdl2[X,opengl,sound,video]
-			   media-libs/sdl2-mixer
-		)
-		!sound? ( media-libs/libsdl2[X,opengl,video] )
-		media-libs/sdl2-image[png]
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-python/pyyaml
-	sys-devel/flex
-	tiles? (
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/gitless.patch
-	"${FILESDIR}"/pyyaml-safe-load.patch
-	"${FILESDIR}"/rltiles-ldflags-libs.patch
-)
-
-pkg_setup() {
-	if use !ncurses && use !tiles ; then
-		ewarn "Neither ncurses nor tiles frontend"
-		ewarn "selected, choosing ncurses only."
-		ewarn "Note that you can also enable both."
-	fi
-
-	if use sound && use !tiles ; then
-		ewarn "Sound support is only available with tiles."
-	fi
-}
-
-src_compile() {
-	export HOSTCXX=$(tc-getBUILD_CXX)
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		BUILD_LUA=
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		CONTRIBS=
-		DATADIR="/usr/share/${PN}"
-		GCC="$(tc-getCC)"
-		GXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl"
-		SOUND=$(usex sound "y" "")
-		STRIP=touch
-		USE_LUAJIT=
-		V=1
-		prefix="/usr"
-	)
-
-	if use ncurses || (use !ncurses && use !tiles) ; then
-		emake "${myemakeargs[@]}"
-		# move it in case we build both variants
-		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
-	fi
-
-	if use tiles ; then
-		emake clean
-		emake "${myemakeargs[@]}" "TILES=y"
-	fi
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
-	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
-
-	# don't relocate docs, needed at runtime
-	rm -rf "${D}/usr/share/${PN}"/docs/license
-
-	doman "${WORKDIR}/${MY_P}"/docs/crawl.6
-
-	# icons and menu for graphical build
-	if use tiles ; then
-		doicon -s 48 "${DISTDIR}"/${PN}.png
-		doicon -s scalable "${DISTDIR}"/${PN}.svg
-		make_desktop_entry crawl
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if use tiles && use ncurses ; then
-		elog "Since you have enabled both tiles and ncurses frontends"
-		elog "the ncurses binary is called 'crawl-ncurses' and the"
-		elog "tiles binary is called 'crawl'."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
deleted file mode 100644
index 3a7e637f88e7..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-VIRTUALX_REQUIRED="manual"
-inherit desktop eutils xdg-utils toolchain-funcs
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="
-	https://crawl.develz.org/release/$(ver_cut 1-2)/${PN/-/_}-${PV}.tar.xz
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
-"
-
-# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
-# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-# Public Domain|CC0: most of tiles
-# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
-LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	=dev-lang/lua-5.1*:0=
-	sys-libs/zlib
-	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
-	ncurses? ( sys-libs/ncurses:0 )
-	tiles? (
-		media-fonts/dejavu
-		media-libs/freetype:2
-		media-libs/libpng:0
-		sound? (
-			   media-libs/libsdl2[X,opengl,sound,video]
-			   media-libs/sdl2-mixer
-		)
-		!sound? ( media-libs/libsdl2[X,opengl,video] )
-		media-libs/sdl2-image[png]
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-python/pyyaml
-	sys-devel/flex
-	tiles? (
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/gitless.patch
-	"${FILESDIR}"/pyyaml-safe-load.patch
-	"${FILESDIR}"/rltiles-ldflags-libs.patch
-)
-
-pkg_setup() {
-	if use !ncurses && use !tiles ; then
-		ewarn "Neither ncurses nor tiles frontend"
-		ewarn "selected, choosing ncurses only."
-		ewarn "Note that you can also enable both."
-	fi
-
-	if use sound && use !tiles ; then
-		ewarn "Sound support is only available with tiles."
-	fi
-}
-
-src_compile() {
-
-	# Insurance that we're not using bundled lib sources
-	rm -rf contrib || die "Couldn't delete contrib directory"
-
-	export HOSTCXX=$(tc-getBUILD_CXX)
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		BUILD_LUA=
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		CONTRIBS=
-		DATADIR="/usr/share/${PN}"
-		GCC="$(tc-getCC)"
-		GXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl"
-		SOUND=$(usex sound "y" "")
-		STRIP=touch
-		USE_LUAJIT=
-		V=1
-		prefix="/usr"
-	)
-
-	if use ncurses || (use !ncurses && use !tiles) ; then
-		emake "${myemakeargs[@]}"
-		# move it in case we build both variants
-		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
-	fi
-
-	if use tiles ; then
-		emake clean
-		emake "${myemakeargs[@]}" "TILES=y"
-	fi
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
-	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
-
-	# don't relocate docs, needed at runtime
-	rm -rf "${D}/usr/share/${PN}"/docs/license
-
-	doman "${WORKDIR}/${MY_P}"/docs/crawl.6
-
-	# icons and menu for graphical build
-	if use tiles ; then
-		doicon -s 48 "${DISTDIR}"/${PN}.png
-		doicon -s scalable "${DISTDIR}"/${PN}.svg
-		make_desktop_entry crawl
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if use tiles && use ncurses ; then
-		elog "Since you have enabled both tiles and ncurses frontends"
-		elog "the ncurses binary is called 'crawl-ncurses' and the"
-		elog "tiles binary is called 'crawl'."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
index a617058863e4..1f9ee28db56b 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
new file mode 100644
index 000000000000..58ccb08b8062
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+VIRTUALX_REQUIRED="manual"
+inherit desktop eutils xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="http://crawl.develz.org/wordpress/"
+SRC_URI="
+	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	=dev-lang/lua-5.1*:0=
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-python/pyyaml
+	sys-devel/flex
+	tiles? (
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+S_TEST=${WORKDIR}/${MY_P}_test/source
+PATCHES=(
+	"${FILESDIR}"/gitless-1.patch
+	"${FILESDIR}"/rltiles-ldflags-libs.patch
+)
+
+pkg_setup() {
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	export HOSTCXX=$(tc-getBUILD_CXX)
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}"
+		GCC="$(tc-getCC)"
+		GXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
+	fi
+
+	if use tiles ; then
+		emake clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
+	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}"/docs/license
+
+	doman "${WORKDIR}/${MY_P}"/docs/crawl.6
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		doicon -s scalable "${DISTDIR}"/${PN}.svg
+		make_desktop_entry crawl
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if use tiles && use ncurses ; then
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses' and the"
+		elog "tiles binary is called 'crawl'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 02d5abe94c9b..67cd64aa3042 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/steamcmd/Manifest b/games-server/steamcmd/Manifest
index a194901669c0..2bc04d552153 100644
--- a/games-server/steamcmd/Manifest
+++ b/games-server/steamcmd/Manifest
@@ -1,9 +1,6 @@
 AUX README.gentoo 1420 BLAKE2B 470f3a40acf5eb150c583697a5dc2b80b6a8d1814b8c4e2c74757479e24540c5f38297b27096e8edd57b685fa0458f5175d75e34d08bd2acf45f4d7aa2c12fa8 SHA512 103ebd60a5e8c9bce0ba742ed945734d19330f5567e738317a0d8e37b2625b852c6606678487c8aa27937c7cd25a05680a7d165cc8f33a0044a993d801e5a65d
-AUX steamcmd.confd-r1 576 BLAKE2B 6e944d2a707c1428a73dccd51abbd07732d622707aad00ccad79e796c313fcbdb4b7f484b82a05774c08c403526a09ae7387da4b2b744f4ec8fbd79062d6c0d0 SHA512 73fe7f4be500628e89f9905263b032e86c7e2792971ddc5f6d27b911f9c3a13601fb2d3dcd5a3a6dd4926d04c14fd6b3b297e55343ce5f5c2372e69c315df3f0
 AUX steamcmd.confd-r2 786 BLAKE2B 064be96c4052fd8ec5d7c10e18959fd1465637d9680ba79e08c3779efb5f8e706bac58a5f70602ff07aa00eb08d2e84f6312aecb0a792f84dcb4261ea038b2b1 SHA512 76cc695f74e71747cd5f1e083d38c13db105af0d8f4f465d2a2d53c0b0933022ff4acc9920e961868d9177dc0c2a6648aa20401f60952e9af94e622801cde5b8
-AUX steamcmd.initd-r1 791 BLAKE2B 9ba1002a7faed781bd24f1e0534ec09ba0036b1fc97be3ba4a57aadc764c50573059b5c4cbe60808ddaa7e3cf808a5c8b43ec2bc25a0fd3039d41fa902962725 SHA512 56f8fa87d3cfc0de635fb95516b0e8e6c471155e3f397b8ab40e877ce770ff3aabc2846156f98de9ba8810e71f18a3fb202f9c098efaa1b97ecdca11ff689bbe
 AUX steamcmd.initd-r2 1248 BLAKE2B 881c45498dc1097ad9852661d866c2de152b0bf061567ac1b036a3cf3c3088fd7c3dd12c9cdd5aff07cb2e6368f50c40f61355983533e320e28fbd1422a25947 SHA512 79e7bf2a15dfc041c77d1c97fc66855f993905a791b8d25121163246feb9ba98a72f97647d9a2ce3ed7fd2590533b2da92992abe4fb39fcba6ebd13ef5c3a501
 DIST steamcmd-1.0.tar.gz 2428561 BLAKE2B c51dbb8c7731222eb748508b8a84a4cbda55168c85116078074bd0da85018a344ca088b7af41a07a96c15e64d0aeb28fb90cd85d99f444e9425f5a326c1823fe SHA512 b37debfa45e5578cc065924770258a026adad339aae86da1a66e71ac4ee80d2ddbca9060ca4c734affd2c6902635e7b32e2b3efe11bb600969654b3abeb3839e
-EBUILD steamcmd-1.0-r2.ebuild 1134 BLAKE2B cfdb069a7fb3f4474549e503cc8e72b210c412c0dcaf295793beba28758df1158a702b69bcaa5dc0eb037f26d45ec743f26b82b750554cb0846f15a1e3be141f SHA512 4e944a7d7b06a7d7b1b6d71b086ccb06e89267967f4604803c6c25a4fd22d1edfb232f7efe7c445e851f84484bb201b28a1a1cec193ab79c65d2cadd0702c427
-EBUILD steamcmd-1.0-r3.ebuild 1134 BLAKE2B 9735010ba3e1335546a4d7c40e7cefaea7e9bebfb994423945abf68289814811dee273193d67d260591a5f5268c53454f360d280d08dfe85432472dfb8e95ff1 SHA512 3e5c6f6c9e9e49ab93e3500d57c27eaadbde387b64ba5e1cdd4169843abd8270f0eda45cdd330238f5ec6bceafeecc50e365ed8c0a45a956fc4c559cd116a467
+EBUILD steamcmd-1.0-r3.ebuild 1133 BLAKE2B e4fb40c369e45e20eeae7d06b995433ea4f9298b326cf130758d8033794b6a5fa0d454558a8ddf892ab201283f580b0cb3b0ef6500ab4bb0c8771b922cc41e21 SHA512 51674dd05c221f82bf3ba0f5f6a296eac5dbc21e0c7fd2c95f730e5da6e2609298645ce841dbb201c9b82a5b0f6af620d22e57bd36f219cdec30beef0c92d550
 MISC metadata.xml 635 BLAKE2B 1e57286c55cdd028c5cb0e81e068f557f3d0d64f1efebdb53716805f25e671918a4e038cf329a6a97e76142e87faf0efe8020fd8501d0e72e4d06d951e55a7dc SHA512 afdf6f2e8e1903634803ade00b5ed3230e2f24d0272c0a1a0bbdb3708517dedf1ecd3f8a88c1a752289ce7b7d361fbb7d80977a092cbe66e8c92b3ed548ef0c9
diff --git a/games-server/steamcmd/files/steamcmd.confd-r1 b/games-server/steamcmd/files/steamcmd.confd-r1
deleted file mode 100644
index b5d8b4198493..000000000000
--- a/games-server/steamcmd/files/steamcmd.confd-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Specifies, which server binary is used.
-# This could be 'hlds_run' or 'srcds_run', depending on your game.
-# STEAMCMD_BINARY="hlds_run"
-
-# Path to the files of your started server.
-# It's recommended to use:
-# '/opt/steamcmd/hlds' for older HL1 based mods.
-# '/opt/steamcmd/srcds' for newer HL2 based mods.
-# STEAMCMD_PATH="/opt/steamcmd/hlds"
-
-# Options for your server binary.
-# STEAMCMD_OPTS="-game valve +ip 127.0.0.1 +maxplayers 32 +map crossfire -pingboost 3"
diff --git a/games-server/steamcmd/files/steamcmd.initd-r1 b/games-server/steamcmd/files/steamcmd.initd-r1
deleted file mode 100644
index 327b47734ec6..000000000000
--- a/games-server/steamcmd/files/steamcmd.initd-r1
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "steamcmd" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#steamcmd.}"
-fi
-
-name="SteamCMD (Mod: ${instance})"
-pidfile="/run/steamcmd.${instance}.pid"
-screen_name="steamcmd.${instance}"
-start_stop_daemon_args="--chdir ${STEAMCMD_PATH}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${STEAMCMD_PATH}/${STEAMCMD_BINARY} ${STEAMCMD_OPTS}"
-command_background="true"
-command_group="steamcmd"
-command_user="steamcmd"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	if [ -z "${STEAMCMD_BINARY}" ] || [ -z "${STEAMCMD_PATH}" ]; then
-		eerror "One or more STEAMCMD_* variables in /etc/conf.d/steamcmd.${SVCNAME} are not set!"
-		return 1
-	fi
-	return 0
-}
diff --git a/games-server/steamcmd/steamcmd-1.0-r2.ebuild b/games-server/steamcmd/steamcmd-1.0-r2.ebuild
deleted file mode 100644
index 102dc5e774ed..000000000000
--- a/games-server/steamcmd/steamcmd-1.0-r2.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
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="This is the command-line version of the Steam client for dedicated servers"
-HOMEPAGE="https://developer.valvesoftware.com/wiki/SteamCMD"
-SRC_URI="https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ Steam"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="
-	acct-group/steamcmd
-	acct-user/steamcmd
-	app-misc/screen
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/steamcmd/linux32/libstdc++.so.6
-	opt/steamcmd/linux32/steamcmd
-"
-
-src_install() {
-	diropts -o steamcmd -g steamcmd
-	dodir /opt/steamcmd
-	keepdir /opt/steamcmd/{.steam,.steam/sdk32,linux32}
-
-	exeopts -o steamcmd -g steamcmd
-	exeinto /opt/steamcmd
-	doexe steamcmd.sh
-
-	exeopts -o steamcmd -g steamcmd
-	exeinto /opt/steamcmd/linux32
-	doexe linux32/steamcmd linux32/libstdc++.so.6
-
-	newinitd "${FILESDIR}"/steamcmd.initd-r1 steamcmd
-	newconfd "${FILESDIR}"/steamcmd.confd-r1 steamcmd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/steamcmd/steamcmd-1.0-r3.ebuild b/games-server/steamcmd/steamcmd-1.0-r3.ebuild
index 9a420152f06d..b31bdda9ecde 100644
--- a/games-server/steamcmd/steamcmd-1.0-r3.ebuild
+++ b/games-server/steamcmd/steamcmd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz
 
 LICENSE="LGPL-2.1+ Steam"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	acct-group/steamcmd
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 16ffc74f7845..6fb49f41c7c4 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 79ac7464fbe7..af9179cc00ed 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,5 +1,5 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256
-EBUILD freeorion-0.4.10.1.ebuild 1599 BLAKE2B a6982e749e59eaf7d18d9bd82dfc01fbb77c11f44013c932d5789ae158ca3d58d7261542278ae41f54aa7f2c6d0a321c916fb0c7e24052ff6f1d7668c544d8cf SHA512 a339d5d49d0931b7db6db237781c699e04fd5492b19f3ceafc74059767dc4f0d1b27c4481c9869d267fd1019812211f517b0f5f5082e5b20ec8b4e3164d11336
+EBUILD freeorion-0.4.10.1-r1.ebuild 1599 BLAKE2B 50615aba70661a4be2b8592696aba2ae7e1cfd46f1ab622a0b1cf5f4dd00b853d94426a5bc141b44ff3adb8c5a25f54ac8edf0dbee2191a2c91ad45dd47ddad2 SHA512 0e3adb70e8c3aeeb948891755bb4fb9863103203b4037b9962a0b674aef799d8142bece2d8acf5d45262c009e85db551d6a930bb9d28a88123a722f3fc93adb6
 EBUILD freeorion-9999.ebuild 1599 BLAKE2B 4700fa07d7be8e63657cc413a378bfa9e4e94fa8d148b7e3130041426cec47b294107f8574377074b8092ceeeb9494e31afa200cc3afadda6cac9da5e07e9c8a SHA512 1338d150dc86e5c23bd5e508435ee7cdeee576f4a6da097499763c60e67992d9126ea5088a2c9cd991b07fa06fe6896ca14d9bb29ff65bd0b496de71246262b5
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
new file mode 100644
index 000000000000..9cfb07f7b4e2
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
@@ -0,0 +1,77 @@
+# 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 cmake python-single-r1 xdg
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="https://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	KEYWORDS="~amd64"
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT=""
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${PV/_/-}"
+	fi
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE="dedicated"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
+	')
+	!dedicated? (
+		media-libs/freealut
+		>=media-libs/freetype-2.5.5
+		media-libs/glew:=
+		>=media-libs/libogg-1.1.3
+		media-libs/libpng:0=
+		media-libs/libsdl2[X,opengl,video]
+		>=media-libs/libvorbis-1.1.2
+		media-libs/openal
+		sci-physics/bullet
+		virtual/opengl
+	)
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
diff --git a/games-strategy/freeorion/freeorion-0.4.10.1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
deleted file mode 100644
index eaf03461b487..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="https://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	KEYWORDS="~amd64"
-	if [[ ${PV} = *_p* ]]; then
-		COMMIT=""
-		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${COMMIT}"
-	else
-		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${PV/_/-}"
-	fi
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE="dedicated"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
-	')
-	!dedicated? (
-		media-libs/freealut
-		>=media-libs/freetype-2.5.5
-		media-libs/glew:=
-		>=media-libs/libogg-1.1.3
-		media-libs/libpng:0=
-		media-libs/libsdl2[X,opengl,video]
-		>=media-libs/libvorbis-1.1.2
-		media-libs/openal
-		sci-physics/bullet
-		virtual/opengl
-	)
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HEADLESS="$(usex dedicated)"
-	)
-
-	cmake-src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index acdfb9594801..9127706454bd 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index e6b084d3e45b..c94bb26b6543 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,7 +2,9 @@ AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c026
 DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
 DIST gnome-desktop-3.36.4.tar.xz 736324 BLAKE2B 68abef71e1732f72eabc6cac83b513af30d8cd39f92baaa57757bb818f8309a82a1ed8dcecef6015d6b8fb08f24e2ab041ccb796955c599a4cf43c412dd0c147 SHA512 06683df9a774487f386cf5aece586fb9666fdebfe5c9ea247e6ab91f6f281ca0241b13e9eb4e0eda1fb856b9cf1109fea859964998df2e2b06c8861efc76316f
 DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b
+DIST gnome-desktop-3.36.7.tar.xz 739284 BLAKE2B fb64db72883ca6b5001b519f6ce3b5b26605e081530ff27728bc565e5d3ce832281adf3d10107e74028d14d9d1e5fa64f8e5d447c13690ff67aa3d2c2816c2e8 SHA512 20e3566ce1c36399a7fa359dd218f0357e1deef54ad613ce825d19f9266d98ed03c5ae59843100b36dcc6b3cdee8479ea9403514eb39e1f32d9b1fd4e53a7679
 EBUILD gnome-desktop-3.34.7.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301
 EBUILD gnome-desktop-3.36.4.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52
 EBUILD gnome-desktop-3.36.5.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
+EBUILD gnome-desktop-3.36.7.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
new file mode 100644
index 000000000000..e7951e7ba9c2
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/19" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	app-text/iso-codes
+	x11-libs/libX11
+	systemd? ( sys-apps/systemd:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=[X]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 9e5a85d2beb3..25b09c02871f 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index d8a5ee0b0e85..7897a1349dc8 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-20.04.3.tar.xz 330960 BLAKE2B 0dc3885728292c5aa7b0354adefe2c3e21a539a93f32740283362abb8975f6a26a49580f707d79a78086f2b66df5841a09f50a89eeb2181220562d55df31b8db SHA512 d740799699adeab1a730338c446a5089a7936736cf8c36b440c192d53238a351738b26aceba8458b2fad3dc856417014a5b16852e5c2a585b5048971a64c417b
-DIST akonadi-calendar-20.08.1.tar.xz 335408 BLAKE2B eebf88d7667072b965eccf802da729d880752fc42e84e03acbbcd54b3a6980bc2ccf78ed1721e4ad5d3c0c9ea15821b2a086bb7afa3467011807a546ed619e66 SHA512 9e82046400536c19c3cb322b4a6a4eeb21139451384e4d9099dc69b2f5d597e74a2461772b206ce888962b6e5240429baeda656c18e896167835ee7e806627fc
+DIST akonadi-calendar-20.08.2.tar.xz 335424 BLAKE2B 4169f43c69a7739c902e2af4cda2ff39b4ac820eb135696e452281ae15ca35572fb6d0e1b4d4a2e05b7f538a7befb63c4f0ecc6b1bede3c95ab620a108bb7166 SHA512 3652a342a2b1260658b057ca4b4ec0077c03806d8c0b24556c25f4a1aa4f95aca411fbe99f3f8c51cefdff0a3dfb3ae4ab3c77a5d31e2dd46fbe1ca6da93f326
 EBUILD akonadi-calendar-20.04.3.ebuild 1222 BLAKE2B 7537763c28439b48fc253aecef5f0187701d79486d26c5a966142f6b13609638db15285aaad2f108e39b5ecd6dbbf43c7540b8ed9bb6ce8875846eab247bbbba SHA512 fd741db16fc845243dd046d771eb5061a7e47c00d5d8b1ac768895101cf12b6af352331df57312ef3b3fa31db128f0455a7821ba6862cb2347ff3f50de297d4e
-EBUILD akonadi-calendar-20.08.1.ebuild 1188 BLAKE2B dadfb611ba7c7a17669297764343483a28432ba7adf2061318cd892b41504b2daf9c38fb32166eb265df6b9a306acb9af59be0d3985198f80b8d90cff1e7bf10 SHA512 8a590eead3d0e89572278982a68d27a5ab1f317173cafbfcbc6d48447c17a69020c56663993636668a083c6e8d9811ca0b543044f4a2ad86db9f4d248a6654ca
+EBUILD akonadi-calendar-20.08.2.ebuild 1188 BLAKE2B dadfb611ba7c7a17669297764343483a28432ba7adf2061318cd892b41504b2daf9c38fb32166eb265df6b9a306acb9af59be0d3985198f80b8d90cff1e7bf10 SHA512 8a590eead3d0e89572278982a68d27a5ab1f317173cafbfcbc6d48447c17a69020c56663993636668a083c6e8d9811ca0b543044f4a2ad86db9f4d248a6654ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadi-calendar/akonadi-calendar-20.08.1.ebuild
rename to kde-apps/akonadi-calendar/akonadi-calendar-20.08.2.ebuild
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 5c2e93b713db..2c30206cfc19 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-20.04.3.tar.xz 393708 BLAKE2B 3bd1b0971d397221344db5f07c1e3b2935c0c3d7fa8d47bf8c76c27d303be017b2defd918b94c9d531cfb3743c2120ec938e4735e22fa2827b889291026aa3a6 SHA512 ccb65c3874853dc9d9f9dd5b39d8f541357d49543386302c99bd1e978d87c9c5b9aee45f5e5589a4f61a04fd82a2867baf1d4fac0936036559957a9be463bb2d
-DIST akonadi-contacts-20.08.1.tar.xz 404256 BLAKE2B 0fc0eedcc2c0c8ba2c527ccb57f9fb6b775d8cabcf6eb348f87bf8e2be2f187719766cd061051dd103fba955abb4d364f9181a0cceeeeb1762dcc33ef43248f1 SHA512 5d7a481b60cc7d6068e4bd12fd22e695f43652e3ebe4e03e5512c5901240193408a2e72227de91f00c76833b957d7c9b26c62a4fe16615028229b46d40360b4b
+DIST akonadi-contacts-20.08.2.tar.xz 404796 BLAKE2B 6ccde65ab6df287a005557d43cf3d8c9c7e6045e979127c8053450a3a9b8579ad21d8822fd56017b16ccf4e5bcd8e1f831013d4c3bc95d575134485cdc30d979 SHA512 3d81b62ac9707a0be09faa66cc1091396f22687237d5d0868dbab645a0e154cc063ca22d3812951854a5acc1cafc170452656ac4e12bfb4ed450ca51ef213b20
 EBUILD akonadi-contacts-20.04.3.ebuild 1188 BLAKE2B 992be9c35e4ced37c1236aa9ab00799b6aa4194e1ea740011e7309df450ca6adef6876e6972a9ed6ab226b515f65be3965b3a170777be6e4e409fa7854a4be18 SHA512 c029fdd2ab32c7a350f32ca773eec327ae76748956e6b11a016635ddf9e0cc5d711f2a2996e20d0d0d61846a4728aafc4649ec5d3233c7b71fc6fdcf16f068bd
-EBUILD akonadi-contacts-20.08.1.ebuild 1154 BLAKE2B 0e406365e918505b2eb2e6e2c3b2f69f101d342b120ebdec35cf49afb7421f33857a38bba1167c0ecd03c1372e44ec4041167b1de1e4a0568bea12e8f5e2d99c SHA512 e95905c66bc5658af2ad2ff1e0ff329135ab3be2f691ee4c47d22e070b3956a388f3c79dcf761e99318795c460a309f79da0f04db316cfaa2a1c2615e3067538
+EBUILD akonadi-contacts-20.08.2.ebuild 1154 BLAKE2B 0e406365e918505b2eb2e6e2c3b2f69f101d342b120ebdec35cf49afb7421f33857a38bba1167c0ecd03c1372e44ec4041167b1de1e4a0568bea12e8f5e2d99c SHA512 e95905c66bc5658af2ad2ff1e0ff329135ab3be2f691ee4c47d22e070b3956a388f3c79dcf761e99318795c460a309f79da0f04db316cfaa2a1c2615e3067538
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadi-contacts/akonadi-contacts-20.08.1.ebuild
rename to kde-apps/akonadi-contacts/akonadi-contacts-20.08.2.ebuild
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 6799cee8b917..ae418ecf38cf 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-20.04.3.tar.xz 439088 BLAKE2B 8a1c979a15b2f4cd787a35273e2e783042399c849556e14fa5b23042895fd0ca3ac636f7ada74138c621bc41c7014579b76e58e715d41d2db5b8af4cac0df429 SHA512 35f28bf0c51398a744b1e1d3008100350bf7b11b7598f9333851a748fa5afe49db14d37977076872e757f9104eee6dd3fedfec0223115d30985069517a1541a9
-DIST akonadi-import-wizard-20.08.1.tar.xz 505800 BLAKE2B dd8c16d313cf98c6153afcdaf894a5dab1076a09242a6aaf5b71bf9127184ace41166b95015e0e90072349bfae8208b99c914662fcf6b2ebbb5b5a88fe26cc5d SHA512 ec51133580e4fe8c68d3d15cfe2c4fb681ebb565b9ec10d6d013df0825ed5bebbef3b0230e180486c2044df6e64638a8b872574657bb945b4c2db0a0da99f4c8
+DIST akonadi-import-wizard-20.08.2.tar.xz 505988 BLAKE2B 65275a291422e5eea7acbd3b8745a3a43330e0d1d4fca2818e83fd6e6b13b695be25624b98a6cd0f26a05029a8aa49f9e34d9fb569afd207e0d498656480e2ab SHA512 ce719f82fd227539ad0510c3b90c82d3e0cf2d89d149fbe04cd31cf57424c5cf4663d4f7aa82d1b4842826b82839310b23672b211a0dc86a85929a9c6efd87b5
 EBUILD akonadi-import-wizard-20.04.3.ebuild 1221 BLAKE2B 74a1ac402b6af90880d2b0cda03ec176b975cafb2bfe21cc0044f98f6da650f57c232cff6d4491ce1c625812aa1b25b6251c91937ab70a89f09ca9c335fade69 SHA512 5ef2b500f78994d14a799610d3ef3234ee8042dfa658f03f40b6bb7a02fc8e7be6d1639f9fe1620e283ed1d62ee9a2175a809ce3f8b13710399b34eb0202cdd5
-EBUILD akonadi-import-wizard-20.08.1.ebuild 1191 BLAKE2B 35c000737b8fe65b0f634631224b167a472a20653178360fab5a75ccfba43877d0aabfdbd4bae6eecdad6c73db4b0e37fbd199c603926e46323252be70f4b57a SHA512 efeb91e219f067bc1f8bac05105f8cffdc8f1dc647db2e157754df562a739c00b0abe2e052c52bb4542b663d8d048e74d3ae0c74ab01b4229ec08e4aa4d5a7a8
+EBUILD akonadi-import-wizard-20.08.2.ebuild 1191 BLAKE2B 35c000737b8fe65b0f634631224b167a472a20653178360fab5a75ccfba43877d0aabfdbd4bae6eecdad6c73db4b0e37fbd199c603926e46323252be70f4b57a SHA512 efeb91e219f067bc1f8bac05105f8cffdc8f1dc647db2e157754df562a739c00b0abe2e052c52bb4542b663d8d048e74d3ae0c74ab01b4229ec08e4aa4d5a7a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.1.ebuild
rename to kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.2.ebuild
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 46fbce83ccd9..ebd6c314f01c 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-20.04.3.tar.xz 132240 BLAKE2B 0fa8b1763cd13e2a1415fcc987e76fec00e52d5153e8b5c22ce9033f955b98bb9fbda0be737704b906a7705f1f90c27402a9e9bcf10f8ca871ca01662588655a SHA512 a22c8eaa5912fc2b13cf018b89062063157eb87570a9367d9fc4cabdf87e132fc564c81b21583fd0693b7ae4b2f13da6e2f7d6683a441ac2f320f594123bde0a
-DIST akonadi-mime-20.08.1.tar.xz 137956 BLAKE2B dff451a372f943cd279c0ce77ee1f4b4a8405a0c14b5bf9cb25d122a87c54222bbb12b76233fa64d63080df449cc8df0a9e3f2b6b9efa44fc344e9f6b63e3eff SHA512 7bc468d93ba40ded4d3cb3fac23a2e1a06d76e3182c6b938fb21e09e6169ac96b8f5519becdc6d546ac269245f67b286afc37c6026cb05bc91e2e74b4f64a134
+DIST akonadi-mime-20.08.2.tar.xz 137992 BLAKE2B 2e857927e8ae0b6cc0a6f4a23f8b0449eb339a5b7110d52eb0a1f15c578d928aa56155db8d1c2ce364dc8a0b51bff01747ada7157992e3a3834e6f3ff3d5dc47 SHA512 6ebdcb7a673608ee59e4dc98508a944a7c47d58d1ca7e4f74409b6b18123130faa1b9056fe9f4199c8dc151923d28504b4cb1da4fe37363bc03c5ad46f858155
 EBUILD akonadi-mime-20.04.3.ebuild 914 BLAKE2B db7a81abb23db6a899a308c38ea4e5780d151891fcce6de723d2e2f5b0a77f50cd924f996b34164c7d33636cf18ec9796e4efe7f58ac39a8fe534e712b1e4677 SHA512 a0a1d6e77819665bd24aef87052d4f57a8e6e801053f5eeeb911cce70185a76f580f70fb07791b7fe5e9a5ca1d56e6f8b314f9be7b5faecbbc4cb912c76f8cfa
-EBUILD akonadi-mime-20.08.1.ebuild 880 BLAKE2B 23af85c0aece2a4c822a762246d19af47ccfa43917ef9342cc14745984554d08aa5edb8f65df4f107cd096890c51ed52e1453686109cfd72269f50b5ce085c9c SHA512 33a971a947731bbe66728e3ca8b6c171a798262dd591e38d25caf5b915ec05b00b19ea2e3689e16f35ea2f57ac4977048aa14c52f418f8964ae9fa5d269d0377
+EBUILD akonadi-mime-20.08.2.ebuild 880 BLAKE2B 23af85c0aece2a4c822a762246d19af47ccfa43917ef9342cc14745984554d08aa5edb8f65df4f107cd096890c51ed52e1453686109cfd72269f50b5ce085c9c SHA512 33a971a947731bbe66728e3ca8b6c171a798262dd591e38d25caf5b915ec05b00b19ea2e3689e16f35ea2f57ac4977048aa14c52f418f8964ae9fa5d269d0377
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.08.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadi-mime/akonadi-mime-20.08.1.ebuild
rename to kde-apps/akonadi-mime/akonadi-mime-20.08.2.ebuild
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 2bc889390dc0..177436d74aee 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-20.04.3.tar.xz 24608 BLAKE2B 099ac0ebd458b3fe87d37ce88b88beccd5e6a2280a7dde32f7d56ec52e946f2193e1c586413dd602147fd08c275ba1ae717e141cc0fe12c2804ae65377cab04a SHA512 9fe2cd29e7b35dbd269177b53e5efbc568791e889254169bf21e032b4dae06fa673b3e3f26b2d2fbd4bbccd8e3b8d870ada6ddc16517d585a078f8604584d458
-DIST akonadi-notes-20.08.1.tar.xz 22816 BLAKE2B ab1cbae19491f467b135d3f34b3f97ebe55b460ba8db3d46dd847b5b0db77f2d66b6bf8dca8ce596d985b9893b7436ba03479e6495841f5c268b8be56e58961b SHA512 897047fe84b203be83bc6ee7795115eef02ff7fa62da0ef1e5b4b0173d86de1fa2234d3f7545df153f6b7df0006b10640c777ac74982b9cdf28543c0ae9580be
+DIST akonadi-notes-20.08.2.tar.xz 22804 BLAKE2B f6e5f9382c9b203ec23004fc9c33c24fcab96117c5fd1c8173a7171440124c1fd506027a19a8ec6fa874c0aa2b72c78d105838df4c1cf0e048b5060c3e7b8058 SHA512 c3d68d253c92fa43a71f73252ba4705fa0b59ce24881f848cbfbfeaa147eb6467e5b1471f493ec50006ff46de513309b15b4ae35e1df26e1d79cb6edf6e4b256
 EBUILD akonadi-notes-20.04.3.ebuild 461 BLAKE2B 0711b38c3518183226d4616e99676ea28086cb3b26aec665199ab97078280e4a4590144d4a75b2fd8f12fb05f7aed61d18325b64e2b0f8e6d1a2bb87794d7c66 SHA512 5a8d90549bfeae883e9d175d1562b873ff279135e626b61b2e9f15102c4283aa7b7e0d06443754cb87a88380a251a2730549371826a1907441bec002ccc328e0
-EBUILD akonadi-notes-20.08.1.ebuild 464 BLAKE2B 26cb69f338f64762053e5a6bcbbc52272ae54aad5a647c4f0ef4be2a4a373f03b51ee7eaeb6be76d49262818971493148573454849670929ecf3d8ce04c306db SHA512 9a90daf19f9b8335713e32d29a179b5a0c64d88d0d6c7cdcc1c7acc8e2cb024a88df0700b39afb089948ba47d1ff0585a09e42639ef7549fec9112e4a8c9d2d8
+EBUILD akonadi-notes-20.08.2.ebuild 464 BLAKE2B 26cb69f338f64762053e5a6bcbbc52272ae54aad5a647c4f0ef4be2a4a373f03b51ee7eaeb6be76d49262818971493148573454849670929ecf3d8ce04c306db SHA512 9a90daf19f9b8335713e32d29a179b5a0c64d88d0d6c7cdcc1c7acc8e2cb024a88df0700b39afb089948ba47d1ff0585a09e42639ef7549fec9112e4a8c9d2d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.08.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadi-notes/akonadi-notes-20.08.1.ebuild
rename to kde-apps/akonadi-notes/akonadi-notes-20.08.2.ebuild
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 1c1475892c33..c13ff2211b69 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-20.04.3.tar.xz 83260 BLAKE2B 1823a8c309fe0727c3f3fce99924d96867d0482e6665d8069aac93905fe643b42f4b553a7c01c01a605cfe57f8bccf83d9b654ba2b5dd74cd66ba78f4ddf498b SHA512 902fdef259863d0d0789af29d7ac5cf49e0b95df4f3509a444a20fefd9948c134e024a685bddc1c547efef6d2ef7872d00e5a1f3ecb836b88103d17de47ce413
-DIST akonadi-search-20.08.1.tar.xz 94296 BLAKE2B 72e3bc923f3f63a26e82b623c34998a5b52c0037efb34120e1bd0e85aadb3b7d1694cad10e69f6cfeca23efc8b13d239c2237164cf1ab04f9ed93f0ecc2c9148 SHA512 28e0235af1da68fac47b4535b0c5627d42de472d7d6238928a244dd729844f470c16c66c4092d25a33a373d790da8975c8b4d6fe429db209657003b50a39d7d3
+DIST akonadi-search-20.08.2.tar.xz 94776 BLAKE2B 3b2fc63b279f97ac786ee12e519095d441d7eade91d8211182c1763e687ac8ab24ab15255cfc77b54f7dcc3503efa540e695e4ad283186dcd249da40cb18a769 SHA512 9434ab0428a5d15b47c57a20017413fb0b3bf8f95c1fe3528acb105e35062d03ea97f661a027bdd2f6e418d619ca4b38f9a27ae40d11bfa0afc9ac668d41a66e
 EBUILD akonadi-search-20.04.3.ebuild 1294 BLAKE2B addf121ebb57625aedd069e8da2cfcc845ee12e8df6980b81091eddefba8ec9d0fe0f849f65200a8bd3f0c02b2705592d1dbb323e08c2be75724f9bd2e8bf234 SHA512 2a36b11180c3061bfc9c37e995cfd4390f0fd4ad8ec3e72ce0176b303cbe04b789931dbf607adbb99ba3d3ecb5fcb8cd30ff97faff145faeaa275dc6d5acd454
-EBUILD akonadi-search-20.08.1.ebuild 1297 BLAKE2B 62b0582ff8a9e5621b2fca38d07dcb6e25fa5ff5228639ff3a8798a89aa1be3f199c7472268d735aaf792b1d06afcfaf6b8bb977956ef4c8a9d7de105d531b50 SHA512 e7e6bfea4148d2f3ae2393d3047c75cd5d6bd2e36e6d100545d7f663b8c7fa2dec995a6865a8bb741c6dcfd58a95f6e3aa58d1f59326263bb39986e005dcc5e0
+EBUILD akonadi-search-20.08.2.ebuild 1297 BLAKE2B 62b0582ff8a9e5621b2fca38d07dcb6e25fa5ff5228639ff3a8798a89aa1be3f199c7472268d735aaf792b1d06afcfaf6b8bb977956ef4c8a9d7de105d531b50 SHA512 e7e6bfea4148d2f3ae2393d3047c75cd5d6bd2e36e6d100545d7f663b8c7fa2dec995a6865a8bb741c6dcfd58a95f6e3aa58d1f59326263bb39986e005dcc5e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-20.08.1.ebuild b/kde-apps/akonadi-search/akonadi-search-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadi-search/akonadi-search-20.08.1.ebuild
rename to kde-apps/akonadi-search/akonadi-search-20.08.2.ebuild
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index f7bdc61ba1c1..e8c8d7a3a300 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
 DIST akonadi-20.04.3.tar.xz 1584704 BLAKE2B 7dfcc8406946779338de7cbbe7752d200078335e04372c26f84dd68409a2a2fed7c6a6025ecbf3e3b6299ce5ed044755a942fc6abbf3fb413a044551a515931b SHA512 29612920af6794f096d6ae51d98830f38f4d94bfb3669e11b748fbf7556b2396fac1837f1ee14cfdbc2285164c8b08206d2d46a62d0929354af47c77d9978698
-DIST akonadi-20.08.1.tar.xz 1584016 BLAKE2B 4da5cb23ffa77ff3b57d1302083a43f4fddf6955d6eeead8824acc76acbbff9b54e4578ebcf22aca69ae870b359944f8802e8cce50a1a6f8f25d2733b91fc9aa SHA512 e444f7449d4ac6ed184702d854785d3ce9a3c42878cb030934901a712a372cfc95c07d3e7b3ee70a1f0081a920f64d44372fbd194eb6c7c32b9938b69ab9ac5a
+DIST akonadi-20.08.2.tar.xz 1588176 BLAKE2B cf4b35525a019a331638a71e0a82f8f9afaf2f985cbb2f75e1ca7e656968f9c1e9d148cd77df04c5951f15f96e555b3dec58855823873ab0933b6e271599bddf SHA512 bdd897387ef06264c093331fd1c4804bfbbfd641aa4775a992454c644de076a18d8d9fb6a8468b2bdf94d226bc2e5c139c2a20bd0dff0047b8f79933464a475d
 EBUILD akonadi-20.04.3.ebuild 3694 BLAKE2B c9f4d2413ce23340fef04396112f9043bc893757023abfa3ce2a5204473fd934aee2eee920857431822237088793f1efcf4301318ccc8587ca2bfb98a8c4dc01 SHA512 befcd458aad3098783a8a7a8d913fb4db0a4afa2dbd207e842db450fe67cb9638f24756f4d42979fb69c4d25be6f3c72ec67af8c95f4382a7f9eac942cdc967d
-EBUILD akonadi-20.08.1.ebuild 3697 BLAKE2B 66ff5029fd168959e71cd2c3f4cc541710bb0aa66782d7c56eb25df3a39b06cd0d7306c34618c77c66a0e852b35eba9ec7c0946facece4670c429747de4e4150 SHA512 fe1fa52186c9bc24220a3b16643fbb2d7e7b40b34dc654c59aa6aea950ebf4d45421d904a094db363f2c43dad3e05afc3a4422f1ff1ae3599b368eff07555159
+EBUILD akonadi-20.08.2.ebuild 3697 BLAKE2B c84fefd4d6c7a7e54c24541d685da4ac8faa2b28530f6249c46df020fa1505959ffc93d110097aff297c5070c4dabf7b5f79b19f2c0cd1cb353a7a75c3d7660a SHA512 7fb9cdc160038109b982f62a8a7733c6de094b85b16aa030b99c4ff398068271d9493e2e06232b7e0d0221963571430ca8a57f49baae7e73102e78fa4c4f2c45
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-20.08.1.ebuild b/kde-apps/akonadi/akonadi-20.08.1.ebuild
deleted file mode 100644
index 729ae7326179..000000000000
--- a/kde-apps/akonadi/akonadi-20.08.1.ebuild
+++ /dev/null
@@ -1,129 +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-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
-		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
-		ewarn
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-20.08.2.ebuild b/kde-apps/akonadi/akonadi-20.08.2.ebuild
new file mode 100644
index 000000000000..9321f090ff4a
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-20.08.2.ebuild
@@ -0,0 +1,129 @@
+# 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-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+kaccounts +mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	kaccounts? (
+		>=kde-apps/kaccounts-integration-${PVCUT}:5
+		net-libs/accounts-qt
+	)
+	sqlite? (
+		dev-db/sqlite:3
+		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
+		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
+		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
+		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
+		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
+		ewarn
+		ewarn "Manual steps are required to fix it, see also:"
+		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
+		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
+		ewarn
+	fi
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake_use_find_package xml LibXml2)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	ecm_src_install
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 0167ed5a08a0..2e72879fcbea 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-20.04.3.tar.xz 193688 BLAKE2B c52fa0b3246ecb00bf090a7ef77bb71125dde41857e7c059d76b471e37ea91060776b011a0e84208c62c3e49b4b373d3ed32692d171c210c0753bb4cede806d2 SHA512 5a27a92a67638831633f0020f92f9c64fdf95465977d90fd70ebfcdb383d11f2662e9e4987f1114aae3271dd1f6e5fb18b16e09eba76cc58edc834671245dd92
-DIST akonadiconsole-20.08.1.tar.xz 194936 BLAKE2B a0d98717fc4e949c9b9c1c2d43a9f422e1da0ef2594e948fb1ae3ce995cb85907fd5969e70941bca3eba53063c893c66624fbb40f5a4ea3d737fb0698417d5b0 SHA512 2ba5fa2d68e1fe55c19dec57ca1105c4a81da2d2049437d01c487796a91917be8b81b7f647cc5bd87220a4a179a5c1230d40f1a4f04e63e765c3e4a84217170a
+DIST akonadiconsole-20.08.2.tar.xz 195004 BLAKE2B ac365d5e4518685e92bb177b17ede6752d95e256f0f139281985677ebd0e95059707c87d007e240d6c43caf38db08a9c81fcc624eb3fb95e2359405316e4fbc4 SHA512 bca602448f3930c6574a11d22da995321d4033c115652060cb88109fbf57d633ac61b403f48785d512408e2607a97839b48e402c0fc294f72e35c48c99f69a39
 EBUILD akonadiconsole-20.04.3.ebuild 1474 BLAKE2B ae775e885b64a6f05a5b711778c1cc21173eb5dd05fb59ed290bf916751437b5ade399119201e780a07c8d2b07c9ad45570b19591d3ee06ead4383a1662e9a67 SHA512 c3db8705dd463d6109da6681fb74705eb14ed1d65344b3d7bd527aa23ae47440bdbbb0d61c949439f41547479f014279e12b4b9fc79dc88fa1529fad035ca17c
-EBUILD akonadiconsole-20.08.1.ebuild 1477 BLAKE2B 295194cbfdd7e3bbc2fbb0066e8a2e18833dcb6d24819d06e3cb229e72f80e4caf308e4794f8179aa2795f9c8a6e0ac8103f72f4b313697e9323693008a66a44 SHA512 2e001e35e2b956f72599aae82bcb1c268f9afd122fdc631f0d222953558964f1ddcf3faf337e4d30274d299b07520b125f8223d77219c76af45fe8a504a31c4c
+EBUILD akonadiconsole-20.08.2.ebuild 1477 BLAKE2B 295194cbfdd7e3bbc2fbb0066e8a2e18833dcb6d24819d06e3cb229e72f80e4caf308e4794f8179aa2795f9c8a6e0ac8103f72f4b313697e9323693008a66a44 SHA512 2e001e35e2b956f72599aae82bcb1c268f9afd122fdc631f0d222953558964f1ddcf3faf337e4d30274d299b07520b125f8223d77219c76af45fe8a504a31c4c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.08.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akonadiconsole/akonadiconsole-20.08.1.ebuild
rename to kde-apps/akonadiconsole/akonadiconsole-20.08.2.ebuild
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 322d07a7a870..86476c18abd5 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,5 @@
 DIST akregator-20.04.3.tar.xz 2196124 BLAKE2B 80be80ed8fb10086635bb224024ee16180d119c1632125f6eaadf7977ec255529d35b11defbf96058ea3b313723828820c4742e0518aa79433d77ef802d77048 SHA512 5d4d76becd5f6491a010ec27d24775b4163697b9c1ea780d382fee4a2351b937598b449f269e7652656bc0a14589726b68f3bf5e62d8cab62de6862d5182758c
-DIST akregator-20.08.1.tar.xz 2203848 BLAKE2B 920c4ceff8436fc7c8ed5adc5dc954d5239f2f12879ba8908706a6c178065765a57d7b273c1f3c9a230c40071ee475e5a8b1b92247d487d9ecb2173a61428add SHA512 c46580ed1644da075cbbc3b9c883b98a0a8bbdec4aed38d03029065d1caa678f286cec80c0e340a113790167de91d2fd34a2efb201564b35bfc127994049972c
+DIST akregator-20.08.2.tar.xz 2203876 BLAKE2B 59da4450336367109d6b5330605ea89d03c0201c81ce932e0195bac16b0a3448f8cbe7c6b1ef3bc1f34729070ca403c0c3b5fb5f3410854e37a76029c1b4413a SHA512 3060bb568349aee41b10efb792b27eeaf085f8deb322bf2315f4f7c8efa0faec85068b4c19bbd61b73d9eaa37990a22c603c1662fe39acd3d8391f6662459639
 EBUILD akregator-20.04.3.ebuild 1742 BLAKE2B aa6258adc1cfc1021a232bffc22b845fcfa79dc8f5b1241f52cdb470d9e8cf4bbd770929073b382d82ac80cbeb85b5aeb4fb12ce3092be96d0043dca2fda4a61 SHA512 934b017333a3fc02631d857a5b48f9f60377a9b85f245d54db9a09997a1ae3d4e6a5e5e26755168604e8985f3f95c6465b0844370de597f650d4a849eccfbd72
-EBUILD akregator-20.08.1.ebuild 1745 BLAKE2B 6ba16b5d978ba38559619bfe9958d8dc9bef2412d86a5c72f5d4b856dbbe68fdfa56d533f8d46445509d0bb3be0ae7f0a0db6b7abb2043a7b10a508f0d4df78d SHA512 6fe4e3d59ce5acca58806e87465b5e2b489702c5a1bf54b50f275c46f52c4c787ce85d30a39f3ccdcc36ee976fd2c7c3b84e0686bfc1da95067e7b548e473460
+EBUILD akregator-20.08.2.ebuild 1745 BLAKE2B 6ba16b5d978ba38559619bfe9958d8dc9bef2412d86a5c72f5d4b856dbbe68fdfa56d533f8d46445509d0bb3be0ae7f0a0db6b7abb2043a7b10a508f0d4df78d SHA512 6fe4e3d59ce5acca58806e87465b5e2b489702c5a1bf54b50f275c46f52c4c787ce85d30a39f3ccdcc36ee976fd2c7c3b84e0686bfc1da95067e7b548e473460
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-20.08.1.ebuild b/kde-apps/akregator/akregator-20.08.2.ebuild
similarity index 100%
rename from kde-apps/akregator/akregator-20.08.1.ebuild
rename to kde-apps/akregator/akregator-20.08.2.ebuild
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index caead9cf5657..42d9969ccbb3 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-20.04.3.tar.xz 333208 BLAKE2B 2d5ee19afece27561defc3b264ce413d619d447d92f4b2faa0be9ab715b26c16268ccfc978fad4f6e9ae49d1898d5fc9553d6e8083c9e7369c5e49d821444170 SHA512 25a5f20505f27902623029f0da416209186dd8274479c808a466225759efb0389816388e2fc77e708362ebde4815ca298840d67c98cbd43f516b73d66159c629
-DIST analitza-20.08.1.tar.xz 338564 BLAKE2B 63a9a1ccfd03d1bf4d2fbef22e56ece79be7e4cdd1998112dec2bfe56a593f4c827f8bf5bb07ae7ad6808c6da46b756ce8672dc6c15a3fefa9011281c6b4d0f4 SHA512 ff9cf4b52e355c155b1b8dd2311e0314b4c87dc43d5d3bc3e54c66b6216b836cc675c17f5adc3d3b0cda5d8406cd07ef87035ebfc81e45e9e2d103af8c612e51
+DIST analitza-20.08.2.tar.xz 338540 BLAKE2B 0210e34438ed133eafb32fd89d3d26cc2e8d478ce207f371003cc7454ca3a302bbdd9495dd496e5f44bbf2ed2b4ac79f78e6ec0fddbf458d8c0a4436904d3efc SHA512 d419446458b293dda2abacfa2fd793ab7e813638b592e5b7bd2db35eecd8709b6bc367e422f3625e37d1552c179a7a6c3afe318fc45b67f1792b30e648254f01
 EBUILD analitza-20.04.3.ebuild 923 BLAKE2B 9861fa389c413f71e7e39662850ae9ec764b486a09833a7743c3af8516cd8b8e47812646e4ef4418e12fe91cb6bc59bf8da0989d6c9ada88ee5dcd94979b5533 SHA512 afa08a6370d9a08e6af9875d9c42e2295339715dd037a93f87c9858012dd2f239cb7da24d12d93e01336a81743ef815a797d890a949e5d0958f943be9b7fc4e2
-EBUILD analitza-20.08.1.ebuild 916 BLAKE2B ecc7c97423f66028773eb0cba1f20a80d5bc5c4f4e27f2cba91ac21bebb7836f1ce794acda989bccae96dbaa32b3d1aa4bf5722e8ad69db6b101998c0e565140 SHA512 72198081d6094d742d58a7578d5c87bffbbb5e46cdc3341b3229f20c42219e89eed0a64830b9e1226adcc0c95cfb04ae220f6fb886b9b28bfd0aeef0442fa98d
+EBUILD analitza-20.08.2.ebuild 916 BLAKE2B ecc7c97423f66028773eb0cba1f20a80d5bc5c4f4e27f2cba91ac21bebb7836f1ce794acda989bccae96dbaa32b3d1aa4bf5722e8ad69db6b101998c0e565140 SHA512 72198081d6094d742d58a7578d5c87bffbbb5e46cdc3341b3229f20c42219e89eed0a64830b9e1226adcc0c95cfb04ae220f6fb886b9b28bfd0aeef0442fa98d
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-20.08.1.ebuild b/kde-apps/analitza/analitza-20.08.2.ebuild
similarity index 100%
rename from kde-apps/analitza/analitza-20.08.1.ebuild
rename to kde-apps/analitza/analitza-20.08.2.ebuild
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 185a578c9c81..3eb463474b5f 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,7 +1,7 @@
 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
+DIST ark-20.08.2.tar.xz 2711160 BLAKE2B 9a26c6bb418ec264bfb3cf7152daac4d6d73adc02e2f306254d15e1fcf580080c56a1ef8c75cad8c6f4177712bd8d65c615621c2d158c394660c8f73cd4fb7d3 SHA512 6e5285fca011a2c44817a4c9844ef2f5e7137ce446e28be3c65e259bb1011be634107886b72a53c8c735ac38f0ccee92d22670ab7c622fe4dd8d3ecd273706cf
 EBUILD ark-20.04.3-r2.ebuild 2087 BLAKE2B 6373cd5721212dc21ece5683135873c6ce0b8d06390143b27e25eb5c5897313dfaa44a9f849922e7cdc958748221e4ac08cb5ad9d1c5c101a0465ad6fda1dd58 SHA512 0a400e7dbc6933d94aa12195d04f392da8fc3a68a737fdad8891d996681909deacf6e428e5a7dbdcfe631ca860ab955863f9eeb4b16bb9a2b24431ea90f6862e
-EBUILD ark-20.08.1.ebuild 1995 BLAKE2B b16597d7a6852fecd3f16935cad6161337b8758d7a8c67b37be17b299855badbf775537b4deacb818dfaba3e422ece157c4023a17c7d14833432a91cb6d7366a SHA512 e91daa641b690c9e31ba10041c698e0997d79096b934415f26d6468c310d640905a34e0fb1c25843abb512f24b3cca86a317018e672fd7647a40e8d3fa0062de
+EBUILD ark-20.08.2.ebuild 1995 BLAKE2B b16597d7a6852fecd3f16935cad6161337b8758d7a8c67b37be17b299855badbf775537b4deacb818dfaba3e422ece157c4023a17c7d14833432a91cb6d7366a SHA512 e91daa641b690c9e31ba10041c698e0997d79096b934415f26d6468c310d640905a34e0fb1c25843abb512f24b3cca86a317018e672fd7647a40e8d3fa0062de
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-20.08.1.ebuild b/kde-apps/ark/ark-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ark/ark-20.08.1.ebuild
rename to kde-apps/ark/ark-20.08.2.ebuild
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index bedbe98edac5..ab738182d342 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-20.04.3.tar.xz 1079308 BLAKE2B d3f5e27751e372f4a73b4cecc1495fb3e2edc08d25e02db37a0c0a8173c8533259a42872283d0e705193877871f59791dfeea12da85aa5b4c3abcad0e3a3f6c0 SHA512 ee7292aff6a4639f310284e2d508dcecad49f9b12550dfa9616e8a56f6955ae3b872733e20f7ba0135321a16bc9cc7b3fc72019b1e4b8ff00d8df31124f8c0ab
-DIST artikulate-20.08.1.tar.xz 1083988 BLAKE2B eecd707c0e2b895fcdf5161bc85a23fb093ecd1bc3f6c039fcd010f8728e608efdbaa0775754db35f0f940737a2d7ebfab3741edcd741714707ef910bea32d09 SHA512 907f23dd86dbd2de37f942a6c8446af1a62e0e1e805ee02eb7483cef74b7575a34cc0fbda52402ddf84f32c38fe8d15306cd8412aa8d449087af36327151a608
+DIST artikulate-20.08.2.tar.xz 1084172 BLAKE2B 20814dc61d136f6f52fa67e0b4ac44bd08293d9ab8abcfa5323f1e60754412f82f1fabfcc1c5ecdc59c5c5acf4d2f2d633128cfd41a40453a2e6bacc41e97b42 SHA512 80fc712b4644542f873a195d95117b3444e439952fea0de85daf23700046f0a61114fda098271958665736817db983900f97667ffab6213dd28867e4064dab9d
 EBUILD artikulate-20.04.3.ebuild 1216 BLAKE2B ff5a2baa65584e685385adbe0dbda6353a00288f8e2740cfe6db319bdd5f0aff01954e5892735e0b846412af4261da11157aeca680e2ab3fb61ede11946109db SHA512 56dad2b2b14e7e9819c606d34993bcb6f00a4e87fdbf8de8df6d153326d07eecfa6b9b0880451cb6b785ca69ce080518c56d1d79b02b84ec2f14d357bbeb48f0
-EBUILD artikulate-20.08.1.ebuild 1219 BLAKE2B 5ad2af46ef6dd1c7890ca92cf57d62a1fefce22cb1eb12c1c686f5eb14e6c8388f671ece5d8479fe54604ddabb3b019a011f1fdbadbd2ce5cd40e033f238a0e5 SHA512 4768cfb92623fcb4f2b057a3897b8e484fa2f73231dfcb65f81d0269d69c762e994ea9e0cc2052c4c61a7bb499d9ad4bdcd30b2326e1212817c0fa5fcf1c7f8e
+EBUILD artikulate-20.08.2.ebuild 1214 BLAKE2B 5b9094a02665c11608b2b94457b39c88118709f124bd6140c3570d79eb55dae79200a6726c7bf2d032e0042483c9a126c0e1c6cfaa7baaf5564fe076cb4f32bf SHA512 9f23643e5ad89a3da28a1420c9369603017195857b8405ec8100f2085bdef4cdbf72c6004568c88d591ef667e294584ab608ca6841c27ab44bc5e8ebcde8e186
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/artikulate/artikulate-20.08.1.ebuild b/kde-apps/artikulate/artikulate-20.08.1.ebuild
deleted file mode 100644
index 9b0293c8f43c..000000000000
--- a/kde-apps/artikulate/artikulate-20.08.1.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_HANDBOOK="optional"
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://kde.org/applications/education/org.kde.artikulate"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="gstreamer"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	!gstreamer? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex !gstreamer)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-20.08.2.ebuild b/kde-apps/artikulate/artikulate-20.08.2.ebuild
new file mode 100644
index 000000000000..ae6edd70c197
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-20.08.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://kde.org/applications/education/org.kde.artikulate"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gstreamer"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0-r4 )
+	!gstreamer? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
+		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex !gstreamer)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index e5d779972e35..9883476897e8 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,6 +1,6 @@
 AUX audiocd-kio-19.04.0-handbook.patch 717 BLAKE2B 997c82779a9598d0ffbb0605ca7b9f71ed62298ea3f3acb2ec88ee99417dac84fd8e6ffa0036d036346bf28612c6bb4323ce2e4f62316c4d321201d00462e665 SHA512 7601c79145be90cc9a49eec28b8ff63e275212d76d4faba779a1cda53c45ad863cd638de64d522c099a2c8858275c92058928a6f4396951aaf370277189e72ba
 DIST audiocd-kio-20.04.3.tar.xz 489356 BLAKE2B ebee9c97026b58a2a04362449b730b69b10850c273311c091b1c6f3551ed2e8708357bcde9692a88b855eb8579849648ad4977718da645eed2b0ed4e0a20ba59 SHA512 197a8c8ed9b8dc9392c9bb274073c33c4f0c40fddf6061d092529f16405df0cbee93f3a2a8405157fbd35958344085eac9ee4b9699e06a96f22c52b9512dddd3
-DIST audiocd-kio-20.08.1.tar.xz 498096 BLAKE2B e01c9b872bff17ac6c74e0dc2f43136099020592bd5b746316a4dc994b5c976b809998d2f8f873c98ccd305c376f366f6ca54d2db664fa904daaf28cf1c6510b SHA512 cce09365d0e5c5d7afb96dedfdfb13f8a2745c18f3592bbe19582217140f6bfe33c2a642e682cf8db9aec4ec8c9f5368f64f30763c3d61aadc4c9661e42a5e25
+DIST audiocd-kio-20.08.2.tar.xz 498328 BLAKE2B 8cec5aedec78af6da7982a8b9ab1fa2cac6e43f8fe8de00a0afda22ab082a24ad9a600f359a34566df8437cf1eaf0719a35a0da888360806201eb1546cdf0e01 SHA512 00cf93dd33c1c85ca7583ce33467f418136ce7b2defef5882864293c5f1133604dae674830dd5c7b9d589eaa8bbd6e6bb41af22659f79fdab91cd6f24aed7007
 EBUILD audiocd-kio-20.04.3.ebuild 1075 BLAKE2B a2ed7d4ab8c2482e4bbbe62bb735a8fabf17af806b92bf6f6d2a9ea5892c0a464c9c081a2b79e949d11fff5956196c553a7030c682a7f1b7026c3beb7b79a1ee SHA512 1d6b73447ceaee07033dd04856dfdd2e173f16d4d592b0bf2b3020fe21e531bd6c4a09622701f6e3ab02aa22cc033a63a67318b74b419a5e0b21ddd3b640c1d7
-EBUILD audiocd-kio-20.08.1.ebuild 1078 BLAKE2B 3b890f0c7de4ee45e67262f77d5ef008898b6a0f656ee6d7a9bb00715525486b89cb9bb594ee0714512f75287f68c1177b96fb2a229cb0346c3e705ad490a60d SHA512 74345ac1b1852160d047f7b8cda3a0682ab0ba4bf7c5029cd2c1adb509f18a23f459a758d0b4ae1a8da4b952ba8cdf3c126187f9673c1877951cafc6e2c8a529
+EBUILD audiocd-kio-20.08.2.ebuild 1078 BLAKE2B 3b890f0c7de4ee45e67262f77d5ef008898b6a0f656ee6d7a9bb00715525486b89cb9bb594ee0714512f75287f68c1177b96fb2a229cb0346c3e705ad490a60d SHA512 74345ac1b1852160d047f7b8cda3a0682ab0ba4bf7c5029cd2c1adb509f18a23f459a758d0b4ae1a8da4b952ba8cdf3c126187f9673c1877951cafc6e2c8a529
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-20.08.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-20.08.2.ebuild
similarity index 100%
rename from kde-apps/audiocd-kio/audiocd-kio-20.08.1.ebuild
rename to kde-apps/audiocd-kio/audiocd-kio-20.08.2.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 513db022e8e8..64f8d6b19947 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-20.04.3.tar.xz 261440 BLAKE2B 7f108f29303b56f05de6c62412bb6be2459a119e7eaa08deda515bc515ac5301e5f215491a4c615fd0c05d462d61784d3ec6d7f11af1889a43ec88ffd0bee3a5 SHA512 831a063d15958cb96d86e4273fe66fb7fc8d0f408fd9ecac2871da411ed41b88623680ff4a449ba2013aa006cba0c2e6b5ff9e2e3214513f0eed1306b62dd504
-DIST baloo-widgets-20.08.1.tar.xz 261416 BLAKE2B d47c25d26aa8d29c54c17afc14ad885a65622667337f996c75cef971c7437cb66c86103b05148e3dcecfe526df82fac256df0bf3870c0a888e8251142322bb87 SHA512 e64719df49742852fadd8ca7e18bb725c5e7259f9dee2b96f972e334eb3cf846b45ac5f9fb91a425e9354a9a2476d1bdb89761a34804d17c1f68e8958db9af5a
+DIST baloo-widgets-20.08.2.tar.xz 261692 BLAKE2B c03787c191a83db9f3713b54cb3b5409c23223fce14aab1154dfea628aba3cb7bea39f7642c5471848fb0223aed24dc74b0d9390a63d8669b8686c3eaaa664d4 SHA512 db391c0d54f257e0723b56d817bc0c5e1a99b8ad5185b9345e0233cd0c1f7182cf9ed2a90a485b5054da3321dbd2d522f0c9bd80ddc0db06a93443507969e525
 EBUILD baloo-widgets-20.04.3.ebuild 704 BLAKE2B 760c5e55d99511522ee9ae2726bcda29038a40a31ef781242f32739a3f143300097b3112eba116aa8957fdc3004e6c7c459dbc452a8cbfcb22aad7ad040326b3 SHA512 305a78b97a15c0951cb039b07fec5cc583d144cf1bb2db7f3bd2ef6a9bc2827c42d2173cdc892c32197665f544a2c1c6e14aee53293d922f91430b6ba1d5074f
-EBUILD baloo-widgets-20.08.1.ebuild 707 BLAKE2B 5211e710858e0d75a9cbcf901fe786f376da611a54c6979830dee0facd4d58048e6e877aa58d32646548904050887205862d386577cf546664105ff4900f88d9 SHA512 28f4d1abd0ed3703695a83fb9e222f9a11c21713ef5a4e78260094d6ca371872cad64501248f8400281f80f83804793e161f70bb6a8e02376010aec30f24b753
+EBUILD baloo-widgets-20.08.2.ebuild 707 BLAKE2B 5211e710858e0d75a9cbcf901fe786f376da611a54c6979830dee0facd4d58048e6e877aa58d32646548904050887205862d386577cf546664105ff4900f88d9 SHA512 28f4d1abd0ed3703695a83fb9e222f9a11c21713ef5a4e78260094d6ca371872cad64501248f8400281f80f83804793e161f70bb6a8e02376010aec30f24b753
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-20.08.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-20.08.2.ebuild
similarity index 100%
rename from kde-apps/baloo-widgets/baloo-widgets-20.08.1.ebuild
rename to kde-apps/baloo-widgets/baloo-widgets-20.08.2.ebuild
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 5b4b55acb615..2dfeb83a2196 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-20.04.3.tar.xz 2822676 BLAKE2B 8cb128b18e9ebc9919c46057ae466011b0a60cbf6776f92042b49f7ef4da6fc7a7005aa2ebb2ce4c31a71c951e1850c5a9ff1285524387b417bffd8aa07c324c SHA512 5c84a319d980be8273a593d2ae00fb75cd6444347f54f00b3f533d8d9b4cf5f1612f3db8a4a040a650dd30506d3070ad647a179d7498be4727315eb30ad2975e
-DIST blinken-20.08.1.tar.xz 2828744 BLAKE2B 32280988046ab960868b8efbb94fd4318528379ff083abe42a40dfca1e60c29b31ed2d8ab14ce4e7cfd108dcf7b9cb08e2f8d5437fd622b58738ba134789ed65 SHA512 18610007944c980f40d6f3c98f99194d2d103bb1bdd167177a9303cb89a0fa95278f28047b57eee21a4b34c30bb35b8554ed8bd5a47f61b709f535a97f6862c4
+DIST blinken-20.08.2.tar.xz 2828780 BLAKE2B 11725c530124af6eaa6d32a7287833ff5375bb85a1fdd1c11ba45cb1be4a57d5d1e90741a5c317a888197d23549b656ab42712e8723937ccb8a04967e3bcd0e4 SHA512 4cb9b8c0206c330f8edeff04060089672ce9f63dd1f4b158d34821887cc9ca98ccdce8979d72f90964585b681296b5b51920bbe0061e6145b7d28ff9aae5316a
 EBUILD blinken-20.04.3.ebuild 920 BLAKE2B 99bb76c7e742b2d8e57204fb4672e2b3905257a405908abfcda0491547426637a0ef0435fab170e9665786354eff85d25198f540982d9a01d88ad4ea0b5523cb SHA512 503c60812c1695792801c27952228af8a0803d6d5cbdc0a73a78e4640b82179dbeccdb181ee345d121fa1ff9fd58aaf7d1cc966c6f42bbab78d6623fa03f9351
-EBUILD blinken-20.08.1.ebuild 924 BLAKE2B e2147bf41aaaade6da59c7a98f628d54fa1df4020ac6cf8bbcb2fe0698b7f4577485322706c9f6c09fa3a59816e2d0155dced5c2bd1704c4f39695cb3cc74173 SHA512 e9e11440d93050efbbc8ecd388dbc5d94faa61ef2739aa8cd9f6ee37725db7752d1be17d98e7a93673a97e9102f4871288f516cc33d86a62bbe06c9cd6416be9
+EBUILD blinken-20.08.2.ebuild 924 BLAKE2B e2147bf41aaaade6da59c7a98f628d54fa1df4020ac6cf8bbcb2fe0698b7f4577485322706c9f6c09fa3a59816e2d0155dced5c2bd1704c4f39695cb3cc74173 SHA512 e9e11440d93050efbbc8ecd388dbc5d94faa61ef2739aa8cd9f6ee37725db7752d1be17d98e7a93673a97e9102f4871288f516cc33d86a62bbe06c9cd6416be9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-20.08.1.ebuild b/kde-apps/blinken/blinken-20.08.2.ebuild
similarity index 100%
rename from kde-apps/blinken/blinken-20.08.1.ebuild
rename to kde-apps/blinken/blinken-20.08.2.ebuild
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 22f97c5c106a..f1a452f0424b 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-20.04.3.tar.xz 820252 BLAKE2B f53e7be9a6b775ea0114f15dd208df5457ca639093d7d45a1d694b6b2d982d906b388a1a583818440946db83385cca5992f33ae52485eebb82c3ebc950dd38e5 SHA512 c4ecae31c9f1a4af628dc5a7dbc587f5d05d3bb141942584bb8ca6cb932f32e5df1cd77f8891189fb9fdad510cd027b664c75e520e9c90bf3d054a930dc6935d
-DIST bomber-20.08.1.tar.xz 825000 BLAKE2B 53184f68f9b9f12b8426f986beac9dbe34cb2e116276dedf6036ab6ae8ed721ae4e5e37b42e067fea660a6fd81098d1b3cfa8f6a2a6fc823163314de090c0db7 SHA512 ee39d29824e102cb681d537e38691cc175b95ab334c1036f5c00dadc8cb24e064a510d40bf9f220e3d9efb2382b9a18bddf36c924f1cfdd1adba5ee159bc4794
+DIST bomber-20.08.2.tar.xz 825072 BLAKE2B da51ecc6c645aa8aa14d20a78256e41a279905dd91551e1ff4d3c0ddd5742218f79fd0f406ae356abd4d356c055bb785fa10f80d5cf14671488e2c75790ae4b6 SHA512 f01a917c4199193700ca0a80eee4e0adbeb6cdd9866f423b6c399b1d73701a56c4825637973fc3324effdf75f52d69ada9b2864387addb6f67d3a670e68cc588
 EBUILD bomber-20.04.3.ebuild 858 BLAKE2B 2b1a4626aead282f5ccda2198523ed6fcc6bbbe8c0be6ff56abcf7d4364d8a20c6609f8c28f3dfd17f86ef68a2995105fd32bebe8ee1f80346094e5b1715b7d0 SHA512 67c70960ddf965e5fefb03044dafe0137c49511d3a9cce0101e362a8ec8214dce05b2b5d1411e94326e17fa765422bc61884f778ea12ea7626a9f53f50c99f2f
-EBUILD bomber-20.08.1.ebuild 861 BLAKE2B 847ae08dfcd129c8eaea0e2345ba17924b45ca45b350752705193e376cfdc73189a75774673c0d768a09d95e4b29f85bb7468c629c1079cf1797a61cd7c2ba53 SHA512 798248146dd3d9bb44228d3409684072e05cf0171c0c1c702f6671b6b750a3187d6dafc8252efb0cc59d65fadefba273adc53abae577695e0c0c83fd11c7de20
+EBUILD bomber-20.08.2.ebuild 861 BLAKE2B 847ae08dfcd129c8eaea0e2345ba17924b45ca45b350752705193e376cfdc73189a75774673c0d768a09d95e4b29f85bb7468c629c1079cf1797a61cd7c2ba53 SHA512 798248146dd3d9bb44228d3409684072e05cf0171c0c1c702f6671b6b750a3187d6dafc8252efb0cc59d65fadefba273adc53abae577695e0c0c83fd11c7de20
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-20.08.1.ebuild b/kde-apps/bomber/bomber-20.08.2.ebuild
similarity index 100%
rename from kde-apps/bomber/bomber-20.08.1.ebuild
rename to kde-apps/bomber/bomber-20.08.2.ebuild
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 8b647eda629c..d900de7712fa 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-20.04.3.tar.xz 200216 BLAKE2B 3ed3405312fddf777dcdf25b2f202bb897089d0c682dc06558a106993cf625aa0e7cae81ceba672330f6012f656505021788a4f7a01da2f39fe42e7e50973c51 SHA512 cf01b8713aa79f562dd89744e7f6b070fdad30b257bd13d570c6e26a38b3bfb96882a36159ba432dc06fa4a81591a17a613deecdb09b2bfd129b97c2d6aa8bda
-DIST bovo-20.08.1.tar.xz 205932 BLAKE2B 570a2a7c8a08ef314babc98afa0a2d87fc2a1a80d8b321f3216261255ee4557aec2c7015c6c2197b04ab3e791ae6febb6792049ae89b8772d35fc1c9c396e421 SHA512 15ad14531fa769ed208c7e3f6a9c81c000faa4d4bb97ae6b2bfb823993917a6f6526c23cf3ed756df9b1dcaa08fd5990fbac051d1bb21e5482ad23efb93472e6
+DIST bovo-20.08.2.tar.xz 205944 BLAKE2B b314b9fa70b056130fec15ac93498d750c7fb1521980d67ec788d042374f0a1a7672c07ff1498d983e63f999174b9ec0da480083b4567edacd2225cac77c2aef SHA512 8c7348fcda78ecf85f6d243185191c5ecca62d4965a19b663d89aefed135af4eac41234253bfd90846c7e7254558b4392797a9695c53efbbb6a86bf91d164716
 EBUILD bovo-20.04.3.ebuild 871 BLAKE2B 42dc842d67f1ed6bd142e83b1dfe9fa5f957787fdf72d7b85a31e22f9c4e7c6d0f5a337363cf9a2c41eaaea0bc307ba61ec4363799f5ef1d18b53a533d8c4d6f SHA512 9fb66f246d8adb2400a0b56a7f816136afec0f5af4ad0e6cc693642b4c1dfe570dd40880a51c747fbbdeba4da1de8ebe37365909d0be7c1b125dc0c1c7c55f28
-EBUILD bovo-20.08.1.ebuild 874 BLAKE2B ed329eeaf71311e0cf2fcdb09f7d637779e566d403fc004b9421bc3ea2b634eb9f30982fd7b0bbfcffd1bfb8bca7d8ba64df415f9c0ee90dfd6428a949a9e547 SHA512 783556a76f3187ad6f83308ba0a06f5c94ca1aa4300e742f1355dcb86459c78338fff5afd4164370a39d089a91992e032866790c2a5b14e2f90206644a080bf3
+EBUILD bovo-20.08.2.ebuild 874 BLAKE2B ed329eeaf71311e0cf2fcdb09f7d637779e566d403fc004b9421bc3ea2b634eb9f30982fd7b0bbfcffd1bfb8bca7d8ba64df415f9c0ee90dfd6428a949a9e547 SHA512 783556a76f3187ad6f83308ba0a06f5c94ca1aa4300e742f1355dcb86459c78338fff5afd4164370a39d089a91992e032866790c2a5b14e2f90206644a080bf3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-20.08.1.ebuild b/kde-apps/bovo/bovo-20.08.2.ebuild
similarity index 100%
rename from kde-apps/bovo/bovo-20.08.1.ebuild
rename to kde-apps/bovo/bovo-20.08.2.ebuild
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 9550b9183cc1..c07ca476cfc6 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-20.04.3.tar.xz 224784 BLAKE2B dee144e70ccae0cba4a84a11a6b3a9d18a8801da6257dce963e1b77d5a80bb3b18ef86ef97a383b966c249d0bd0fdc43967297b6a13b8212069cdf2aa3d8ab99 SHA512 58acc5a2f82daf1948be21e8a1a009c096588d1e0e20ca3e4f11afcaa3a787001f084966052cafc462f0c8d3b9f284aee8b25bd566876e6d86bb457ce1f46be5
-DIST akonadi-calendar-tools-20.08.1.tar.xz 227148 BLAKE2B 1ac5ba99b78be40c708257b7c6cd93d7de718f79a31b7f1022e0e60eb7c9c14bc23c55b865bf7b23628bc7e8d9150c25bba4d36c1a615722b6c27bb79ab36ed0 SHA512 6e7229951823b296b8b050cc9ef7e592eb1f8907158999713694a11e988e9a966260ed945498568e2a435da07bf9a97bb8fce13b93799210235f860e2243d14b
+DIST akonadi-calendar-tools-20.08.2.tar.xz 227152 BLAKE2B 1b4decb957ec9319cdb33731ea3cc6977e989713cdede4241ef7a4b9fde1aa32d85474e95fb9b9751f94148adcdb05a47de6554b94d175f11921b493e5921f5a SHA512 1e7807a04f08d4eaea8f3cb5ac449e92db85e6c159029d3757202fd7dd623e453ecd1138f53d01f846580a4f82bd4f2a183bf9074d3fe0869de71089d8003015
 EBUILD calendarjanitor-20.04.3.ebuild 1078 BLAKE2B 76c4cb556a4a0d9a1f56bdaf254d507f2010fab30e9cb540c7d66b856dbe40d851aac7e7684e4b22cf5c34b0a54ccecb837e4f47d0f683ec3577816a6b33b5b2 SHA512 b91b0f6a7662ab6c974031cb8313f806fcf4a454930b767e7926aae4b26db13a8a059a09b6f413d894db64c8075b78427b9ad15eadbd48dbccd5493c15219ed6
-EBUILD calendarjanitor-20.08.1.ebuild 1081 BLAKE2B febf8a41b85bb09cd2bb4f9a66f903deceaca0330824e38943f4fc55094ac59213f7d617258076e28fd83575e89e9afc564da1e8b395704eeded984ec8ee317c SHA512 da98051b083c3700b211f1427d9c468117ced34dfaa10011f5d1560ff1054e854228c2cc2640f6b0dee6044f3ea27d6c049007d2ff796cd11d23c880b3aa7443
+EBUILD calendarjanitor-20.08.2.ebuild 1081 BLAKE2B febf8a41b85bb09cd2bb4f9a66f903deceaca0330824e38943f4fc55094ac59213f7d617258076e28fd83575e89e9afc564da1e8b395704eeded984ec8ee317c SHA512 da98051b083c3700b211f1427d9c468117ced34dfaa10011f5d1560ff1054e854228c2cc2640f6b0dee6044f3ea27d6c049007d2ff796cd11d23c880b3aa7443
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.08.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.08.2.ebuild
similarity index 100%
rename from kde-apps/calendarjanitor/calendarjanitor-20.08.1.ebuild
rename to kde-apps/calendarjanitor/calendarjanitor-20.08.2.ebuild
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index ba3860b0c010..244ab505592b 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-20.04.3.tar.xz 651616 BLAKE2B e119b0d5d0e17c20e562b490f0f0674af4c8a96da6c82d8a296246d83c4e1ef083d9370ff049d0868ff79e22838592ec4825dcf0c3c19ad76df5d6b487ceeae6 SHA512 d7c0f8bed00501de8edb72fb53d68f155edbd8e0417adf11ea38d06bd363c466ed83a922fe6e49da2a6781b87aec440e5c1c5d21128e090b1ce63bb2eba18598
-DIST calendarsupport-20.08.1.tar.xz 660100 BLAKE2B 992055ab97f199e01c974aec9d7bf22b304ffcbc5a8ec15fcc15ce8f42826868c02b4d54515b4bd1d6773b2cb3fd6fce4272a946bc0db99f22289c223d0b2165 SHA512 65849b524534b154ad45413ee35f6da2e9ce5edc4c3dc516f868adf70098793c609b726c4b484d9106c6b31fca830fd575b9671abb006173a00f2ccadc44551e
+DIST calendarsupport-20.08.2.tar.xz 660712 BLAKE2B 3844eb2bf28da8f6b58dc85ec68783fed2a4645f42c38cb7421f1137f694675b12b65707930058333ab0381180fba03ece0316d0c0984ef35dd9a8b1615b155f SHA512 0bfbefbd35f187348e317395bbe6fb0749cc9309d9368c0cb4305b5f23ff9e8c4e298cffe2ef1bd7b4041c992a4347d462fa5fec517021996e59cb8bf64c1874
 EBUILD calendarsupport-20.04.3.ebuild 1232 BLAKE2B a72f89209782f657c77d9c880a6b248403e9d6a7ea2f2e02b6bd6f7b9cd039db5e55a1bef0baeddc3af88f32898276e583dc36f565aeaec2b715f32417f5ef60 SHA512 999b2a99cfe9a46e69da9ecae44052457c4ccde443dd13c08bfbe8b9a85d159b9f776aab20eb562ef865bf22aa86b023e570f205aecb9a581b3db844f3845821
-EBUILD calendarsupport-20.08.1.ebuild 1232 BLAKE2B ddcb9952e6c12904f122db42c3112e4cde7c1bafeb473389b545eca2d42a3f49abeafea4fd302b9be18bfa8fe62c109b7137d3cb4edfaf6b48a9148d45531162 SHA512 c0b5f89af4917a66db230a6db55a5fe7e3bc0cd677f52f422a691e926852cfafa51f4af757ce07a7de5bb142cce92a0a29396c4fceb9f0df22cf98b4f661eb64
+EBUILD calendarsupport-20.08.2.ebuild 1232 BLAKE2B ddcb9952e6c12904f122db42c3112e4cde7c1bafeb473389b545eca2d42a3f49abeafea4fd302b9be18bfa8fe62c109b7137d3cb4edfaf6b48a9148d45531162 SHA512 c0b5f89af4917a66db230a6db55a5fe7e3bc0cd677f52f422a691e926852cfafa51f4af757ce07a7de5bb142cce92a0a29396c4fceb9f0df22cf98b4f661eb64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-20.08.1.ebuild b/kde-apps/calendarsupport/calendarsupport-20.08.2.ebuild
similarity index 100%
rename from kde-apps/calendarsupport/calendarsupport-20.08.1.ebuild
rename to kde-apps/calendarsupport/calendarsupport-20.08.2.ebuild
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 7d03edb35b85..3bf19d0f0aad 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,6 @@
+AUX cantor-20.08.2-python.patch 2510 BLAKE2B 8ddcdfeddb90a3e3749ad8f53aad498455e986b263667550a6281ede24f47d2d6072fb81ac3bba445ce21db0d17d9b7b210183c23ba7d591ddf7edf09ed09624 SHA512 2b00bfa5d31f458b1dbb93f4e16194e8420754f5fd5a4d278896a12fbc4981c8ec7d4cab6ade52169f7907e99a6ad4cdfd9724c895385708d6447434508b67fe
 DIST cantor-20.04.3.tar.xz 9029068 BLAKE2B c5b436304d3aa84150a0994d556318600f73ccb606b59fc67d8476828c356f54d64cda85f781c9c939403b0bb6808e2a943d37ad306fbc751800944ad27e74f4 SHA512 07351d8b4b72653394a337bc3ae5c8f8c669dd8cd66f4cf9d41bbdd25b47a8b3666f79580e319ef56c878ab626ce959d825b4a34243c5f639de96674a1bc111d
-DIST cantor-20.08.1.tar.xz 9078272 BLAKE2B 13134da1df4753fc00faf0ff354a1fc0ff489e7233573496bb88a6dbd6b1d3a48e7ef82cedc0936e34ad58039046dc64450de99166d9738afdf98adf13ef0681 SHA512 7f3193753a3368940cad14b51cb920f59a2c5550ef2ae527869c1011b238533e15b0d89b47c29b383d623709e7576457d9bc803a63124c641e58871115e72d6c
+DIST cantor-20.08.2.tar.xz 9082392 BLAKE2B 1771838cefdbcc8bdec10a883b8b3244d3fd08dcc23de048218144ffe2269928c4537c1bcb3c6ec27f6677c215e4f1c3fa128bdc427e36982980068bbfa4bd80 SHA512 86e2fd81b66b006c420b178c36a9a5b73d0eede077ba1b639d6a6c48bc3f7d3689a49257925f053063e8be0cd09c5ab129891d07c78d7ed9417edbecc97b1bf5
 EBUILD cantor-20.04.3-r1.ebuild 3208 BLAKE2B 4f898e218a51e89ac90d09a049b293d1754853b2eaee14efbeb889f9bc10e1651873832eb9243c027f00a11abff6147f5bc97695cadf78d234ea5b3a46486c88 SHA512 4b451a499178fd8efc23455f2ef344f6f3fba7d541c2401c798a905479c2d853bb463bc1a7f801c0edf93d90ee98e6149423e52da843b012eb681d767c281989
-EBUILD cantor-20.08.1.ebuild 3199 BLAKE2B 70a26b36ae09ab13280b20dcaafd739360b8113df97b4133065abd4f504184fc7ba0f1599e35370d4c92efa777c16b84dfbbe016cbaa80032890e056d3967a31 SHA512 2c707f803b8fae9ae5cfdcf8aad59ba3ba3dc9c31986ab96f71f2425e2e30f0f17467d55830306cf0e4b6f0eeb18e1072b3d962cddaa3de452f0521f0ef6dc63
+EBUILD cantor-20.08.2.ebuild 2943 BLAKE2B 03b7bc31309aef91e9499b2e04f96626a4e3659cff6f10145cf265a754c21119c6e0e838590013cc2847dcd96d9629e6715ce409216f85f5bbd1cc4e83f96833 SHA512 226ffd29f7a70a36ee460027bc42125e8ee01c3f529482824d5106acfffa7b9fe462b42c09f6c246011aa1f156b56bd7f4cc3a6a01ab8c8f101a1998ad5112a6
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-20.08.1.ebuild b/kde-apps/cantor/cantor-20.08.1.ebuild
deleted file mode 100644
index f4e32e0c2d11..000000000000
--- a/kde-apps/cantor/cantor-20.08.1.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
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://kde.org/applications/education/org.kde.cantor
-https://edu.kde.org/cantor/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+analitza julia lua postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-DEPEND="
-	app-text/poppler[qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
-	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtdbus-${QTMIN}:5
-	)
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	ecm_pkg_pretend
-
-	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
-		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
-		elog "You have decided to build ${PN} with no backend."
-		elog "To have this application functional, please enable one of the backends via USE flag:"
-		elog "    analitza, lua, python, qalculate, R"
-		elog "Alternatively, install one of these:"
-		elog "    # emerge sci-mathematics/maxima (bug #619534)"
-		elog "    # emerge sci-mathematics/octave"
-		elog "Experimental available USE flag:"
-		elog "    julia (not stable, bug #613576)"
-		elog
-	fi
-
-	if ! has_version virtual/latex-base; then
-		elog "For LaTeX support:"
-		elog "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		$(cmake_use_find_package analitza Analitza5)
-		$(cmake_use_find_package julia Julia)
-		$(cmake_use_find_package lua LuaJIT)
-		-DUSE_LIBSPECTRE=$(usex postscript)
-		$(cmake_use_find_package python PythonLibs3)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package R R)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/cantor/cantor-20.08.2.ebuild b/kde-apps/cantor/cantor-20.08.2.ebuild
new file mode 100644
index 000000000000..5ed83ea22785
--- /dev/null
+++ b/kde-apps/cantor/cantor-20.08.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org optfeature python-single-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://kde.org/applications/education/org.kde.cantor
+https://edu.kde.org/cantor/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+analitza julia lua postscript python qalculate R"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+DEPEND="
+	app-text/poppler[qt5]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
+	julia? ( dev-lang/julia )
+	lua? ( dev-lang/luajit:2 )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-qt/qtdbus-${QTMIN}:5
+	)
+	R? ( dev-lang/R )
+"
+RDEPEND="${DEPEND}
+	!analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? (
+		|| (
+			sci-mathematics/maxima
+			sci-mathematics/octave
+		)
+	) ) ) ) ) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-python.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	use julia && addpredict /proc/self/mem # bug 602894
+
+	local mycmakeargs=(
+		$(cmake_use_find_package analitza Analitza5)
+		$(cmake_use_find_package julia Julia)
+		$(cmake_use_find_package lua LuaJIT)
+		-DUSE_LIBSPECTRE=$(usex postscript)
+		$(cmake_use_find_package python Python3)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package R R)
+	)
+	use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Maxima backend" sci-mathematics/maxima
+		optfeature "Octave backend" sci-mathematics/octave
+		optfeature "LaTeX support" virtual/latex-base
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch b/kde-apps/cantor/files/cantor-20.08.2-python.patch
new file mode 100644
index 000000000000..0f3c67746284
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-20.08.2-python.patch
@@ -0,0 +1,70 @@
+From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 11 Oct 2020 22:47:55 +0200
+Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12
+
+---
+ CMakeLists.txt                     |  2 +-
+ src/backends/CMakeLists.txt        | 10 ++++------
+ src/backends/python/CMakeLists.txt |  4 ++--
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e96e6df0..a90328b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
++cmake_minimum_required (VERSION 3.12 FATAL_ERROR)
+ 
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
+index e99e1731..9b6b615e 100644
+--- a/src/backends/CMakeLists.txt
++++ b/src/backends/CMakeLists.txt
+@@ -50,15 +50,13 @@ if(QALCULATE_FOUND)
+     add_subdirectory(qalculate)
+ endif(QALCULATE_FOUND)
+ 
+-set_package_properties(PythonLibs3 PROPERTIES DESCRIPTION "A powerful dynamic programming language."
+-    URL "https://www.python.org/"
+-    TYPE OPTIONAL
++set_package_properties(Python3 PROPERTIES TYPE OPTIONAL
+     PURPOSE "Backend to use Python with Cantor.")
+ 
+-find_package(PythonLibs3)
+-if(PYTHONLIBS3_FOUND)
++find_package(Python3 COMPONENTS Interpreter Development)
++if(Python3_FOUND)
+     add_subdirectory(python)
+-endif(PYTHONLIBS3_FOUND)
++endif()
+ 
+ set_package_properties(LuaJIT PROPERTIES DESCRIPTION "A lightweight, extensible programming language (luajit implementation)."
+     URL "https://www.lua.org/"
+diff --git a/src/backends/python/CMakeLists.txt b/src/backends/python/CMakeLists.txt
+index 04b4c313..ccf76193 100644
+--- a/src/backends/python/CMakeLists.txt
++++ b/src/backends/python/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(PythonServer_SRCS
+   pythonserver.cpp
+ )
+ 
+-include_directories(${PYTHONLIBS3_INCLUDE_DIRS})
++include_directories(${Python3_INCLUDE_DIRS})
+ 
+ qt5_add_resources(PythonBackend_RSCS python.qrc)
+ ki18n_wrap_ui(PythonBackend_SRCS settings.ui)
+@@ -34,7 +34,7 @@ set_target_properties(cantor_pythonserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH
+ if(MSVC)
+   set_property(TARGET cantor_pythonserver PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+ endif()
+-target_link_libraries(cantor_pythonserver ${PYTHONLIBS3_LIBRARIES})
++target_link_libraries(cantor_pythonserver ${Python3_LIBRARIES})
+ 
+ if(BUILD_TESTING)
+   add_executable(testpython testpython.cpp settings.cpp)
+-- 
+2.28.0
+
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 4617884f1be9..332f889e2093 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-20.04.3.tar.xz 1882368 BLAKE2B bfc1293db86d10b5b9d859fd3606711c427af9205c744eaec62906fd0f1809f31f3a7b1b6263b49b01e9ce8d0a2322f2f793ed94ff934e355fecb04a0e6e91fd SHA512 cdbd6d9c212e92ca7f925c23c20442fa72cb07f666a5f2895a1cb631ff9bc87024bdf2bdbb8b2c638104f688cca585b64eaec5c8ed20ea153fa1184a2f5193c2
-DIST cervisia-20.08.1.tar.xz 1888428 BLAKE2B 977f516ad249765f911151184c049559e0d1c0c9e286fcef0d7d416414e6a3bfa1989270952bb5e7fec56ee6492295825ff2e46a65e13468b47e220459bbcc39 SHA512 71fb3b7c691a5963df0c5e784dd49d6abddb4562aaee99725347687caba7ba1888a2b95822c712444d56b224783c755861b488ffbdca286fcffd76c35a3208cc
+DIST cervisia-20.08.2.tar.xz 1888240 BLAKE2B 3b1ccd830c229cce7b886c28e9a20db58cfcececdcb3aaa83e2594d7acad5c4cd53a4268198fa9eab5b48045e3e2e7a61625c9717c39b7e7add7918a09f2c01f SHA512 e8939162e3f92c1e7f4a02e66b28b9d5043c1142544baf4cfe0f5ee757446761137f259efc3eae88e4ab9fd7c35199962721e9ef77a7846337902a27ae6336d2
 EBUILD cervisia-20.04.3.ebuild 1087 BLAKE2B 8abb5a233ec86d0eb08ee8bf0b449d2fd55270f5ff2741834e377ff3673ab4bc3d4409086a13283f157bb0a618389a425990254393cf6458a79aeecb10cf364c SHA512 f077a67f11cc6a3cfec365af005c1bbc8e817bf6b31e1952b6c934bc645447169dbb0d8aa2891ef3138950f36a08c414dbd8a2cf80729d3299889b7f9090f7d9
-EBUILD cervisia-20.08.1.ebuild 1090 BLAKE2B 1cf25f617d52ddbaa4c681adea6a67043877f4870a2038330303bfc947585dd26767d05821ee9b3ad1c52800ee79080721580d3827a34d414f2d088045b7392f SHA512 09a222e97688949fd2280bb5d89967a2db44118cec64c0239ae8c2618a1f40817668efa50ce15e8e29b7eab26df46d04fa49da0d214292b9e908a35bd911ec42
+EBUILD cervisia-20.08.2.ebuild 1090 BLAKE2B 1cf25f617d52ddbaa4c681adea6a67043877f4870a2038330303bfc947585dd26767d05821ee9b3ad1c52800ee79080721580d3827a34d414f2d088045b7392f SHA512 09a222e97688949fd2280bb5d89967a2db44118cec64c0239ae8c2618a1f40817668efa50ce15e8e29b7eab26df46d04fa49da0d214292b9e908a35bd911ec42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-20.08.1.ebuild b/kde-apps/cervisia/cervisia-20.08.2.ebuild
similarity index 100%
rename from kde-apps/cervisia/cervisia-20.08.1.ebuild
rename to kde-apps/cervisia/cervisia-20.08.2.ebuild
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 34bbe03056a6..ea4db3a8669c 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.04.3.tar.xz 213888 BLAKE2B 8ad8e98a42c5a6d12bd3c03ffcc9f5923d1651bc10a74152f5561ebf59b50aafa24fe29d0ea6a7ce147d4f8732fa72c50664b7a890a6e4fe00c64298c8aa0bd4 SHA512 cab1d81deb8204e2d95ae10dc375d5cdc98958ae3dd0a969ee9ea78326229877cd314d2f37266b2ef1ebcdd876cffade6d7e5ee296028867f9c00592c8cd6eb6
-DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
+DIST dolphin-plugins-20.08.2.tar.xz 229440 BLAKE2B 53d8c1c16a9ba5abcb3164cd4d30769506c4dfaaab148eed070185b17d00fc5583b5dbb28b163794e187da8e0d64435d904fb8ffc99e8625b8096bd96dbd94ab SHA512 c854c3a7c918c9a8be1da41d9d4f8039b9c8e38ba4782ae064ea688fed51966b9749ce009b2f96bcac0f92dbe36e5f826a45265eb29e3f2ec4740902485099d7
 EBUILD dolphin-plugins-dropbox-20.04.3.ebuild 1335 BLAKE2B 9eeee6a4f35ba555a7102a46a4278d4f94807e657cc868fa41244746ed9992366acf6509c455562810e712afb712b53c0277b96c209179d1eda806128c01752a SHA512 b30b6ce641df9618934186c035e430f7419cf63058a61f671eb9fcd94aa132a0bfb4830e9dbc59f436fe6fe359653d59100399a9a85cb21bbf8e913d0541a11c
-EBUILD dolphin-plugins-dropbox-20.08.1.ebuild 1462 BLAKE2B 7e9c0297d368cbc07026f019d940eaaf77b97a104b6c8898c2730b6385ab4641b0b5a6eefb024c3fac473bc5ed871a478c68305adb84cb6e6a93a96c18f75c97 SHA512 985a3088ae2a8db0fd2ebaa9101473e59bce6e868cabf7e4ddba0b6cd8425b67a0d5c0c701442cba56ac239d98484229381d4a7e31326bf3d2eb208fddadc1bd
+EBUILD dolphin-plugins-dropbox-20.08.2.ebuild 1462 BLAKE2B 7e9c0297d368cbc07026f019d940eaaf77b97a104b6c8898c2730b6385ab4641b0b5a6eefb024c3fac473bc5ed871a478c68305adb84cb6e6a93a96c18f75c97 SHA512 985a3088ae2a8db0fd2ebaa9101473e59bce6e868cabf7e4ddba0b6cd8425b67a0d5c0c701442cba56ac239d98484229381d4a7e31326bf3d2eb208fddadc1bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.2.ebuild
similarity index 100%
rename from kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.1.ebuild
rename to kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.2.ebuild
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index db3b078d3c13..bdafc9865cdf 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.04.3.tar.xz 213888 BLAKE2B 8ad8e98a42c5a6d12bd3c03ffcc9f5923d1651bc10a74152f5561ebf59b50aafa24fe29d0ea6a7ce147d4f8732fa72c50664b7a890a6e4fe00c64298c8aa0bd4 SHA512 cab1d81deb8204e2d95ae10dc375d5cdc98958ae3dd0a969ee9ea78326229877cd314d2f37266b2ef1ebcdd876cffade6d7e5ee296028867f9c00592c8cd6eb6
-DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
+DIST dolphin-plugins-20.08.2.tar.xz 229440 BLAKE2B 53d8c1c16a9ba5abcb3164cd4d30769506c4dfaaab148eed070185b17d00fc5583b5dbb28b163794e187da8e0d64435d904fb8ffc99e8625b8096bd96dbd94ab SHA512 c854c3a7c918c9a8be1da41d9d4f8039b9c8e38ba4782ae064ea688fed51966b9749ce009b2f96bcac0f92dbe36e5f826a45265eb29e3f2ec4740902485099d7
 EBUILD dolphin-plugins-git-20.04.3.ebuild 1447 BLAKE2B 0856d6cf0025f39fb2f7838b67bbb158b06420f219e28177a22b3031ac7e81824715175950e561de2b27b057fd90a621ddbc11a9ba855b7290faed115d909336 SHA512 59e6c90748ec3796c1861a7888cf9d9f3a5fd99f625308fb623cf9594227e48619f9097fd2e322ef156d3a595557ab146f86ebd4562531aef5f9dc7cc6ddc3e2
-EBUILD dolphin-plugins-git-20.08.1.ebuild 1575 BLAKE2B 19faff40d2676f00ac1f076599e39d7b50c248bb991153dc8e7d5e2d95babe10234096052560d7459ee8164a2609cba8fb722b3d8174e5a623b788ab92f0083f SHA512 2e1d5af87c494bfe3b142ef81dcdff225262c0e407f6ac27b0c529f97eac8f4f14e751785d47be53022e46017de373db444ea8d0d77189930796efc76beeb625
+EBUILD dolphin-plugins-git-20.08.2.ebuild 1575 BLAKE2B 19faff40d2676f00ac1f076599e39d7b50c248bb991153dc8e7d5e2d95babe10234096052560d7459ee8164a2609cba8fb722b3d8174e5a623b788ab92f0083f SHA512 2e1d5af87c494bfe3b142ef81dcdff225262c0e407f6ac27b0c529f97eac8f4f14e751785d47be53022e46017de373db444ea8d0d77189930796efc76beeb625
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.1.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.2.ebuild
similarity index 100%
rename from kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.1.ebuild
rename to kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.2.ebuild
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 7307fa373e6c..1eef08ccd898 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.04.3.tar.xz 213888 BLAKE2B 8ad8e98a42c5a6d12bd3c03ffcc9f5923d1651bc10a74152f5561ebf59b50aafa24fe29d0ea6a7ce147d4f8732fa72c50664b7a890a6e4fe00c64298c8aa0bd4 SHA512 cab1d81deb8204e2d95ae10dc375d5cdc98958ae3dd0a969ee9ea78326229877cd314d2f37266b2ef1ebcdd876cffade6d7e5ee296028867f9c00592c8cd6eb6
-DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
+DIST dolphin-plugins-20.08.2.tar.xz 229440 BLAKE2B 53d8c1c16a9ba5abcb3164cd4d30769506c4dfaaab148eed070185b17d00fc5583b5dbb28b163794e187da8e0d64435d904fb8ffc99e8625b8096bd96dbd94ab SHA512 c854c3a7c918c9a8be1da41d9d4f8039b9c8e38ba4782ae064ea688fed51966b9749ce009b2f96bcac0f92dbe36e5f826a45265eb29e3f2ec4740902485099d7
 EBUILD dolphin-plugins-mercurial-20.04.3.ebuild 1575 BLAKE2B 140d6772490bc3f58640178e009c4d2d1689fb4667053f4b246841185269df45aed47f656fd17e6357567cfd795e06630ea11a3485f974101d8dd5350eca10db SHA512 71a24aa7753a105a77ca7510dd3fb27cfae47e7a5b3cda03d7a6ccf786428df037e72fdcd51cace826dba78a424c1806ec64b25f58f4173488af85ac290ae95b
-EBUILD dolphin-plugins-mercurial-20.08.1.ebuild 1703 BLAKE2B e409e9e296b67dcdc3c43dd30f61b49a8ae287e06d88bda80ae357b0d5e1fe3923a75125bda877da05b4d1b2e41c91880c61d4f86a49935b0b7b14778e9f2a86 SHA512 c63001f4787ebf325f60ae06b488bf8180f50a599a785d609716f6bb93b06bc99512aa14d92effc1c154ef2ef6d0764fa41a53e202890be437f18469e207ecf1
+EBUILD dolphin-plugins-mercurial-20.08.2.ebuild 1703 BLAKE2B e409e9e296b67dcdc3c43dd30f61b49a8ae287e06d88bda80ae357b0d5e1fe3923a75125bda877da05b4d1b2e41c91880c61d4f86a49935b0b7b14778e9f2a86 SHA512 c63001f4787ebf325f60ae06b488bf8180f50a599a785d609716f6bb93b06bc99512aa14d92effc1c154ef2ef6d0764fa41a53e202890be437f18469e207ecf1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.2.ebuild
similarity index 100%
rename from kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.1.ebuild
rename to kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.2.ebuild
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index bbba340b0610..e601da902efd 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.04.3.tar.xz 213888 BLAKE2B 8ad8e98a42c5a6d12bd3c03ffcc9f5923d1651bc10a74152f5561ebf59b50aafa24fe29d0ea6a7ce147d4f8732fa72c50664b7a890a6e4fe00c64298c8aa0bd4 SHA512 cab1d81deb8204e2d95ae10dc375d5cdc98958ae3dd0a969ee9ea78326229877cd314d2f37266b2ef1ebcdd876cffade6d7e5ee296028867f9c00592c8cd6eb6
-DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
+DIST dolphin-plugins-20.08.2.tar.xz 229440 BLAKE2B 53d8c1c16a9ba5abcb3164cd4d30769506c4dfaaab148eed070185b17d00fc5583b5dbb28b163794e187da8e0d64435d904fb8ffc99e8625b8096bd96dbd94ab SHA512 c854c3a7c918c9a8be1da41d9d4f8039b9c8e38ba4782ae064ea688fed51966b9749ce009b2f96bcac0f92dbe36e5f826a45265eb29e3f2ec4740902485099d7
 EBUILD dolphin-plugins-subversion-20.04.3.ebuild 1407 BLAKE2B b5aa739b82aad186b20e3fc3e69b0a2ade9319c63bf98a40215db438602f7536081657c2a842f98de0cd9fcca4caa9a6be55572efd331381742adffef64f25d2 SHA512 462397546191623f867eeee8e177df4c9a8406859c34654f5c74cc689cc67d0be3c3876550e62898294b2e53952925a315ef5955918a7bbdb512d1f74b194e09
-EBUILD dolphin-plugins-subversion-20.08.1.ebuild 1535 BLAKE2B 873d37c7396ddd3ad49e44849eb7b8f48161052c07fdac7220529f1bc83e80f462635de150a6de64d8598d4697523e922bb0a1cce19e6ca5ad637ff2105e0d7a SHA512 bf6dc5fa66bb492701e9d6abd491d43d5e25f8c2b61297ef484b2efc14cf69544ba3a7ea73861a500fcd489e3113ccf6eac918bff03948afb81d12bdb61b8089
+EBUILD dolphin-plugins-subversion-20.08.2.ebuild 1535 BLAKE2B 873d37c7396ddd3ad49e44849eb7b8f48161052c07fdac7220529f1bc83e80f462635de150a6de64d8598d4697523e922bb0a1cce19e6ca5ad637ff2105e0d7a SHA512 bf6dc5fa66bb492701e9d6abd491d43d5e25f8c2b61297ef484b2efc14cf69544ba3a7ea73861a500fcd489e3113ccf6eac918bff03948afb81d12bdb61b8089
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.2.ebuild
similarity index 100%
rename from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.1.ebuild
rename to kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.2.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index c622eb1878e6..63eabdae5654 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-20.04.3.tar.xz 4798732 BLAKE2B 080fbe7c2a5156623f6558caaa980aa9202e0e0a21330d7b1bc7800d790daa60a6c4c90a9d5806a9330b0d29908bf1ef755d0900560613e137cdd1e80b28fdac SHA512 fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca
-DIST dolphin-20.08.1.tar.xz 5091048 BLAKE2B d0c25f1598f3a87fa8738b18560e42041dd157cb20d7e2426f18d7bc8a45bd0f532858336152c33d98033c19bc16d0fabb6234112acfa3a20aa14c549820b7c0 SHA512 fcc0797691c5b365cf0d7ad7f227feb88e3047bb8aa9547c71baf2e765f07abba4588eee39bde1b0b4f77a7b5297916144ef9a323eb604eba7cd2ae0b4b3a71e
+DIST dolphin-20.08.2.tar.xz 5094116 BLAKE2B add47738eedf63d44c5b5ddd7ed9aad092e03bbd8214225bb5a3bd3b86894c0542b6add21f14c0acc268322738a8a753a003153451e040e476eb91287c13ada2 SHA512 f64000957a1b10ff9e2783af9b32cf184989bf000c33ee7ed47026cb26014770a5b889f9c10c11c833b2310ca1e72086e8f55eb78e650fbe82067b1f1fafee19
 EBUILD dolphin-20.04.3.ebuild 2911 BLAKE2B ad92970a4c937ce2480333d56b4ac90f2104b47a209d542d84eb511d9801422efa0468ee375530dd986d592227d1eeaa021e0fed79a9378460719f695de90025 SHA512 ddb228662b73f51ad71df5b1127b58b9aab11aa9635a8ed56604f1497920e86fa3af521886020f42308ceda5416064caad9b29469bc38e8b23cd9aca2c5c4c11
-EBUILD dolphin-20.08.1.ebuild 2963 BLAKE2B bef991ef718867a7978e99e67fd24e16e11c3c9e1686338192b63feddf2a0c80b0929b439a86c17c57b6d1884565b65495c33ebcf50aa4ef19c001a7849a4702 SHA512 3356277ac8de10d7a4252f139a8af6e143956c30e6da47e33149b89e69a7e2ba2329147bf395e2ce972afa58757a9338821d0a223fd5a3a8ec36252136c6a82e
+EBUILD dolphin-20.08.2.ebuild 2722 BLAKE2B 3d69263eadf1e0a78e6395e073c32c4b3160539acd18d33acbf1599acf94028bd129d373aed264d9f0cf197c819ccd313b87fab0335edd39f55afec3ae8ccb33 SHA512 79684ebd9a367c5702103e0e833d5ab353ecc372c224e0f50be0559f1dda7682fe20d8997ae65899eca2ad322bee9ea0d4fa2fa4c76f1d0ec64789d1f669a3a5
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.08.1.ebuild b/kde-apps/dolphin/dolphin-20.08.1.ebuild
deleted file mode 100644
index fca3debdfbcf..000000000000
--- a/kde-apps/dolphin/dolphin-20.08.1.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
-https://userbase.kde.org/Dolphin"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities semantic-desktop"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	semantic-desktop? (
-		>=kde-apps/baloo-widgets-${PVCUT}:5
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kio-extras-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/ark:${SLOT}" || \
-			elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
-
-		has_version "kde-apps/kleopatra:${SLOT}" || \
-			elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
-
-		has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
-			elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
-
-		has_version "kde-apps/thumbnailers:${SLOT}" || \
-			elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
-
-		has_version "kde-frameworks/purpose:${SLOT}" || \
-			elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-20.08.2.ebuild b/kde-apps/dolphin/dolphin-20.08.2.ebuild
new file mode 100644
index 000000000000..1111bb7347d7
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-20.08.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
+https://userbase.kde.org/Dolphin"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities semantic-desktop"
+
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-libs/phonon-4.11.0
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	semantic-desktop? (
+		>=kde-apps/baloo-widgets-${PVCUT}:5
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kio-extras-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
+		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
+		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
+		optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT}
+		optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 9f5abfc2bae7..2dc713977959 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-20.04.3.tar.xz 1351632 BLAKE2B 3c1dec7591b79582ed60258a1f76a3edbb3bfc2d83466a935dfb465c964db87ab9a8b2edcb30b6a41e4080cd0e633cef1c00b9be91e53995608db737ccc59bb5 SHA512 1e802291d58fed6e9f0a51dfea8157e897b36ddab4e61a7af4d9350116f0d8ae871c15289f3bb0ee0c63401e830f8dc256f7709fa9d309b06f4f0f01afc8b59b
-DIST dragon-20.08.1.tar.xz 1656348 BLAKE2B 32c519637815b2aed6330a9f0ff8f515906255b4485c89d2c9fce866dac5d72f13b7c9e4c2e4433e7048abff559fe1f6bbc1a2466154c0587956b58ef6e37406 SHA512 1ec08a57d625cb85c9decfe69e029dae0815fe52e624c2a31c354ecb5789c3b34942b5d451c9905bb61d278d1f30c99fa07c2b47c95628cfff996b4f420cabc3
+DIST dragon-20.08.2.tar.xz 1657276 BLAKE2B 5de8d6f1d7cb6ed0d305b81daaea2a892b82719a5cc7d737ea14286b83682bf9eee4240f1296c0ff0c012e5e420d840d7ba23ca5251752e0a366c969dcd1eaea SHA512 eaf577de58ede3a9a06cbdd012d9644666bc86100857f513ac0487a84b3fa80acc47e30427578fdb574fb5b48c85590e73f4d7194c65d2a7c1e908851a219e0b
 EBUILD dragon-20.04.3.ebuild 1159 BLAKE2B e51151e4facdc527948a98b07cadae033b522ad4a74507beea460b3ce2e92e3a91a40e32a42ee9b4b589ee646c062380bbeccfa4579a0a5c75e1eb30e6f04fea SHA512 1c80c0af81270d1f7fe36b4a6e8c583f4c6e28e6f5cf6c90532ea5f4d489e6856d9d39c1edbfaeebdcef91555ff96c7068697ca5ef07af3d2daaef38c5b887eb
-EBUILD dragon-20.08.1.ebuild 1163 BLAKE2B ca259043903528bbef4d7659cb847a6b977df421a752c43c55bb347193382c5190ba63701a1a883748f49a8ffae47f98d78572815d5b96ee909e343566886cf9 SHA512 08ef9e72659de4f621d1ba4e8d12c1a2dc904fccb510f3f123b58ebc08e2439b469b90899e2132a30003d14be0b0fb279d0f561c506064dfe51a77508acbf7e9
+EBUILD dragon-20.08.2.ebuild 1163 BLAKE2B ca259043903528bbef4d7659cb847a6b977df421a752c43c55bb347193382c5190ba63701a1a883748f49a8ffae47f98d78572815d5b96ee909e343566886cf9 SHA512 08ef9e72659de4f621d1ba4e8d12c1a2dc904fccb510f3f123b58ebc08e2439b469b90899e2132a30003d14be0b0fb279d0f561c506064dfe51a77508acbf7e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-20.08.1.ebuild b/kde-apps/dragon/dragon-20.08.2.ebuild
similarity index 100%
rename from kde-apps/dragon/dragon-20.08.1.ebuild
rename to kde-apps/dragon/dragon-20.08.2.ebuild
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 35bd7daca886..b26f5ccd4bf1 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-20.04.3.tar.xz 444392 BLAKE2B 9382263a8b8783cfa033caf1d434c1f698aa3d290d9d62e0a167bf4572a9626cd05ace5c8faf98132c376a359010b053b210b8855810e2b75c67b532effa263d SHA512 c099f61c0c8cb1997cdf898b6147dea918066f8e04f155690e80bc93167ed4e851a5042af70ddee876ca9800f8b8af755cdf7a3c3e6d31a68df4189882b50124
-DIST eventviews-20.08.1.tar.xz 445276 BLAKE2B 0209fc91b52bb5275a2e4371ef93c2f56d7648188272e9fcaa046a2c4e9a83ad357804ef3d1ae20a73b829194f7a27d0a49a67aede8aa6c9d9e42fb6be0f20e8 SHA512 08c71fb05679ab034b0b9dd1c55afc7a21cef1f6db20a6b8c20b335bc6cee1e854cc6614cacbd2fab123fb27616a3f723fa18805f6719e7a9afeedacb2564d49
+DIST eventviews-20.08.2.tar.xz 445304 BLAKE2B 8507057fa4418106fa45190bcbc2e94dc2340bcd0d0d9ddd055bd55a473ecc996e65f075ac0689739aeec69fe70a371446dc8293ebb3e6f47f9ebe21ac8adacf SHA512 7898de4e898fab7cf1b3b2723b9588c29d14a7702da1bc72c666517a7b13202c2ad099c4c9c4bfec7e09d3d6c9f3b039bd71d11c202997c496892be5e1c4eb3f
 EBUILD eventviews-20.04.3.ebuild 1223 BLAKE2B 117ff3acbae58cc1af7e207ca78b038e7f59cbf7ff377380bfcba907b6796f17e1d19e847958e675018f63aef57b6c72f52f467c9cac91674b8172c3d43c3dae SHA512 a0b82e3bf390c0de9fac28f4c31c8a9df2e56ac84d499eecbe3aaf58bb51890b631a4d42a42500e3361d3afbc2b47593e9a510eb89008543a04b0835b86200e5
-EBUILD eventviews-20.08.1.ebuild 1255 BLAKE2B c9b6e7dc3da0cf64ed43a807be020c3347355b922905ed003b1cd1668fccca140d49df6de5ff031ce9ca8395b1d2093fb32a85730c44dc682b3194fdfd7906b6 SHA512 65d33511a06b8b9117a0f03d3f6b42010e585067297792420952020a396765fe2f58a19e2e5e1f9e9ca5b6966826b4e343f8a900cdeed947f57636db1db15455
+EBUILD eventviews-20.08.2.ebuild 1255 BLAKE2B c9b6e7dc3da0cf64ed43a807be020c3347355b922905ed003b1cd1668fccca140d49df6de5ff031ce9ca8395b1d2093fb32a85730c44dc682b3194fdfd7906b6 SHA512 65d33511a06b8b9117a0f03d3f6b42010e585067297792420952020a396765fe2f58a19e2e5e1f9e9ca5b6966826b4e343f8a900cdeed947f57636db1db15455
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-20.08.1.ebuild b/kde-apps/eventviews/eventviews-20.08.2.ebuild
similarity index 100%
rename from kde-apps/eventviews/eventviews-20.08.1.ebuild
rename to kde-apps/eventviews/eventviews-20.08.2.ebuild
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 1856411e2e6d..4f9d031df16c 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-20.04.3.tar.xz 27528 BLAKE2B 3e7cc3a607c464d460da58ede7e3923f24578a21b8266924518452e03958a6eeda5ff7f69fb2110be09cad02080a606a78139788dce90f6ff6a64ba12362e40f SHA512 8b9cbcbad56aed5924fa416d295a42cbe1fa992287919fb8475d1dde41fd45608afeb97fd8a747a77d71823f92597428c99896792291a3def0d539f29df3870e
-DIST ffmpegthumbs-20.08.1.tar.xz 32064 BLAKE2B 7a36344301cdf8549c80ea34146873e320ea36cdf06ae992680ff1e1fd5f832864c23c093fd2bb4291d1ea0177bea27a3511962ceb301bbf5ed7105de8662b0b SHA512 74d962269ba89821d0c7b3292619e04a04d4caf3139db21d7ca278028a3724cc0c284fdc7c554b3bae31fcccd910cf1741d7d01538dc326ebec7bad76e849086
+DIST ffmpegthumbs-20.08.2.tar.xz 32172 BLAKE2B 5e3d76879f9e5e31de29083cbdc6663fd63570f40fdbc448fb6b3d6003cc81c2cb6e864870845946c4550eea02655f2550ce1fb99d6f74801ee2ba973d6a7538 SHA512 c808eabb91af4e81cd4921a76b628cd77601f129ec9a0020eebe97c35489e636b87dc67935e78ce521baa279309724770bdb1848da4c161f6baaaa6e735afac2
 EBUILD ffmpegthumbs-20.04.3.ebuild 541 BLAKE2B bc81fbab5ca6bbdb7bdabeb28c926a3a31fa94163abc0faf7dee343628419edbc79c896437e806c3a7f80ed269475c767233b4124824cfe5a6e379cb14131737 SHA512 e60ef600a9c84447365a62afd3915584fce9004f7444c356acd58fa2808f0c380676c6abd7e26b20fddf15e8cb645fbf3e7fc0debda7d59506bd570253c18773
-EBUILD ffmpegthumbs-20.08.1.ebuild 544 BLAKE2B a35c84d75fe33a17270cf3391f9a1b9b4c351d9df40e4a0c077254d477f971ee32ef2a3df4a30853192d27af7174a9724f6fb2a92d120637fbc4869a5d063380 SHA512 86d384f05454b60be2a7f061b0f724bb5c45dadf5ce3fc3f7c9fd79bb7cff41c915c85bca5b81d745e671e2146f6683fa9e4a96349f7bd68a0ef31030e7163af
+EBUILD ffmpegthumbs-20.08.2.ebuild 544 BLAKE2B a35c84d75fe33a17270cf3391f9a1b9b4c351d9df40e4a0c077254d477f971ee32ef2a3df4a30853192d27af7174a9724f6fb2a92d120637fbc4869a5d063380 SHA512 86d384f05454b60be2a7f061b0f724bb5c45dadf5ce3fc3f7c9fd79bb7cff41c915c85bca5b81d745e671e2146f6683fa9e4a96349f7bd68a0ef31030e7163af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.1.ebuild
rename to kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.2.ebuild
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index cb62aa81699b..b39690637e0c 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-20.04.3.tar.xz 661668 BLAKE2B 0a44d0733af7f8631ae8f1fa8891384887c71365278e80ba6ba985bc29f32a3bc56a34ba8b33eecf1ae877cf79a6efb6507547678febae19aaf4840a763ec0c9 SHA512 62a8722f51b0aaec66ebdf5e409eea59419ed5a732a6dc3313a2ba567d4bb2da0c65aa45f2c59065304c5eb93d0c46c85f55fbda9e291be3482adf55ca7cb8ef
-DIST filelight-20.08.1.tar.xz 666688 BLAKE2B c60b57c89712351b7544908e1c8bc68fb640acbde79e84e26cccb021118538aecb7ea3833236c4b4d47fec2818803ed46a49fa765709abe665d39a0e481029fe SHA512 ecff6f7715c5c2f7ff33fe3e61e5ba7c8ad660961e3a911760ab8722e51af1bb9d1b0e41f964813799aaada47caa494cfe92bf6e79d784188f265c63a16c6807
+DIST filelight-20.08.2.tar.xz 667072 BLAKE2B e338ad6d97bfc2ba1f69f679653c302d37037c972469dd152777b6f392e2e18aa91cbee661e6dec797b9ac934f98c07e2f0014bbab3825d36b883fea9db87dbc SHA512 d3e3e4f830c0f5e4f26ce64b1e58d93e4ef80ec1d329a9fb0289eb8762e058b0bb79732a9ef8e7468c4d3f5be8d9e94856f880818c8c33c7b5cb1e10b4e845f7
 EBUILD filelight-20.04.3.ebuild 903 BLAKE2B 318dec60de3eec861b67de46415ca2459a87ca73eb5ecd102791b355ac9b2ad8f4524857cf0048e0e7e48c068dd46cf2d9a8ea083404e3c9f50a651b4469abea SHA512 115132eb0015c2c7becb2f29ebc73a182e8aaab32aa37af1f1f77fb31ac40513e1a71cab93828fa66b5e30692b74b8f25897921252d52d33e45b55cb0ff23d90
-EBUILD filelight-20.08.1.ebuild 931 BLAKE2B 022cef69f9532b0f7418720ebe6077b6ce9812cd1c8eec140519b2f87b2b8cc7382a0762f7a7088d2f017d9f79c348a6331c962e274d77a50d24c229eb0e5790 SHA512 99a0ed979495b1031dfea67a54521b67ae2635b20dd196af3461fb8645da2981d08929d107d331184823ac455fae721924d7cc98d16b28d4d3e90fdc7ec5a0ac
+EBUILD filelight-20.08.2.ebuild 931 BLAKE2B 022cef69f9532b0f7418720ebe6077b6ce9812cd1c8eec140519b2f87b2b8cc7382a0762f7a7088d2f017d9f79c348a6331c962e274d77a50d24c229eb0e5790 SHA512 99a0ed979495b1031dfea67a54521b67ae2635b20dd196af3461fb8645da2981d08929d107d331184823ac455fae721924d7cc98d16b28d4d3e90fdc7ec5a0ac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-20.08.1.ebuild b/kde-apps/filelight/filelight-20.08.2.ebuild
similarity index 100%
rename from kde-apps/filelight/filelight-20.08.1.ebuild
rename to kde-apps/filelight/filelight-20.08.2.ebuild
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 2d4b329a5aab..64d533134a02 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-20.04.3.tar.xz 1944416 BLAKE2B 2f6064a85217a9d6373a1ee49a0265b7a066887e695281246c96456e5a82721ea8bda217001988e40b8033edbb1df60aaa08839daf2abeb5d4bde3f956214205 SHA512 612395ddca651052a8ffae48a3e977780297c0ef397946705baf735cdf447a0a782c4a0299cab496332592d0aac33000de969978669c4b8122e2353429e17613
-DIST granatier-20.08.1.tar.xz 1951488 BLAKE2B 21e4edb691f04d04ac84820cf8dba712a91cb61503ab4c147dfbdad1ce7610f6760655234786a561f071007e9512287646159ed5d191053466edcf00ef3e929f SHA512 ea07e8cd4f7f99dde6436905a55c1e45d6e8df86308430d0b3e0b9f3334cda21f4268684b02902feb44aaa4d49895e59f9dea940cc8f24ad30a6567d9d3e6c5d
+DIST granatier-20.08.2.tar.xz 1951508 BLAKE2B aaaa886f12338566a8dae7b738b871cde20c60b03a7c0a6d92a06e79be21e2e8fe6991e0955e8a90bd3d4117ee491a97067501765176cd3d826461183680e0c2 SHA512 b0428ba2d8ece5ba33cfdc185ff010928fc5577ca4f389870f361e665d1cbc8bf852f53e0190008afaa7bf628e0995b62af3ab35fe3dab2bfbd11acb2546f5af
 EBUILD granatier-20.04.3.ebuild 915 BLAKE2B 1781046f3b9d83da4800b5dab29e0866e30265d2bd21a193bc20d21aaf53091b764f41462f2d5ebf54f21590429c3e766b5d5fa5b9b7567926a2632731d9b462 SHA512 a7e4d5f5cdb5b1c6c83bef47c17a036f41fed8b704214adc25d9ac7fb12d1c392743d0af5d8cfb3caadfacea597d57a4a8f5f62a9078c87210aa17a26222027f
-EBUILD granatier-20.08.1.ebuild 918 BLAKE2B 98db09cfbf288a8d3adabac67e577c25a8000d0dcd849f2c432b8743edf4e0023d01d60f6eeed68ab05da48e0da154a1be3dba09120dd51468595f84f9938f82 SHA512 74b51b469740a719c00bb158d70c17eb9934e8c07c9f80d92ba47c4a84ab8bbcd2e68fbee4565ff778ee82eaa2979a7bf550be0318153b31ce8fca2984a924c7
+EBUILD granatier-20.08.2.ebuild 918 BLAKE2B 98db09cfbf288a8d3adabac67e577c25a8000d0dcd849f2c432b8743edf4e0023d01d60f6eeed68ab05da48e0da154a1be3dba09120dd51468595f84f9938f82 SHA512 74b51b469740a719c00bb158d70c17eb9934e8c07c9f80d92ba47c4a84ab8bbcd2e68fbee4565ff778ee82eaa2979a7bf550be0318153b31ce8fca2984a924c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-20.08.1.ebuild b/kde-apps/granatier/granatier-20.08.2.ebuild
similarity index 100%
rename from kde-apps/granatier/granatier-20.08.1.ebuild
rename to kde-apps/granatier/granatier-20.08.2.ebuild
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 104a80be6421..b80beee02b7d 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-20.04.3.tar.xz 111096 BLAKE2B b1d0b8d334da441f76f191fb43f74d13c392c36b529eba0e596aa8a03ffd32d60f831358cfdf1c166b817958e7caec165d58965168892e3f4ea55da60d7ecc5b SHA512 1236004016cb42d3e682551102a827c39f9e7fe662a7e586a7d4fb453e07284f7004f4df49e9836eb271dd2b53b18649d7e7f48ff2741eafae3bdce5ed589efe
-DIST grantlee-editor-20.08.1.tar.xz 111868 BLAKE2B 15d6e05a202ec120e4c9b8083853fab8bf70d408ef53e956cc4ec528733d9eaaf3283d67f817b4607c8e47ef946f2f45dedd4c6009dcc6cc56962e8230944013 SHA512 ffa52bc5a3d881e824647dc3fa7c736c5090ecf4f5855d2c4753f0c11e35b7e09331922d8ec610545379b3674ef7df17ad71d3df0c41f8bdc7df57e3dd64af4c
+DIST grantlee-editor-20.08.2.tar.xz 112024 BLAKE2B e21e67a7136ef50b75cdb1c7972f07b1f722808fb92bec3f8365c51b8553954b74f196059a2d5583aa09d1c174db336a52af8abb03444da1319fbd7e467edd9a SHA512 99fdee8449f02e922943b14efd116134e7a4ef09c30eb8488d9531facd04556e5a1a7120c3889470dfa1a1354f86376daad1e8fff29027172ef82af668b1baf5
 EBUILD grantlee-editor-20.04.3.ebuild 1257 BLAKE2B 367cecc21457071b0521ce50c9672be0101e5f729dd61cfcbeaf4a0cf4d7fd9a39da594ffba077a66bda76178e9036050e082885e575aeb334711cbec700a03f SHA512 b9ad52ab873a1a8ea626b4efff923a0903c1c7d646093a3ed39d7eb36467404b84f58bff1cc205760f45d3b6e2e5876fa914565ad5311f272f030ff9481f6756
-EBUILD grantlee-editor-20.08.1.ebuild 1260 BLAKE2B 645fcc5cf24bf8c0f62ef2fb62a2a75f35d79cb6c65fc90e60b0889044597f0b12713c50b177b6d769f57a53154b92f8dd1ba172cac41f8a8aed848c435349df SHA512 60a5f218aff7a74834a54f51899e4168b39c90c158e3498086e110aec268d8f5bc6ba200935f63046a67be4d158ab5c3849b1f950ad4a54f60999cfac2b0564e
+EBUILD grantlee-editor-20.08.2.ebuild 1260 BLAKE2B 645fcc5cf24bf8c0f62ef2fb62a2a75f35d79cb6c65fc90e60b0889044597f0b12713c50b177b6d769f57a53154b92f8dd1ba172cac41f8a8aed848c435349df SHA512 60a5f218aff7a74834a54f51899e4168b39c90c158e3498086e110aec268d8f5bc6ba200935f63046a67be4d158ab5c3849b1f950ad4a54f60999cfac2b0564e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.08.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.08.2.ebuild
similarity index 100%
rename from kde-apps/grantlee-editor/grantlee-editor-20.08.1.ebuild
rename to kde-apps/grantlee-editor/grantlee-editor-20.08.2.ebuild
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 824e27118104..3e3a6a514970 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-20.04.3.tar.xz 55100 BLAKE2B ed2e671d209fcb484c18140ce158d7cc8139639ec755fda7c410b181f125c3a74899ac5376c6335fc764b11c99f0be06dc61632cc7c703d513a1e00f4e6db61c SHA512 4bf3dd73238fffa4db2c2ec8d619100570847684e2fc5ec84b2f23c651b505127cfa019d0a8ceb9f8b0237124f53007d7052d67d7476f0f43a51e29b92e787cf
-DIST grantleetheme-20.08.1.tar.xz 56264 BLAKE2B 2e95d6149c60afc8167f1ebbd590251efee16050b1df46b58c5717b0cba19bf14cef6130d011a1267951c36dfb66ea088cdfce502cf1a7b8dd80a7365e14839c SHA512 31e5979fcc5f575bdd26e4a814ae1b8717ea83473fb749cfd20ff61ea6e6cfb2276b55770b50041cb7e2bc263b674d58e1c6db51dc6d712e591587a833521f93
+DIST grantleetheme-20.08.2.tar.xz 56296 BLAKE2B 16ec91338af113440c4502a4f9589438a1cd128bf2abb8b169481ad58e74e5a825bc4316c66e28ac18a6e4ef0192b9cbd0a781d65724b360feb2757091f51135 SHA512 22ce3e8f874c95f330f596729d6e4041b4f11acb72a1e7f5ca847b08311284d62e1d328fc7a8e5a85628d2855b8c977d929d84d8b0037f5ebb371501dad5b568
 EBUILD grantleetheme-20.04.3.ebuild 818 BLAKE2B 9d124a6153672b5bb4726ef7bceed419d913d960d84a1d75cfa86a56c6e8ddc36b1b1770a0b826ad24eb18168040ebccfe66bbc723b51270552527d1532e3482 SHA512 f11c43a6354868c1582f9de5dc1e3e54200e439db4ec2146c6d3e00ca2dc03d0ba561150450ebbbe91570586eedbaae529da16a4854276e107fdd672cebec591
-EBUILD grantleetheme-20.08.1.ebuild 821 BLAKE2B 2df16742095ba489901960037519a65ef58773dd989e934191d216936f9f1751df16862fa33e04861bc1c74f8ef2b0b293c1db1559711d6f2e828b0176d7f5b3 SHA512 8ca0e45ee9e225f10e2fdebd35dbd2ce58480ea01d8d7e391419d5c4f004898e86d022ab6240c0576c84e5319009a67a0df4f1ae6268b8ed6ece38c824ab009a
+EBUILD grantleetheme-20.08.2.ebuild 821 BLAKE2B 2df16742095ba489901960037519a65ef58773dd989e934191d216936f9f1751df16862fa33e04861bc1c74f8ef2b0b293c1db1559711d6f2e828b0176d7f5b3 SHA512 8ca0e45ee9e225f10e2fdebd35dbd2ce58480ea01d8d7e391419d5c4f004898e86d022ab6240c0576c84e5319009a67a0df4f1ae6268b8ed6ece38c824ab009a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-20.08.1.ebuild b/kde-apps/grantleetheme/grantleetheme-20.08.2.ebuild
similarity index 100%
rename from kde-apps/grantleetheme/grantleetheme-20.08.1.ebuild
rename to kde-apps/grantleetheme/grantleetheme-20.08.2.ebuild
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index aaf8e6ccf704..842e9da9fc77 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-20.04.3.tar.xz 5629044 BLAKE2B 3895b5a4b3a858784470a0d72e473c651047f9b6f808b89192556d12fd80d798703d33a3409f3fbc2b35771b1ad1dc5f840f4935ca25c4f66b7130dd3a2bbf45 SHA512 c670111e75938028713ea77695bbe6fdd8e76d0dea74acc0cff3a20dd5a7ee4c956ef79b67c7ac8e99bb07b9895c16fcf985580d91442005451c6439f19726f1
-DIST gwenview-20.08.1.tar.xz 6741100 BLAKE2B 891781856c31c7e2d981265e5341badc9f408aa4dab95a051db71b7fbd8a06fa077670eaf96b73b60086bd9070f4a989f9d39cde6ad6513ce3b1f7e884b7f465 SHA512 76382f3edb228667c85766049a4dad469496ef15364fbfec5b9c570cec0a7c6c083edd1832ccf82f8f7ed3c6d4819811cc2e784200db1a0298b9bc01ce606cb3
+DIST gwenview-20.08.2.tar.xz 6742400 BLAKE2B 782f8365f6624461ca2c735137b8678f5860c4a92aa52aa3dfb23b165f7134eeaf967731825d062f6ba66db61de1a404e931bbbce1f2a00c63de63ef0ee3c24f SHA512 f5ec77a5014a3ad99ffc8d363358dd49b4951435e792a75e17fa460200361afb2acfd540711a690d886b519efcd240138f2d5a4aecd27275e4cd9706223575b6
 EBUILD gwenview-20.04.3.ebuild 2976 BLAKE2B ae5058e337745110905424f3c0240e117f37e6cf02207ea7d64cfc4ad68d20c08f50e21e78f92933d568753154ff587c72f3a0af1d29a1e0050ca0e004cfb85c SHA512 e0e22ddf6610758ffb25b49f6f21d1234b538807c838e1da09b64c0971058e785753dbd4890dd2caee9dc35e30a11187bc12871152543ba7603b8fbe442ed06f
-EBUILD gwenview-20.08.1.ebuild 2997 BLAKE2B 3d1fe3d5ffba056cff6fbedc81665921efddcda0a66ce5dc9718d0b29fbd02b98d760acd0121e58d247ac5bead2b53a5218880b21ff17b7439a38f67ce6a794a SHA512 be7aebcfee7afc593305527c8c7d074bca99cc7944b4f00eb1098177b494187e5443daa4467fa6633eb1a57cdfb4b5d1e0779cc80f6f878780990e96f38d49a7
+EBUILD gwenview-20.08.2.ebuild 2989 BLAKE2B c5c41d843f5b85bf7f9cc8f84449df020dd10e9cb36eb945b63f1fc9617540dc30e0184eb0e995b38431d8c37e34bc1dc58c0a3c8b25d048b5c756318dd9c928 SHA512 0285689eb56e3e4987c533e98cfda9f4c953e4fdb6baac833fe6998bbf038041c0792ad7178d0f83397658eaced15f963003c478cfda46efe2073a94d29a23b2
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-20.08.1.ebuild b/kde-apps/gwenview/gwenview-20.08.1.ebuild
deleted file mode 100644
index ce79ad7a87da..000000000000
--- a/kde-apps/gwenview/gwenview-20.08.1.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
-https://userbase.kde.org/Gwenview"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${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/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	media-libs/tiff
-	virtual/jpeg:0
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtimageformats-${QTMIN}:5
-	>=kde-frameworks/kimageformats-${KFMIN}:5
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
-	fi
-}
diff --git a/kde-apps/gwenview/gwenview-20.08.2.ebuild b/kde-apps/gwenview/gwenview-20.08.2.ebuild
new file mode 100644
index 000000000000..035ec84cac97
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-20.08.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Image viewer by KDE"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
+https://userbase.kde.org/Gwenview"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities fits kipi +mpris raw semantic-desktop share X"
+
+# requires running environment
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtopengl-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${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/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.11.0
+	media-libs/tiff
+	virtual/jpeg:0
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	fits? ( sci-libs/cfitsio )
+	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
+	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
+	semantic-desktop? (
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	)
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtimageformats-${QTMIN}:5
+	>=kde-frameworks/kimageformats-${KFMIN}:5
+	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package X X11)
+	)
+
+	if use semantic-desktop; then
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
+	else
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
+	fi
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "SVG support" kde-apps/svgpart:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index c750870745e3..24d8af048507 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-20.04.3.tar.xz 550072 BLAKE2B aba9b68b9dd2e5bdc9e0eed06faebe3c0c297d8dc438ebfb479ce68b5c88407a41464344c6df0634c5679f21f9dea153c485d3d7cb89d387ccd223eedb54a57d SHA512 42ec71587a14e6840932962ced3c1ac36b00218d94cd1c857ccb9fc0d0c13a12580a87e2e2a5fc5f7832c8190bee955d6c5372c9d3cdf8f92bd9a45a5c8d465c
-DIST incidenceeditor-20.08.1.tar.xz 543004 BLAKE2B eecc3a067f3da989716afa4e55f1a775e1b6b97b657f1711e358b806741d57e23d750fabe679f0f9d40a3237dcd069014e856749899545f4c9d585196257d0de SHA512 f7e9179f5aa2a86a868a19c0cfce343db6ea0fb1a62d7781cf68622efaea350131377c45e4730fb6f8834711d2694ad45a639ef08b353216c01650ea38caa73c
+DIST incidenceeditor-20.08.2.tar.xz 543128 BLAKE2B 17b7571b449f5da2246defd68a22845983767d45fe35f853f48986a4c8decfb98b476403ea7d852f4cb6a6e85ec4d24bc1ec1efa0bbc6d0d78073968940b4f0f SHA512 8eab6ff57581a0e162901df83209d1d5cbb5c709e7cf94ad105ec142fc6d1cd9f337ec6db0cb638ac42da6b84a92bf6590ba850f7d30f1e75ac56f01390f2e23
 EBUILD incidenceeditor-20.04.3.ebuild 1568 BLAKE2B c203a1637bf0fbd7ebd26acaf60c3f46f1ea65905684ebe52145bd43bafe15ad48076a79f4faa19aa8ed6644a9909ccff5a634fce47c20cd70786f77a7410323 SHA512 2cf6d33104777a2f94766e37a3fc7d89cf7390e8692a17a9552e06801564971b511a39e19f728b61755ff6f2975d27dfb4cb7e5ec079b0872cd24177951ded54
-EBUILD incidenceeditor-20.08.1.ebuild 1564 BLAKE2B 4d58e62329a91b145cb4ba30a07a0588b70e7fdd1f8202f233facc54cb9e16c0e359ba0da8a3ea6cf23a1dc49e3c6d3e9556d20b37ec47b584c5dca68af4e6cf SHA512 494b85123af97803d1e257c17db7b91effeafaa5b5781e2f0fc21fe7531c4188c14b5d980ff78085ef90b07ef4c1703f2199043781bafd31398ba2721c267638
+EBUILD incidenceeditor-20.08.2.ebuild 1564 BLAKE2B 4d58e62329a91b145cb4ba30a07a0588b70e7fdd1f8202f233facc54cb9e16c0e359ba0da8a3ea6cf23a1dc49e3c6d3e9556d20b37ec47b584c5dca68af4e6cf SHA512 494b85123af97803d1e257c17db7b91effeafaa5b5781e2f0fc21fe7531c4188c14b5d980ff78085ef90b07ef4c1703f2199043781bafd31398ba2721c267638
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.08.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.08.2.ebuild
similarity index 100%
rename from kde-apps/incidenceeditor/incidenceeditor-20.08.1.ebuild
rename to kde-apps/incidenceeditor/incidenceeditor-20.08.2.ebuild
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 9f27064a4767..5c2c84ee576e 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-20.04.3.tar.xz 1868832 BLAKE2B 515916e5d7a9ad6a7f00779d820744d4acf192f29b98b6ba0f66b0128695dcf19218b6e0634c8cdf5cdda1b6e3f1fdaf1f9e4ab216328bced019a7af4d6693dc SHA512 ae0b998856129548b99abd5d9567fbec79a7760e9898a58c5d0334e2be2c8e54fc2dfb13ebadaf77aeea86ee3cea4677319a7a11f048b84322171580853ec562
-DIST juk-20.08.1.tar.xz 1998336 BLAKE2B 545f31aa7dc7aa62cc4b324d6f576d4529435a1403a98ecbce1eebab75d8e527a58cd535e97d86411f3cb2806feb438b45998d7d0daa2dfa0dacc2fbbaa5d382 SHA512 423358bb3a55b69a3193534a39e7453d386ec0101e37710645efbcd5080ac7c01291e6daf9c47313439ce0806c873a7a49de7cf71fad6b3be5be942aa76d3e56
+DIST juk-20.08.2.tar.xz 1998088 BLAKE2B b17f7f8bec7004210bf43fc5e8c573561e4a42bc2b037f69f6b5026f1f4d1a11e5fa37a002920edcbafb2dc23bff6914df5904ca31dbc0de1e2246521ee9ae0d SHA512 fdcbd62026eabf3269dfd7158b0140c497d1aef71cdb075a52aabe6b76c3f4742ae5aa644b912b3faca35b07edf7a020ca554f950392f95cdaf4d779671a2eb5
 EBUILD juk-20.04.3.ebuild 1292 BLAKE2B b189dce83f6ca1097484dab6c7fd9fe0cd96494f6ecb71277c16b27123f9e393fe68df64036a97077fa3726d574c1eb5bab07d3d77723b4615c1b79f866e21ba SHA512 1f1353a18cc0ec4c78845c7f4e051c13788e81f935ff231416d1909266cc7df243e0b181ea284b05e443297fbcad7293cbb2deb833fa1889c89f0490d2280f1b
-EBUILD juk-20.08.1.ebuild 1296 BLAKE2B 22e417b87b0e465ad3e09593120fe5b6097af5b20d77431eda47696a92c50f9f34a9a4029eeb4a4338f6245861a4cc2dee2925ee883d304425bd79e1d5cbd38a SHA512 6024a308eb54045923adb363ca9f13036b7b49e68f945c2a57b719c3074596253d07ac064d3fcb0985e13bdf62f4d3efea7a8c77e979c0ecc08006385b016910
+EBUILD juk-20.08.2.ebuild 1296 BLAKE2B 22e417b87b0e465ad3e09593120fe5b6097af5b20d77431eda47696a92c50f9f34a9a4029eeb4a4338f6245861a4cc2dee2925ee883d304425bd79e1d5cbd38a SHA512 6024a308eb54045923adb363ca9f13036b7b49e68f945c2a57b719c3074596253d07ac064d3fcb0985e13bdf62f4d3efea7a8c77e979c0ecc08006385b016910
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-20.08.1.ebuild b/kde-apps/juk/juk-20.08.2.ebuild
similarity index 100%
rename from kde-apps/juk/juk-20.08.1.ebuild
rename to kde-apps/juk/juk-20.08.2.ebuild
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 00b7e30b83bd..d962a45f86dc 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-20.04.3.tar.xz 10509884 BLAKE2B 9bc05efbc06e9909e36fd23e56aef95182f3db9a82b2ca9c5404b5fa839eb71a411a92492591ff7b5d0875a296d71ee02a4008c61051da6b893628801f096a48 SHA512 ba45206ba25df77356b1afefe3b601cebc26610d87068af5c3d4939b407de8f08890ca7ed8b0e0059f0bd98adc9786b00bec3f0ec142488b686d0663c3cc65b2
-DIST k3b-20.08.1.tar.xz 10681496 BLAKE2B f4692418f8085ab4b76d3defc8ed5e1e3f888ac4f4606523d9fa7d5c63085e095d1ce92fedeb0b797dac3260fd328b0a4998b09c63fbdc9a2709234539f95059 SHA512 b0d6e6e5372916963a0e6c405792c55c4bb70e56564aaad65e7c2e79177d651f9edc84d6813900b18acaf657429909453a5ac1b47f4624c1751ecc56ded52b93
+DIST k3b-20.08.2.tar.xz 10681572 BLAKE2B 1f52724a307091bf81eb85906cfb1f4f4313b026862ab2f65226ed699460da452261423f76d6f545cf55bc31d9f47468f359a9e1c9ce4fffe34fe0eb9da45580 SHA512 ca35a414ab747f5e8ce99fd58ef4376dbc8be8760d9e92527745de722a0ee0418eb5ce1098edfb611b30c75781d36c77a14c47a73f27ca1d43a58652679b8565
 EBUILD k3b-20.04.3.ebuild 3516 BLAKE2B 4a44aecc98dc130822dc4ecacea193564eadf3e20b458960c8308bf4bfed739563fa413a4e1b7b251c1ee0b80e7cac9709e63fa9dbd6589895e27f2cbf62f29b SHA512 686205a2b13c228de85b73acb7109c4a123421a5d7756fb96de56039bf006054c54011e25d5ae73d1be66edfcd60396cbdd455b55ae909fe73cc1236d4bf45f6
-EBUILD k3b-20.08.1.ebuild 3519 BLAKE2B c8670add053124e6ac4a4fc5b7bebe238d35e857458ecb4d83e0186bc109dbb37677b61a73735f8ff33ddf62639392c54141db5c382a28167b5a6e7cbc517340 SHA512 12e3f2c27149753f7a57a887bf6c6088db7f90f510ba4a20d975814beb231c7f9ec10c23afb4d18b2014a358856f3dd1b1bfa1c67d490de17af651456717a395
+EBUILD k3b-20.08.2.ebuild 3458 BLAKE2B 31c5adb8292a4280718c0a907e406389b639c0045f9d7fb2232f542856417fcae93e7b18aa01eee73ec058d08c69f126ac971961637b3b5c0d918605b4ffb1b0 SHA512 eb1135f9a996c9bd1096af3c5f2d88d0d88d8ffa610c175ece2a5527fcf9e904342f795c86a755781871500e1602d2803778b4e6270e06d762ad374e2dc000db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-20.08.1.ebuild b/kde-apps/k3b/k3b-20.08.1.ebuild
deleted file mode 100644
index 34c518f9fd03..000000000000
--- a/kde-apps/k3b/k3b-20.08.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.k3b
-https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-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-apps/libkcddb-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	dev-libs/libburn
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/k3b/k3b-20.08.2.ebuild b/kde-apps/k3b/k3b-20.08.2.ebuild
new file mode 100644
index 000000000000..7807ff5baa31
--- /dev/null
+++ b/kde-apps/k3b/k3b-20.08.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/multimedia/org.kde.k3b
+https://userbase.kde.org/K3b"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+
+REQUIRED_USE="
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
+"
+
+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-apps/libkcddb-${PVCUT}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?]
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread:= )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	mp3? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	dev-libs/libburn
+	media-sound/cdparanoia
+	virtual/cdrtools
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		-DK3B_DEBUG=$(usex debug)
+		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
+		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
+		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
+		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
+		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
+		-DK3B_ENABLE_TAGLIB=$(usex taglib)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	echo
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on optical device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 3cafeacc9cbd..5ce89be60c82 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-20.04.3.tar.xz 65632 BLAKE2B c7f6958cfa38ef0e083afe0f0bdcaf7cec8051db90bc418f82e3bf0ff0de1fcdc0f98115b421296bcc580eb930bfdadfd6e92ded0b7badd5970ce7881e8224e0 SHA512 974cb5296431d692c2b274172a4e538bb727016ab23419dce3c9da881b129521558b87fca505836447e24eb2bc8b1bb1a6d8c1e7950f448fb27dbfb8e74cd41d
-DIST kaccounts-integration-20.08.1.tar.xz 74792 BLAKE2B cb8a5575b217dfe87dd6d3a4ff8f2b12ec41d7f8870e4639fbb7c58cd2efb4d02af0ec92068ac8917c45ca69075e3da5b597124170a0ef9923ab040c77f63edd SHA512 94c2b7977228e0e3993540bf8093e922916a93cc8cc7e721688bc42568540a3aa62c13d77e89d342aba19456624a7e6d88f1c96aab8c9ba04b306fc77e0f18bc
+DIST kaccounts-integration-20.08.2.tar.xz 75668 BLAKE2B 88f9e39ded8cd4232048c4dcf37d4bdd0e5a5339e6f155491885888e33d60c88f674fdc2e7eef2e996f44404776752fd44cf2e88b8fb6a0283d910e1903fddd3 SHA512 d52c405ed1611fc0d5ad23dcf1eb2f32cd6bf5efaf9e15764e46e4e31f0155dd5b898e4da9a95f1c5e743a3bc4114dd951a84f4adf11573e1f5e48fb56ccd607
 EBUILD kaccounts-integration-20.04.3.ebuild 1126 BLAKE2B 3c7627251977e849d6899bd61815e16542b7fd306e6e9bb83076bd930ed9bd4cc4dbe46e12f1aac5ba526c0a60a321cf0b95d7fd13d6923a5fd1b989216e935a SHA512 76b2897eede2fce1905b87f00c01920fe2f548e49302527a8095fae761d795364842bef3b2d07a0374256344c4d7f0f9665f6c7aea08db6893665e1755e28eed
-EBUILD kaccounts-integration-20.08.1.ebuild 1199 BLAKE2B 0683be36ec755c1323f5a14a43496965a32340a2228afe65cbf7954ddc7132ca1a558e2c64be21aeab555cd19634fa075a5dcd2c644dd138ecdf319f885a44fb SHA512 4f92bbe3579a151c3842e3aa61356ba6e459767c9146a516034a673359d9049ab60994e8dcee6bcea02ba6b2af241f63194c7d00b8d7790dac8a2677cf05c314
+EBUILD kaccounts-integration-20.08.2.ebuild 1199 BLAKE2B 0683be36ec755c1323f5a14a43496965a32340a2228afe65cbf7954ddc7132ca1a558e2c64be21aeab555cd19634fa075a5dcd2c644dd138ecdf319f885a44fb SHA512 4f92bbe3579a151c3842e3aa61356ba6e459767c9146a516034a673359d9049ab60994e8dcee6bcea02ba6b2af241f63194c7d00b8d7790dac8a2677cf05c314
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-20.08.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kaccounts-integration/kaccounts-integration-20.08.1.ebuild
rename to kde-apps/kaccounts-integration/kaccounts-integration-20.08.2.ebuild
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index a3f619b22235..69934e8d392c 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-20.04.3.tar.xz 35820 BLAKE2B aa0a631a4aba0dd56d8c3215c7a24ff44d0a86e32e27e15b4670022cec8765e0369b7728f190d225451c2b7869d9a837588d00b1f5c134dc57f60e483c551d7e SHA512 71078b37ac747cc7b0e57f49f87db69b67ce7f1b62d2856942085fe267c1bf90cf33c043143aecfcac997095ff894ad7d0a37dbc6e912965bb7964240ef7e504
-DIST kaccounts-providers-20.08.1.tar.xz 35968 BLAKE2B 2287d558cc9e3429044073891764cfd164fc8029bc6b3946893a8746985c3833beff87effb07aa7e12a4b6c65a43aa4e8d5f3a58c7b36c00ad9fb0bf81484a88 SHA512 667d99e435f0b7c4fb476a4f430f52b7903519f9dc992d3d06020248921287eab7d55298b1e5512955a541467ea6f68654c31b02d5d344cf7b02e436d6e66bad
+DIST kaccounts-providers-20.08.2.tar.xz 36112 BLAKE2B 245ee606b53a68cf019321dc520a8a738b5652dfdeb0e5aef3161552f5073581aab5441b1fa4794016757f26f23a44a4c8220a4846d3aba7e4730703b68c2146 SHA512 9c91a7db217cf83db9afe66ee96de5444db71367087e6b7a7db1c0a2dc3dbf681a1a95a448f556669a8733b588be89dd4eea4e0e929e6cdc0b7439fc58a4a9de
 EBUILD kaccounts-providers-20.04.3.ebuild 796 BLAKE2B 7b73ff6a3385bddd9a78e6233a2d11a1ff5fc9877e51c621977367f112fa97181cee226c9c28ed79261ecdb85d8e54bf7245c463c16281f807cb48273a2caddb SHA512 a5a249418700bdbbd56d1dd7806c719a211dd39e510a69891083685006f741d364116ede6b7126b3d57fa6812d7c8354b4ac16ec7b7b64af7e33d05d34d29ac3
-EBUILD kaccounts-providers-20.08.1.ebuild 799 BLAKE2B 110eea1380f1880afe1158b3c1e9c82ced3e23ae66674d7bd4ae21f76d47ed13d64144d5784a9d865abe2f93136e5a274ac9439845a9400b50a1997dfd249db5 SHA512 e9c47f4b2ab014f558906d2f3137dd5702024fb7c77a41979f8fd698745925733aa128a57976e6e6c88e9bfc1c1706bbc3e398c8974b8ea0525b0a01bc3fae19
+EBUILD kaccounts-providers-20.08.2.ebuild 799 BLAKE2B 110eea1380f1880afe1158b3c1e9c82ced3e23ae66674d7bd4ae21f76d47ed13d64144d5784a9d865abe2f93136e5a274ac9439845a9400b50a1997dfd249db5 SHA512 e9c47f4b2ab014f558906d2f3137dd5702024fb7c77a41979f8fd698745925733aa128a57976e6e6c88e9bfc1c1706bbc3e398c8974b8ea0525b0a01bc3fae19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-20.08.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kaccounts-providers/kaccounts-providers-20.08.1.ebuild
rename to kde-apps/kaccounts-providers/kaccounts-providers-20.08.2.ebuild
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 68f57ef4fc5d..595800d8d2db 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-20.04.3.tar.xz 2427140 BLAKE2B 26e916eae393816769411d5d66946e5e9455a21d9b710f90801fa86d9409f6fa61fdc4a112c4691deeba578b0ed16ea713d312b53a7d1a0876cedcce39b97c39 SHA512 3b9d3f17a73c5687a30b10909004aa9c6ed52210808cb147badae4bc07046cac44b0ae2f64e8c950344e755afe3da0f402fb3ed6688d825d99d5e0faf160df5a
-DIST kaddressbook-20.08.1.tar.xz 3167108 BLAKE2B 2d99a5e4561bb964a769335eeb0ff651ace93d0583bc5097cbeff6064a549b70ea8286e71904c605a59a2d0835434d953edca7a08683384f9c6413da148428c4 SHA512 2904dcb07799489bab5e8e3faf2c36be0f0c44d084e8d96dccb014de7f3fcee745213ac9a5d5a72bfdfa89f14e9c0f1391669a1a2ae26454d2bc170f4b6a17c3
+DIST kaddressbook-20.08.2.tar.xz 3168116 BLAKE2B 11566489c558d6d56500205bba7061c67b88204deade10cba4b6b96d14fc5576d8183811bbe14d930652c9117e6ad45668d23541dfd56e13b692fa09ceb07858 SHA512 a1ca16bee3d862446bab48a6c0cbac54b9cef85d1e5656d2bfdc5f6c8d4946e32083788687c53cb378df8102aa667fa51bcf4ed7f80988ec310a858ab8ec2b10
 EBUILD kaddressbook-20.04.3.ebuild 2114 BLAKE2B e406e01d554c9859058b864acadf8738f113592570db51dec617cbc850085284b7062cd5bce0661662d1e2df149e4f3ed5d7788fc5dd10af95138477f2ff02b3 SHA512 3f9d7dc0cca3fe4856985398829a5781e3271a760faf563ef43b50ade009ec442eb83db6d03b9c5215c36148366161c0b47ea47c08e2989594d07be3db74676c
-EBUILD kaddressbook-20.08.1.ebuild 2117 BLAKE2B 621b708039dd2b25874c37f87b9adc097152db4288998945cee874e9e22b8a436fc3a5064ef29a26bafe3549a65f47b20935d3f4b00d9d07f462d2c076060873 SHA512 07c1ea34cca85b7819cab3f22b2b4a81c98e29452a10b14f0c7d5c7a0db8ff1d8094ba27482d1b73b8a420ace5f126629fd27aad3ca36e648466449aa2cfaa61
+EBUILD kaddressbook-20.08.2.ebuild 2098 BLAKE2B 0357717dfd6e15fe1e59a3a955c32dc7a01da0272b287bff4d42dd51ee5f022408578cc8129087bc37425164a8f06b45af38458f3020a5124c7ca527213a4eb5 SHA512 eee0a079cd871b37ed30c3080628d42a26383f5dad8ca4d7caacb496de1136b1d2e6f588f6da179f126a63e108f93d9ade0fb86a161b30e627e00dc54d37574e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild
deleted file mode 100644
index 53d41d35bcf6..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${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/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/kdepim-addons:${SLOT}" || \
-			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
-	fi
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.2.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.2.ebuild
new file mode 100644
index 000000000000..022ae9310958
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="telemetry"
+
+DEPEND="
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${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/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 06132d9bed3f..ade7b4075f66 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-20.04.3.tar.xz 4467924 BLAKE2B 80bc1717586c93b530973c937c7ca7f5952a701d70ed297b4c5f19d32eea9f037bc4eab32662b2c7042fb4e2ed763c1cb4ebef8e1ad2e82bea995463f9eb38bc SHA512 8621d8f98de76b3debb3593f6f5deed63605023f38dfb682186cd829f355423b84813a47698d4316556eefe65bb2bc8b85225e28d231a5bfec98925ad34ec0cd
-DIST kajongg-20.08.1.tar.xz 4475168 BLAKE2B 265dd60b297ece3d8be075dfcaaf535ce29293a2e30ad98a8577ece35acd111945ef569fe3e564b085a8af3fb3a8ffa7f905e2985daadf53c92a989461c3ef5e SHA512 6ba1d29b8b8ea131e8248e24d084ecd798c20631e3d7f8a3c8047457d546517d774462bea82a9c1949e2fad78191b570514eee38c94e52bb08c7160616203cff
+DIST kajongg-20.08.2.tar.xz 4475300 BLAKE2B 8f08e38dce747d274279f40c34e6125a7e7e45e38c579e1a231784d3974cb3b704407c20c3410fec1a2f52cb36f18f7dbca6fab95e8e157b753d5f415813885f SHA512 f093f29b6190e2f1d65c7a60beed99c53c6c3e9afc8c7b46e0b15ebfb79c966d0c801da65aa294bf3c9f4250a2cf855fbaf32f846bf9c02bbe0b8fd425853ed6
 EBUILD kajongg-20.04.3.ebuild 1040 BLAKE2B f6677ef9da453a2a44cbdf38ccfe9e2482106f781536acf6037ac9442c43824b224d0325a8966ce4c2b802c77cb801464e34224b6a9e22af2d9d80fdc028e83d SHA512 161f2107975d901d542258a69f6331c0071dce2fcffa9d772134ad766641878ebeef68726359459ad2bdb124337fe3e2fb898e7154cb4f7ba3caff1683411088
-EBUILD kajongg-20.08.1.ebuild 1043 BLAKE2B b5035f354c975c5504a342a024622f1554893d08216c66b7f8be4c863a1b3280345add6f696e0d45cc9df28c8480006020db8e5e7fac8e862291a3f202aaf958 SHA512 202e837fb743a9f3dfeb82decafe77c97d70a9506692325804d90d1dbef6127b08887a97dc56f276510cc79610f896b4d2683e769f2b2b9ecd3aefbb1f94ad7e
+EBUILD kajongg-20.08.2.ebuild 1045 BLAKE2B 4dfc09096bf394c809afd124b379aaa24461bbc703ad1e5a5239b78ba38141b58a81c7c7ea723bba5d5acfaf057dce7ca39796b6bfc80295c23c26efb910cd0f SHA512 6b67e55c0d9da8393d3fd85ef9b363bb3b9487c21755baa9c0678a0b8226fe05d6928f2c96935e0f0661495839c4f05fb3ec9ffefdadcaf6d06fbd6bac5547ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-20.08.1.ebuild b/kde-apps/kajongg/kajongg-20.08.1.ebuild
deleted file mode 100644
index d49b3cf13b01..000000000000
--- a/kde-apps/kajongg/kajongg-20.08.1.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
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kajongg"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	ecm_src_prepare
-}
diff --git a/kde-apps/kajongg/kajongg-20.08.2.ebuild b/kde-apps/kajongg/kajongg-20.08.2.ebuild
new file mode 100644
index 000000000000..b06e32ec4f57
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-20.08.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kajongg"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkmahjongg-${PVCUT}:5
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	ecm_src_prepare
+}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 138afe98a361..22f1d9432a1a 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-20.04.3.tar.xz 1838048 BLAKE2B f6eeb205f8f5a597f2e2aca47877497dd414ed1e5f0b4db65b03b4a63b1cb592c2717a68c377c065f1fd0d49df722af8451bf8f5e9ba12a5d34248fdc18ea836 SHA512 a8665a16d6a35790778596965819f25ca47c93887f515439a143a332bf129f699eb42e85d11da6cd737c63f81c380c6b93870105c87f59d1e9c8106e6694a282
-DIST kalarm-20.08.1.tar.xz 1914168 BLAKE2B dbef0ca57d0f6e29f5a3b6cd0dced1fbe5810e790be88f801655c626b00c133170ead218aedf202f176941b35c7d9ca7294f2d9af392932264898302bcf25887 SHA512 e0a4d859891178608a97643cd53d1588306ded230d29cdd542db9088e3b1058379b265f38dcc0ca980d6ed853c98dd286dcf124d80aa4853f73e1a7a5eede261
+DIST kalarm-20.08.2.tar.xz 1983400 BLAKE2B 2ec59af5e366fdd9d0fbaef8ea54ca59e9acf3df3d79d6b215e4211be68db1f56e40d670ca1942105a569bc02490e2de7ce77d7334513c1ac7d97c0dbedf48f1 SHA512 108efcaa6b755c205ecb1da2686f9d7b265da62c37fb916ebf7f6e08395087a49cf8d6326e30a2f1a30f2a9bcee4309cdc86daaeaeb91c238cdcca24b52e91fd
 EBUILD kalarm-20.04.3.ebuild 2420 BLAKE2B ed43ef8158497dadfa63c4fc4caff6a67c2512437b87062eee9df102753d0b5568441cd4248395e78d0fc8a48880f38d80cdf739c0385d9b32fe196d328e109d SHA512 424219f4f0b1d11e7f5d91b3d87a14bd773ad025b0f0f18d4e3ca293d11bb141a9621cb075e1d8b506a54c366dfebc54727aded4604029b009d7309268f83b7a
-EBUILD kalarm-20.08.1.ebuild 2351 BLAKE2B 92235e8b9c4fdf54baf959dfe964e31054d75be03c2e3bacca6b7c6c3d31506b6a0332195987fab9340217bc9b62f4ef85cc4ac8b431796d9d1f25a1852bcbbf SHA512 3359346f6a99bb54f6cb66f805d22bed182514feea3641fcda671c6ae42afd9998bb31ed0573d573e48578d574710a0542aae0b3d362036b682b71534cd1ea36
+EBUILD kalarm-20.08.2.ebuild 2351 BLAKE2B 92235e8b9c4fdf54baf959dfe964e31054d75be03c2e3bacca6b7c6c3d31506b6a0332195987fab9340217bc9b62f4ef85cc4ac8b431796d9d1f25a1852bcbbf SHA512 3359346f6a99bb54f6cb66f805d22bed182514feea3641fcda671c6ae42afd9998bb31ed0573d573e48578d574710a0542aae0b3d362036b682b71534cd1ea36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-20.08.1.ebuild b/kde-apps/kalarm/kalarm-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kalarm/kalarm-20.08.1.ebuild
rename to kde-apps/kalarm/kalarm-20.08.2.ebuild
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index db2d2f081c79..d9bb28ea64dd 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-20.04.3.tar.xz 574436 BLAKE2B 723ae51531c9d99f3eb92c3de286e4681dfa51917a9870e2bcde35e8754c6e88b2dfc619ccf9eeaa0fa7330c15d78250236d87925c3c6b11f31c131b9e768f56 SHA512 961ef8bbc3a41cd5f6ffdeea3bf1062730cd68e2c6b971a98d7a709a2d7a2c69b69a53ea7d4c98c553911324994bf3422e4fdd0a0e916c24a298352b4de6219f
-DIST kalarmcal-20.08.1.tar.xz 575088 BLAKE2B f32bff527a0cbbfcc0533b08af69aa0c3d70c7e4577d65b3a7455615ee593833772f951cea199e72dbeb429d7fc70f65a4cd4aa9ce1c9ce42332fd2d9faf9a63 SHA512 c071ddb06a76a0cfc3fa51f75b079c869ab0b532921a21d77aa231261625002760ab0b1ebcc8995172cc4e6aafa62bec50c84f6a00a72db1a272728b5bd0611e
+DIST kalarmcal-20.08.2.tar.xz 575204 BLAKE2B e964c84db0066d03f32811f403f02b4098aaef42806012ab6bb4fe7f5b10f998591549be2feb52ea6273e6a350bafa1c0f2dda2cb88fdc49162e4da8ab4d17ea SHA512 21b0e5c58c6cb07493d5e5ce91b6c38d63d68a917407c19e6cb8b8c3c90b24c27db4c9c67176806dd6ce510d3d2b441ce046aa87f3d0df1f3bd703d56e610f9f
 EBUILD kalarmcal-20.04.3.ebuild 835 BLAKE2B 0b7e0376b105c2a5bd5162345c2471e6db5f7c5e71557e06a9fcfdf3af7d037fad2d87e49e636fe342c5d2a4b066707abe2db53f24278edb66c53dd70b67d1a1 SHA512 a3fed13b779c53a9cd4c7b64a22c494670ff8968d19bd682588c424a7fb29d76bb112b1f7aec1599ae88255e68fa6712db815491d114b233dc8c93b5bc65d53a
-EBUILD kalarmcal-20.08.1.ebuild 762 BLAKE2B 0a660f3006b9fa923d9a75fecf85a576dfc20ce6dd5e8a82fd8d74dfe87d1f967aee24d359240401c56c2eca20e0ad5e35a75a1e7b0d85971383bde64cfebca9 SHA512 f016bb829fdee619199652e7045c866090b724fcd8b1a4c20c94bf3a6b1b502bffdb6e4ba2c45e5d342ff2a5abd93bb169b45a641b4d7ce99c85ae54ab5e42db
+EBUILD kalarmcal-20.08.2.ebuild 762 BLAKE2B 0a660f3006b9fa923d9a75fecf85a576dfc20ce6dd5e8a82fd8d74dfe87d1f967aee24d359240401c56c2eca20e0ad5e35a75a1e7b0d85971383bde64cfebca9 SHA512 f016bb829fdee619199652e7045c866090b724fcd8b1a4c20c94bf3a6b1b502bffdb6e4ba2c45e5d342ff2a5abd93bb169b45a641b4d7ce99c85ae54ab5e42db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-20.08.1.ebuild b/kde-apps/kalarmcal/kalarmcal-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kalarmcal/kalarmcal-20.08.1.ebuild
rename to kde-apps/kalarmcal/kalarmcal-20.08.2.ebuild
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 88bcd6f452f6..14a810e9ab21 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-20.04.3.tar.xz 1158436 BLAKE2B 73550df6f4fd585038809ce6d8c6e3df98cf358e0e50aef5e3709ebee7b790ac7875d34ef4a5ab035c6dd363e0152740f6551f378e63f59a2c2746aa050179e8 SHA512 215218105cb7fe76da3439aabfbdc97c1c5ab396aab21e9dfd8cc8d91c897d2fc94db06e405a44e45710e2d4211049b084306fb85595aaa84443828f8258acb0
-DIST kalgebra-20.08.1.tar.xz 1164324 BLAKE2B ce1f63bff9a98a469644323f5c73adca886f83f1b925c790cca68df38baba620204f31493497c0e92c4e49c838b168854e815b0adac651c3d2c27ed4a3f4918d SHA512 a19e4852f07a7471a55c0fa80df4b33a3b43b0973ff51f3beed0c536fdee62b21506288c57ab44464b451596136ce79b8bfd7da32e2bced94bf9f29f537bc129
+DIST kalgebra-20.08.2.tar.xz 1164252 BLAKE2B 2d58f549282db3d7e471c1385b317d318706edd36cb865b629b067905a79aa8f5cb368ab24f999d50f61a23c5e35e76a4e713d11f90ad55696edb87bc1f0d639 SHA512 546bc1827ca519d5ba7d9c6fb85aa0f0901710152d043ccfbdf675fb65846ade9b3fba2395e896f4e77961aae5c31b2b386e2aed643030ff5b7b9b55f8b8fe46
 EBUILD kalgebra-20.04.3.ebuild 1175 BLAKE2B 716eab79ec0ed11e9fefacec2e336c9c45fc43a0f9d7d31eee2ee0d737234bf0a24b7aa688eba1c5dd1f3bd4f8da556a328df6cb13d089a17f2a71fb39306ba0 SHA512 7eb1a1260c59f4c5f92c65e2f34bff2a9f334a5501d4bd6992dd71db25d3ab9f02676685ee317246633e6c2c0afa65cf6876ac1ce90bb48dd4529d280a424b7b
-EBUILD kalgebra-20.08.1.ebuild 1178 BLAKE2B b3dedf40380f20a309d8068ede475cf0240ecd9aaa06e21d336680d3031c87dec89b0c0ca5e3aa28463bbdab1c348768c90ea61b883f79fe82eb54e9c6105c60 SHA512 3b9e5a4515048b9425ba3a659ceaee5b6b9d90eb1a0a6e7db10c8a3abb6b24904d2c9d56c97a383310983919f263eb59d87c4eabf50a91c88b1f490f2ed4f794
+EBUILD kalgebra-20.08.2.ebuild 1178 BLAKE2B b3dedf40380f20a309d8068ede475cf0240ecd9aaa06e21d336680d3031c87dec89b0c0ca5e3aa28463bbdab1c348768c90ea61b883f79fe82eb54e9c6105c60 SHA512 3b9e5a4515048b9425ba3a659ceaee5b6b9d90eb1a0a6e7db10c8a3abb6b24904d2c9d56c97a383310983919f263eb59d87c4eabf50a91c88b1f490f2ed4f794
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-20.08.1.ebuild b/kde-apps/kalgebra/kalgebra-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kalgebra/kalgebra-20.08.1.ebuild
rename to kde-apps/kalgebra/kalgebra-20.08.2.ebuild
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 3d9b599ce889..6dab5cbee1bc 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-20.04.3.tar.xz 24550796 BLAKE2B 85309f277178f3e70b50db5154376371fbf3484d8b7fd7486ff74025044745de5dd77f4c8e5b18520279b8d5630ccb8f3fc3bc68618f2fbcd4a593090715ad0f SHA512 fa8f67128d35faa8bdc343cf425aedda8a9370584bdeb69e22ca229c0c1029a5d178f851d4131bd60c635d8d846c8bf1e9104fc030fddb15578ead4c2cba7ea0
-DIST kalzium-20.08.1.tar.xz 24525128 BLAKE2B 20d5e28d549812d78ef914ce8a23c79d737235a68db91be3aa0c6a0a443d1f1c72be4bc320cb69ee3fd882ee5550f3468d7b9d03b73946eb9f2e67a037730da3 SHA512 60da587ba5001b718bd6106a384c26b5351e41d943ad6796def4b1e8e8c8aa8c077f58019e4a6e6796a90a3d594dfa61602cd149d82415d7cf7df0e6f453c5ee
+DIST kalzium-20.08.2.tar.xz 24525216 BLAKE2B 8e5f83284b9f6d6040e116873cab1d3a7d84586817dc7d2f9902c7ee18d403dc21ea751f4f3b494eb6b1ff0c081093fa9deb573387abfca93fb2abbd4c0598ff SHA512 8f289331f3aed9f936aa4a01cf68e34e9b57dbafd10f174a21182a6656e4a5ea4aab2d96b94a25f886e5368fa46f51500cb548b11aca804780733deefb58a4db
 EBUILD kalzium-20.04.3.ebuild 1731 BLAKE2B b7747e84156c31e099835ec5a178cad83489ae4ef08f76139b461145438b8f78efc3846cc86815c342d7890ee315e9b5cbffba3ee68c37e89f49c59bd5a5177e SHA512 9add3f09f1bd58fcb7f67bf8af307e368a1d296d06464e41eb9c990c83c8aec5c1bcb6eae7dc385556dcc981c355a4e17a2c9aedb64303fd4f93879f3df588d5
-EBUILD kalzium-20.08.1.ebuild 1734 BLAKE2B 6b5ed0bc64619fded84fb7eb79aee2ec4b3716a69a4ac908d0107e89d66afc6ae243d1b9bb79dbe7aa26169473620ee0e088e6f5481a868790dab0fcf6036e39 SHA512 9f4195997416c2513b5ac9cde5fa3594cb2a0a2731e4bb317ecae8d26ae333b1a714425009e53a6dadeb0a9b9fefc934c95392bccecef52a8ce3c6d1a869aa04
+EBUILD kalzium-20.08.2.ebuild 1734 BLAKE2B 6b5ed0bc64619fded84fb7eb79aee2ec4b3716a69a4ac908d0107e89d66afc6ae243d1b9bb79dbe7aa26169473620ee0e088e6f5481a868790dab0fcf6036e39 SHA512 9f4195997416c2513b5ac9cde5fa3594cb2a0a2731e4bb317ecae8d26ae333b1a714425009e53a6dadeb0a9b9fefc934c95392bccecef52a8ce3c6d1a869aa04
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-20.08.1.ebuild b/kde-apps/kalzium/kalzium-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kalzium/kalzium-20.08.1.ebuild
rename to kde-apps/kalzium/kalzium-20.08.2.ebuild
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 875f9cf6c48f..cda5b63a0431 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-20.04.3.tar.xz 103800 BLAKE2B 1f3fcfe5f6460babef7ea56395dbf81028faee83a50f951bde8779c3bd0d33d5fafefa29868b54b7f0ac11eaaa92db55898dfe1a40bb3c6a57e0464dd938f3ee SHA512 56393780a07c72c069595188a56eb449873683942a404343336a36c598036b4a339795af8441c073b2a9a5b5145b913ed19d0f7f19933cf999d87886e9aa5592
-DIST kamera-20.08.1.tar.xz 108612 BLAKE2B 965919df7ae07d8aacf54ae178afd3013335a25edcc8da22b4c34847a630c6dcd9c83a99f65e304f4cf87f890f18c10aee17bef154bbbd9abacf46b7b2f8e94c SHA512 8730584914b5f99059a16710b153576750d6266670a774443b2949921a93f75f68cb14664a9d75e4804e4b41af158268950eb9126173e62539f91b7695be0c59
+DIST kamera-20.08.2.tar.xz 108780 BLAKE2B 4aa02eddcef5296c8caff71f97a2b1aa14ab8a87c4e7a6e3ff137a210c5c4025d394ff31ae265cb60ba34c38ac5db731bf036fb0a26a4b19290e854d70be2394 SHA512 88eaab54a0d1449b18f1a45004010fd31e769b1dab3aca6c046a8038b0d7600d6ac4cad49f17a4c9c982c55cd1beb1d37c7137abe6d1b64d9b7dc9abb1b3c798
 EBUILD kamera-20.04.3.ebuild 815 BLAKE2B 2ef83bfd4f27fba15ce308ca163ab9c6c64db89c595939463a6f028299e55723b70b9e57de18487a0c097eca54465a609519e3491ecc5acdef93423de19dee94 SHA512 3e5285748f6567c817fca47d2ebeda1c64cd266e6ad387f1d00ef86c06fb74f866bcf90db4b4bd47c39487ecdef185f03fe4a9e647a8d334c380c7d3479e6f52
-EBUILD kamera-20.08.1.ebuild 818 BLAKE2B 2173f76f9c0ec1948cc2528bb6a7a9156715acc61053e51850238e402294b8e53cf69a34ac21c46b32759be4c9554b885b7b3c7528cc9ed95a33fa4c8855780f SHA512 2bd69183535a5101eaa7296f625c48a8f2772b50eea79c820c34876d87ce998610f43a5675c74a67a2b9fdd8a86de10458aaec302c309dee4968dafc34329bcc
+EBUILD kamera-20.08.2.ebuild 818 BLAKE2B 2173f76f9c0ec1948cc2528bb6a7a9156715acc61053e51850238e402294b8e53cf69a34ac21c46b32759be4c9554b885b7b3c7528cc9ed95a33fa4c8855780f SHA512 2bd69183535a5101eaa7296f625c48a8f2772b50eea79c820c34876d87ce998610f43a5675c74a67a2b9fdd8a86de10458aaec302c309dee4968dafc34329bcc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-20.08.1.ebuild b/kde-apps/kamera/kamera-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kamera/kamera-20.08.1.ebuild
rename to kde-apps/kamera/kamera-20.08.2.ebuild
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index a47ae1edafeb..73988fbbdd10 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
 DIST kamoso-20.04.3.tar.xz 203356 BLAKE2B de47f456ab49348dafee7cd5a2ffc3d76720704355605ea4e20168faedb1c7006c30c9d949b0f5d266994037d0d8a0a46b0c5324caa11d899472edef2592f162 SHA512 7da5f635cd5744215e7d3c3332729c149786b10a50ecb6c1e63843da8756da2dd2b355b837d24bed670c52990c7f5322b52d703ca61c5c6ec87d89de04458e80
-DIST kamoso-20.08.1.tar.xz 211836 BLAKE2B 4a4bbb7fd751275b3fc5d8b367a2613d9365f9c810bb76a8ebfe75a3bbe7cb661212feaaac39b4134299d13ad391ae273337d1f3368d6f94f4635a28e03ec816 SHA512 4f28f112906c2fc888e723b9d3809dfc78cbb2ffd0ae4c14260c512ef48f63d574b5e5afbd0f183b1cfd958fd6323a006102a0eaa0f3ea44c4acf0e333bfa4aa
+DIST kamoso-20.08.2.tar.xz 211732 BLAKE2B 1616cc7c76045110ac2bdfbaee2d4bade5b9e0238e4bb60c7805930b29f02f14138e90e856208e7cce813f69c9898dbbe95032fbc659676895b1851c127472f5 SHA512 38298a442d23ef2776b25b5702a7a9b674721db3613667ecafc55e7c36208109722878ec46c8a1b12883b076a5bf54bd935a26cc7c260038ab060a4629881ecb
 EBUILD kamoso-20.04.3.ebuild 1109 BLAKE2B e5c649a16f8be2c8e561735641734caa85420fb7d31c961e51a0b0a9533e0ebab98b6271c97ffb6906ed2e960a9638e4080d9b5ba0b59c19ef6f8706d9c7c650 SHA512 1fef7cb869b8c9d07a85fdd2f7040343e1b21f924ce7fd77a968f72164d37e9f6ee698865af8adde5cdc477f415b29edb58e57bc2dd259cc1735762993e854fd
-EBUILD kamoso-20.08.1.ebuild 1112 BLAKE2B b22978721bfcfacce291b21bc910646d4eb29209e7c8b5f05d3b13d5162459a2067a4005abc56461590a3340a99162aeea399abe193b2ce4d41197e6ff9dc59c SHA512 25aa1425c2b7316e473a1181c8803334714b023aa4f3333102c1e5dd5d2874ea4b38f376590c153e5488632511b9280d1b4ac72aefef05287a9a82cef2179e81
+EBUILD kamoso-20.08.2.ebuild 1112 BLAKE2B b22978721bfcfacce291b21bc910646d4eb29209e7c8b5f05d3b13d5162459a2067a4005abc56461590a3340a99162aeea399abe193b2ce4d41197e6ff9dc59c SHA512 25aa1425c2b7316e473a1181c8803334714b023aa4f3333102c1e5dd5d2874ea4b38f376590c153e5488632511b9280d1b4ac72aefef05287a9a82cef2179e81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-20.08.1.ebuild b/kde-apps/kamoso/kamoso-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kamoso/kamoso-20.08.1.ebuild
rename to kde-apps/kamoso/kamoso-20.08.2.ebuild
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 49076f06b900..803fc4954336 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-20.04.3.tar.xz 8024860 BLAKE2B 59fa4cd16da329138baffdb6466868d4b24c843cc02367a424967dca0ece621c00b632f54694dc9c6149d5a980c4d0720d28182c5550f32e969c6880f5936c5f SHA512 e25f5bd4724b8f55ccf6b1fc71ab614ed7cb813c6558abafb0c1cfcc002d04edee856667f361c1a23b1297fc71b70af28069f320bab923403dcd56b48e2143a2
-DIST kanagram-20.08.1.tar.xz 8031916 BLAKE2B 5f4c2ac89f160aa5b9e16ad4d906585672379e9452b31aea21d4ab0297bc0cacb3e0f79cb23cac1dadc7791137dec15bfbe0691144328947a1c5356be524e7d7 SHA512 82a90e3ef602ec90755f82292b7dbafbbef91698c7279a7b20de66b5fc2bfa2ac5722d4f4852f0c919ca9f6b6b3db069649efe33b9d2c3df95856deeca11bab8
+DIST kanagram-20.08.2.tar.xz 8029576 BLAKE2B d33f469c60afbca9bd9faa76c3ebbd7c9eb9eff639f632d72f16bddd1da86717b34f860c2e19b884a9c6ae26b0d182b6cb13b8f76c5e25c7a7052595218983f6 SHA512 7a0fd4d1d6bfaae0f2e2767777eb171e7b85a6203ec274141416a76c9b632931eacaa58d696872edafc1b886fc9d7067cbabc9612cece1c034dc227a9298a7a2
 EBUILD kanagram-20.04.3.ebuild 1356 BLAKE2B 3128f883fde697a1437ecdc5413b141f860131ba5a97c91a2c040d4df2ca54528e6b353ae6b52556ca86aa311c3d300e004d8c889b3ad5dfb764cad69d3fac8a SHA512 66a7f23ea3450d27e077afe85c750cbabcfd1db9b06d4d4dce4bd16d1e71c9c14e1dba4f97713c8ebaafd96697eb17bcc6cce05bddd97e699076ba62692bbf0a
-EBUILD kanagram-20.08.1.ebuild 1360 BLAKE2B b140df108974624602dbd444e0b2b4cd2066a546b68cc43a5f5585c35ad5334b8898b0d2dbf2ab58b3b486b09ad953555a365646cc4e903dea14befd6775c702 SHA512 2eaf4045162ca388c5ce5a377ac03616ae3f37894cc74213d56538ae9cc34bb2fcc671af47067d3ba016900ca9a7595d02734c50f3274f9cf06d43824081500b
+EBUILD kanagram-20.08.2.ebuild 1360 BLAKE2B b140df108974624602dbd444e0b2b4cd2066a546b68cc43a5f5585c35ad5334b8898b0d2dbf2ab58b3b486b09ad953555a365646cc4e903dea14befd6775c702 SHA512 2eaf4045162ca388c5ce5a377ac03616ae3f37894cc74213d56538ae9cc34bb2fcc671af47067d3ba016900ca9a7595d02734c50f3274f9cf06d43824081500b
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-20.08.1.ebuild b/kde-apps/kanagram/kanagram-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kanagram/kanagram-20.08.1.ebuild
rename to kde-apps/kanagram/kanagram-20.08.2.ebuild
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index e857b63d0d62..448e21d985a9 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-20.04.3.tar.xz 2526392 BLAKE2B 13e0ae547d667a5543b474758945b775f0dd0d7faa7c9c483b5f6a6d026ea9a9fd7ba36f9b4dd543fde8a6894f496d929199dc2e2a4ade2d5fba0424b8fd8234 SHA512 1b291f4ab39e5f0fd3e0624bf65afc2fc1fb5990ce73cc90a2737fa8fd420d6d9692a64c75d15b6710d62e81045e41751e14cef5a9907a86b92e00bf93399c8a
-DIST kapman-20.08.1.tar.xz 2531576 BLAKE2B 66aebed31a7b236a809af298ecad63d75c9abc4dc90b4f4945af736935110438e8ce493c4568932707261fe4b6707e316cbb39834a07b7536c8cc39814fda582 SHA512 0bc9577e52a7ccb5bef1eccdcce56dabb5f65085c3cddfb1f969916ce95f1a58b65282d14395eb7c20ca3eb2c4fd686b9bd11ecf58f92a0085afd1f8cd128b56
+DIST kapman-20.08.2.tar.xz 2531588 BLAKE2B e7f3fc0b74530748aefe2a0c9879206be0166075a4b96714f37b522a3d7d47ae24f3a903b5faa6c7113f93d7601842e8cd09910dbf49e14085c2e8c37e03bf05 SHA512 01baf8990aa6c809705d53c9f92a2a0b078c421becb96b1665e66ab9272369bf510c9cdcd5322fd9c603fccd38cecab6ee14002be6685fe65fe3bc4885965122
 EBUILD kapman-20.04.3.ebuild 875 BLAKE2B c88b6d4716cd652fa5306ab95da3d947dcae6f8598a855e9e2c8b8f764969067b88e21c60a87dd457bc58fa81c047b8287e45adcbb60d2ea35b2730345ad64de SHA512 1896f769d7b42202afa1d202ad004ce8ad10a6e1a3a814c177ab89a0d3eb1c9c9fbc969d4b19f8ba915a2de993e92c7cb71cccaaf3e14b58cbbdf8ebe83b87a4
-EBUILD kapman-20.08.1.ebuild 878 BLAKE2B d7461f315aa0c13adbd867b2d02f353c48956dfbc8396ea9d683a44757f40b4a68f1e120f696144469970e5ea395db4221612ff3d18199a4938630014f077b29 SHA512 94e38521b4d94f66de5077387f8e423d31b2a241a5046540cfca7e812229a06731d1f06dece04f1fc1e3dfcc2253e9bac4d7ca7494f8335a148328b8dc4d0549
+EBUILD kapman-20.08.2.ebuild 878 BLAKE2B d7461f315aa0c13adbd867b2d02f353c48956dfbc8396ea9d683a44757f40b4a68f1e120f696144469970e5ea395db4221612ff3d18199a4938630014f077b29 SHA512 94e38521b4d94f66de5077387f8e423d31b2a241a5046540cfca7e812229a06731d1f06dece04f1fc1e3dfcc2253e9bac4d7ca7494f8335a148328b8dc4d0549
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-20.08.1.ebuild b/kde-apps/kapman/kapman-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kapman/kapman-20.08.1.ebuild
rename to kde-apps/kapman/kapman-20.08.2.ebuild
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 162846a942ab..17c011f24023 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-20.04.3.tar.xz 325176 BLAKE2B 8b5fa1f277cf5787649e0039bba3d0bba5e00ec49e7fda9a0c422dbe52784322bc1ba2d47a5012c80674a10d8a0c8f310a1fb89d8e20179b886b35d4c8733af2 SHA512 29d5be322cee268e308513c2080eb8b87cec251fa09bc8ff9aaf9705126c69a9bc8a7173fa96397125c5190f6ec8f8a46d460093a666ffeeb7aa5d74be5f041b
-DIST kapptemplate-20.08.1.tar.xz 334884 BLAKE2B 527766c454cb12fd71ab907f3acc938fe1b1485fa31c8f7aadaf871d67cfe15efe8c6de7997f07941bb38dfce38f6e209018c321803b309d6bb14c8cc1d58b65 SHA512 02a3e9d0f7d6fc08059365eeaa070f906c8cb618b0f4b0ca69543eec493d97c57205211a71309088c3d0eea057a335224ed6dfdbb133ed6c90f1069d5b9d274a
+DIST kapptemplate-20.08.2.tar.xz 335724 BLAKE2B dbea5be80e2fc457fa5cb704066957eba963f5dfcdeb1062a8d14144c4d633f69c8add7dd110cd23fd66584fb4cdf32432ed824d936b342f9c0bf013d88a191d SHA512 61d0b16d3e730fe77e168edff7018944c4012bd13a5a7aec32c8febd09a7c001f90da772f3c5f32e2a1927f05105fd794a5fe56e769ebcab71842c454bfeaad7
 EBUILD kapptemplate-20.04.3.ebuild 854 BLAKE2B 121a2f3fe7161fee1a11a68642e0dc53db43bc7aa1497298ce528667d798cce7a6b1921e34fbe918b6cb243f10b7392ba8b4f19e82e7629f6799801d64ebcb0c SHA512 d61b96770c7df02c02624e39477341274d7b44cad13cec70b0482643d7f7890c968bd940570b33a02f23faedd86633f142805176a5fa3a915369766b539967ea
-EBUILD kapptemplate-20.08.1.ebuild 857 BLAKE2B c57d874f917c32b6d2ad1e0ddf0ab762e3f8e0574e5c74483720328a6440e57fc6fdb1d06bef43c9b44ba3b4d92d83902c4cec15c063c69aec14081b68c09e09 SHA512 677f030b3cd18afe8053a120e1eba4a603d608ac8b1ca71b31558836b29acbba2349ce8e2830c84746036fa051eff38391815eaefdc0c53a539b12e7729de5b7
+EBUILD kapptemplate-20.08.2.ebuild 857 BLAKE2B c57d874f917c32b6d2ad1e0ddf0ab762e3f8e0574e5c74483720328a6440e57fc6fdb1d06bef43c9b44ba3b4d92d83902c4cec15c063c69aec14081b68c09e09 SHA512 677f030b3cd18afe8053a120e1eba4a603d608ac8b1ca71b31558836b29acbba2349ce8e2830c84746036fa051eff38391815eaefdc0c53a539b12e7729de5b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-20.08.1.ebuild b/kde-apps/kapptemplate/kapptemplate-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kapptemplate/kapptemplate-20.08.1.ebuild
rename to kde-apps/kapptemplate/kapptemplate-20.08.2.ebuild
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 1b05e12ece63..155e99113f3f 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,5 @@
 DIST kate-20.04.3.tar.xz 5813840 BLAKE2B bc078ddb20edb282f3779f3f989cfc1e00444484667e80ab8b93d02a488ffa2308196243df44cc3738300ad6e8ecbf09d58d373c81c484ee3250e90ae617c622 SHA512 b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9
-DIST kate-20.08.1.tar.xz 5848940 BLAKE2B 70a8848202d73ffe60a22a1565f9e96583d6a523da5ef55da178ba4a29fd188a103ba2d55fd37abae89a93b5022e48838d9e3299f226dae9292f4cbf0b428b4f SHA512 63d1c2d8371047abbdc3b1ea2e96b94a6f85ccec05ff5addc19f19d593e2b1760c91b4d87145d329516bd40e0bed740a94306df7760d1a2936edf09c87f6982a
+DIST kate-20.08.2.tar.xz 5850968 BLAKE2B 12faf6d848e50e391d5e14166875bdee39e45889ad5a2c75ccda397e8e6b3414006f4b50f04c3e32ff0690d0cf6432513ca6b0543bdd848c7cf5fb21a6fce630 SHA512 c8cfc7e92db47441fdfac66097e12566ebc51fd1d2721711aef76b5d951dee402f485a1e3de14db8f20260d1297464210d73bf02a006ed5109c4952e5614f9e2
 EBUILD kate-20.04.3.ebuild 3043 BLAKE2B adf1b3adadb353804a5b653ddbcf2f00d7e9c1e8a603d1865b78167d6725281127f2cd80eb7ee237bf62bb0896c017b5ae824da242b37e29efff9e14c85030ea SHA512 62d509a8a1ada4b22d7fb61f576fcfa3573c3823d4b7688ab6ca0cbd3b3954a3b9d00ed53e36eb36dc68bad1270ed50606845b7f26d8e6557755adbf898515e7
-EBUILD kate-20.08.1.ebuild 3071 BLAKE2B 8098569c9e02b620479ebea574799abe73cd7907684bc8a252d154e6a976395a54427f7d22bb2cb5f24b3ea2ae038053447ccbf5da4c0de65b2f1e233b0694ee SHA512 ec4be556dba21f01a2e726e3cf9f2c25176dddb375a2a1a287982edd762086b5bc3ed0a70f45688005c8ca228680597cba1103a95664c523e56d221c5eb98b24
+EBUILD kate-20.08.2.ebuild 3088 BLAKE2B 2341b2bc007069ad1195fcb1b0c4c288185abb0ee955543e5aaf22607d5ba666e3c27c5084c9c796fdf9b6e02a7a1a17fe7e671e618d4806e7eca6118b1dc214 SHA512 96701fa9bf1efc8bef43a83d5905d0ddbbf7fb176798981674254329fbd9b6df52508b050093b1219861f2bb3491eda77b04c2a2cce0ad6161bf23ad135523e5
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
diff --git a/kde-apps/kate/kate-20.08.1.ebuild b/kde-apps/kate/kate-20.08.1.ebuild
deleted file mode 100644
index 28abd04ca358..000000000000
--- a/kde-apps/kate/kate-20.08.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kate-editor.org/
-https://kde.org/applications/utilities/org.kde.kate"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
-
-# only addons/externaltools depends on kiconthemes, too small for USE
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
-	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
-	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	projects? (
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		>=kde-frameworks/threadweaver-${KFMIN}:5
-	)
-	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
-	sql? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DBUILD_filebrowser=$(usex filebrowser)
-		-DBUILD_lspclient=$(usex lspclient)
-		-DBUILD_sessionapplet=$(usex plasma)
-		-DBUILD_project=$(usex projects)
-		-DBUILD_snippets=$(usex snippets)
-		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/markdownpart or kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/kate/kate-20.08.2.ebuild b/kde-apps/kate/kate-20.08.2.ebuild
new file mode 100644
index 000000000000..058c9324a8f9
--- /dev/null
+++ b/kde-apps/kate/kate-20.08.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
+HOMEPAGE="https://kate-editor.org/ https://kde.org/applications/en/kate"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
+
+# only addons/externaltools depends on kiconthemes, too small for USE
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
+	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
+	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+	projects? (
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=kde-frameworks/threadweaver-${KFMIN}:5
+	)
+	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
+	sql? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# delete colliding kwrite translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kwrite || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		-DBUILD_filebrowser=$(usex filebrowser)
+		-DBUILD_lspclient=$(usex lspclient)
+		-DBUILD_sessionapplet=$(usex plasma)
+		-DBUILD_project=$(usex projects)
+		-DBUILD_snippets=$(usex snippets)
+		-DBUILD_katesql=$(usex sql)
+		-DBUILD_kwrite=FALSE
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# tests hang
+	local myctestargs=(
+		-E "(session_manager_test|sessions_action_test)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
+		optfeature "DOT graph file previews" media-gfx/kgraphviewer
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 7eb59fe7d83a..6ba52ba4087a 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-20.04.3.tar.xz 1424232 BLAKE2B 83a188ea6d86150617fcfa1f21c57c6d63a09adee2523489bb4993e71f3ac751020166b058189ffa0f9b0a01635f90b7eac0a6824e728123b9c96dadc70f8b1b SHA512 757d63edb5541ad8cf8524b7bfcd9f42c9ee0b5ceb3fd90120442a8ca58c40779ac0c53f0c66f238c46d7917590cdc2d7c18e5a8a8126b8271c5b68b680f3370
-DIST katomic-20.08.1.tar.xz 1429208 BLAKE2B a02857ad96ccccda795bfda8c90770ff4f0b79562c12811df2984dc12a5337e8839af6d2dd3356a33d69a5df58e60046db348f10dc6c53e99931ed0c38a0d84f SHA512 18a076797404ef7528c7acf76a4b6db4c93b6c7c251439b637d63506e4b7c7e599418f6702e1d8ff906214d8dda5efcba033984117753d684e0f9ee00a311c9a
+DIST katomic-20.08.2.tar.xz 1429480 BLAKE2B 81ef7192b8b53a507dec16d2041cca985daecf466cc40a337ed3014a32b60fa39260442e3ec5bcdd6ad6a8e1cb70449002e046581e2b7506d0ccdf0daa0e5218 SHA512 e88d3134f158f55be159ff5519cb96f2a3b71946fdbc5c8745c515747bc95ae40493cf241170d3db9b830e68b09621b80f99481f7c01d1cba5ba77f2fc37145a
 EBUILD katomic-20.04.3.ebuild 897 BLAKE2B 730e300424a12ec55830cf37fdb98883a47aaf9b8678b5d7c16ef8f0dea12e255af7b64a7c90d07fd25defcd0801f29c662870d39495655f011a109b7f4f1351 SHA512 e5f3c45472b460382dbf285a93d5ac126b746293f084da4329dff4bc55accb6594a4f537ae4ccf17d2cca476119e8a84ee37e1461eb7a2276661a5d97179cb30
-EBUILD katomic-20.08.1.ebuild 900 BLAKE2B d5ca162c4d986957c5e2bd03a0843fd4670ac1ae49f85779ef4ad55ec012360306d710c2326bbc8762b8ccfee0c30da1e3ae041a0a46a42f053de8f5740f0780 SHA512 1aa81e1e724623fac1679d15506fa3390d9307426ce55be088ad9406010ae6ccd8f4d28080b03673a510ec5b3393bd7f2de0a8e2922972b5911a618b0bae291f
+EBUILD katomic-20.08.2.ebuild 900 BLAKE2B d5ca162c4d986957c5e2bd03a0843fd4670ac1ae49f85779ef4ad55ec012360306d710c2326bbc8762b8ccfee0c30da1e3ae041a0a46a42f053de8f5740f0780 SHA512 1aa81e1e724623fac1679d15506fa3390d9307426ce55be088ad9406010ae6ccd8f4d28080b03673a510ec5b3393bd7f2de0a8e2922972b5911a618b0bae291f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-20.08.1.ebuild b/kde-apps/katomic/katomic-20.08.2.ebuild
similarity index 100%
rename from kde-apps/katomic/katomic-20.08.1.ebuild
rename to kde-apps/katomic/katomic-20.08.2.ebuild
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index e5f22686220c..7ac32667f65c 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-20.04.3.tar.xz 360740 BLAKE2B c382c290ee9c7527e09d7d4a83b58610a022bd7be704a5929daacc8bd862362de5141abeee7c99ef22095327dd3d2b16e986954f715cd17c0b38d5e56b515a6a SHA512 9d578a2673705745e89f060ce59ad2498a01ef95972e060320f0e015cf8fb3214017212039aad97f5fec00fc9ad4f5889db534b47950e43522ed41badf1828a1
-DIST kbackup-20.08.1.tar.xz 371160 BLAKE2B a976fc5ccacc74023bbc8aae56995c82aa36db6f9908fa7ea7499a8aec02aa44784abce3e675e537ee42f06f0ec039aa058d138cda78c5796e9ed8ae4f6f7c04 SHA512 314cb4b70e0bed6ef86dcb01937ef063b9f367bd622049a6ca63c951598c8459931f8d6a14bfe640c7fd16b73015ade4cdefe1b14bd95ae733a98510964ae5ce
+DIST kbackup-20.08.2.tar.xz 371100 BLAKE2B 5eca9f8ca66bc59eae72cda4f3e8b6d63e702ebbce1180a90793edffcdc445905e4419ddb0ea73c0f03bfdd14fd1f98392bce195e3ba858c04792d01528d77a5 SHA512 610910c46e3b3ea2616191c46910f59e5e76ed2e9bebc51cecc0b206ce8351ff920506b03fa3db8fd95e7b712e91fd9714365ff39b2f037e37b9409bd4e6f3ed
 EBUILD kbackup-20.04.3.ebuild 955 BLAKE2B 2a5ab1a165bad00fb295cf88f59bd932542988c9f59b8470bc9ffc8783b6bb9fdfd7e100fe5cdb8e7899f6d5fa2dabb2d329d00bf38609ba83386c3621992c7c SHA512 7472da3b7ba5f1d800c60ba81940c9989f6b3212e49ec6bd6acdadc2e7782db815a982ba5dfc8124f5e5a5129495ba74b621af73978ad159dc52c8c3f1939438
-EBUILD kbackup-20.08.1.ebuild 958 BLAKE2B 723318c290fc0ead74759f3b0710806f215b5a21930d34f4c9907aa314aba314fd10c3c837a15345862d1e7f210b640f129c222f610f1770156cf71998145c1d SHA512 8ec1e8df22347770e139bedadfd82117b49045c962af13203e567375a73150ea2ef2142682422d23cab14d408182de0c4da24ced2017da081854c3770d29dd94
+EBUILD kbackup-20.08.2.ebuild 958 BLAKE2B 723318c290fc0ead74759f3b0710806f215b5a21930d34f4c9907aa314aba314fd10c3c837a15345862d1e7f210b640f129c222f610f1770156cf71998145c1d SHA512 8ec1e8df22347770e139bedadfd82117b49045c962af13203e567375a73150ea2ef2142682422d23cab14d408182de0c4da24ced2017da081854c3770d29dd94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-20.08.1.ebuild b/kde-apps/kbackup/kbackup-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kbackup/kbackup-20.08.1.ebuild
rename to kde-apps/kbackup/kbackup-20.08.2.ebuild
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index ec6a300080b7..e68d2fa384e2 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-20.04.3.tar.xz 446808 BLAKE2B 725c0a5f4f164c98d615f742eedfe3994fdee67e921ed650f4269db6cda0d7630d9397f5d0d2645231ba336fb2fec18a2695d4a1aa4f64eea8f5d505979f9e71 SHA512 2b97dab5f04807f03d84fa9a5611b3bbe733db71cc88ef4bb240d67419eb0645cfd5ac7ba46ca25b71d3f8bb5862134b9c5b2d96ca8f763cfc32312a3b4a3399
-DIST kblackbox-20.08.1.tar.xz 450432 BLAKE2B e11b26c0032db2fe199f3960c3cbc173c91c42d0c32eab895a182aea97412db213c54c6cd1778f6db8c68b45aa6915d45024a7da2205c9a8f4a43622ce164f50 SHA512 3d57a9c0df8baab8c98bd56a02d128e575ede8308bee91e8b47996d473ac1bed8bfee7519de9b6868a38f2aa106c919a2c11db8ac0eb3fd97cce5508979bdc50
+DIST kblackbox-20.08.2.tar.xz 450436 BLAKE2B b02cf1dc132374ea5beeffc7b6dafc5ce3aec2320a43b9ae03da20286feee0b934d3599cfa755e63971e1ffba371d97f631d49a6a1707fc5c30343cb0c2eabae SHA512 5f7eb75c2745f946aa503f257af139e75e9cc7d4b7ad334e7458a3da9e52b87ad88a851878607230f4d90bc02c7e29252515afdda18618d9ff1d1ed21688b2f7
 EBUILD kblackbox-20.04.3.ebuild 1012 BLAKE2B 6e2458a1d5a2370d2345e2c090379b0dc6f0e0e3416dfb54e4cca2d4b9802de54f15b849a382efc7904bd5a635e4087e1dccae9b32bfbc4c6fea9477b0376578 SHA512 6b753c57cd17b3bd3545c83e0e1ece124536dec01fe29ad9fbf09c30898b60f614ce60f95c7ca1893f76b56e52dcdeb45eec5bfad6638cfe854574c26bf004d1
-EBUILD kblackbox-20.08.1.ebuild 1015 BLAKE2B 65e9a761389698cd8a16092f46c863648368139cc76e7ee9b6c9e03f4528fc7522eecd3f5abf5f41eca1fb5a01d60932c4aa06b976c886e62cfdba0522d2f1c7 SHA512 491b67577f631b1f4f6bd0295c7839bfa2339b6b20266ead86d88044f2957c5ec0d5a92e65851b022b9e2e3d2997e3a2d9058a466f5312055ba106d75b7f7c9d
+EBUILD kblackbox-20.08.2.ebuild 1015 BLAKE2B 65e9a761389698cd8a16092f46c863648368139cc76e7ee9b6c9e03f4528fc7522eecd3f5abf5f41eca1fb5a01d60932c4aa06b976c886e62cfdba0522d2f1c7 SHA512 491b67577f631b1f4f6bd0295c7839bfa2339b6b20266ead86d88044f2957c5ec0d5a92e65851b022b9e2e3d2997e3a2d9058a466f5312055ba106d75b7f7c9d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-20.08.1.ebuild b/kde-apps/kblackbox/kblackbox-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kblackbox/kblackbox-20.08.1.ebuild
rename to kde-apps/kblackbox/kblackbox-20.08.2.ebuild
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index fc5c56095fbe..3c569668b509 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-20.04.3.tar.xz 1906592 BLAKE2B 25a0f38d118f2006cff15e277d2b194fdf1058ab1671581e13c472104b22ed7e691c6aa7fbd8a6dfb3cd7e03c23e3b00d9a138651cfc4a143432e657841109ff SHA512 9179ef69c21fcbf7e6c1071f34d1ff93045f4fe16f50db42a88a116c49f30acfaa16e7e78b3731be584de76d1907208d050fbef9b246602efdc48038ed8a8671
-DIST kblocks-20.08.1.tar.xz 1907048 BLAKE2B e1fa32aec2d65823a1e7544a64a4d38a63b86b3369cb4ec43646e0eddfb4625e520042e164bc44c924c8b4ea0ac4747377fa71b207515aa725c80811bbb4dc43 SHA512 4d892cce5e2e14c3f44477757d56a74b01fbd15ec050162a2707e7b859f382ec040c3774798b0f47d8fde50ed16c8e2348fa44c670f46505f2b6dc85fd328b66
+DIST kblocks-20.08.2.tar.xz 1907272 BLAKE2B 9b325db7e8c5a368345af9723202b52b66bc88c11a69aa504eacb96c26daaca79018f77f7c405d930b59febd2f40f9435a055dcd833e796ba00afe2248935374 SHA512 e22cc67c8ae249db64a991fcc2ef8737104a20bffe700704116a0e3b5a07ab1b52d57987ea06e78fbadfc769294afd7895560e88ecc80b62ed5cd9fc9daabe5e
 EBUILD kblocks-20.04.3.ebuild 853 BLAKE2B 66ea85fd6e4fbe0d15809ac71acd065f0883b336c4fcde1f8360dd0630b4c73bc3301fbe18056f16ed38518699fdb98cf7d6e2b8d1d0c2024f786d426f375450 SHA512 7e043fb1c1ac0f7fb4fe5db6379b50ca7fbbfb52a595812f441c28b15b619b8885709fbfe895d1d2890a6c11fcab5a3e0b018e58e1bcfd7ad7706c3ad38f28d5
-EBUILD kblocks-20.08.1.ebuild 856 BLAKE2B cd8dabc95fcfbf80d305d619b2e6746b5f52d64c721aba5386a2bd07db6f92faee9c75a08396dbe8adf0f04ba2d1ae45748f41065a76a2bbb2ef103249231c47 SHA512 467694d45a372eaeead5e387dc4d72c8c5f79b6523584aea0747d4f08ced899f85ed03c18cd7961901f49c38eacca26d0fd083543faf64f2cd4c8b2a1fcf17f0
+EBUILD kblocks-20.08.2.ebuild 856 BLAKE2B cd8dabc95fcfbf80d305d619b2e6746b5f52d64c721aba5386a2bd07db6f92faee9c75a08396dbe8adf0f04ba2d1ae45748f41065a76a2bbb2ef103249231c47 SHA512 467694d45a372eaeead5e387dc4d72c8c5f79b6523584aea0747d4f08ced899f85ed03c18cd7961901f49c38eacca26d0fd083543faf64f2cd4c8b2a1fcf17f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-20.08.1.ebuild b/kde-apps/kblocks/kblocks-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kblocks/kblocks-20.08.1.ebuild
rename to kde-apps/kblocks/kblocks-20.08.2.ebuild
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index ffed83491860..9b7b89c16fa2 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-20.04.3.tar.xz 3467888 BLAKE2B 0600c922e1d87e9f8074a3082a2bbacb9b0148f7944d96b310100d89719c6e0121fcb504693973001389b899ea4f5f8949929c3cb41febf7ea939970a47b0573 SHA512 9391502dc08513036fa5dcdb571fd14596f6d143dd72231b1f8c9d23862cc216f3ba9468dbf9cd57cea5ab13af5673557221bb0bf65bb69c65ba43d4f12be140
-DIST kbounce-20.08.1.tar.xz 3442944 BLAKE2B b3a6dba542335fe6160f2a6d5fb5a812c2be8414672bd3125dfda721b13b33eee515d17eb769d13a79687b575949d7cd685ff5af0f50dd27d7187a5f8593c9cc SHA512 32b867e9a4c95925a40aa53d51e3bbfde2e2d603386c453df86e8fdceeedb7cd8f1701950935d66be8932fbf8273840464bbc344393166924438bf4007a3b9bf
+DIST kbounce-20.08.2.tar.xz 3443312 BLAKE2B 2c8d09d379eea7b4284c80afc17cafaf6232edbb34c8cf577408a28b8119db3895b35af4b9fdca3ace7dba90491c33f33aacb4d6c6a7a45347b6ebe336340ec8 SHA512 3b62e77ad95263c738c7fd99285f4a113c3e587d23090c62022692d3e43bf5a1711d3dd58f02034bfd650a89c2d52ebcb3fa9a57a11785f06e2ef19d03147e1d
 EBUILD kbounce-20.04.3.ebuild 994 BLAKE2B 4a0125fa1e94c3ca9a0bb9fd8518e82c38d754191bc64e459b768c5bd34e1dc81239af92609d910464576b66884f86492d36e0abed6216a4ff4046a25e85b8a8 SHA512 15f90aafc710686a325e5211668c6df205bfb06fcaec3bae885abc93705f23f216181cead0666497a054527688833b6d97d93e7bc8d3f2a894d08bfcff9d541b
-EBUILD kbounce-20.08.1.ebuild 997 BLAKE2B 81043d34933833d0c627b72637da4d3a8171aaac6afad27a14fd3c6b9453eee50e80de9c882d4fdae2bd69f1f11b24860236690f8f3ac17ffba88d0ec484ca73 SHA512 e238538b178606e3bf7a3ff4fd3d56fa8831497ac575fa2a6bdf36c0a658b7e836ebeee4d2d2565eec3dba439b74e0c310a5b6da7ab74ca7aa0fb920d60f9dd0
+EBUILD kbounce-20.08.2.ebuild 997 BLAKE2B 81043d34933833d0c627b72637da4d3a8171aaac6afad27a14fd3c6b9453eee50e80de9c882d4fdae2bd69f1f11b24860236690f8f3ac17ffba88d0ec484ca73 SHA512 e238538b178606e3bf7a3ff4fd3d56fa8831497ac575fa2a6bdf36c0a658b7e836ebeee4d2d2565eec3dba439b74e0c310a5b6da7ab74ca7aa0fb920d60f9dd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-20.08.1.ebuild b/kde-apps/kbounce/kbounce-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kbounce/kbounce-20.08.1.ebuild
rename to kde-apps/kbounce/kbounce-20.08.2.ebuild
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 0f9017cfb98e..7f7709c0e818 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-20.04.3.tar.xz 2280280 BLAKE2B c3b2fe3a04625bba8aa3fb1e9dcffd292c250667863f234a25d62a629651ea15c1c797b8bcec37463789a82f175778c00fa206aae234a560d8aec65832aff2c9 SHA512 70005972ae58e9571dde11f68d4874ab65d934cd905786cf537cd3ac29c19a1bba29d4c5a79963d258a81f51926e2e5de543dd9152cdf5c4758f0003004a7119
-DIST kbreakout-20.08.1.tar.xz 2283108 BLAKE2B 20da159a7ae6c95f1301332f6126e9664b35a5958ce8ffd56b9834b7f86e19366d68b70e395e3670dcd9b91003fd1416ddabdd658859a7c42cdf56731f6b01df SHA512 238070a42d0e91b8e788b7eb9da613c2d1a3897fd2ca055ac0182808dadba97f024e6619d2bd7052753226ba94ce69a394e6837cc120292b7b0252aa17fbf9c3
+DIST kbreakout-20.08.2.tar.xz 2283616 BLAKE2B 933b4a4a63c719be8225d6db26f606e1abd885fa446c23a03296d04f229a70e2a62b3ea915e9c04e23d2b4cdc1788ef7db9c964f0892de11d6bee082648689af SHA512 08781862017568ab48832e1a64ca41e6aaa89a14594116998f5c3b141c97f3b05dc470696bf65bad8d18ad19ce1e63ce5c845d6729813d54e44225d1068cd73d
 EBUILD kbreakout-20.04.3.ebuild 937 BLAKE2B aca8665141ad04ec054dc763b611013cb20672bb5bafabb8839bace3f06d723f6f21142ae24a9fab92d9f3d5f11244aa95f1c0a395ea0750b18bc5455711f257 SHA512 519a7e7a26392255cc16604748c4d81e4a104f39c669fc55ad1e13bc22565c300ffc90deb672220ea26aead8c52a0fc3a91d2e72958567af30279986d99f42ab
-EBUILD kbreakout-20.08.1.ebuild 940 BLAKE2B 92586b0e2c44d1525cf11521328571ee92bd23d548a0cbd0cb82764aa7aa817b4f7af44f93c90b6e053fa6d751fa5b4e34878aadf66559fc238b5c8daf98775b SHA512 9953c71acd0892ace728987339c25c9cc82e35cc76f86d714db9eb3ccf2e2c0ad62f7786a6e18670d6ef1842d94e2897975810e5d1befaad1322e33d9191cc3b
+EBUILD kbreakout-20.08.2.ebuild 940 BLAKE2B 92586b0e2c44d1525cf11521328571ee92bd23d548a0cbd0cb82764aa7aa817b4f7af44f93c90b6e053fa6d751fa5b4e34878aadf66559fc238b5c8daf98775b SHA512 9953c71acd0892ace728987339c25c9cc82e35cc76f86d714db9eb3ccf2e2c0ad62f7786a6e18670d6ef1842d94e2897975810e5d1befaad1322e33d9191cc3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-20.08.1.ebuild b/kde-apps/kbreakout/kbreakout-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kbreakout/kbreakout-20.08.1.ebuild
rename to kde-apps/kbreakout/kbreakout-20.08.2.ebuild
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 9f960ad9c169..7276fefccc13 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-20.04.3.tar.xz 5606472 BLAKE2B 91c1aaca30701e44e48dd107f30f95ac6dade50a7e171f9a119d4b5bda485ea71b1739188830b73956a61bd566064b131d7f0e118505e4ea1f19dd2984568f75 SHA512 2cfb9bdac40fc025ddb87429f3bc6d79f8797be699761378bb23067bfe84ecfd5d9f05d51c4afa0e2e962370e2c588ff7b50483fb7e14f6283ec747784f8c6b8
-DIST kbruch-20.08.1.tar.xz 5614744 BLAKE2B 0451c40272ecddcb4b0aa66bda1413fc6aace9da2c554cf128a05a170086995dbc466dba63f89d15cab7d1afa89966af2717a22207032819cdd64d2a21038de7 SHA512 59ae2b50f229009cafb03a786059db5bed4cfd4c6dd668bd9a5e616b0d81f6e664e5acfe69d9539b42d767ebf8e93ec8f758853e6d01ec70b195ad86dd7a4d03
+DIST kbruch-20.08.2.tar.xz 5614668 BLAKE2B 5935af3773574bffe604d628df54bfe344dd219ab56cdff4a77b0c30909a5a8ad06984c128a2c4e2bb0735df72ef23209439e84a77e67187f1cfcdf85b082b16 SHA512 57f25a92dc454a09bda25f4846241bd135eb16f7a854be218c370d21ec2a2af6da656e3aab1e80c26c4a5a571ad9a9d466d1c9250d123b2fe98fea42b2a2aebe
 EBUILD kbruch-20.04.3.ebuild 759 BLAKE2B 71687f6ab4cc6162ff38b2d3580317783d225dbfcf3654ce0a4115008e88275f5a4e6c450dcf5b58a21d0c08a388a69a0dfdc64eb310007cb332465671db5b7c SHA512 78c2525971cdf44fb6bf273452b928ff043f33c930bfc3aead808a10753e4e61ceadeefb1fbcb6fa2f0c73f5265730ecfcb8c60e6d316d01ef6c3511b9e19a72
-EBUILD kbruch-20.08.1.ebuild 762 BLAKE2B 0b1b35b908a2971fd4074104c31959301296861126cecbe2f20fbb8074ada79f3d467d40805691ff145746894585b017b8ffae1a3d49fa76eef929cbfa5f1a9f SHA512 0cdeb21f8e26732973a4de454fa9dd81d37d0d9f11a7cf2a86133e70aafbb5441366aad2e00147ad6cdc314e535b899591814186bd1ebce158ad4658e62d75d3
+EBUILD kbruch-20.08.2.ebuild 762 BLAKE2B 0b1b35b908a2971fd4074104c31959301296861126cecbe2f20fbb8074ada79f3d467d40805691ff145746894585b017b8ffae1a3d49fa76eef929cbfa5f1a9f SHA512 0cdeb21f8e26732973a4de454fa9dd81d37d0d9f11a7cf2a86133e70aafbb5441366aad2e00147ad6cdc314e535b899591814186bd1ebce158ad4658e62d75d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-20.08.1.ebuild b/kde-apps/kbruch/kbruch-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kbruch/kbruch-20.08.1.ebuild
rename to kde-apps/kbruch/kbruch-20.08.2.ebuild
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 732256b46aad..2aa5c15fd618 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-20.04.3.tar.xz 810252 BLAKE2B ab26532a6ede7b7c48aebc6819f3e6661a66c220946fdb7fd91600ba68ce4067a95925e7374cd84aeb8751f210caa648cfc173bd095be4e5d92fa1b7413b30ad SHA512 d7d6f224293cfea1282d97fea543c22b235386e63633765b6c6431c586d24948f70df11478d2f1bf96b6f1b03585fa20f03461b7f24898435c6d266311d061e9
-DIST kcachegrind-20.08.1.tar.xz 790688 BLAKE2B a4e598d4a753c98b41109d2aadb78e9b96c6105cb8d04112c3542d4bbc81a9344efad0b0733d39bc6b36b64d3bb50e22215c828de85396da03b8db1f8711bf1b SHA512 a3bfb41f618ad360319372effd22d22c9486ecf8eae830f2a81f9e2253f453096cbc80d5c3b26c26f31449727ff854e9a79f5eb52b73f38786321a96cacd540d
+DIST kcachegrind-20.08.2.tar.xz 790616 BLAKE2B ac82b1df979539956ab254b22046a4827377ed5cd481b72e5dff27a3caadb15ad39ebf7026d4d5c146f9677964e047d25b7e4eb9e2bf15b6588edfa50501c423 SHA512 e376fcb8b81b5665fba2383d606799a5ad91b8f1384edc02790d49c435e08195d6ee57aa4ee2667e9322436bd665a9eedbf37c588764515b33bab80c5a0d7cee
 EBUILD kcachegrind-20.04.3.ebuild 1002 BLAKE2B 5e3ba905215676c2c60097ffdbb6d9aea9cda117b4c360682eea30a9c058c2128d1378457c7f1962827ca4824d8d0430375648df26738e9a8e191c88f3ce1ef5 SHA512 6435a1c1e531bdd3f4c094258d5c460a143076204c5c690546da5855482144628e1e4d4574d570c15f03b0ebf1c4e8eb84eea402b99c30f446a6c7d116a181c7
-EBUILD kcachegrind-20.08.1.ebuild 1005 BLAKE2B 8745bf986790496edc5ef05a6ec1e98268241f84192fc25f170daed20a0175871e5efcfdbf0b8025450fb212131b7db4525c7b900f8d978e73f5d5ee11173133 SHA512 692bf6919058282c949e80c0259f027954c2bf0a811b83ede2794c8eeaf66994f01b27f51dafbe9a71533d77750f83ec4b659a4064f006a0c5e2fe4a2fb11b7e
+EBUILD kcachegrind-20.08.2.ebuild 1005 BLAKE2B 8745bf986790496edc5ef05a6ec1e98268241f84192fc25f170daed20a0175871e5efcfdbf0b8025450fb212131b7db4525c7b900f8d978e73f5d5ee11173133 SHA512 692bf6919058282c949e80c0259f027954c2bf0a811b83ede2794c8eeaf66994f01b27f51dafbe9a71533d77750f83ec4b659a4064f006a0c5e2fe4a2fb11b7e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-20.08.1.ebuild b/kde-apps/kcachegrind/kcachegrind-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kcachegrind/kcachegrind-20.08.1.ebuild
rename to kde-apps/kcachegrind/kcachegrind-20.08.2.ebuild
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 9a35d1865e3f..b4d39624ef19 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-20.04.3.tar.xz 373484 BLAKE2B cdc2058be158aeec257bacee2b49056eec702ec328e94fb79ef30da91fc526b4bb9afd6312edf46c615acea443c2e9161d15a92fc9987f291bd476a9547147a9 SHA512 dcc6765a8e0341f833e147015d1f6547adbe21eba6fe2bb7233bb717c29bc97115772001a7d7c654297b884ec7cd08373371d26ff60a50d2c4d527ebc0cf538e
-DIST kcalc-20.08.1.tar.xz 379048 BLAKE2B 866cbfec3734649bf4d364326c07aaf1b36fd7ce59e144d8d02e1fae544bd8382343db6b718b80982fa89cce0df547a7a51e68d2afe32aafabbb2d295cba3dea SHA512 13e9fc58d3a60934d5d648da113ff40701a4a81d0618f575c9cc7f6af4b7c9b283e9c699b448e83d462a63774d1e507df4d7a442360782425302ff9b0081e754
+DIST kcalc-20.08.2.tar.xz 379272 BLAKE2B 87c80d070c8ad251f61b6aab949b7b66fa2877f5fc07728ae639aabbea68f7e331057a13a410bb6f437e0a9310a61e702d0368117fe524780d9f9302de7c9afb SHA512 bc08e47d1d4355740c3a7fabc152476b593d75601acb8a153e032b5b9342157f155d844d85052b943867f959ba819b918858f953855d49e1d5109b1c89151930
 EBUILD kcalc-20.04.3.ebuild 994 BLAKE2B d8171583cf8dbdc491a272ad619e688583aea72964861e6712e3d29bfaafb2fa6d863fc40decac9feccba7df42149801802442801c3c703924c7f7e5397d1528 SHA512 c44b3285c9de7906959db803270ec8e5e996f539a03c0538948a90e9fa27c4a79fee5d97883e72bd4d56e6a1dc8482536fb84de4855abb9db952c46a9a86bc22
-EBUILD kcalc-20.08.1.ebuild 997 BLAKE2B cef76366c8cc25d081fceb708996fd135615955178fe1009f29a5e74eabf5764052e51da7c0ce401318b2f0a9cf0d0079504642141cdeb1285cac4b5193a4d6d SHA512 f57765b518d35d5798be026dc9760a9155ea35fdcca0f4458c8052088a484cc5c9dcc51bffb938831d095757f6399d061b3c84f642c2f1b7d647d52d1ffdf82d
+EBUILD kcalc-20.08.2.ebuild 997 BLAKE2B cef76366c8cc25d081fceb708996fd135615955178fe1009f29a5e74eabf5764052e51da7c0ce401318b2f0a9cf0d0079504642141cdeb1285cac4b5193a4d6d SHA512 f57765b518d35d5798be026dc9760a9155ea35fdcca0f4458c8052088a484cc5c9dcc51bffb938831d095757f6399d061b3c84f642c2f1b7d647d52d1ffdf82d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-20.08.1.ebuild b/kde-apps/kcalc/kcalc-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kcalc/kcalc-20.08.1.ebuild
rename to kde-apps/kcalc/kcalc-20.08.2.ebuild
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index fe4ab2de893a..132050cb132d 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-20.04.3.tar.xz 319228 BLAKE2B 0a4e4b6f288735912adf81a1f0a64657fe74f824d5aefcd19d64f061b93a1fc622a97a0f0b47db898aed720ac0d81307bf8bc19dbc15a78e456d0b115cc498b4 SHA512 9c51af22da7a0a4ad62449c28386b016fc1836f6be0735acd7756f4a57e72df747160c0da56c2803c204b5dc7be9396e8b23fc9b26692943ebbf6eaf5dea9e6d
-DIST kcalutils-20.08.1.tar.xz 324716 BLAKE2B 136414ab7731f9bea8a4965e1f12a46a095ddfa087a82745009b42fbf9e428eee9339d411bdf029e9783d0d91924782e870672411b32954e4ed399c89cfc2b46 SHA512 6b2b978c1413152dc33008facf0555540404df3d312a1cc56ec5c24fa0a37e5cd47df861e8e03c9861596e263f654c94586f222720d6deafac10711b7d449fdb
+DIST kcalutils-20.08.2.tar.xz 324656 BLAKE2B 09296093e1d54ba1c4a2b8c0b4af60ec1387c1b928be3497bcf5d33d74d731a3cd27db1bf9b5977ea8189de3f781383af0fe8158af86ba5a22d69f660974f7f6 SHA512 4be7b356e65f28eabcf9772a400844da30ab766c4e834e09bb30c4a87aecfa97418a1167b5923acd568fa5fff8c0ec098d5657af8cc324512c8fadd05b46a934
 EBUILD kcalutils-20.04.3.ebuild 967 BLAKE2B 6d9b0663668f44c21404dcba8c31f970691518c39877e756e19475ee77e3e0824202b192706b28fbe09dd52892c7bcb7ee27e7e906bc73be14ea56a80baa53e4 SHA512 99ce9a969b9f32e60ad6991d18c1368c690806234b6cd524cad5aae0c9dc217dd787c76f2f3cdb30d6f50778b15f59e6f8832cfbc78f2a132077ed1529319a6f
-EBUILD kcalutils-20.08.1.ebuild 970 BLAKE2B 6dacc31b99342dcdae539497ee204979c31ca7908a5feb7199373e6694504d21038ad13994ca96af6028e57cffbcd811d74ae29570e13c3fde79e519f6ad7a1a SHA512 64106dfa56d9804f116e0801982c6e8548b65d4af601d5ac484d72bafe9b92f496f9f0c2763b475e2f3b76b47f7040eb900e8d951de5b5ea8ecef33b33373b3f
+EBUILD kcalutils-20.08.2.ebuild 970 BLAKE2B 6dacc31b99342dcdae539497ee204979c31ca7908a5feb7199373e6694504d21038ad13994ca96af6028e57cffbcd811d74ae29570e13c3fde79e519f6ad7a1a SHA512 64106dfa56d9804f116e0801982c6e8548b65d4af601d5ac484d72bafe9b92f496f9f0c2763b475e2f3b76b47f7040eb900e8d951de5b5ea8ecef33b33373b3f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-20.08.1.ebuild b/kde-apps/kcalutils/kcalutils-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kcalutils/kcalutils-20.08.1.ebuild
rename to kde-apps/kcalutils/kcalutils-20.08.2.ebuild
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index ab261a9a75a8..ac633e695fba 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-20.04.3.tar.xz 335620 BLAKE2B bb5aa7fe86ac2be85e84d8b3004ac0a7e9f15e77591bde7008fb1412b8df20175d2cca7d825792c504737db4a694425f0f04655314bcfaa1fb103bcd7c0895bd SHA512 f286115802d76d94ec7b42d874cbae750b707fccce00f3292cf861ded72ce32bc905a477c07afd03b24c214e3716ee7db445d1174bb6642fff9692a5046ff998
-DIST kcharselect-20.08.1.tar.xz 366076 BLAKE2B cb38b64e52fb9093c9df5147756fd534ab72c4b8686b3579c6987c3a21478c743e01e8e758a1b1c0c0049341dc016f68ef8fddb782c2c2cb9b7392e48f6b1754 SHA512 7b6e2c2dbd7c7d78189963f99ff73833b1ac34f7c6e1a00ee23c1e2c522d58b6907fa70c587312bc0fee7f7709db48f0f6572e707bc07ce7996688de8908c0b6
+DIST kcharselect-20.08.2.tar.xz 366128 BLAKE2B ebff64fdef1f58fa1fea0546b2b5b6987d268361773a3dfbaf6a9c4e7dbc132fcc3743dceda9cbc16dbe98d91eb242a3e0fe6f6dde81bd33e950c742d8b165e0 SHA512 e41a3d66de7b710ec694b99285ce99fbee547a2dbe9b0198f607e7376d6f1c51c2275902c07b1b147d7cbe53f8566e5ddf470b32183135f96ce1996e0de34ff5
 EBUILD kcharselect-20.04.3.ebuild 799 BLAKE2B c8a72511c1991f440a75c3ed2f4b40d9b741ee9869bdd713a29f4aa28674867dfa268d3b7c9c42a50ad276497be6958e4c56dc3efbc80c5c364dc72d413d7246 SHA512 4cb3bdcf84df80cb5b2a182d3fd19851d3054bd60fb386debd9b3116d86240b54dad917803e78cf5e5b1b94c42fe55e06c7318bb5e98617c3e2c80f4d274d7ec
-EBUILD kcharselect-20.08.1.ebuild 802 BLAKE2B e62520c5a90c5de1644371076a6656095f45c05a0b3af1a8f7f2a13ec1b4e919b91f85a618a25d646f80a681fa5eec4b22ed5068d227c2e2df30fdfc75456fcc SHA512 88718d5395f4b7acd527cd8d8629c191f97d04e6842873d17ac50e3dd75f539e49168a0f52b7066389de45c71c156471c64f4b9754769428c19fe204189397c4
+EBUILD kcharselect-20.08.2.ebuild 802 BLAKE2B e62520c5a90c5de1644371076a6656095f45c05a0b3af1a8f7f2a13ec1b4e919b91f85a618a25d646f80a681fa5eec4b22ed5068d227c2e2df30fdfc75456fcc SHA512 88718d5395f4b7acd527cd8d8629c191f97d04e6842873d17ac50e3dd75f539e49168a0f52b7066389de45c71c156471c64f4b9754769428c19fe204189397c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-20.08.1.ebuild b/kde-apps/kcharselect/kcharselect-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kcharselect/kcharselect-20.08.1.ebuild
rename to kde-apps/kcharselect/kcharselect-20.08.2.ebuild
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index c98a33d63c5a..5b71bf07e022 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-20.04.3.tar.xz 21848 BLAKE2B 75edcfcd5a41fa8766dde29d65ebd05e3e6364f89102a2579e56237683f98969a4bf2aa8729367a8b17b99f178147403bc99f580331151a2b6e0b40b1db8a60a SHA512 21ceff866c4658be0672625e9f3143d47a1ca0afd08e82db4a2648e8369522c4746b762db1e36c9da462ab109d7c55184dcd59c99843b52bc9c6a2f8cd031909
-DIST kcolorchooser-20.08.1.tar.xz 27064 BLAKE2B c49cd91bd44725e39254595ea9cd05536f2ec41f5391bed1d2f1501fac76e6ec244ede74fa42be956556e37d122dc369f91c0d81ff115f84eec270ee252767aa SHA512 77d2c19fb851e75821e463b6501822223fc6f122ae8bfb4169823eb4a61aab28ec9205970676da3b76e33b4987066326f27bd4d1fdf9de83d91451fb3a1b9969
+DIST kcolorchooser-20.08.2.tar.xz 27412 BLAKE2B 41dc74b43c0120e3d51445e23568629bbc3f0190a358e5fb8f989ab80a9cbf715c621fb64634a9dda3d55e6c4da00847af4d85e5be29c0c7ad496526dafc65fa SHA512 0f9de5f4b12374b01343bd66e0b7d0ca3a4131f50f094ae835c3f6795f198d122a88b6287c37a2c5383d4df3c48b9f07879d69e9557a292ebe4bd268cbb8ad55
 EBUILD kcolorchooser-20.04.3.ebuild 540 BLAKE2B ea0e835279375cfd442a08185fc28fd2d86028a1dedf80da14252080678afdd1817c6702616b031e317f61f58054eb3e720dd4d57a77f63d8fe8448ede288c28 SHA512 ee2c094429350dbec4d0cb2501215cfb4df0c68c854c57c555ce2865e02584ec3cbbeeb65b00358dfe1d75c2b99b0f2e622289d018b85b3ab663416ea65413ce
-EBUILD kcolorchooser-20.08.1.ebuild 543 BLAKE2B a6e4ed8a390e7ecc1e94763d3fd66eb2b64855f7ab96a3e9113e8637ac5842592636f880c9340f8aadb4791bf7e1c08701184820886fe6ee9d988836215ef99a SHA512 401828ad52d943d208d83d773dd7d5901d2997cc4236a6cc7d2a6525077504f871938d4fabf9a7cf17dd97c918844148f8337c5b8271d7527a4d3d9fe594376d
+EBUILD kcolorchooser-20.08.2.ebuild 543 BLAKE2B a6e4ed8a390e7ecc1e94763d3fd66eb2b64855f7ab96a3e9113e8637ac5842592636f880c9340f8aadb4791bf7e1c08701184820886fe6ee9d988836215ef99a SHA512 401828ad52d943d208d83d773dd7d5901d2997cc4236a6cc7d2a6525077504f871938d4fabf9a7cf17dd97c918844148f8337c5b8271d7527a4d3d9fe594376d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-20.08.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kcolorchooser/kcolorchooser-20.08.1.ebuild
rename to kde-apps/kcolorchooser/kcolorchooser-20.08.2.ebuild
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 44e7696c7472..b560b4205118 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-20.04.3.tar.xz 893920 BLAKE2B 01da221254e85d70ce23917803f5fd606f61ac76ba37003b0d0895507c3d3c747c56e0513037f34a6fa972164b0964eb64694a10ce8e22ac8ff68f9371399e51 SHA512 28dbc8bcd54bc8d385d3cc3be437d5b965699ce829e5d527cd405543016d0432fb4457d1ac9718d815a5fcf1b20c2b3c765a31137a4992be2a16ce17f00e8e62
-DIST kcron-20.08.1.tar.xz 898596 BLAKE2B d9512c1a0c7753c78598250e7f0dcecb49e0ffc1b955d44ba4df1a0a0d269cdd0855aa6a4d74788c5a54743df37685e6bde7f4625cb3de45dd8831981790409f SHA512 3b9ac8beadb72314ca4592018dab44a82bb0e197c82e820224438a22f5c564aa8039f1fde6178307897b36620f5ede22ab8e8cdb3b7585ddc3bdf92e683c5019
+DIST kcron-20.08.2.tar.xz 898724 BLAKE2B 3dd16e2b6deb7425d59d08834617a8ab62fccb33b573ac0d68be36b20308821b219c617c8db529b77d19c68bdc98026f1c4375661428e05c6f7bdf71fb550479 SHA512 e2fc5b7ce6056f9f7672f05c5c852be810e3061f831286bacc059c47cb9d5e23104abdc014457d2e33c8abcfd805696236d9f919216c679787a0fcf007e08c89
 EBUILD kcron-20.04.3.ebuild 747 BLAKE2B 077334c85788c28e89e67761092bfd52afb0c04fc82092b2d50ebed8e5fcbe49575460556243ed6337574afb1f85016ce8f646c4df364ceac0ff72095f98cfaa SHA512 4a0171c40dcb2836356690a853b3b09e0ab1dea38e5eeb68e9b5e819c81c6d4e3c524a0cb9c36db064d396dd6e77904e1a0c9d1ea3adbe6c1986f042bdf6cdc4
-EBUILD kcron-20.08.1.ebuild 750 BLAKE2B 29bb726818eed77c31b31b4a709736fe2f62447f4eac8af2f22b3b7bec836872a81ad0176034f5e9212006a76abd3ab9b9c1102bc7e340292a23f1059c26d449 SHA512 71e5de3a55ae70326cddff03df8e3c32572b3a970be3561a931e904d467e0e3bf5579cddbe0449621f90e0f0e4c3434d642b032af1280a8716c89178ee6e10f8
+EBUILD kcron-20.08.2.ebuild 750 BLAKE2B 29bb726818eed77c31b31b4a709736fe2f62447f4eac8af2f22b3b7bec836872a81ad0176034f5e9212006a76abd3ab9b9c1102bc7e340292a23f1059c26d449 SHA512 71e5de3a55ae70326cddff03df8e3c32572b3a970be3561a931e904d467e0e3bf5579cddbe0449621f90e0f0e4c3434d642b032af1280a8716c89178ee6e10f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-20.08.1.ebuild b/kde-apps/kcron/kcron-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kcron/kcron-20.08.1.ebuild
rename to kde-apps/kcron/kcron-20.08.2.ebuild
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 071aaa9938c2..128d8101b38f 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-20.04.3.ebuild 793 BLAKE2B 68bd8c5855d00606a00d362ffa6410a962902de928a8d2ec3b3aade2e156e2206f24a609a8cf677b53f5491b771f2602fc586ad20f3f270ad5742f260fccf575 SHA512 3d036ac6fc2143f6060bc4e4a8e2d079c72c978fa674132123557731a099c9c66d7c065013fec5b086ccc6449cb24e1ff389f1b1f1d1ff0773f2257b472066e9
-EBUILD kde-apps-meta-20.08.1.ebuild 796 BLAKE2B 3c748e587c7a812d7a7df7b7384c4505933df37b8dc1c22eb37a92d3a023250c911cb53441b51316e895df8a33902a3dd37386c0f05664445fabf645e48aec9b SHA512 d5f93214334bc9722ee4ac6b5522cf4be5e04a615573fc2a8d3f808ae56c18f284d4d46b392ff6555cb1f450ed732a73f84322252fb294b64128f5504469fa48
+EBUILD kde-apps-meta-20.08.2.ebuild 796 BLAKE2B 3c748e587c7a812d7a7df7b7384c4505933df37b8dc1c22eb37a92d3a023250c911cb53441b51316e895df8a33902a3dd37386c0f05664445fabf645e48aec9b SHA512 d5f93214334bc9722ee4ac6b5522cf4be5e04a615573fc2a8d3f808ae56c18f284d4d46b392ff6555cb1f450ed732a73f84322252fb294b64128f5504469fa48
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-20.08.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kde-apps-meta/kde-apps-meta-20.08.1.ebuild
rename to kde-apps/kde-apps-meta/kde-apps-meta-20.08.2.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 7e285b9ab392..c15d5b4d703d 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-20.04.3.tar.xz 378452 BLAKE2B 069224ccadeb6a94b6ba019336520c520969a1c4e17b69b150925a478302dd5bed354fe53d2ec8ac0e4ebe233ef95b0b2b1cf496b4ccc33850f2d7ae12b0e521 SHA512 e818269cfb042cff31b7c00c310bb737cd52c7db62a90c381d95808b0bfd43cb18f13f9852e2494c6c85fd12e94be1cda038342d395804f7126da4af677691d2
-DIST kde-dev-scripts-20.08.1.tar.xz 366172 BLAKE2B 5687fe9797035e50b39093bd13cf2a122a1c784c26217ca4c791c61d5edeacbff311fa3c4efbf9dab24bb0f080e60d1e3a26f4afe3bc10878e75ff59cdbb0092 SHA512 de23a817d00bb34456aa164e320df3acfa31d064b08056ee500904d2fd6b12c9349ed080a4bb223c0d2c8147f16de664a17573a3b452417530509bf5659d556d
+DIST kde-dev-scripts-20.08.2.tar.xz 366152 BLAKE2B 04df8eaea00412e66a87ab5c6fe76a50b176cbd5a78830f35e894bade0a248ed7b01285a7da7b686a7a04652fa3240540d858a509bebaac2ddcb96875d264eb9 SHA512 2771938fdad43158e6fc705902cc1d2ab6bc40cc5bde23f7f91920d623aa8bd9f3add6cef24c742ee459a7f1d25f9cdb281837072f8366804705166fb79da714
 EBUILD kde-dev-scripts-20.04.3.ebuild 633 BLAKE2B ddf3dc0e3718c2f4688d636489d9a927879d1be5d599a272cc098be387d47f8db9a2e8c01fd4025b11d59f46d1dd74e4308339c04b4b27d44612a783d73cdf36 SHA512 191750107398272f9b4e1107b7ec360436bf5a0bf361e17d6ee6cab9a64275cb0f8156c913b78b8d90a8dd930d24cf4064cc36a056a078b4862fc44b2a8fabc5
-EBUILD kde-dev-scripts-20.08.1.ebuild 636 BLAKE2B f486817b9b2e54bbc8bf2b0e5a2526df54f8ac9dba01f7728d986ea1fa1cb4edea533b748bf59a7b61a6f812102ba567541358194355bf1fd73fcb08b8dd7856 SHA512 546040bdcb86528ef939cf25bb7a0052fd778ce8830b8eb8735904ccfb501330301304efecd4efca539eed62332f61efa8a5e7ce0b42dee7e06dffa12967d496
+EBUILD kde-dev-scripts-20.08.2.ebuild 636 BLAKE2B f486817b9b2e54bbc8bf2b0e5a2526df54f8ac9dba01f7728d986ea1fa1cb4edea533b748bf59a7b61a6f812102ba567541358194355bf1fd73fcb08b8dd7856 SHA512 546040bdcb86528ef939cf25bb7a0052fd778ce8830b8eb8735904ccfb501330301304efecd4efca539eed62332f61efa8a5e7ce0b42dee7e06dffa12967d496
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.1.ebuild
rename to kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.2.ebuild
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 07f9f4dcd7df..2a7ac3c1a9c2 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-20.04.3.tar.xz 64652 BLAKE2B 5d28f61bb9b1cb00be35166a6b4ac2c49ec59f4c9acd9b16302e89c152bed13f05dd0160cab7a11d7b3cd85d67a99969c5bc13624f835c95970da3acc0df01ab SHA512 d330175b7c1212dac9e8c63b84f8ed28e65be83fc1260f43a44d2ce1ee358405ee70fa16b9760f6ebef8443b669327401bcefdeb4232abeb2e59abbd7375106a
-DIST kde-dev-utils-20.08.1.tar.xz 64912 BLAKE2B 9ce2497ba50b29651608c526f87dc16950c9dbad998a61bfc7db99f04d3d391bddb604171dc87da8fe295540c150dd2b7c65178df0ecf82ee49241febdebc0b5 SHA512 483e9c77b91c1ed108b43d2bbf2e7485ef7ecdd5955080e19e8f23318b86e33d03c94ff44dc6a772555b67b86bce91df8a9880980812feb89fe9b002633aec64
+DIST kde-dev-utils-20.08.2.tar.xz 65336 BLAKE2B 54212e5b211020a31f1f6dbac53a8d4ec436492865ee6359397d7a5ee351737a698d79d646e08acccbbf9f8cc3a4c904fd68fd0b56394e47778ccaa1155ea7b0 SHA512 0ead6dd1e67762e1fc6d9aac918c5843d66a06e150b4abc6b1d0f9fb64984e94e46ea638b2b2d6b72ff79ffedc4f3ce1f225d100f6b2ff4a982b3fc3a04215a3
 EBUILD kde-dev-utils-20.04.3.ebuild 730 BLAKE2B a3f34d6aa33c7bcd211818ff56f8dfb89bdd5848273e2855b80cabe3e0fc3480cd5579ce46871126064cdde7a29af0466aef9170fcd991e2eab60c38c36918e7 SHA512 4cae763a90b26ad65881154f0f0f4e1ec10ba55f089734349e2febf81f2504323b9f7c71158d7b597eba2ef38291d2885cf7c8f7a9c2d66b0d20484e8fcdcbde
-EBUILD kde-dev-utils-20.08.1.ebuild 733 BLAKE2B beefaf7795de5295c6c55a69aace79a253ca5f36d9c70339165d36701949e532c27a9437c7c9d772dd53fe29e16ead8d240a17b50cba5d02f3fd85e5e927afc4 SHA512 b2e0702759f4ecfc2ca459af5902597828da27045ca20f44d3bf832231656fc1b27d1c2493e20b247b2dcb24cafafc8ff5937dbffbd083af00b8fa99d06a6c0e
+EBUILD kde-dev-utils-20.08.2.ebuild 733 BLAKE2B beefaf7795de5295c6c55a69aace79a253ca5f36d9c70339165d36701949e532c27a9437c7c9d772dd53fe29e16ead8d240a17b50cba5d02f3fd85e5e927afc4 SHA512 b2e0702759f4ecfc2ca459af5902597828da27045ca20f44d3bf832231656fc1b27d1c2493e20b247b2dcb24cafafc8ff5937dbffbd083af00b8fa99d06a6c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-20.08.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kde-dev-utils/kde-dev-utils-20.08.1.ebuild
rename to kde-apps/kde-dev-utils/kde-dev-utils-20.08.2.ebuild
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index c27ffd8aab82..a1d4af6a99f7 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-20.04.3.ebuild 364 BLAKE2B 6b6c6caf846e1f81310598b0998dc2aca0e90954d5df6802db84a55eb3c662e2fe1ca426553f43c7210b9f2942daf723e132bf91ccb843d46b4d4fb8e1daaad0 SHA512 fc2513631f8b57a7a04bb0bea40fbaf1bfa9157916886768613f1e4e5873cd636aa78b7363e8b41e27480c56597495e12364e86aca3b58159f9124d9417ff2d8
-EBUILD kde-meta-20.08.1.ebuild 367 BLAKE2B 1c1c2574816fbc70ba33313ce6ebb7e6d968d9d5078da779942f51814ba7b7594dcd2c6aa5a39b2635f70a9961667c17cd2f09a00c7eae76e50112ae118a90d9 SHA512 d4bc4f0caaad85881be38329c9eeefee3b59fffed9cd99f8713e56438a04f8b648583514c909692389fb729adf8994b63f4b4cc60bf872d101319a6117056a39
+EBUILD kde-meta-20.08.2.ebuild 367 BLAKE2B 1c1c2574816fbc70ba33313ce6ebb7e6d968d9d5078da779942f51814ba7b7594dcd2c6aa5a39b2635f70a9961667c17cd2f09a00c7eae76e50112ae118a90d9 SHA512 d4bc4f0caaad85881be38329c9eeefee3b59fffed9cd99f8713e56438a04f8b648583514c909692389fb729adf8994b63f4b4cc60bf872d101319a6117056a39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-20.08.1.ebuild b/kde-apps/kde-meta/kde-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kde-meta/kde-meta-20.08.1.ebuild
rename to kde-apps/kde-meta/kde-meta-20.08.2.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index e4e1e3ce2b7e..5c5b951911a4 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-20.04.3.ebuild 414 BLAKE2B 294c7f921596ed12b580399549bb0d85b1f78d765e3f2bbf50c6612b28ce0189e344871cdcf50736368e3c92ac95c6ff3f51419ed07b6a39b285562619d0b41b SHA512 ed12710d4b9a333f5b0f4812744ab92af0881677fe1943d2ca3c932935c163a30fec3b2e962aa0cd715ec4b157f1c8abbab6bb0d35ebe26751fc0bf06df04e2c
-EBUILD kdeaccessibility-meta-20.08.1.ebuild 417 BLAKE2B 7e3b2037cc6564b9a3256ae36d85ca9e6f059f6e07c029041550bb4c2faaaf7aacfb70d7c7879a60ed32bb0b503ae6780bc2be98bbd7915ffbf1877d0cb23a9e SHA512 47b2498400827c57a52530fc7adc6da18b34067417b06c5439a610fe11e348be4ee80fa8c8fd7a2b1c969a47cf8ca0c3538c5aeef60cdafce3a9c618c7362455
+EBUILD kdeaccessibility-meta-20.08.2.ebuild 417 BLAKE2B 7e3b2037cc6564b9a3256ae36d85ca9e6f059f6e07c029041550bb4c2faaaf7aacfb70d7c7879a60ed32bb0b503ae6780bc2be98bbd7915ffbf1877d0cb23a9e SHA512 47b2498400827c57a52530fc7adc6da18b34067417b06c5439a610fe11e348be4ee80fa8c8fd7a2b1c969a47cf8ca0c3538c5aeef60cdafce3a9c618c7362455
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.1.ebuild
rename to kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.2.ebuild
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index ed2120cce8eb..09affdbcd503 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-20.04.3.ebuild 405 BLAKE2B 0c60fce6b82080a1c71f4268f573569c81c6a7330f72ef62bbf4b1bf0a4aa5a87dd5b2c7bb3ca60c34fd24049ce7fc778805ff77709967dc3cf408b3c8202822 SHA512 8b3a3a3c06873e4005525b0e8f34f27a772f0ddbb1adbfb73f1872a2ea7af9a911daf2f4ad86c8a5c4d2c28506f5b15d050d4b7e4c2c86391f9f1a1ba6e2da4a
-EBUILD kdeadmin-meta-20.08.1.ebuild 408 BLAKE2B 39e83d9a543e231d48c1d856de64addd7bd2a09470277c38b7eae74b1bb306cd4efe5201b87791a4459f1bac00e75d9157a6ea277cc930eebe5e915a9f63023a SHA512 2877895940b13289f9e40f7c1cf9aab9df5099b662fd3b5a29af153a0e33821e6bc87732d65f60529633a6988be70b4918ac02e2d5cac2d89a6602c3745b6043
+EBUILD kdeadmin-meta-20.08.2.ebuild 408 BLAKE2B 39e83d9a543e231d48c1d856de64addd7bd2a09470277c38b7eae74b1bb306cd4efe5201b87791a4459f1bac00e75d9157a6ea277cc930eebe5e915a9f63023a SHA512 2877895940b13289f9e40f7c1cf9aab9df5099b662fd3b5a29af153a0e33821e6bc87732d65f60529633a6988be70b4918ac02e2d5cac2d89a6602c3745b6043
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.1.ebuild
rename to kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.2.ebuild
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index 4cdcaa90dcab..f00dbc0def6c 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-20.04.3.ebuild 373 BLAKE2B 81ad2574c439071fc806252e6a1678f4e3117664721e78f8ebd9598dcb13e7c4343d4c44aa3a1b07b0e87a92c63d8af6a9b20a5b4fd98cccf7991875137c340b SHA512 07e28158f110569ac062d842a55ed9bad632c3e869871a8597a1b65efc86399f3c018bf688ba7fdf5bd81c98ffe7275674d61622d4c80060a8bd3d135e0200b9
-EBUILD kdebase-meta-20.08.1.ebuild 376 BLAKE2B 56a9863005f43d4f43697f87f6daef84e3c911a9424339e44f914bc1720376f5865f095eb7f7a515626703264d0448c625508532af9c6729c6998db1afcdfd4f SHA512 da1be4334a59de45c01dc207b5f1a5a5b5e5f566df0e8e5958638d7e2739427a8d67968f1921173a7ea5ffd70030fec7c15f6c12625abd6ab7f8027ae935be35
+EBUILD kdebase-meta-20.08.2.ebuild 376 BLAKE2B 56a9863005f43d4f43697f87f6daef84e3c911a9424339e44f914bc1720376f5865f095eb7f7a515626703264d0448c625508532af9c6729c6998db1afcdfd4f SHA512 da1be4334a59de45c01dc207b5f1a5a5b5e5f566df0e8e5958638d7e2739427a8d67968f1921173a7ea5ffd70030fec7c15f6c12625abd6ab7f8027ae935be35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-20.08.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdebase-meta/kdebase-meta-20.08.1.ebuild
rename to kde-apps/kdebase-meta/kdebase-meta-20.08.2.ebuild
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index d8ddce698718..8b6739652fd0 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-20.04.3.tar.xz 65472 BLAKE2B 3f18f9027de4560b23f1b138ca1cac1ef9aa85ab48f112a35222c952339fd6747cedbfa1a45f0002f2787d0a98b7db18c17d656bccbe3347fcc2f8e31031706b SHA512 af6770415d7f8ba5ff56c13ce7227cc1b22b2db2f24da3ae5ee9d03d3275ced87dd0f73d310f0e4b1eaeb20bbe26df76f40b7c6a258be506529394d044826012
-DIST kdebugsettings-20.08.1.tar.xz 67428 BLAKE2B 93658ceb44328ba2dc299e415786da54f8f073428fff0b01e021ced2af4ce26281a1f312e1eae34884e90a165c6ebcb004799856b141c28e32b5e06bda63e421 SHA512 991c066b949e213713df1880fd2a74d4dab536c22e690f63a28f1fdeda668a009d7b4bb0e1100afc4f357884d736f356d9c1d97ab1f9fd2bdf6a6f70899ae89c
+DIST kdebugsettings-20.08.2.tar.xz 68032 BLAKE2B b047fda0958efdc1cafbb30d2bbc8d7f735ffa450896836e39d9f43b38e988d17b9bc6575387299a42bc7330589072ea539cd5780e68d88449d339f9549cd8bb SHA512 95cf27ee32934b572bf492ec75706cb5be17faa2a54dca5f3a3b8c745aad517e46453386eff2b40da6117e92359e4a01b273ba58db6a929a1e048bf9ae693b35
 EBUILD kdebugsettings-20.04.3.ebuild 807 BLAKE2B c00c72c48faf985a3dae0c22833c77616df50bd06776a45e54a938d325ddf5e7e34b1c44846b4a5e0a2ce41a6aa95176d4dd85a98887a1a9d993171820450b13 SHA512 427c7a4a57f9725884f57dc707663241aae0355c0f96c5e7afaadd8b0256dba936a737f63e9bcccd8cd86c489a2941e150b1bed10d8b85147c9a4158202b5d6c
-EBUILD kdebugsettings-20.08.1.ebuild 810 BLAKE2B 6b5cdc7a08fa87596809d22407502a30f57b4e93a50f49c8b13d650a1bb9ca8c1ecab332a5da205db820f1bf863bad556f2ec3470e53ff595227fda17f823913 SHA512 5e1c2a4eb1f9dff9a6115dfec078f54f8fc4a27b8bcf07fa93ff5148822213a79b962c96ff8d5279fed6e49db8a08a5aebfcff3fa6339e7b30bd1bd67bd2edd5
+EBUILD kdebugsettings-20.08.2.ebuild 810 BLAKE2B 6b5cdc7a08fa87596809d22407502a30f57b4e93a50f49c8b13d650a1bb9ca8c1ecab332a5da205db820f1bf863bad556f2ec3470e53ff595227fda17f823913 SHA512 5e1c2a4eb1f9dff9a6115dfec078f54f8fc4a27b8bcf07fa93ff5148822213a79b962c96ff8d5279fed6e49db8a08a5aebfcff3fa6339e7b30bd1bd67bd2edd5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-20.08.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdebugsettings/kdebugsettings-20.08.1.ebuild
rename to kde-apps/kdebugsettings/kdebugsettings-20.08.2.ebuild
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 8b173032b82f..11564a083b53 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-20.04.3.ebuild 885 BLAKE2B 187e3f0da292f7dbb1cd2e2687303aec85741bd8adb6290e06d432ebe4e09c6f494cbea7d1961cb9bd6ef1493716f2042f3e8bf000a141576c4b2db82b05465f SHA512 f7b8435ac5b9b14307a92a68566d30906497d8724c9770e8e7f72d598504e3452c8515d8741065d520f942d3bdb0ada68da8c921cf7f241ee49403c709a59f32
-EBUILD kdecore-meta-20.08.1.ebuild 888 BLAKE2B 6c82bc361673fd00764f55d935754c4d74d4450d88c3dd5e93a2311109d5d7614d7826df72a4cb5eff95058eeddc3d7827e3b92795d0ea5ba06baafcb547d0b4 SHA512 1703f0c7c7970744519891d5ecec87aeeebe833743c9104507e169cfb09b432dfeeafc01327bd7705d93dd0487cf2f5bb597b9332dc48c319ef35f030f5b8411
+EBUILD kdecore-meta-20.08.2.ebuild 888 BLAKE2B 6c82bc361673fd00764f55d935754c4d74d4450d88c3dd5e93a2311109d5d7614d7826df72a4cb5eff95058eeddc3d7827e3b92795d0ea5ba06baafcb547d0b4 SHA512 1703f0c7c7970744519891d5ecec87aeeebe833743c9104507e169cfb09b432dfeeafc01327bd7705d93dd0487cf2f5bb597b9332dc48c319ef35f030f5b8411
 MISC metadata.xml 682 BLAKE2B f02620682a0f1f2b1e8a7621ce9fca0f0bec646787a8e2b00b0d7b4b0b2236d07429fb31bab4935f0ad7f969857ccfae49f8c4ca8849c9b733583ce0e41533c1 SHA512 414e4d9cd87a259c5ce473d33e9f55c6aa54428f2024925f6bf49e68df2d458d45e42f865cc8a5ba97eca04ab85c035c253ab98503c5c3855e199b7b97043098
diff --git a/kde-apps/kdecore-meta/kdecore-meta-20.08.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdecore-meta/kdecore-meta-20.08.1.ebuild
rename to kde-apps/kdecore-meta/kdecore-meta-20.08.2.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 5bf7829820b5..420b358727d8 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-20.04.3.tar.xz 328836 BLAKE2B fd4ff2f42fe98ccc86b171ab2b167d5265625953e0dd7bd71aa6f5284f546dcb11d487d068719cb033e626141670e817e7b7623e27e8143fa36b10d85f90a712 SHA512 2863c767effd58c5ba460c94623859e63a12577adc780b35b2a5a744500f20e0663ec88774d75a1baee5afb85e9918cf5b09f630230560a758f4526ede154014
-DIST kdeedu-data-20.08.1.tar.xz 335644 BLAKE2B ac648cf4c4514b3b9bee80ee4b92dbd183f7ed62e185cf721cf3157fd4e191f42441d0a9c33f77853563fa629090ed1d923fd497bcc9fe01bc52d67586f83ff4 SHA512 2014cf2c35add8a3a2e49abd9a822c5e8b8b2bae5212a2bdd7c4112f9352af6bb0de1af4d3863eafe6996b930eb2117449df3fc324101ff25fc8f6efb0851f6d
+DIST kdeedu-data-20.08.2.tar.xz 335428 BLAKE2B e407bfe952c1afe7b6ad205845c7816fc2de8a3b211fc50e787780912c0d554b71a7e76c01aa4c4a151d4360afe72d21ae46236423767eed3d0f868cae4e5fb5 SHA512 ed80b9ca86c02f2ded07b8bc92680b3e920daa0b798d554bbf112203b2a506e0607da2bdb5d518e7809f80e4022b0660b019ca20e01db2a1824da5b262a490de
 EBUILD kdeedu-data-20.04.3.ebuild 345 BLAKE2B 41fd0c86a8ecd727d1429423e0773392fb4e139d8b67e4ad16b7e89a59e2c8716b2fe7f83a5f97b623c18476dfcc2ca586bd054118c88b435bec4fb9298743b9 SHA512 b63edb9b19b9f13a0ec51673a340aef92a9f1c4c227ac7aa7b937de598be703671319e45d5adc8d7bf8b09547c97f990b2ee1574cfc4b68051fcad1cb49c0305
-EBUILD kdeedu-data-20.08.1.ebuild 348 BLAKE2B ccca519c4e8d5ececa2a50c338e7368e733d22e48b0b93c0efa680024d92d54a5117139469dc1c9f2c110094484565fd13afcd5d354814ea30cd9b1d695dd9c4 SHA512 062f8acc364c571e5aeb01efa6f3ff7068b6044a8eb01287a33a00eb27b4823303a6bd937624fd153fd871ae610379f74ca021bf906cf11ca737fa4dec435198
+EBUILD kdeedu-data-20.08.2.ebuild 348 BLAKE2B ccca519c4e8d5ececa2a50c338e7368e733d22e48b0b93c0efa680024d92d54a5117139469dc1c9f2c110094484565fd13afcd5d354814ea30cd9b1d695dd9c4 SHA512 062f8acc364c571e5aeb01efa6f3ff7068b6044a8eb01287a33a00eb27b4823303a6bd937624fd153fd871ae610379f74ca021bf906cf11ca737fa4dec435198
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-20.08.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdeedu-data/kdeedu-data-20.08.1.ebuild
rename to kde-apps/kdeedu-data/kdeedu-data-20.08.2.ebuild
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 3379f4a5df30..2a60e32f1d4c 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-20.04.3.ebuild 1206 BLAKE2B 6fce14aa475951d221e980a32ca897ad8a02bc528fc742b4b9abb7f792bca314a5529a73b597aeeee8aae39aebb4d2d5e31d92f29643aad5272c97be8c8859c4 SHA512 49d73404d0816db5bc44e43c83a7c42d50e3dfe2ee860590a867d72174197f6f307dd1f7aa3d9c6e270e0f2cbc10c8dac7fb0e08d56292c606aeb5e006fb1bf5
-EBUILD kdeedu-meta-20.08.1.ebuild 1209 BLAKE2B 148d28603d6627398e8e4cba0f4d94d44b2a98f73c6e850698daa3717a2f1265c1a913e0c8033067b00d432ccd4d7bf51730037ba5537ac0555278bad71e49ec SHA512 3fc082c712bfb713be82c77aa3a131b1a96f41ca10cf59679c26fcb740c6e2719b720aeb0f25b955d848525646aef070929df180e530659669e2655aa76b41bc
+EBUILD kdeedu-meta-20.08.2.ebuild 1209 BLAKE2B 148d28603d6627398e8e4cba0f4d94d44b2a98f73c6e850698daa3717a2f1265c1a913e0c8033067b00d432ccd4d7bf51730037ba5537ac0555278bad71e49ec SHA512 3fc082c712bfb713be82c77aa3a131b1a96f41ca10cf59679c26fcb740c6e2719b720aeb0f25b955d848525646aef070929df180e530659669e2655aa76b41bc
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-20.08.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdeedu-meta/kdeedu-meta-20.08.1.ebuild
rename to kde-apps/kdeedu-meta/kdeedu-meta-20.08.2.ebuild
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index ee292a836852..a208f036ac50 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-20.04.3.ebuild 1804 BLAKE2B 50d9ae3a1cc9171edfa47c735408250ea5d9abbae3c75d81fee6d7cb54caf8c341f9497f7b0fa639637ca978435029440a39dd847493e4abe71a077075543447 SHA512 a6f364c017ce3eb925dab9b7ad8d28c81214ce7d1a357764f58a812dd1ab719c3b684160e0e78e302f2fff1810991b1c245ce75df4369660bf0e0855249b15b8
-EBUILD kdegames-meta-20.08.1.ebuild 1807 BLAKE2B 88bb932ff26bd7915855e77d1daaabd61c30ff9ab7b85d38b9d0acd2d32f2529f449d3e62fe99cd8dafbd15b1a3caf1800de35d01a06308693107f7a02e091ef SHA512 5d22a49f4a13e414e7589b7e6afb03067b9c36f63cb24227063224ed3d78baa4d1191c66664a3dad7543d7190c70ba63608c5872df8fc31778ec28b945e4a2c0
+EBUILD kdegames-meta-20.08.2.ebuild 1807 BLAKE2B 88bb932ff26bd7915855e77d1daaabd61c30ff9ab7b85d38b9d0acd2d32f2529f449d3e62fe99cd8dafbd15b1a3caf1800de35d01a06308693107f7a02e091ef SHA512 5d22a49f4a13e414e7589b7e6afb03067b9c36f63cb24227063224ed3d78baa4d1191c66664a3dad7543d7190c70ba63608c5872df8fc31778ec28b945e4a2c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-20.08.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdegames-meta/kdegames-meta-20.08.1.ebuild
rename to kde-apps/kdegames-meta/kdegames-meta-20.08.2.ebuild
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index cfce829dd6e9..3f8c44c1fa72 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-20.04.3.ebuild 902 BLAKE2B 38e46dc07c9d5d64c283411e3fe63a76a7087cc381e551b8f5a355cfba98dc1bacbcfedd933f585b907576634f95a492ff35e3a2b24104185e41e70e90da23a2 SHA512 dd6b2af369558a4ef22789f3462f41eedc64cb5e4c0a3fd6f0ce85dacd92604b722d89bd2638525dc80adbbae05d086de464a23b2c2a2d60cec246176e90a569
-EBUILD kdegraphics-meta-20.08.1.ebuild 905 BLAKE2B c77b2c5dad729669a6c842ea9eb462053d11c6808b6bcb447522db8256982318120d974a86e26036b2ec3df1c8190622177847dda7696619d59a94eed206c968 SHA512 136df571dbd10687a7a2cce843271ba243281ab711f535da7be5536bce8e42457fb6c7b98fa16e22dbac1c4d4e6392fd2cda67c6531d0a4a0a68b61acbcac633
+EBUILD kdegraphics-meta-20.08.2.ebuild 905 BLAKE2B c77b2c5dad729669a6c842ea9eb462053d11c6808b6bcb447522db8256982318120d974a86e26036b2ec3df1c8190622177847dda7696619d59a94eed206c968 SHA512 136df571dbd10687a7a2cce843271ba243281ab711f535da7be5536bce8e42457fb6c7b98fa16e22dbac1c4d4e6392fd2cda67c6531d0a4a0a68b61acbcac633
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.1.ebuild
rename to kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.2.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 02d79385363e..9d047a98e458 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-20.04.3.tar.xz 16536 BLAKE2B 2685c6dbff56b46cf565979d6998b0ec1f9559dc3a49c5626185f3054c63eeb2c0f1f6094b2f831116b17cc51d7a13fe209584d553057d0f98ddaf716bd023eb SHA512 d9f0c3e330c52ae7451a6092ed5410bd0de40f19cfea632c0a20c04c08d458df43a0e46b4d939740f1be6e433a8a5602a757e221a66134af296e9b7140e4ffaf
-DIST kdegraphics-mobipocket-20.08.1.tar.xz 16940 BLAKE2B 6248e9f6723601face3d7bee4a3654720288934450b6a721ef3c3073c4957329d339b39098722a3f17ff0f56f67ee3a058ee76cc4d661fa4ae7ed0c173380cea SHA512 fcbea96744209e7a98ef6a4cfc2a33022f418e4866caef4ddf2f17a0edcec66abcfa16909e2219957b75c627435e84e5fa3ab2badd1c927d4a9b6a3ad6ff51fe
+DIST kdegraphics-mobipocket-20.08.2.tar.xz 17048 BLAKE2B 89b91897abd9f611736976a7bea1990e7863878bcaac6b972fed1c6b0bfd5e4dfe51540215cbb1b519d24ae37f33b7a600b0755a8783aeb0be42ea3b1629bffd SHA512 1f0e1c1ac09d3accf84ae58538656bcc5e0b76dcb5d908bbba6ba09e7ee45fbc2d1988fe3f831ba979b7865e170b8fd00d74d590b1009c0c56d0a3a2aa150c4c
 EBUILD kdegraphics-mobipocket-20.04.3.ebuild 516 BLAKE2B 9047cf261f7a9c0229fed41c1cfe412d98f43c36d85610517faf8c10b004e47dfb2c1f674bf9d53718edc738818af0d1023a644a5c23eec1150359b8afb180d6 SHA512 a590ad0e70313683e2fcee0e1c940201e906b6405a087cfda0484c2f730710f90a8b237efe9a93dbcaa5d5d88be21d37817d343d169ce6dc1eec0d0902111742
-EBUILD kdegraphics-mobipocket-20.08.1.ebuild 519 BLAKE2B 7583faad356c476d1f8eab53f5d7fc5d2aa583d0d9fbe92a6811604a07ebc2923029e9062a9852269e038c4dc4c4e845bde155c8df02affc07a4d4a804c608b4 SHA512 23b965170dcc8b0f3cb287f84b8fc251565a528b30c15e2d3431c8f5d53b4749a22049bce926df7161bf3b8d74ee626c4d42f3dd83d67197016838e3699abd7f
+EBUILD kdegraphics-mobipocket-20.08.2.ebuild 519 BLAKE2B 7583faad356c476d1f8eab53f5d7fc5d2aa583d0d9fbe92a6811604a07ebc2923029e9062a9852269e038c4dc4c4e845bde155c8df02affc07a4d4a804c608b4 SHA512 23b965170dcc8b0f3cb287f84b8fc251565a528b30c15e2d3431c8f5d53b4749a22049bce926df7161bf3b8d74ee626c4d42f3dd83d67197016838e3699abd7f
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.1.ebuild
rename to kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.2.ebuild
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 5eb3667bdf35..0addcd06b6fb 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-20.04.3.ebuild 840 BLAKE2B 29032178756143d5c9643b6494cc67a5aded70841b793d8c5d5c65757a0a4b5096118eaade1f33a428e38ce13b6708984482c6e49da486a5cf224f24c9af3985 SHA512 02f942647049ea3ac46998bcc3a362a25ab2e2f477156c324da5c95d2f940c8fc28042d864340616d10a38d2d08b04847179c8cfa0f6c5f73ea39ff10d0b09f7
-EBUILD kdemultimedia-meta-20.08.1.ebuild 843 BLAKE2B 74e2917a0d6bfc540c4472941c9cee168d535417b024c1182342eac10c653b10c1adf5947ea559a3e31a2748ee4830909d24ae976ea175af091a1d8034592f57 SHA512 e5c88e86d46066256ccab153343ca8e72059f375cca947002b6dc7e36845944aec591e7b608a2634617cabf5e5c5d13099a84ee170e3c465ac5137bcfd8dad1e
+EBUILD kdemultimedia-meta-20.08.2.ebuild 843 BLAKE2B 74e2917a0d6bfc540c4472941c9cee168d535417b024c1182342eac10c653b10c1adf5947ea559a3e31a2748ee4830909d24ae976ea175af091a1d8034592f57 SHA512 e5c88e86d46066256ccab153343ca8e72059f375cca947002b6dc7e36845944aec591e7b608a2634617cabf5e5c5d13099a84ee170e3c465ac5137bcfd8dad1e
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.1.ebuild
rename to kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.2.ebuild
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index c318eb88a5d6..b860822cacd8 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-20.04.3.tar.xz 320332 BLAKE2B 71b389918d019c0efa6e6eeb5459628eeb4281dddeb1941b25015abf6c1f2a49a4269e1a1be95bbe4e24b9589f155b1ab25ba518889d7211cda2ab23f10b9c9a SHA512 e7068024ebadfdd279775932e014f8cd7016d05f3082d5b847975d6cb469cda1f19f74989686e75cfb939d580065f70f9202bd90566331e6f7a0bf2febce9f63
-DIST kdenetwork-filesharing-20.08.1.tar.xz 320888 BLAKE2B 05db5d5d4fe2d6d6f49a9dc136b39d497adda5e784eefbd9625e8ddc7814766b22ee516bd6125511a23f9f648023d126a2fefe72f70be10f456e99c8f9f9cb95 SHA512 1a313073bd5272236a4a4b49ba1c41ddb507fbbfb59d9ef2a8029be3684b1b64ba6132204c838896e5c6b5202ddbe3f93b7b11524b3b5d6b475403af67f4adde
+DIST kdenetwork-filesharing-20.08.2.tar.xz 321172 BLAKE2B 770d5e3974edbbf7b5494823da1a2ada346e4a851ab074fb7aefe1e45d58382badb41da0d1d7c7f94722f4614650fd4463adb33cb4e04dedf8662db3f6a5e8d5 SHA512 9390b7f3e43fbebbf674ab6dee5a43a33eceeacf5635df63b5603895d85b2f5492e8be6657046bc99ab2a198412df39673adaa16ea3f50e78a36166ae0fa8ea8
 EBUILD kdenetwork-filesharing-20.04.3.ebuild 773 BLAKE2B 857bc4f0a4ef73a189eec09382826d1986aef93702f8f372a982c69623aed5ba7163fa75284cebcaf4b589b5f15f8e254320bf8426a57cb886516c475bc3c4da SHA512 4e9d275be3f2e7189308ffb7a5d0375a9f720e47a6481acfd0e67ef98b6fc984257a8fc8005a80da2b1b599dd3a6b38858e480dd55a7004c102e20b5984e42e3
-EBUILD kdenetwork-filesharing-20.08.1.ebuild 776 BLAKE2B 7145bea1b565ae33462cdd39efd1b6fdfdd51af10dae003f93554cd1f20a0255b6f62dc4c11a97956d376e74fca6261f2c218d7f6317d3263a7c8b3fae3850ee SHA512 13be7231e9a40646e20ca23ed726a589ee004371e1b9cf19348d303c7f95ff5ef06d903c8b9d3b22b509b15403c2ae91f8cfe07f61f4a96989f4f4ba1d1ce799
+EBUILD kdenetwork-filesharing-20.08.2.ebuild 776 BLAKE2B 7145bea1b565ae33462cdd39efd1b6fdfdd51af10dae003f93554cd1f20a0255b6f62dc4c11a97956d376e74fca6261f2c218d7f6317d3263a7c8b3fae3850ee SHA512 13be7231e9a40646e20ca23ed726a589ee004371e1b9cf19348d303c7f95ff5ef06d903c8b9d3b22b509b15403c2ae91f8cfe07f61f4a96989f4f4ba1d1ce799
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.1.ebuild
rename to kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.2.ebuild
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index f98cc4d86fc9..159eb6e8afcb 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-20.04.3.ebuild 701 BLAKE2B d20c6eec0fed044315f940fb6515785a93e16e15359831384263ea1f3bc6e9bb951beb6b185ffd9db9fee8196cea090edfb92f70b6cb7fc33368631dc7ed0153 SHA512 30731a85e6ed99dfd369e97dbb8b1a63f4b77f68dd2c5ef87eff4963dad250125bce72c64672521173a836b37a2c080a51c6e69545f5efd06be205978b943a20
-EBUILD kdenetwork-meta-20.08.1.ebuild 741 BLAKE2B 8cdfc954daa6754aaaeebdc1f595702c34615a348818e147d4c111ae30bf3344929f7d84cc43bf8e0998d4f87047622960c539e2275414fcf2c79b62ec6a9f98 SHA512 0090367cca9747b0338c6b951c9d43ee047221ecaec54f4e807be7cc0518c8a79c491544fae76d1f6c4c3d4ed06b96ce89543cc1c37c8e2ff63dd218df393adf
+EBUILD kdenetwork-meta-20.08.2.ebuild 741 BLAKE2B 8cdfc954daa6754aaaeebdc1f595702c34615a348818e147d4c111ae30bf3344929f7d84cc43bf8e0998d4f87047622960c539e2275414fcf2c79b62ec6a9f98 SHA512 0090367cca9747b0338c6b951c9d43ee047221ecaec54f4e807be7cc0518c8a79c491544fae76d1f6c4c3d4ed06b96ce89543cc1c37c8e2ff63dd218df393adf
 MISC metadata.xml 546 BLAKE2B e154b28fa9be92370d875b8c4758fe2ca3a78f29c05fa0fbb8581206eb4ebb918d035d5eeb4a46f1f8b0f4dafa1f74acbda9120d2cdfb35e4a5eb12efa963828 SHA512 970b3ea6b838994b9b761aa0e62f35909d1eb5c196781d00d09aaec971989cd998b44ca68ff6d6a3f315362cce85ec614e0763146aece1a34028e45804d69113
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.1.ebuild
rename to kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.2.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 05e867fa844f..a58322bd2eb3 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-20.04.3.tar.xz 11291332 BLAKE2B b25b330a3920a90e9e27ae797f5c7f57148a6a4a33a70a9a574ac43f1107139bf0dda8baa31af477aac39a88895d42acbd03f734958bb0d46e81b034d795bf59 SHA512 5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689
-DIST kdenlive-20.08.1.tar.xz 11367852 BLAKE2B c1e85299f10d93660163852ecbca912030efa6bfc5c5780a3122b90edec27d44ad47e01e47196eadbefe5b555653bb03defa4784b15239294049bb2d59cc3117 SHA512 540c13df8eb73f53d022895f4d4a67fd7523829b48628fd8b596af07962099dff8214f37aeb80339503afd4b0f11ab959b6af89b08e4d8a85f012fa1502e4246
+DIST kdenlive-20.08.2.tar.xz 11372428 BLAKE2B df6f9507791b892928d816ec3b5c0c79e7d0f4771173db45a1e081000a393b1de2d2f04dc35080a1862706a7628ba413f0f1d4493e7542d047608f3f069350e9 SHA512 0ea4b8062a147106d73772ba5b735bcea39d67125bd34af3af2d29a196340d02f33f31e2f1de44be565c8324e67f59c246a8ce21713dffafea4b01ff0e32cc09
 EBUILD kdenlive-20.04.3.ebuild 2608 BLAKE2B 84a43b4f7a5adb33af4f911c42da5008e5a0b814c6f55059f8b57d85a5f488dfad5856cd978e449df5fd0eb0283ea42266c8d0a4df905225bf50fed362747230 SHA512 e7e18e4212783fa89220fdd51ac5b5ea214e661aabb04a94dd0bd98a8e4a653d77779320b4bdd894ce6c76f82a355d402631bb614cba853555b56258bde30d1f
-EBUILD kdenlive-20.08.1.ebuild 2611 BLAKE2B d43a5b45ae844d0ee8805618144f9c0e6740384405366079598a7d1e8a906d27705b7f524059ee36fc52d767fa4762c6c1fbbd1f821f5cd457de5e6e8584bf73 SHA512 358d3ab2d16b98c0a461b3aaf9b2fdc5bb8fa12ce843f9f37fbaa5ae5071a3e3c373dc030dc4abcf61f102714af21824e7820ba13e9f8d22ae6d7f0947cfd967
+EBUILD kdenlive-20.08.2.ebuild 2611 BLAKE2B d43a5b45ae844d0ee8805618144f9c0e6740384405366079598a7d1e8a906d27705b7f524059ee36fc52d767fa4762c6c1fbbd1f821f5cd457de5e6e8584bf73 SHA512 358d3ab2d16b98c0a461b3aaf9b2fdc5bb8fa12ce843f9f37fbaa5ae5071a3e3c373dc030dc4abcf61f102714af21824e7820ba13e9f8d22ae6d7f0947cfd967
 MISC metadata.xml 486 BLAKE2B fb7e3b5c16a68c4993cadc893d28438138d81e74ed899c0e56230e7284913af8237269483eefdebd77e6a4880023d6d5e1d200debc1e916761d7156fddc59c41 SHA512 b110a1cec041bcf91c7a9028ac31292ff41c0a70a0f1c5462918671d300c9642ae0e04b4360f03dba344d5c4c7e67f8c4fd95f169f38f30a3628433c5ec1379f
diff --git a/kde-apps/kdenlive/kdenlive-20.08.1.ebuild b/kde-apps/kdenlive/kdenlive-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdenlive/kdenlive-20.08.1.ebuild
rename to kde-apps/kdenlive/kdenlive-20.08.2.ebuild
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index a9d3a8c1a234..608b0ec1b56c 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-20.04.3.tar.xz 2064488 BLAKE2B bbcb877b10946eda8388ce92d84bb85276055f46e04d112a8b0503fa80b80c8d5b3f2788131fc56e05d795667a5858c48b75e34012a582e1c757d62ef58cd89c SHA512 faf986a08339452c7f3bd7e46b438ed31780332756b23eb5fe58c3c0325b21694fd1bf462eca7f0b4c463df056d42aefdc9db16905ce1e79a6df3cd0f26e3d87
-DIST kdepim-addons-20.08.1.tar.xz 2070748 BLAKE2B 129ee1ca8b56a5a28560c6852ad282f2bbb82be4eddacf2d99bdd51632c6cc2c73433b1f9b055d3c074512edde39a5c00076a1627bc4a15d05e619ba20d89b24 SHA512 b9ebf5e85bd295a9710c2d5aeb529540437320e0affcc687751ecdf18ca44ca6bf89df223b68bc205f2f1b1ea55bcbec6ef9fc3eb2ecc234d2f514202b56b452
+DIST kdepim-addons-20.08.2.tar.xz 2071328 BLAKE2B 762f8c54e88ba8e570213bd1b49c6eb9e8228dd98637b700563c626bfe896197b365115cb6c1fec0276f6e8c47eb22a4b45df01636d2bd9a37fa79ee5278834b SHA512 11f73c0b2c21e8ee2ec466fe66340148956eddfee91a7a69cd64053901be249ddebbdf8850c8c3334469c73ebcb033da4cb31e24a996e1a8669c20e9cb5b77cb
 EBUILD kdepim-addons-20.04.3.ebuild 2535 BLAKE2B cf1124c2a7084c9e759b8dd95348dc5e75192a2766bb8880080f375d2701c3aec528c5da43270621e613fc5846785dee87ac88ab2c2795a5308bee62bf7f0bbe SHA512 2c46f7b35bdd9e70e76eaf42247c374641f2af07db50d6b9c95b276abaf872a4710fce126d5c609964985a368cfe102fe0db3fdf3c0f63ff2f9abaad36fe5517
-EBUILD kdepim-addons-20.08.1.ebuild 2528 BLAKE2B ff16df18a171cbbab83430c88888853f5f6c87a4c031e0437ae816247638356345efdc835712182095c47067c147493dd79361dc3f6644625c28773e5a2da55c SHA512 6ad00972f6c419a9f8f2cab53ef59e205b658e5a438a72ef40e4de9349d8a2676166fd43d3ad46f16d9a7091d1365f1704734545acff831f7a99c5fc63cf868b
+EBUILD kdepim-addons-20.08.2.ebuild 2517 BLAKE2B 3c18d4a26625a95b28fb765131012ff1595dfb3811d87e0e469545a8f47948623631c4f9924e65580a7825a7d83ec14ea852ae89842b5cf62cf34a17116d3954 SHA512 381257ab98610e06fc4a97faf7faa974d2cb964ab9abadf22d359022bfa33b7c4a0b6f3f0144bd6365aa617f5b27500b56791ec19c7c1959c9dece6d2efed237
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.08.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.08.1.ebuild
deleted file mode 100644
index 7ad4dc10f9a3..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-20.08.1.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
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="importwizard markdown"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kitinerary-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
-"
-DEPEND="${RDEPEND}
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package importwizard KPimImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.08.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.08.2.ebuild
new file mode 100644
index 000000000000..0aafc0ce981c
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-20.08.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="importwizard markdown"
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kitinerary-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpkpass-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
+	markdown? ( app-text/discount )
+"
+DEPEND="${RDEPEND}
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 98bea9234a07..fe7e06d45468 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-20.04.3.tar.xz 84624 BLAKE2B c8b88b0366765d1195c8739679b63f01b1bb6b3ea7eef5b9f817271903e86b65465c2da6cfd369ee15a166093a745601e542a0771f2db43b43af1357958ba2e9 SHA512 3858a3ec173545383f71a02ca55662f7fd636d55f187cf0a46b1c2b663e793a298f053768e7ed4d0fec812e1cebdfce62a390d4a912bb2fc363673edeee464e1
-DIST kdepim-apps-libs-20.08.1.tar.xz 59956 BLAKE2B c4a93be1b74290e0d5ed43d65697d5d938ee8497a3ec797b627ba54357cda9d811359f8b0dd673a8566e12a91276c1137d758fe23d8e632e6ebb7dc0bc72c219 SHA512 0fddc873aad6e77c43d74aa5b2673ef7e815a477c2ad5f574c15a87ce68dfe39c786b3230d0d88891a6b039bfda935d3072343c3507faa2e0ebb3f775570ae7f
+DIST kdepim-apps-libs-20.08.2.tar.xz 59960 BLAKE2B cf755dcdb397cce2b12a40e19ae66f713db991a9a9de2d1e4414d428379e530b87ca4cc77a500858ab0a4be1d0dfbddd9852c85a802dbb43481b6a38718e5b7d SHA512 37e50f557368c646790eca0f0705a5acdbc04a4011b50a35262382c85920a476f7018d4dc7e14dd3abc5add4391cd2d7ff34371e1f6338ddd260980dd9be1e9b
 EBUILD kdepim-apps-libs-20.04.3.ebuild 1081 BLAKE2B b4b6193a0821deff6c10cfb369dbbee4c7263b1d40d36a767eb32a2671da4bc12ce51cb21a9b0b90fcdfff59c95bdbc502692c3c6b536811f0f504eece9ad6b8 SHA512 8f79ef7b1c1124c751dee31f0088b3f2d0ea72cb8a7ce7d957a2ac7a8aa24eda7a55384558b141da109a2c9694500eadaf9891c057762dcdf048518c69fdcbf1
-EBUILD kdepim-apps-libs-20.08.1.ebuild 1084 BLAKE2B 61e7ff535158037a126329c2a6c36517cd46c7ab86dec9839f5bdf1a02909d8f6ffb85d4a93eab67081a349dff98054f51b118308f8a8e8d321e62c99cd63ed1 SHA512 8a5f1e6b854f2c2db5cff8524a8aad643cb065276cc54abdb988ea0ac6572c75d6b75dc26e13e0957b9a998688a11bf9a9ae4554277b4f428641231bf62e286e
+EBUILD kdepim-apps-libs-20.08.2.ebuild 1084 BLAKE2B 61e7ff535158037a126329c2a6c36517cd46c7ab86dec9839f5bdf1a02909d8f6ffb85d4a93eab67081a349dff98054f51b118308f8a8e8d321e62c99cd63ed1 SHA512 8a5f1e6b854f2c2db5cff8524a8aad643cb065276cc54abdb988ea0ac6572c75d6b75dc26e13e0957b9a998688a11bf9a9ae4554277b4f428641231bf62e286e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.1.ebuild
rename to kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.2.ebuild
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 3ccebd7dbb39..26fa38d873be 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-20.04.3.ebuild 2577 BLAKE2B 9bf8441c0f2e1444b2285ae53878444019dbde5015747e230b1241c2cb59316c4c4b246e625f5258ab7a9e561672ae9a7d0290c519a84acc661abcc3a5bf6b36 SHA512 738e3e7a01d9b7bb976093c101664c9bc1016ac259e947e9d9aae95c19ffef71f82006657e1d5a8f8ae882238da938a1a3655e9d8e18b9537965afb65def745e
-EBUILD kdepim-meta-20.08.1.ebuild 2580 BLAKE2B b11f6ba0e76919ca03e9224697f428dc3792287677d477dde9e16e7a3aa0854e1d05f861947997f3c342cea25f7c818e30281207f8c0226a1c602d76f19c3395 SHA512 40653cc35063917b4dea015ea8c1780276a691711cfd4d852fa7e1fe8ed02a56038dacefb61966e1eaf3ca73ed23449f06fe9554c9ebc7f6972ec459bf96722a
+EBUILD kdepim-meta-20.08.2.ebuild 2580 BLAKE2B b11f6ba0e76919ca03e9224697f428dc3792287677d477dde9e16e7a3aa0854e1d05f861947997f3c342cea25f7c818e30281207f8c0226a1c602d76f19c3395 SHA512 40653cc35063917b4dea015ea8c1780276a691711cfd4d852fa7e1fe8ed02a56038dacefb61966e1eaf3ca73ed23449f06fe9554c9ebc7f6972ec459bf96722a
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.08.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdepim-meta/kdepim-meta-20.08.1.ebuild
rename to kde-apps/kdepim-meta/kdepim-meta-20.08.2.ebuild
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 49d5fa893d64..d25ac850ada5 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,6 @@
 AUX kdepim-runtime-20.04.3-CVE-2020-15954.patch 891 BLAKE2B 842b8bdf564a18b70fba9f5135e56e1ea351bb4e4f3afd22f49be32b9eae89cee18272ab20b2c34d4b6c23405f33978bfdf5fa460477dd41c8c430ea796147bf SHA512 3c30ec3e482683b78384704f3c67d41beeb5b59bc8d2815998bc5b197d3fb3c94c14aabc27db35e681a7bd39b071da7a4a150143dddf7629c1440e71e74689a6
 DIST kdepim-runtime-20.04.3.tar.xz 1739888 BLAKE2B 514bd4167e961a079397df11331abcf7a308071306f53be18386106eb14cca99c5c984f9bc69d1f361cb7f93d2b41a1568175f889df48f513b4d89d94f906afe SHA512 2b6e88a61606a833fc7376e9f28f347261c8a7000baf91cb2f0ff2a7df465c8a642c64aabf0e1d064859cab2daf0ef84116f47c043d3cdcea0bfbbe102c12d19
-DIST kdepim-runtime-20.08.1.tar.xz 1753944 BLAKE2B 87ad8d744f1a28e576d799b49e671b65b649ed34d38779657a1fb1d7651023e16c1d6824aca92d54f0089cf18bf38a9553a929178cd8d76581df553157034b55 SHA512 b67d736d8395e9f37d0eff33f8588ff9af614740fc564a067b76bf8d1ec420d5e23f540b6f2288e5645401c26d525b0e1279dfa2a6bb9bbadcd87aa45239532a
+DIST kdepim-runtime-20.08.2.tar.xz 1754028 BLAKE2B a27e77dc009ba955569990c8282f79a54b32be96c335b297c81b10875c773c64527043edead02c4a49c18ab59c112a4fb80c0bb975874f6a771cfb939b9ff447 SHA512 655d47c72606013fa09fb0fddfcb5a901591783aa18f380674f364931939325337de946368d0783472fab2e15116f073601b092fea0dba32597b810b86d263ac
 EBUILD kdepim-runtime-20.04.3-r1.ebuild 2487 BLAKE2B 32a190fa8205041ea0cda1482f2bb1bb4f34e0b5b1c08b2f0440d4a6a0e0dc72e89d822f2608fdba717fedf91112a9d76d80f1e2828e3b8ec186e663f8cfc689 SHA512 43551419111d8f6e274f4c9c11a49e521ba80d06618306a55a76e25344e620956ea6450f95d4a74444f359aef5122b71cded0aaeeb6ca010a807f26eeb7edbc9
-EBUILD kdepim-runtime-20.08.1.ebuild 2498 BLAKE2B e189f8c7c23504968a4afbb92cf2e787ecff8682e9abeeaf9eec8ebb0dd58c33e1ed83f8bdfa4af6de1323c646b5ffbfa18104bf1e65f2d35b261704753951d8 SHA512 1231b4c2881b5099f7f50a1dca0d2a0d8abce74575f6f4b0b52dd86f21888ab6b76bfc339aa2b96c12cfa99f64f9277ca5d4bea6993155b933f7f9e13994e55f
+EBUILD kdepim-runtime-20.08.2.ebuild 2498 BLAKE2B e189f8c7c23504968a4afbb92cf2e787ecff8682e9abeeaf9eec8ebb0dd58c33e1ed83f8bdfa4af6de1323c646b5ffbfa18104bf1e65f2d35b261704753951d8 SHA512 1231b4c2881b5099f7f50a1dca0d2a0d8abce74575f6f4b0b52dd86f21888ab6b76bfc339aa2b96c12cfa99f64f9277ca5d4bea6993155b933f7f9e13994e55f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdepim-runtime/kdepim-runtime-20.08.1.ebuild
rename to kde-apps/kdepim-runtime/kdepim-runtime-20.08.2.ebuild
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 500183d8052a..400cec429450 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-20.04.3.tar.xz 37272 BLAKE2B 3038cd5b878c349cdd6e9c072cef06cfc61197ff4a6f50c97598b0e4ee4c3653ad696b555347a93006aa9278027bd7c505259cb75be633f9e821474a3266e060 SHA512 77a64fe53bb07cf0a11e683ecf2707e4045a75a470b33ee820bebcc95c757d57214691a2369416a7efbcd1e9e126af27bf98bd5dcf7dd33f76177e3c14fb9bae
-DIST kdesdk-kioslaves-20.08.1.tar.xz 37388 BLAKE2B 28f3985b6380f8b690a779f9a4e789c455e10bc6d50bbf69b53b0456b1d9934638747051be25b2c3b5036cd2c13a5d01b3e386e51433ed9830adb6091a65b15d SHA512 2b512c40389ee91db6f0ad33c76db10254cc34b1664dff14face04193eb4432575f854c074773b71c17524d572cb8c4e5f7fa68d8c4a898aadfad3f1afb66d88
+DIST kdesdk-kioslaves-20.08.2.tar.xz 37388 BLAKE2B 1652d433918d4feb8aba7c47f0fe8312a5d744dcce789616c7645de7d73d60223df03fe7d26b085238254bc525cc5f5d823ee6c29e4154fafee392cf280e756a SHA512 0fd93fcb13b92da3a5819cc9d9d7aa24e8717431c35e1501997feee9e94e28e23c19099e845877799e9719cfaec2250c7ba5426b1fbb806374494cfb74d8ee8a
 EBUILD kdesdk-kioslaves-20.04.3.ebuild 422 BLAKE2B 0b846382b15d36d541d121f156338945ee20c7c9ad83b4980d7648bf0abb1e52f3a1a8850c522eee92b8fec96743bfa0a81bd221161b6dfb22e84cebc111ea72 SHA512 41c6d75dc97e34980afae6e3d5f8d96f03f91170195af0e7cdb3fe4d9d021fdf84285e50a662a428462e6125388bc6c36224d80c7e036d0201c936fd03336db2
-EBUILD kdesdk-kioslaves-20.08.1.ebuild 425 BLAKE2B de1ea805a2de2b530efa0f94b6c529c8373d25bbe5a81ed0588eeaf4708fa08fa30b7e08f4381caf444a0c5c7a369d4c0e3ab1f5b6d8cb478a855fc75c208cf1 SHA512 84bdddbf428ecc3b8a19ce056bafcde189d2b4cf06aa69716234c57aaeeb94a8ded62d54f37da7b4fcc0c4342dd7232c8ae5387f4a516a5c6f0927a9561dcd18
+EBUILD kdesdk-kioslaves-20.08.2.ebuild 425 BLAKE2B de1ea805a2de2b530efa0f94b6c529c8373d25bbe5a81ed0588eeaf4708fa08fa30b7e08f4381caf444a0c5c7a369d4c0e3ab1f5b6d8cb478a855fc75c208cf1 SHA512 84bdddbf428ecc3b8a19ce056bafcde189d2b4cf06aa69716234c57aaeeb94a8ded62d54f37da7b4fcc0c4342dd7232c8ae5387f4a516a5c6f0927a9561dcd18
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.1.ebuild
rename to kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.2.ebuild
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 64fa936e6728..82e48debeafc 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-20.04.3.ebuild 1092 BLAKE2B a06ffeae924da2ef02c3e93d9f3c0e77ff85eb7f733a75569b91a64f4c97e7e2ec291dbb43d9bb6e7a73fc9c46d48c568bddee3d45b73e156bc594ef926966cc SHA512 f80222c0a6b92ce88d964488b6508d094df9274a5c5c4ee3017cd3842067ed8c67b8bbc3185c027bb86dcb049dd7bec1297a55cca38c7fb6ae7bdcc2f78ec6d8
-EBUILD kdesdk-meta-20.08.1.ebuild 1095 BLAKE2B ed62f8d515bc9de74963cf6dd492dffe0bf0aad218032cd9c3ff8e9f78ded507477588d5e3a3548cc7406576c340998bf97ecf3cff163f52a45cd9c46ba4a83c SHA512 80792e59dd0fcdc9776bce2fd89c8c4c00efd4cf96594f71323b64d763d33f155d3f59895d53363ca4511e7fcb7dfd4e35a8cae30778c1529e3629fbcbbf1ca8
+EBUILD kdesdk-meta-20.08.2.ebuild 1095 BLAKE2B ed62f8d515bc9de74963cf6dd492dffe0bf0aad218032cd9c3ff8e9f78ded507477588d5e3a3548cc7406576c340998bf97ecf3cff163f52a45cd9c46ba4a83c SHA512 80792e59dd0fcdc9776bce2fd89c8c4c00efd4cf96594f71323b64d763d33f155d3f59895d53363ca4511e7fcb7dfd4e35a8cae30778c1529e3629fbcbbf1ca8
 MISC metadata.xml 694 BLAKE2B cfb8ab0250e68d767f4d361aff6b3d0341806601ef93012289646091e5eba7495ae07ca0eaa9363d5adc65b6f411cd0cd1ef7a092d02360ebd11e43f86905b75 SHA512 f6db059c65c8dee729f25700da4e9aa24384291bea6a28d546726e46ce6f7f64ee66daf872cd2358525bb8739b3fe18166d2e04142c0539e874f44dcd80b5c72
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-20.08.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdesdk-meta/kdesdk-meta-20.08.1.ebuild
rename to kde-apps/kdesdk-meta/kdesdk-meta-20.08.2.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 60f197bcb84a..b1198562a9b3 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-20.04.3.tar.xz 17420 BLAKE2B 181ef16405b99e3bf503b09ea0f1253e7daea6f806f4585202b516877b1827c4036a7bb5e308109538d477cc31ed85dedc83c21143f7d68ddd242d9933dd2de7 SHA512 8e1ed3b60348060e4322a6bda816674eaa53b7bf8d112e5200dc8879d8c4a84984f26de58f1d325e9e1cc65486b36183a5395e651c1ac602cb69181470456154
-DIST kdesdk-thumbnailers-20.08.1.tar.xz 17576 BLAKE2B 41609a78f7ae04590fda8bf338e3601debed2c3c2b9534ce028454f2b27ce09c40f6c5ec744b935931c8f9300bee1da70387ef8796bcbf1db537cde63b0be60a SHA512 fc08c4b951cf461cd358e6d32e84537dab8c6beb5c2e6a3725a833d5e9bcb9fb2ccc2c6175206f24b8048d43fe678b7d43de23b72ed23ce7279c4d9a5d7d507f
+DIST kdesdk-thumbnailers-20.08.2.tar.xz 17700 BLAKE2B 3c6312c1229389ee133c18e8cb711690f05ff4558d86860f6e62bceeda40eb7fb054e0ed88c3806327474e63b182220981f27516e622c621bb878c3d1ecf1a5a SHA512 f1f63c879f4f140cf8bf06c8d92d211a1d96824bb6cf9bbbea54cd64478c773339334c3b95491baefefc10fbad2f0b513a8ec972d5b9cd257e2af00266766e80
 EBUILD kdesdk-thumbnailers-20.04.3.ebuild 540 BLAKE2B 4cc87f42e07a71bd0979907cb2eafd8c6c59d4f11c13f56b76b6fcc5d715193c859ffd7566fb84d1c21cb30cd288ccf1a731c4151aba3992008cc25336c40465 SHA512 aa5e41eb9b74e0b63249b982954c09ff4327f10877b5649e4d28c0ef972b8256eb867e31e3f97a7bfd5d3f88451ac89cc633485022371872801816b87f19e18b
-EBUILD kdesdk-thumbnailers-20.08.1.ebuild 543 BLAKE2B e19f95691cbf8d5cc0cc851d5dbef6aa008dadbca39a494dd41a27cd6399f7427bda8ee34c91cc872ccc562bb655e4c32bb95075ae11bcf8e90978a893fcc6d9 SHA512 a04954997d0d3066f3cae13c7b33bcf2c963aff3e0389145fac6b93eed62dfeb778c3a8a5afc1c260dddb494f01887767ad017dfdf48e97e0046892e90b20283
+EBUILD kdesdk-thumbnailers-20.08.2.ebuild 543 BLAKE2B e19f95691cbf8d5cc0cc851d5dbef6aa008dadbca39a494dd41a27cd6399f7427bda8ee34c91cc872ccc562bb655e4c32bb95075ae11bcf8e90978a893fcc6d9 SHA512 a04954997d0d3066f3cae13c7b33bcf2c963aff3e0389145fac6b93eed62dfeb778c3a8a5afc1c260dddb494f01887767ad017dfdf48e97e0046892e90b20283
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.1.ebuild
rename to kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.2.ebuild
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 60fbcff991e0..0fa350cec89e 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-20.04.3.ebuild 1207 BLAKE2B d37a63970d4fb2609fa31b0f673642373df75898734d7ad1fac4ab4c9db2752b1e6f35360fb01f32b7f68ed7d00a4c84b2466152015abe890f72439e5aee8ebc SHA512 789c0e7fea9451a8ef5701a13fb8158733a84d70e96b824d6b616987c5fa24c17f69c54215fc3b6b4f18d25b996ff222aea90bc8387ff12eed4ae25dd370ebed
-EBUILD kdeutils-meta-20.08.1.ebuild 1260 BLAKE2B f2c0d4681263ce539ae3ed24b06939357190f7ababeee82a408619dcd33d218721242ad98256eb57e47c9ee1480d7031b69725d3b173b33635e3719155d26767 SHA512 c028d54516ee6d5403de046c67bcfcb9e8446df63cf960f9dcaf1cacd1b458a36fffc9289ceca2e0a0c278d107c7fe7f2eee7ea6122d6889b72d3bdc69af6b1f
+EBUILD kdeutils-meta-20.08.2.ebuild 1260 BLAKE2B f2c0d4681263ce539ae3ed24b06939357190f7ababeee82a408619dcd33d218721242ad98256eb57e47c9ee1480d7031b69725d3b173b33635e3719155d26767 SHA512 c028d54516ee6d5403de046c67bcfcb9e8446df63cf960f9dcaf1cacd1b458a36fffc9289ceca2e0a0c278d107c7fe7f2eee7ea6122d6889b72d3bdc69af6b1f
 MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-20.08.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdeutils-meta/kdeutils-meta-20.08.1.ebuild
rename to kde-apps/kdeutils-meta/kdeutils-meta-20.08.2.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 43a928b193b8..7f61b7ad11d0 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-20.04.3.tar.xz 462264 BLAKE2B 1a80a1191b989b5c4b050d36f0b56c1aaa8c29b28da379bd53c9c2034bc3e8707fda7b439184507c9c49ac3b0f5aba112978cb1695ff393058c3f091a7d33f16 SHA512 df8ebbc258b5ffe9becd8beb4911dc16e0d18a5e0860a8dafb0e9a492997f6aa7741cbe789eff1eb89bfbb52ec4dd9a057d322669f3c9e2b5888bfdd3cede8aa
-DIST kdf-20.08.1.tar.xz 467220 BLAKE2B 9886a55318658706729c2c12da41dfb62f96c67b56a88afee02e257d200f174e37e052805ca0be8c35a7b4966610460eba56d8e0734a29319623fd0910e5bfe8 SHA512 b529145d5f6a5d0ff84e3ce5843cafd8e370701d2fc1892410e1ec57e2cd6fcf9879b3925f9169032c8781eca2796a4bb230a7a138bc9eaa8d79da88805fab82
+DIST kdf-20.08.2.tar.xz 467300 BLAKE2B a734507057c0c61c87fa2a7e451aad98cb5efeb2d52cf67400dabef284e91cdeec3ac4f834f0ca02a9f4687674f788d4fd406ae2a1f6abc33734e1a797506670 SHA512 7416b20753ad018f01e6f644b4fdcaf46e5245cc5a35c256b650abddbb204c41f5fb4dc752cec6223d4ea6f14a75f52b01234ae19f8cf100f82a2eaef8be9145
 EBUILD kdf-20.04.3.ebuild 933 BLAKE2B 4ec62c873b6f32af2be1124ee40feaeea3c51624f673c90fbaa630d2d4d5c088a1519f2f7d4aad5623448cdcdf48f0121fc8dd62476e7dc41d792ab1e72929ff SHA512 f1d06b687bac75a6e0cd77ff25391f086f5c2d7be475e5d950bcc7f7dc6e2b4fed61438b6519f817836871b2a8a50b016670f2eedeac9c27f3550e7981e3e8dd
-EBUILD kdf-20.08.1.ebuild 936 BLAKE2B 021c608a7ed1eafd8f3cd4fa09b31bcbc68ae2ca06f33c97e8fd3608d540be125e322e302c141331d34316d1203f6ec677bfbaff20032cd9703b4df7afeb051e SHA512 4b177e731fda0893001be22d9478e4415961ef0e3ddd51f3124104b84011a65aee49178f122e7f4339e521cf9f1d209b9a3bca592707017bee4426ec0aa39d79
+EBUILD kdf-20.08.2.ebuild 936 BLAKE2B 021c608a7ed1eafd8f3cd4fa09b31bcbc68ae2ca06f33c97e8fd3608d540be125e322e302c141331d34316d1203f6ec677bfbaff20032cd9703b4df7afeb051e SHA512 4b177e731fda0893001be22d9478e4415961ef0e3ddd51f3124104b84011a65aee49178f122e7f4339e521cf9f1d209b9a3bca592707017bee4426ec0aa39d79
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-20.08.1.ebuild b/kde-apps/kdf/kdf-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdf/kdf-20.08.1.ebuild
rename to kde-apps/kdf/kdf-20.08.2.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index bd41425f9f1e..fa362c39cf43 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-20.04.3.tar.xz 103796 BLAKE2B 52ac734443078f6571ae8fbac0278380bc4832de163e5d809ff6db1f844340797a25364604fb143336e36a07a129bc289ff40159a751206d00a751a77338ea8b SHA512 ed63f5734411d0fce289d994a1545a9b7b63936ebd98c8011662330db6e796f3c0a03300568abf619b75428b9af6e37ceebe49698bc6601ddcc910f6ba46af1b
-DIST kdialog-20.08.1.tar.xz 107260 BLAKE2B aa8a8b889e53f4fad605676d70a67aee9bbfd67c8037aaf40cd73f03aa81f4d6d88de62ae1883fab84489e8dd111bec884f0858b854f6f13dc747460f8eadb0b SHA512 07f99ca593470ea566e225241c5da8f2211fc5a40da013ef434defa12ada2263334db4b185aa471d4c20f4006f56b2bcfa0db26a7e16adc24d511a4d890ab225
+DIST kdialog-20.08.2.tar.xz 107664 BLAKE2B ba7bd62de303f9b52caa3f66c19581c2d1ac158e72fcc0973b8f54a0e0b5942079bdd3e115f64dd85a48959100f85a2760e1388b912baf89fd5213e41c4ddba4 SHA512 6a187fa76450a17cd824fd37a392c8c26c637d3df1f3ca98fa4d067136616ed1081996c4e86f8560af887549f0863c84de825af0fad3031de67534535229ef7e
 EBUILD kdialog-20.04.3.ebuild 1061 BLAKE2B 7823bffbdda17c8bc8af007f99655d7b0f7fd5e60a8353a606c23795719f3aaf9801f82d391fc2284fdb029561859739dc380e43b74d6f4d386574605576c079 SHA512 e2b2f7df5277b7ab272fe90b2fdfa8324d514a8c050642582f11f3b12c667e8791a9300e9d21443273ff3b941a2d30903073a74f2631edc3a5f2981b9d0c66f7
-EBUILD kdialog-20.08.1.ebuild 1064 BLAKE2B bc45735e7f9caa93e4c457021bf62d191df88b00a6d391cb69b1e01586ea5aab9735dd8e81f38d536b4d06374bc30bd5c2d2b4f18b2220740c8c5b9f2cffec93 SHA512 c9ff766e3a08b59d6065fea93770e8460d4eda080b9389595e07c3833e327fb712cd4f6cb557d3135da1170f50b20b7df83b34ec8dcd230abf60ab617ae494fa
+EBUILD kdialog-20.08.2.ebuild 1064 BLAKE2B bc45735e7f9caa93e4c457021bf62d191df88b00a6d391cb69b1e01586ea5aab9735dd8e81f38d536b4d06374bc30bd5c2d2b4f18b2220740c8c5b9f2cffec93 SHA512 c9ff766e3a08b59d6065fea93770e8460d4eda080b9389595e07c3833e327fb712cd4f6cb557d3135da1170f50b20b7df83b34ec8dcd230abf60ab617ae494fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-20.08.1.ebuild b/kde-apps/kdialog/kdialog-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdialog/kdialog-20.08.1.ebuild
rename to kde-apps/kdialog/kdialog-20.08.2.ebuild
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 79815f547db0..f65f6c4f9d78 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-20.04.3.tar.xz 4694068 BLAKE2B f8380df7796423ad018ec5eecbd6553d2effcdc4f6f2939cd132cc49de9925e179bc4d738e0c520cd2a5be052ab1a24d1dd84bff41b0f6cebd1ac89bb3b557a5 SHA512 7b298724f37ca29784e9239716d97041c4219b9a1bff565bb034cbee7af40fc3609056ff019fba83d0c46a8005bc2b51e92130e4b431d427af068f95c5884e72
-DIST kdiamond-20.08.1.tar.xz 4697996 BLAKE2B f24f054e1ce41964bd43204a6466b2528f3bde996e6d9e02ee5ba4d10b1fd081f4dd07dbbb6e7fd3b2e61ed98e305515cd5565aec024476f97ead6f46fab802d SHA512 35f13586c943893acae1db2bccc0166193a1e4cab90b6d43a4b37264ed9bac5851cee838b3f8db7e1ae74b57068f67602849626abffc05bb06db8d61b5eaab7b
+DIST kdiamond-20.08.2.tar.xz 4698156 BLAKE2B 5ed0088f1bd4f8d19939f4cae5ff25125576296a109df7022f3ea359a00194b0129864bcd671ea3b61b918577b2965a05c0ee9b37372b2c76e6901c8ed63b6c3 SHA512 7fccfbc4a28a27189202a191a6ce171ee4dc8eef34895458f42dcb6b203d045219976efed929de21762480e9933e14b3c8833c34b80685f02681deead661527d
 EBUILD kdiamond-20.04.3.ebuild 968 BLAKE2B de7f9567193507997f6402c658c5c114557a270e68c8e250b698cc5228b3d06453035a25e0713ca884bd8b6a80288498bd3d83b98c488ad061dea341c9ac8030 SHA512 419fa553dc379700c706a003199da5476efeb751958e31af995c6cd35b645142068c999c7644c5e504efadf2c513f65d5d0d33bef7ffdbc40e14d434b0fdf6f1
-EBUILD kdiamond-20.08.1.ebuild 971 BLAKE2B a4099dbc738dbbbc928aeb4cbfda90eb439781490ae4312d8a6e54d602638ddca2d16f79a759343267bd3e0190a5bcf2f67c1d95c85462c5ef21542d894e79d3 SHA512 c6dcece17d9d0c0f3571b92f223b3d83761eed12d222b3bc5d3b06b07f67776963f06cdca1458836a5d7292c00a94f29b2b3603a01f7da08b8c79ed3f317f567
+EBUILD kdiamond-20.08.2.ebuild 971 BLAKE2B a4099dbc738dbbbc928aeb4cbfda90eb439781490ae4312d8a6e54d602638ddca2d16f79a759343267bd3e0190a5bcf2f67c1d95c85462c5ef21542d894e79d3 SHA512 c6dcece17d9d0c0f3571b92f223b3d83761eed12d222b3bc5d3b06b07f67776963f06cdca1458836a5d7292c00a94f29b2b3603a01f7da08b8c79ed3f317f567
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-20.08.1.ebuild b/kde-apps/kdiamond/kdiamond-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kdiamond/kdiamond-20.08.1.ebuild
rename to kde-apps/kdiamond/kdiamond-20.08.2.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 7fb3768f61f8..0a4673ed2d53 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-20.04.3.tar.xz 188256 BLAKE2B 1ab3bd17c6bfa2a686c9dc79a67ac6a01ae8f2d9e28a82d8aa07b51a4743ce27698852d84a709ede242a9179b43d0b696c39c58448cee06ca2dfbfa3ca5b6cff SHA512 6768272ad31d1cef73d0f6c6889ce32773a6bde332c08d9276439c4c196e31c473ecf70d9857aeebefa7c8f5c3cd4389204f8b36bc779d7e87fe3a308762e23f
-DIST keditbookmarks-20.08.1.tar.xz 190616 BLAKE2B e7fe4cc78c905040009b0f815c43432016811ec0ea8a23c9265778d3562f971e74b0011ab62a863992bf51e804c0640507cdda302bc268c5f4e59c167c609d7a SHA512 16e15024a96f7e3c291808da4b7be882ab573a9629030530b70324b3a10e79266d590a270d91f578d054edb164b5ef1a901c42fc13ee19f15e42c4a96dc726cd
+DIST keditbookmarks-20.08.2.tar.xz 190652 BLAKE2B 04b6755523112537cea90d2f2f3f19c827531fc382fe4c92226dda2d352f638d02559522c3afda6987fb631abb3221bf919abf9aaac74a4cea1364b381726602 SHA512 16fab6d1c1dc800411bfbc12f3a3c761e8cf81f465168fd054f07609bb8c9c0ceb2223ac43fc2d48596ed32addbe0a010db7b5710185d7c9674117b011d1ad15
 EBUILD keditbookmarks-20.04.3.ebuild 1161 BLAKE2B a700d2ff371551d5e8728d833760a66dda512c70da2c89c84029ef2e716339ba9921d822b13221dc2a516ef9ce11442a9f3ff0a3842d38b4ec020e9bfe13a080 SHA512 b3af9f4cc020bc3a7afd1ce9e5194f3a8b0e18f55128cd09c5966dc53e54434af40c93178f9e49bed169ab69d60bd84bee23f268a2e7ee5815a34fe40c614710
-EBUILD keditbookmarks-20.08.1.ebuild 1164 BLAKE2B cf6fd58e4d8ac03dcd8a5ec30f5a265e30a6a48c8a64a5b1f2759c8b25aab38a6611998aa75559d6d973d59c7f8ae672ce9858d734bd55232ce32a10d5bf6411 SHA512 65b5fcf583a0f6c34a5c7183ef4e2018d7a1cc3fca462678926abddf1b75129985dcc9b67839faf463d54987b8362c537a3a90fd6b22f693931510f74bc44102
+EBUILD keditbookmarks-20.08.2.ebuild 1164 BLAKE2B cf6fd58e4d8ac03dcd8a5ec30f5a265e30a6a48c8a64a5b1f2759c8b25aab38a6611998aa75559d6d973d59c7f8ae672ce9858d734bd55232ce32a10d5bf6411 SHA512 65b5fcf583a0f6c34a5c7183ef4e2018d7a1cc3fca462678926abddf1b75129985dcc9b67839faf463d54987b8362c537a3a90fd6b22f693931510f74bc44102
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-20.08.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-20.08.2.ebuild
similarity index 100%
rename from kde-apps/keditbookmarks/keditbookmarks-20.08.1.ebuild
rename to kde-apps/keditbookmarks/keditbookmarks-20.08.2.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index ffcc8a843e36..9afaca791f3a 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-20.04.3.tar.xz 271464 BLAKE2B 9824c05df7b875ae8886e1a3b252db2e41939615a90702ce25d6791b1893b090cb6c704137fa5edf48f81eb31f347aaead8f9908b679cc2a669689526c9d3902 SHA512 cedc192ad1247131a2f708c4ff1266636c57eaf60e46b58f2b5eb9aded61aca63ddbdca936ff8cdc216891569e7c2aca9cf61371f93468df1bca799f8df3117a
-DIST kfind-20.08.1.tar.xz 278560 BLAKE2B 6cd0820f3e3bd9455d360da6b271d989d10baaa43a41bcba14318a872dfcc14f7cc3e3396e79846b6110d64496a90d788aaeaaa30490e3c01c81bbdc3b5d51c2 SHA512 572e092baf9040b4fe31a4d4cf8b11ea1c9aa4f746404810b107d1a428f4699977beb0eaba32dec9706a52163fa986cd22d0313242979d209b02a44c044604bf
+DIST kfind-20.08.2.tar.xz 278564 BLAKE2B 04593325bf3e7421b3533b1ea053ecdef4ff7299a1190ac85d693894eedc2d30944513059d8b71b29c780b58fe8e7c7a66fe83efea638632f2595ae6d2cf08b3 SHA512 657aea927a7777f4bd59de7b54e300878b97231203f43e97ddfc8e6027b4a260514fa1cc8d15da0e4e5a58902fee0987c8167c5038b826ed49aab129e2f4a770
 EBUILD kfind-20.04.3.ebuild 991 BLAKE2B c7063e564eefae161009ec7105eafb5b54c2949ea98a3c102eab5d44b420f798a0299f428a33e492f70399fdabd188d81b26c83c62377ac8b26f8d2804b14c74 SHA512 9f7a7fdcc114f58518af20799b68f6df91c168e49f9dc979b14b5b9f88e66b4d60e5bbaaaf4a4d389a629f39c56fc8d925a042cee201423df1da7a2ad6f3eb83
-EBUILD kfind-20.08.1.ebuild 994 BLAKE2B 74803ed44c9e8100de1706a2dc4ab23c6220fa8e8d91683c2059bf0662a4d76afe3ea285791a47f19246d8260bf3421fd0f8e2d97dbb743ea048d7e18e402003 SHA512 3b005fc42ac2785ee55df69ccfa2b44ed382ff77d2686b3f08f460499333e4176d6d3cd6ef432b7645f43beb4521bf10ab9c3239de28df81be325c26acd0f0c3
+EBUILD kfind-20.08.2.ebuild 994 BLAKE2B 74803ed44c9e8100de1706a2dc4ab23c6220fa8e8d91683c2059bf0662a4d76afe3ea285791a47f19246d8260bf3421fd0f8e2d97dbb743ea048d7e18e402003 SHA512 3b005fc42ac2785ee55df69ccfa2b44ed382ff77d2686b3f08f460499333e4176d6d3cd6ef432b7645f43beb4521bf10ab9c3239de28df81be325c26acd0f0c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-20.08.1.ebuild b/kde-apps/kfind/kfind-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kfind/kfind-20.08.1.ebuild
rename to kde-apps/kfind/kfind-20.08.2.ebuild
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index a7e5e0d80487..bb1ec85ade66 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-20.04.3.tar.xz 198988 BLAKE2B 66e15279399333001e66f674fec7b361401c665d475e4fd489144680a669f35452ae43879471b52df9a4e263676b104a019580b43554d875ac6c95fa10df62a3 SHA512 0226a83e4350c10c3a706d2fc82fb64b510cb992b7c20a1d72dc880da3fb82896be8ff5804aa22c5fd47233625e42afed7239c6cc9ab7fa2f25c0fedef03f2ed
-DIST kfloppy-20.08.1.tar.xz 203920 BLAKE2B 5ef9cde4435b3e2bb6f5acdaedda95a3d5644f9128fc2dadfb5983c65452c2e790c7375ea9a70c586f12f0a590335f0c6f83418d9477f5c78a4c23aef25418d7 SHA512 ca6421035f05481f47c826179686f309b49defa39ba2121cb25e012016a15b7d3ddce2cb74ad9bd952551e2d84e0c3e84a0ac2d89ac4d5188291316c643ddade
+DIST kfloppy-20.08.2.tar.xz 204016 BLAKE2B 2156427602b2f1616f574c38b663be23d1b94c7bfd565a2867087717d30d42d1e255062c36a39fc33533bf73f5c5f39ab180b79fa52471929156183dd6253ab8 SHA512 455bd8cef02e0598aa7708811e69c7c26fc6736e01a5be553abf021bf248155894a9eaa886a46331ba128940adaf76384c48e784522dcce92340d78bdd3e4d9e
 EBUILD kfloppy-20.04.3.ebuild 896 BLAKE2B fb2211180726925dbc4037a690e0bf22cbaa9651e02eb7f8f62d71d8702995b5bcfe4368df8e59b7274cdcdcb313f85231ce827f33c41c826a4c51ff623aa873 SHA512 01c00e97808f3d31585197afce1e6934b852c9889eecd55feff591960e0306cabec62fea04f4c49d4cdea1f792f6a0f6189939bf6cc9a0d8d7c79c0f876faead
-EBUILD kfloppy-20.08.1.ebuild 899 BLAKE2B 6a4c7ab037551b469fbf5114415178675f8cd9daf2a114d8cb5780912c7d05cc9a6c1492f397478defb6281e2069157346201588f553e8e7f0323b33b42d18d9 SHA512 89025b3b72b59a03f7e0e21e9a34a0f2cfaab021bc1d7bcd6b7144a7cca26d75199d466329de52d0d2bc4c21ef4c74269b4f434a89b3b3aea57565cdc0cc0d7e
+EBUILD kfloppy-20.08.2.ebuild 899 BLAKE2B 6a4c7ab037551b469fbf5114415178675f8cd9daf2a114d8cb5780912c7d05cc9a6c1492f397478defb6281e2069157346201588f553e8e7f0323b33b42d18d9 SHA512 89025b3b72b59a03f7e0e21e9a34a0f2cfaab021bc1d7bcd6b7144a7cca26d75199d466329de52d0d2bc4c21ef4c74269b4f434a89b3b3aea57565cdc0cc0d7e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-20.08.1.ebuild b/kde-apps/kfloppy/kfloppy-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kfloppy/kfloppy-20.08.1.ebuild
rename to kde-apps/kfloppy/kfloppy-20.08.2.ebuild
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 0dd20e5eaf90..6951e9b07470 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-20.04.3.tar.xz 639864 BLAKE2B 8c8d0851d7fabffd9284d5b8c55adad62138320c2f96209171546546efa4c1ac2d227808885b39d2c7172ca53f3bdaa025e24dbb838abacfc0b2773a38181a6e SHA512 895fd642e6407d4b2d7f78dccc72a257585cb9e47986186428b40e8d78ab27926346cd79390911660f9673014b872d679adee815a37eb864a1d6923d662523c7
-DIST kfourinline-20.08.1.tar.xz 643860 BLAKE2B 8a51b8c6797a0b9bbd15c8214d97a6478f3f61a5ae92e38549eed0d650b8c0593e6404b0691ffde7a2ed83049c90c4fd9114075e83db4e1cccde20bca30ecd12 SHA512 92395b371b2cb92cefd97ce3fc3068ad9b4a9895b9cfa1319cb32dced7eb8f8abe7d05e0b34396d6a589dcb1777a0c680a281e6b7241f51f2c445ae1774a0d6d
+DIST kfourinline-20.08.2.tar.xz 643864 BLAKE2B 4466095b91b55f3923277a70038cd3dd200e720cf6830e382ed3b871acf5f66dbabd3dd7781d696bd3c356a592bbb472b93309d1fec44a4629e6397b7adb2ad9 SHA512 743acffb31ce03e8013980cae8c523499573efd9066edf06db9b120156b852f84a6dbe40f38f716f31f08019b253b1aec1e00e108820fba698ddc69dda75b467
 EBUILD kfourinline-20.04.3.ebuild 898 BLAKE2B 89bead0c39eec603c6f2783f12c2c0c5f49b380838fadec65505c41191b0a4e0f7bfd9e9ce3b826cb3986ff9b8445545ecdd679ebf99f0144e5be09b5344f5ab SHA512 6155b06c0df5d4d964f179354c9231f4c4e45f3d452b2bba1bb11965e7074a800a5c38bcdcfd70deb05c217d662bef96b464bf7d8ae452c294c8423933819fe8
-EBUILD kfourinline-20.08.1.ebuild 901 BLAKE2B 69be68baa15137eb6e3d91d1e73d47d6e8b1ba158577650b6330f24525f4724a8a0b61d2856663f880e9c91ca8a33e0f75c102485ad72a70797faa62c86f92d9 SHA512 191a0293129e55ea5b13f58df3a70a9c229252d94c1ab4ea8a8ccd8e3dffc101ef1e441e89c09380bed796396dc1993be56fdca16ea445401b8333085e4604c2
+EBUILD kfourinline-20.08.2.ebuild 901 BLAKE2B 69be68baa15137eb6e3d91d1e73d47d6e8b1ba158577650b6330f24525f4724a8a0b61d2856663f880e9c91ca8a33e0f75c102485ad72a70797faa62c86f92d9 SHA512 191a0293129e55ea5b13f58df3a70a9c229252d94c1ab4ea8a8ccd8e3dffc101ef1e441e89c09380bed796396dc1993be56fdca16ea445401b8333085e4604c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-20.08.1.ebuild b/kde-apps/kfourinline/kfourinline-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kfourinline/kfourinline-20.08.1.ebuild
rename to kde-apps/kfourinline/kfourinline-20.08.2.ebuild
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index ebd22d58e004..03f9fdd3f0b1 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-20.04.3.tar.xz 10871688 BLAKE2B 4ade01cf214103f5255e1fe25c9a0de18f0b3d1b5742177cad5dee53893f228ba26a691556f1c991fafd09b854fc73628c1eb1aca6bffedc93edeff7a6a8e5f5 SHA512 b5921fcba4fb2e72a78adad91bc0886818cf473b4c5ebba6d42496205ef76284836a9d71d283514add3cb75a7ce5970b23a62fb08c8444490302368dfe7bf7d5
-DIST kgeography-20.08.1.tar.xz 10764740 BLAKE2B 03905a28aca353bca4bca5c3ff71bb428090d38d4012cc49b2c218bab6208693839c90af47ebfc1149aeed299aad0853c3ad54878fb6e529b23bc73714f46de9 SHA512 a1de3e9efc855fa39c1247c30b6e1033d9cf3f2e9bc921560f848c4a73fe7882a3e4d8eea7e9fc4e5352f135d28fe44313fd45de3da0fe4cb2aec73a8878cc5d
+DIST kgeography-20.08.2.tar.xz 10764484 BLAKE2B 0391e345832707c222cdf5ed71779eab683178564264536e6d8dc11ec4682074aa67ed4770efc681b34dd1a49fd10141a542937eba4f223daf12bd505f0f813a SHA512 daf657bce7e57b89802863918b6972d9426a134474ddf0a5f613e1cb5d42dfe66cc6c0fb83fb682e9a1946c7bdf0bc513088537ccb8be4b4b9a292ee9d818156
 EBUILD kgeography-20.04.3.ebuild 843 BLAKE2B 464f02ab60edf35f7bd2f2a37bbd7a8366ca05d1d871c0526bf45cc506239a723e4ba39610e7235221004133ca2cd0df08736e9af8791431459b447e646cfe38 SHA512 2fafaa454fe7f09e46ef4493a91e95aa08aed6309b55ca36143f366450a17f6675af2afe7b946ec64ae23d14e2d9a7d4f104341a98f49706b1a92d7962702566
-EBUILD kgeography-20.08.1.ebuild 846 BLAKE2B 958960cab83f456d019aaeea2f8dcd0760abb6fb21b9fd5171ad3c04e6b49b1ddb17e92ab82d8db2a5d526c0ace98d7bff4dec5fac0d6c27de3b81a64fb3b983 SHA512 31bb2b372b74ebb9bdaf845aa5e95442cb2c25a307f4ec13785c2d74d6120e8922b6d57959d43e4bf6b0f764a9fc0c9aa5ea6205b58cd3f1e0dd3719378bd67d
+EBUILD kgeography-20.08.2.ebuild 846 BLAKE2B 958960cab83f456d019aaeea2f8dcd0760abb6fb21b9fd5171ad3c04e6b49b1ddb17e92ab82d8db2a5d526c0ace98d7bff4dec5fac0d6c27de3b81a64fb3b983 SHA512 31bb2b372b74ebb9bdaf845aa5e95442cb2c25a307f4ec13785c2d74d6120e8922b6d57959d43e4bf6b0f764a9fc0c9aa5ea6205b58cd3f1e0dd3719378bd67d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-20.08.1.ebuild b/kde-apps/kgeography/kgeography-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kgeography/kgeography-20.08.1.ebuild
rename to kde-apps/kgeography/kgeography-20.08.2.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 7a9a07e716b0..f6345d863ba7 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-20.04.3.tar.xz 5238644 BLAKE2B 4ee1f615e8a176249b051a8c4d225a4dc4c7578a6e659cb96c19919b832ecd3af5922522987f6ced336886fb9186ef11904dd344d545561e8e1a975ca22de512 SHA512 55223e8e32392ea46dd50d90e532119fe8908641c6e49a29e62bd2f6a67db29940efc5e6344089c9e090810e9319399ce3dbdde61bb93f737591df03bfdf7f33
-DIST kget-20.08.1.tar.xz 5583460 BLAKE2B 00957d10037f89c51169d520123ce047485544dfe428a26111a72246b61b1de0d18d3807f2db25b67fbabe83fd99875dc29921e4aaa3240381381e3b829390d0 SHA512 24e3b63519d582fd52d8edd70e749b61c5d9a162dcc481a8cc67222925589b87020ee3e81ae726e525b8c0bf55ce277a7fae43cabb394862309418642996c206
+DIST kget-20.08.2.tar.xz 5583408 BLAKE2B 465dfbd03b5de4fe4ca7a27f88300a9322df61923fa2f84954c89846e4f1039b84ac09f99bfa61f19bd1ebc91e7987a6b49b70c3ccb9caf517fafd3ea020d8ff SHA512 e63356dba02e7234748c6533aedb26ef7ec782488220dc0c8863cbed4c5182afd4a6386f439ee0a126d267fd22280bd91960c4f9627de9f6235e3f9b8d620c8b
 EBUILD kget-20.04.3.ebuild 1997 BLAKE2B 8259975e4797c902214122cdf9959f5bc795ad60dff3bcf4655eb7f80af6d4d95348dd3bac3cfe6c31c9f8139ddee8f723d63ebd4e40136aaa143d24f5ca82db SHA512 330a1694688cbf10506df9def1d7c0db33e2deda745cd83dc043744771e4ecd358c88794c4769b84a62a23f36361335e072ac6dacd496dbc5fbce754cdd3a442
-EBUILD kget-20.08.1.ebuild 2000 BLAKE2B 0c8102554f38f048383fa5de981c501dbaf253fdcd61c42de76ba75ace6d7e51b6d37ba12a7c32db38fd5232d810e8858fd1fafba2f3f3532dc5319ceb8b151f SHA512 7b3c060abccfd86269ef5eb6c65d44b6ad941338be9c8e8f0c22a59a3051aea1013dbae62db5588b6688af5dee8080ec74cc827c74568df52d8c4d4ddfb2afad
+EBUILD kget-20.08.2.ebuild 1944 BLAKE2B 0056a01b66fb9c4052a7b6aa14ade1b94e47bdea6c6d7d3ab8435f32b515e045f80b80a708df03fe5392809fce93459631eb7b460094a5fa9117a9707592d5b6 SHA512 32e7930f395b57c3324fff5ad5aa06202a1492affa6d9d7a19dea973ac9d62bb2f6a3f87f80f45aa19033c9716ee4fd6bd3e152f35146a74663415a200e6366a
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-20.08.1.ebuild b/kde-apps/kget/kget-20.08.1.ebuild
deleted file mode 100644
index d15b36248abe..000000000000
--- a/kde-apps/kget/kget-20.08.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.72.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kget"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="bittorrent gpg kde mms sqlite"
-
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${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
-	>=kde-frameworks/solid-${KFMIN}:5
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	kde? ( >=kde-plasma/libkworkspace-${PLASMA_MINIMAL}:5 )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bittorrent KF5Torrent)
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package kde LibKWorkspace)
-		$(cmake_use_find_package mms LibMms)
-		$(cmake_use_find_package sqlite Sqlite)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kget/kget-20.08.2.ebuild b/kde-apps/kget/kget-20.08.2.ebuild
new file mode 100644
index 000000000000..70d332a6e82a
--- /dev/null
+++ b/kde-apps/kget/kget-20.08.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Advanced download manager by KDE"
+HOMEPAGE="https://kde.org/applications/en/kget"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="bittorrent gpg kde mms sqlite"
+
+RDEPEND="
+	>=app-crypt/qca-2.3.0:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${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
+	>=kde-frameworks/solid-${KFMIN}:5
+	bittorrent? ( net-libs/libktorrent:5 )
+	gpg? ( app-crypt/gpgme[qt5] )
+	kde? ( kde-plasma/libkworkspace:5 )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package bittorrent KF5Torrent)
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package kde LibKWorkspace)
+		$(cmake_use_find_package mms LibMms)
+		$(cmake_use_find_package sqlite Sqlite)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 1646a64f763e..a06545e1b1b9 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-20.04.3.tar.xz 4428744 BLAKE2B e445055ec4364baaa0ca8cff9016db7e375e76d88f5c1779a7bdf6549028ebdf664bc916864dfd1758c5dd1a94e4a912a9e7a4a1df5bef2375b3b49fc593b085 SHA512 1c759f7e7fe7f4369f7fe1b1812f8e5a1e7cd5c6588f67c6998849e01c013826f517401d541130be8d03ab152b737176889a70f7f6c8e2a13cfe440fa9ffb91e
-DIST kgoldrunner-20.08.1.tar.xz 4444612 BLAKE2B acd8937157ede7c4f26b88b312bf8945fd937ce542a03b1782e61c7da960d99992df7e9e8d34cf476d081be2a1059cdc8560f5ca5297d66aac5283665eb28d9d SHA512 ea2c19a80fe0652ef878f3a2683f225a1aa97d7efe4a19dd70f06af4d3f7fde60062e4911c34680a599d66e36ddfb8f70b15439586b618e218a654805ae898bf
+DIST kgoldrunner-20.08.2.tar.xz 4444152 BLAKE2B bef7c03283469f3d2a3f2092adcdbd884fe197ec814d771e08216a3464138447f3811f9eb674fd4233b581e7065a6cb5720d74ff807402d2c1edc445cc7cff1c SHA512 c8ff172d51eab9f3b5213c2352c2651d2a81300267b66f2d939c69208355564224ecbfe86f0ae457742d6073453e4596968adc6d418d4ce05001fa214788d4f4
 EBUILD kgoldrunner-20.04.3.ebuild 1024 BLAKE2B b578781389178a93f02c5d19eb8f3e28017e7de6d657c85884dfb5f28c3e6166a0f8d6c94254748d2d49678d66725b64939bf31c3bf6e368aa821b114c30302c SHA512 2c7900bce266031c51e59cdf47bd54b66426f84cab49e5089cddaa6c8ed9b87a6c631ae21e5096b4e66042b9dbdb0e8bbb9f45bcf07e7e1aff347ec2385ad8d1
-EBUILD kgoldrunner-20.08.1.ebuild 1027 BLAKE2B 52f2baa2baf4014c8b456e4086dd0637d1a886e40aee5e48c4e6881832b9ec5f6b01bba367d17898c19405a75bb036346f185b0104055a898bdff07c3dc33009 SHA512 05df1544cad067e7aac0de9fef7f0c3400f3858dc5faef1923161ef19c03f289ac648720f2c3ae94e446a6ef103399403012ce9d47523eaad2e9f50fff5f286a
+EBUILD kgoldrunner-20.08.2.ebuild 1027 BLAKE2B 52f2baa2baf4014c8b456e4086dd0637d1a886e40aee5e48c4e6881832b9ec5f6b01bba367d17898c19405a75bb036346f185b0104055a898bdff07c3dc33009 SHA512 05df1544cad067e7aac0de9fef7f0c3400f3858dc5faef1923161ef19c03f289ac648720f2c3ae94e446a6ef103399403012ce9d47523eaad2e9f50fff5f286a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.08.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kgoldrunner/kgoldrunner-20.08.1.ebuild
rename to kde-apps/kgoldrunner/kgoldrunner-20.08.2.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 016f8c7dfbca..6791b80c5780 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-20.04.3.tar.xz 2790416 BLAKE2B a6ef91fb72da760ee86b1cb16405027d71bfe80a29f933a1fe34cdadefca66afa9c2a8233e902f1a2a80d036b2ec0a611dbad53ad4dc2fb34aaa4178f9337c05 SHA512 b36ff19ee02a8bbaa64cfece378178fd4d10700a0f62a44e3d911cebeb147564c577336681937e3be795924ab1da522a38b07a32335c95c3c7f711361f0a8a9c
-DIST kgpg-20.08.1.tar.xz 2883800 BLAKE2B 6cbe403e1f375191356c00f271d2c637624701676d701c87c962b10c571613c1cf3181cf212f552f37b1ab6ef4da4b470470fb5534fab53d369f6bb7b05473bd SHA512 326a440b1fc12520c46e516d609697327d46eac5e62ef012411f3b3dd170256d4d72b2ddd741ca985c36934c63d999da80d6f6850db8a22fb640541dac918b2b
+DIST kgpg-20.08.2.tar.xz 2884032 BLAKE2B 715191a796a1ae8d1693b041570780ad3bd8766405435c4da7061332429449099918e781d769dcf417078051433ed8abce95234f9e209bb965375d163a97dd72 SHA512 90bffac279d65a788e13ed8c80172eb5eb4854dc21685e88ef1e9bab898bd8f28eb3ac00a6680653a5a62b34745fcfc9fb39fdc9a67c39974887bb464f08f338
 EBUILD kgpg-20.04.3.ebuild 1531 BLAKE2B 7a7c0df934841851e542f374677940231fd51cab181abc426fc7d8c1096b10189904466f92db6f8161ce009d8e4374be766ebf63ceb096f858a7594f5b8a2d58 SHA512 5dc387d1a98c76e459940f27bf07d9b2ee9e8f29409f03c5480bb0766c0c1dd1092d4a942897d442542e53861679cf79fd652b9876b0d7d91c5e5d8220760d93
-EBUILD kgpg-20.08.1.ebuild 1534 BLAKE2B d2aa5e1a770f22e5bddb36fc2e1b32159bfe52bea51302323c2939dff0b82a88798e2a756340176a97972c9a177b4110a02a4560d3067e850b13beef3c6c2217 SHA512 aed22846de90260a47d49ee5e42b2f302dda44342a5819fd7b42e6ccce53099c7ae68c42c4014278f6c188291ecb8779db617e8f303ca1c56cd0877543dfc0fb
+EBUILD kgpg-20.08.2.ebuild 1534 BLAKE2B d2aa5e1a770f22e5bddb36fc2e1b32159bfe52bea51302323c2939dff0b82a88798e2a756340176a97972c9a177b4110a02a4560d3067e850b13beef3c6c2217 SHA512 aed22846de90260a47d49ee5e42b2f302dda44342a5819fd7b42e6ccce53099c7ae68c42c4014278f6c188291ecb8779db617e8f303ca1c56cd0877543dfc0fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-20.08.1.ebuild b/kde-apps/kgpg/kgpg-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kgpg/kgpg-20.08.1.ebuild
rename to kde-apps/kgpg/kgpg-20.08.2.ebuild
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 8277cf2f0821..3c40e57f9fbd 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-20.04.3.tar.xz 7110980 BLAKE2B bd0eee2d95216d4e64fa812e4c03c88c3fad4e4ca28fdce711ca8ee3072d6a17f17364b849737bb76eb7044a566254c02456d78cecee8d0ed8fa70a569577f44 SHA512 d70def96ffbfed0dfca4e3ac21613639f0344520d8364793d22fe8e90cea376ac7024959007660ffa9e9849fa66158752db83333acd15103e09467a5f5cf5037
-DIST khangman-20.08.1.tar.xz 7407376 BLAKE2B 96184c85b85a0d7db661150f8cd43f5d3f7db863a389314a084e4d1d19f86229c4ff2bc2a541bfca9a5bb8d2a7698a04e2a74e80f45f5b45d2996d2bdd877cf6 SHA512 e158c4478de86b9b775caa6f967643932cae7a7944279c46abe7aaf82b5e02a6c66f67e2db6b6d7792043a8d998366abd5d8b579bb2c2cf6cd0a4fbbe8562cac
+DIST khangman-20.08.2.tar.xz 7408868 BLAKE2B 7979427ede6c23e9ba894fdd391b8ffd49663fdfe67eb7984c28f2d70e69cf2a19d0ccc703cf4eee5712682f670e3b61cf179c0f0eeea4838f13c3b69f91f134 SHA512 6fd863d1c2628b4ed3a66283372662f65d10587a299d9ab0d6ea130957c35d74c1aa2070549303c44088061c37b5b9a24dd63f4b6490dfb7da22b249e10f3dd6
 EBUILD khangman-20.04.3.ebuild 1261 BLAKE2B 34283b148d82da5084b63e0a08be886b2355fffb0425bc0bbcdfc57e0cda4b46167e4729c15d78c7a4ab1dc6562c95af89248ecca82d81da98d6ea06aab86080 SHA512 fe1bd21b3e36939d5aaf0f6a9fa1b77767234ab2e45e96e6fd59d9625d4471b4c973b1187a8daf2548988218c93c9afd83a707b8851fcac9490874185cf3a9bb
-EBUILD khangman-20.08.1.ebuild 1265 BLAKE2B 806e68dd3bde4887d64709741adc3bef778aa37f7fd641fa6782866adfe394898c7a7a7dbe08a3ca784e86430e4c4346b6b722a1c56489cd8a0b38147a05d6d7 SHA512 a820fb3a66ef66c3e8dfd389108a2a3b00a80c005ce18241529e83a8ea3880043541730d1da0286d7e1e4b7398ce61f3c799d1d86981598bccc6791c71519149
+EBUILD khangman-20.08.2.ebuild 1265 BLAKE2B 806e68dd3bde4887d64709741adc3bef778aa37f7fd641fa6782866adfe394898c7a7a7dbe08a3ca784e86430e4c4346b6b722a1c56489cd8a0b38147a05d6d7 SHA512 a820fb3a66ef66c3e8dfd389108a2a3b00a80c005ce18241529e83a8ea3880043541730d1da0286d7e1e4b7398ce61f3c799d1d86981598bccc6791c71519149
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-20.08.1.ebuild b/kde-apps/khangman/khangman-20.08.2.ebuild
similarity index 100%
rename from kde-apps/khangman/khangman-20.08.1.ebuild
rename to kde-apps/khangman/khangman-20.08.2.ebuild
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index c3e3d8cf7ade..d3d6fd32cf04 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-20.04.3.tar.xz 3845608 BLAKE2B 90ca86b9f324cdbff837fcbe5c9b1efb1071f3cad0743fa9933fbd07059f22d4a5fa60f33d8579ffc4b4d4ce934839bfff011f4b1d9ef23e6394ea090ec7acd2 SHA512 0859633ea0a9e8b9a304057e3261614e560d6764d60c42eb377c8cd2d1e9ef3c185feb7221276c6b160365c6041c6711891435d8ce23c1b53ef660706ead14c0
-DIST khelpcenter-20.08.1.tar.xz 4250712 BLAKE2B a38413aa3ec68d1fda6ad5ef0c461f815929a047460186d0f73849c86fbfbe46384ab67578dad70fe7ef9da80caca5906f92493eed33998737cc96de493e37b4 SHA512 ea0ff074533b72b1fcafbd21535e6f5a5407a9dd254321047f6ea3958b1fa237925625e4460f2110dd604672e13213f4c554beaf46a4cdaa8b0af54fca04ad56
+DIST khelpcenter-20.08.2.tar.xz 4251204 BLAKE2B 721ee56cdaf42e1dd6a3aa51cd36ed9b078e69263273d6ba841ab9b4d230deba772a41db2f8e09da7c178365907a6cd02413f748bab67949d6d57cb7f3e91790 SHA512 cfd8dfd75458eadc3f056392353676c5598ae6e96d1aaaa99e507cc9b266fc4f455f0eaca2b9835b648efcd6eea3fbdae1909e728b0eafaada5afdcea8468114
 EBUILD khelpcenter-20.04.3.ebuild 1508 BLAKE2B 03e8d3e72fabf59f0e06b009cdcf7301d3cec82bf0620d3fa955825dd8ff278884beac9666611b92a4e49c772c1b97c9b1c39626f8d16a60c9387de2970e81af SHA512 5920b67ac9431cf81092885dc814c961209454e996a1e08c9039f3e9210ee22b7698ca5a8dc18dc237bfecaece2e93ef3edae2e6ebe31693fdfe39d2a74c6143
-EBUILD khelpcenter-20.08.1.ebuild 1511 BLAKE2B 99a450364db42b88a40cc90ecbd56905ad07d0d2adaaf2b8f4432aa2bb55f2854f243b3becc5dced94e8f16782070f6cb64da9d8ec3c2d771027e3be25536aa2 SHA512 d8dff76c5213a9d8076fe8b93e8ac49a31ad3ad95674e8a09d8d8077bb83b4a51aaaa95b015dfa88724bf33b84226d7b4cb6c05889f470a4c573b68acfe4636b
+EBUILD khelpcenter-20.08.2.ebuild 1511 BLAKE2B 99a450364db42b88a40cc90ecbd56905ad07d0d2adaaf2b8f4432aa2bb55f2854f243b3becc5dced94e8f16782070f6cb64da9d8ec3c2d771027e3be25536aa2 SHA512 d8dff76c5213a9d8076fe8b93e8ac49a31ad3ad95674e8a09d8d8077bb83b4a51aaaa95b015dfa88724bf33b84226d7b4cb6c05889f470a4c573b68acfe4636b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-20.08.1.ebuild b/kde-apps/khelpcenter/khelpcenter-20.08.2.ebuild
similarity index 100%
rename from kde-apps/khelpcenter/khelpcenter-20.08.1.ebuild
rename to kde-apps/khelpcenter/khelpcenter-20.08.2.ebuild
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index ecf3202e8405..6e91b4bd0198 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-20.04.3.tar.xz 149608 BLAKE2B 29384aa0f916a4bc654ebaec4ed6022bb84f1287f5ad7642cacbdc0323294b114c427e24b86ffec594611a486d450fcd791f69cf7226a57a54880205f769a046 SHA512 df5507c67fb151953b8e1ab98580d77e297a13fdede2ee5b484262768932335b8289ebfbb83ffa8eaf8a3e85c25f61b13ffd73823aa210fe9d940f3361a33f80
-DIST kidentitymanagement-20.08.1.tar.xz 150512 BLAKE2B 8258e377040a4b0abca988e37f77bbd0c002ae1ae5cc845a0e4f576653d1a3f6c35fc7f75dfbd1f321c619ef10db4d45d58e8896c8ac15e9f4492e1294c95459 SHA512 f31e44e5f94b0fc3209a4f5d5e9f638f6dafa36fdbb71a5e50ae450f34701b8eb431f5618f6fc74837b9b9f91d8906a7d04f544c69ba5cf6247c415a3f30c593
+DIST kidentitymanagement-20.08.2.tar.xz 150588 BLAKE2B 5ace2a5ee7059dc9a194d964ab4ac20987811f240f17a6898fe3cde07952a3190b83b1782d6d19dcd613e776f3b9d4cccc83f3487458545895741532fa5af70f SHA512 6a7f033262d260c8b322f1524fbda29b0f1c85f3e8877d71eabfb49422b7d465677ec3f6ba1c882e0a394591d3cc229afa8d742c72ca35fcf05f916e34c4fb12
 EBUILD kidentitymanagement-20.04.3.ebuild 851 BLAKE2B 6e1efaecebd9cbb15c91cb7ba707780b73ce4415293f56a28091140af37904333af1fb8bb1baa077baba53533ecd7a7e66900938d6f73833ee8f884105f268e2 SHA512 1ddcde6f472e2077eacaea56c51b0df29f90cd563804601c94b9d867a3e37c68817283e19163cfbbf25069d17b0a23ebaa68d01b14595b6ee52a6cecb9ffc4a5
-EBUILD kidentitymanagement-20.08.1.ebuild 854 BLAKE2B 3d333f501bc4f817688d10e8e35b5ed7bcd1f545db22826088f4f8eedb3019a79a20870248a3fe69b9410d55344ee147a0fc2139d7aaae98464b16d6ff1abef0 SHA512 ce12d8b6851382584990e83a4c333ce999b230bfd27291162ce394d2df6175830499cd44c3a61c272a1d8e90d288d860995f501a7e7beeaae145f6399de49411
+EBUILD kidentitymanagement-20.08.2.ebuild 854 BLAKE2B 3d333f501bc4f817688d10e8e35b5ed7bcd1f545db22826088f4f8eedb3019a79a20870248a3fe69b9410d55344ee147a0fc2139d7aaae98464b16d6ff1abef0 SHA512 ce12d8b6851382584990e83a4c333ce999b230bfd27291162ce394d2df6175830499cd44c3a61c272a1d8e90d288d860995f501a7e7beeaae145f6399de49411
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kidentitymanagement/kidentitymanagement-20.08.1.ebuild
rename to kde-apps/kidentitymanagement/kidentitymanagement-20.08.2.ebuild
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 844d782836d1..8712dec7520e 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,7 +1,7 @@
 AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2249abe730087648d962ebab12faacaebaa2e1bb0788220faf2a03b110477a1112fce771d1b269d03e3a05670a35ffe02c82c86 SHA512 0abd06e611f90a8f73ecf5599377df45ae350c4352ff5c0cac47918d4938142bce9677a0430aa3aaf8d6f0edd5241f4751fc2187410b7287dd399caef6c8e7ec
 AUX kig-4.12.0-boostpython.patch 1014 BLAKE2B f860ac552eb6e50040ce7cdcb2891e246a64fa69002790015774ff2080fc6b7e850fdacc775d65ed79fc32e97e57304dcbb149f5089a8ecf981989f0894feb36 SHA512 fb9e9269fc4af850635eb88f5a97f2c61d7419fbaeff4bef0ed9d4ebf410c4cd02ab70733c3f1d0b08444e1a878fa74a9d691268f30c339b7855506e56c34fa8
 DIST kig-20.04.3.tar.xz 3482876 BLAKE2B d56c3c03f1c90df991377ed1cf43fa734fd5d295e755af6833508540f6796b079025c1ea5eebbf6719a08bc2bec2a3f716e9d2d40bb7038b096941d357285343 SHA512 64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963
-DIST kig-20.08.1.tar.xz 3490284 BLAKE2B 86f9ab6743fb92fcc4ffda26d435df8f2478875b8065bf84eb724c9e6e59daee3dee9a1f247c1547cbf9cf9adde7be89d856376064d9f5f98def8624da38eddc SHA512 2fa0b0ebf88159d8df8cc4d02264680d2fbe81f7c6fd7a177ac6784a8c6348b00843d09a3ac88eab6f8a9817129fff9e57ab5aa906e1a34b1981687cdcfe3d9e
+DIST kig-20.08.2.tar.xz 3490376 BLAKE2B f132df343a85dc6cfbcf334ef03a034fa070fdb0faedb1d080967a62e4fab5a59dbf59de599020476d2ce0a88a2537521852781785ab772f36c1ce27e067e4ea SHA512 734428b9ec18719105ff3782209cace4442b8ae420cc3149148a2ca8d82dc55b1f3209ca163ca6181fc025f77c89dee9f4b871f97bb62eac836309824711b926
 EBUILD kig-20.04.3.ebuild 1720 BLAKE2B b0a48bb08473bbb7f43341ee8ea86908a994d82762b77a0996b3df8f65c14740651019d9f3882395bdaee99213b8e1e3f4fdc72f5e4cbe1a6c2741e8f4e59dbd SHA512 daf6fef631f30e2f79af6db5e6517cab96d2f4219ce89b083e3746086dfc22882828c2462c24e497c6036311e47c2e9ba48705a2cc70a6215d3461ecc92ac67f
-EBUILD kig-20.08.1.ebuild 1772 BLAKE2B b3c8d6fc3df5b22a64b6ffd6615be83eb561ffba2f8cba17f7de98e8d681d056bc622028aac5c85b003be1055e89d0bc6c9de3be47bac50b244a9e83030fb156 SHA512 e8e3879d20a484af5bd47bc1862668195b385136f5d60d1974faff2410286d5c77fb427f79690921b0c5dad9e9d2f5af47989eaf818bcd6e81d6c6238b4d1580
+EBUILD kig-20.08.2.ebuild 1774 BLAKE2B 96eddb47aa1ab13acec6cee43f08383451f69850ef0b71e296f9c0d7d678bd8d056332b956fcb94fd856567a9ce445e3c4b698095d08689c7f48b3df9c7a7b44 SHA512 3e199f5a3b49695352e8e009e3dfb4b21c06f3a633f261a2fb83d7350c7e403198fe8ef5951fb331e5a96157743b0dd11bc08494eab88ab3bfac58e62d58fb0f
 MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/kig-20.08.1.ebuild b/kde-apps/kig/kig-20.08.1.ebuild
deleted file mode 100644
index 582156bfe01a..000000000000
--- a/kde-apps/kig/kig-20.08.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8} )
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting Boost)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-20.08.2.ebuild b/kde-apps/kig/kig-20.08.2.ebuild
new file mode 100644
index 000000000000..bcb4f6de48ac
--- /dev/null
+++ b/kde-apps/kig/kig-20.08.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig
+https://edu.kde.org/kig/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+	scripting? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting Boost)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index e6f8baef37ec..422527e6ad5d 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-20.04.3.tar.xz 5227308 BLAKE2B e2c2147393c27728d3c0c1f2052927ef703f29087485b04b3aabbc065823a19ddf1f98bbed03668328e9e32c0670dab471c8a7bcbecd1d7b3f4ff157a3b9a397 SHA512 26d1bd6d282e5cd535408148be13ab468831ef7ff2c6e75052a65804123fb4440ba54a0fa1d280834ce83400d8f897825bfd34cc02751800660e953762779981
-DIST kigo-20.08.1.tar.xz 5232184 BLAKE2B d721560fac19768f875982ac6e22ea6c7fbedc1476743118d887249c535396118b5bb915060e3cad5d50fee06192261192b13d33cb0d354241d441a3c8d83694 SHA512 c45e44667fc586e7f8ceb86e287f4f021861d80526e607dc05c77f3761b0990b238ce8ccfd9672786dfae0af7bee251869aed0a6f23a555b77ab78f712eef7de
+DIST kigo-20.08.2.tar.xz 5232108 BLAKE2B c302b6af62179805d91a5c3d06690afd158cb80ae9d3d8c074966d926b5c027e866043e202c6cc15570dc9c67646cc720c59b671f7227d18d1d0363ca11a1340 SHA512 174071c99cea6b6c66bc1233d330c2f8dbce05ac081bc6101a8fd26a7043d00e7ab01a6ff5b3aac1dff53c4ac98119b9cc2f4c2507bfff39a30800abcb057255
 EBUILD kigo-20.04.3.ebuild 1015 BLAKE2B 8b81ed4cb4bb352cfd50901ee2beb5d8f1bac1be3747c8d7a8c98566732e14c759dbce9dd43ace16c595d658123e81417f45fb96cbad586aa13ed5291b27e921 SHA512 37d286784c9bde7d1a96e167d5d2b4e106612fe41a93ede7a0a7821ac5a35cd4b0dd8758c8079f59f4ddcb8538f865923c9f70015df2264c21663cad73822c5d
-EBUILD kigo-20.08.1.ebuild 1018 BLAKE2B 338b672f28d09855d7735a7dcf5f54d409e9525600cdee9bb3bb01644447c1b40b83480f8395974ff2acb669e701d4dccc495dbde6365b5e6d4aff6650d59487 SHA512 c3c6bb17b1f67603ca5ef1adad41cfdc2f055a54a0642f952c841965254143f46847fe3d58fcc737a027318625b1a28b694747ff4a102c75705b29ea4dfae5ed
+EBUILD kigo-20.08.2.ebuild 1018 BLAKE2B 338b672f28d09855d7735a7dcf5f54d409e9525600cdee9bb3bb01644447c1b40b83480f8395974ff2acb669e701d4dccc495dbde6365b5e6d4aff6650d59487 SHA512 c3c6bb17b1f67603ca5ef1adad41cfdc2f055a54a0642f952c841965254143f46847fe3d58fcc737a027318625b1a28b694747ff4a102c75705b29ea4dfae5ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-20.08.1.ebuild b/kde-apps/kigo/kigo-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kigo/kigo-20.08.1.ebuild
rename to kde-apps/kigo/kigo-20.08.2.ebuild
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 961748d9eea2..06c771dea14a 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-20.04.3.tar.xz 1173788 BLAKE2B 8c7a7620b5e9c724e6b5c8db1b9feb2dd72e5c2f09f84b64fe53db8981d69b1c06b4bdcac9b95e50924632a7cb19011a6a504a53b376c7f046ce045f67af2bde SHA512 0336667db017881a2bff454c2cfd2c5e80ee19d4567b89c517f072f190544616cce29664bd8471de517a9df3e1a7d7bdc726b564f3904965e03ba9464391441f
-DIST killbots-20.08.1.tar.xz 1185060 BLAKE2B c7d57c2781b107bedf864baf53037ae97f6eaa3e7b5333b8a96c2a8898a0f2daaafc7de6e2eafa804b58331d9a91969ba38594a9b8bc49181a0ccf6bd0c51c22 SHA512 2b9315b89f73f81438f887b1231737b4b945a3296547df004300d48bbc5f7f8b98c251a8f8680a9db41469921e9f658fe6bce0b7711de92ab809ccc68793cd91
+DIST killbots-20.08.2.tar.xz 1184860 BLAKE2B 93a2297457c73e20899f34fca5dbbd8e82d412d35f6430bd892f75fdeec9c1fe1d42ee539139eb65c7414025bdae6914d695aa01264a1e4c5f52a77f55f94d9c SHA512 260d2368a922320cc8088fd28fe29a1feb34d20efd582c76ebe8cdea8a00aac9efc7a2a60cab414625e850e60c24ba8c0ebd76c0929069508eb65adddf25c059
 EBUILD killbots-20.04.3.ebuild 884 BLAKE2B 851eb9222e882fbda15aa6ebb874601a3e3ec6b08596a893bf188df654c03a4f9c3cac13398b1c1e5f01da6dd61c5c38343556620975b11a81b69d113b3b286b SHA512 36152e7396b3c05e8e9a4e05d5e23f8f532f08faa5e702fee168c833cbe782084678a8d1b758b5d105ec9411b5e9f0e66891c6613a3b033500fa4c86afb2e18a
-EBUILD killbots-20.08.1.ebuild 887 BLAKE2B d014416c45f755918e53a48764ba4c60ddf33cca8569940719597e3709c1efc3de407be3a5c7ab307ae80c7e8e1811f7a6a6d9fcf823014b1291644901d3c3a0 SHA512 f9633b30c89885a5345441a38658fb5a9d19b0ad94de10227865a804b8081a9a76a2d52e82d1a8036463df0f011c62f93a0e8c40979ae28deecc5e3ac0d676c8
+EBUILD killbots-20.08.2.ebuild 887 BLAKE2B d014416c45f755918e53a48764ba4c60ddf33cca8569940719597e3709c1efc3de407be3a5c7ab307ae80c7e8e1811f7a6a6d9fcf823014b1291644901d3c3a0 SHA512 f9633b30c89885a5345441a38658fb5a9d19b0ad94de10227865a804b8081a9a76a2d52e82d1a8036463df0f011c62f93a0e8c40979ae28deecc5e3ac0d676c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-20.08.1.ebuild b/kde-apps/killbots/killbots-20.08.2.ebuild
similarity index 100%
rename from kde-apps/killbots/killbots-20.08.1.ebuild
rename to kde-apps/killbots/killbots-20.08.2.ebuild
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index f43d1384415a..089a5f8c44fb 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-20.04.3.tar.xz 1071332 BLAKE2B b15afd8e266ecf86206c2635b049c14895d525c281f12e6a3c13c10e29e5ed2eaa36c76e248dcb9edfababdb70adc6087011ad5885da4530b3396fd7b69a1387 SHA512 a10032011c2eec6a7e7718dfe60c7b1c5dedc0db2cb2c3dd40ba6c5ba515a916c2c7fd62e79d0ca4044a050970071d8deb5c43baff5503a548548cad045f618b
-DIST kimagemapeditor-20.08.1.tar.xz 1077904 BLAKE2B 761d37d63f1f0153ce6fb640b928f3654d205c236e808e6ab2c9044be49011567f8a966610efbed04b1c1f6a85b3389b6db60cd91f86ce60cb7a498292e6b41d SHA512 ef1f47898b0c96d7b0721d54a3c245f2d9bc00bfd3190b035f55cd096e50f8abb2a2671f40b95b4442b4da435e5a77cb7b0048326793bdd10c57ae67ca8506e4
+DIST kimagemapeditor-20.08.2.tar.xz 1077832 BLAKE2B 8b480573e39a22acb7062f71a511dcf4b121623ab5c3ef32d8b54d2a117a16fae2b921bb81ca30ddce4666542ba4c2fd1f44482066f77e0c48d1204fd7df4b05 SHA512 530dfe77525eae8f619d1e09841912a8487489fd3053c659a6b14245d2813c7cf763324e9a6394064440d3fd1d3252e71a7e212c11cf556009a2d12928b45d4e
 EBUILD kimagemapeditor-20.04.3.ebuild 947 BLAKE2B 71780ba11247f6a2fa003afda18462d5955989d57fdad8e8d851f582683d2d524d52e6d0b0743a8374cc3c6f625933118ba82aa075256e4f8ff83c4d13bf4652 SHA512 b4faa0491fa1a747959a2841b62d1a413cf00bd2691113cca498193f21f60e9b0967ec8c53a865c90b60844d2d3ac9b2189b0447b1f81cd705ccc1de2a41c140
-EBUILD kimagemapeditor-20.08.1.ebuild 950 BLAKE2B 69eb4ab2c61f99fac2ae4d01bc885c13a864dd525e6ed3221d6c0184f4531b55ef38f2f85da37ec999adc3f51208068696726f9a44005fd9bea0a21b9693550a SHA512 6f1653ce96c46aa8ed1a0e5b7f870a01524a001cf181bd54d14149812bd88a1b5e989f789cedcf717d7fc89e9d76af52c6ac00cc9ccb30c480f005f4479abb03
+EBUILD kimagemapeditor-20.08.2.ebuild 950 BLAKE2B 69eb4ab2c61f99fac2ae4d01bc885c13a864dd525e6ed3221d6c0184f4531b55ef38f2f85da37ec999adc3f51208068696726f9a44005fd9bea0a21b9693550a SHA512 6f1653ce96c46aa8ed1a0e5b7f870a01524a001cf181bd54d14149812bd88a1b5e989f789cedcf717d7fc89e9d76af52c6ac00cc9ccb30c480f005f4479abb03
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-20.08.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kimagemapeditor/kimagemapeditor-20.08.1.ebuild
rename to kde-apps/kimagemapeditor/kimagemapeditor-20.08.2.ebuild
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index c4a5b78ea407..2d3999158502 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-20.04.3.tar.xz 119724 BLAKE2B 84767654991784f7160e234ef02a5bacdf16bd3581986aa69bf36c782eaa86d6d921d6881e082203be801163259a248dff1e39defeff5a5bf4984af96eedf29b SHA512 d9bfc2390270eb46b903e54f88e84fbc8dbae0cbf71fe69ad826d77d64978c1512b7c9de617ab64cb449d5c0d6fa386ab60f3da634bdcbce01b924a36a7c10e5
-DIST kimap-20.08.1.tar.xz 120276 BLAKE2B 1e0e9f6a940211e1bad8036b2a4b3b5d4043243d702c937659e6fffdad7d5813deeb96127984843e57ac2111943e28ea416214bdd610ead113fec4ea628d731e SHA512 57d81f46d81d338eadef445828d57cf1288533312265b72aa1eac384441a9d347f3e71b4a02eb85d6770bc47d93bbc5ce37cf4ca235d54cda89b989bfcaec332
+DIST kimap-20.08.2.tar.xz 120284 BLAKE2B 7310e28359af3675bc5dfd7602e350c2100e059c5e99abe31c0b47f24121c468f92731e079be3b47955e285e3d8f7efd637092aa0e49216e4e82466d7e31800e SHA512 314525b8ec4075caae6293345a413335dff094add089e474a6038276bff31f98a04a011e1338650a53e0c1377299c91c287dc9b3315aa9d2e130d532d601d4fb
 EBUILD kimap-20.04.3.ebuild 843 BLAKE2B 7a8a866902a41f89435409b480fd7695f9929c7d4ec9501d692903b3eefcec508a39a6663d8591dda10a18e631b9abc051143c9b9540885ba0690fe0cb3b2e3f SHA512 0c21c801bd87a96f885d863975ab62862e6036b0e9d1ab447c5f450b2bbd99986728bded6bce75b5afe02c7c366d51265591b71093967cf04add2f8671681ff4
-EBUILD kimap-20.08.1.ebuild 846 BLAKE2B 5130663943343e21c4ade6f15de2ba324ae92d3d2f4072390e21ddb3201571a94cac1daeb10ac2ea6275827c5f4a459872c1fe4dab3b8dbbe3b4a53cba43484b SHA512 05258c3c056b14f40b6439b3d1788822ab856824e379fadf678f782bd21788bd7a3e76dd79c90d5ce720fe15af6ec00d943041b1cfdb0cb34375e5720b7bd242
+EBUILD kimap-20.08.2.ebuild 846 BLAKE2B 5130663943343e21c4ade6f15de2ba324ae92d3d2f4072390e21ddb3201571a94cac1daeb10ac2ea6275827c5f4a459872c1fe4dab3b8dbbe3b4a53cba43484b SHA512 05258c3c056b14f40b6439b3d1788822ab856824e379fadf678f782bd21788bd7a3e76dd79c90d5ce720fe15af6ec00d943041b1cfdb0cb34375e5720b7bd242
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-20.08.1.ebuild b/kde-apps/kimap/kimap-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kimap/kimap-20.08.1.ebuild
rename to kde-apps/kimap/kimap-20.08.2.ebuild
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index b7f71478d036..c01544418b74 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-20.04.3.tar.xz 618056 BLAKE2B 35f0760948634407e02193ffcdd60176153e37ead99545a39bb777bda600f5685c3ed3bd76aeabc2620ba5ddc11aa094aeaf25c896150acb8da53e894c78e6dc SHA512 25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3
-DIST kio-extras-20.08.1.tar.xz 629980 BLAKE2B 865dce2806dad78f5319ed7cadea5e409c5b50725f5ccd2e073797faab9374ba5fb7a7060777e7f2e77cd8e3e6508f26db11a46ba45859de83d2ec4b3c575c7a SHA512 b8e40f54de08e813b775fa2f1a16c4c444cfb17c74d0c13dcb431a5a26e684beae5951662b8b28ef84d5c5f2a5d988dc7c0ce90d19cfa4bc76f5aa8b63db9fcd
+DIST kio-extras-20.08.2.tar.xz 630108 BLAKE2B c9f18bff7642460f22a4167dd81ee24cc0cbafa1deb9e62948dd5cd15dd0224bd5ed6d28a104ba3701bd41ee01000eff9a7a76c12c0f32c79e5dfd7b48d31529 SHA512 5228dddbfdb3243dd37ca0ceba325f87e5715da92fa247431bc0257f53bb46f4313db3ecdd8caec93910a4de4e480e3d3c9d217d9960a2942dd067b2dae61015
 EBUILD kio-extras-20.04.3.ebuild 2652 BLAKE2B 7fcbd1918df53e92753b3878f44e204171a02a81256cfb7b68d7f8e24be8a1164e1af282a0d8ba6a3a40bfb9334de015cd48d1f991c8196b99c8fb347430b7d6 SHA512 380e389416c7e167258e3ad418998e67f32ca9f6861c8449f633ca34760ad7c6f4a48650712260c80effb8650a0105fa37813c5a4a70554e725488af7b92b793
-EBUILD kio-extras-20.08.1.ebuild 2656 BLAKE2B ca42df199424d790714c2f1e8a1579db09c34bc8d8a9e01ca2462c851f7b6180c8c003bd2d6886ddb5101f3a3fdfe8566f7fa544ce452e629f823dd421f4bfd0 SHA512 340cc12f3bf1592b42f800bd74ca9c42d80a9bd757098ff772c824484c08c0e731066784bbf2d85d76edaa09da77bd9c028aabd2a79b7a5b93c31e03f53c40c2
+EBUILD kio-extras-20.08.2.ebuild 2656 BLAKE2B ca42df199424d790714c2f1e8a1579db09c34bc8d8a9e01ca2462c851f7b6180c8c003bd2d6886ddb5101f3a3fdfe8566f7fa544ce452e629f823dd421f4bfd0 SHA512 340cc12f3bf1592b42f800bd74ca9c42d80a9bd757098ff772c824484c08c0e731066784bbf2d85d76edaa09da77bd9c028aabd2a79b7a5b93c31e03f53c40c2
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-20.08.1.ebuild b/kde-apps/kio-extras/kio-extras-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kio-extras/kio-extras-20.08.1.ebuild
rename to kde-apps/kio-extras/kio-extras-20.08.2.ebuild
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 6202f448a45a..4beb002ae881 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST kipi-plugins-20.04.3.tar.xz 1642920 BLAKE2B faf5a131d0057439e81cbe5a51506f5e9669f9135e79ef73d969f26ae1713dfb23601a60d07501355a21c7ead690bebb93c8c2e3c7e82eb74f99ecd69454d736 SHA512 9d3e0c4b04cba493c2be50ac3b418532257c18be421caef31e2c1fb82e03b6a3c183336cf73d9af8a1551f4bb79412c5bb2e21df66e56c8fee38be532bed7832
-DIST kipi-plugins-20.08.1.tar.xz 1644296 BLAKE2B 96c3c25819b5639f385ce91dffc93a2401e424c49b01e8a869ac71d810c918a3d84d92679f500aeeb36dd8b46dc5b09643343da4c760db72c2321597ee36faa0 SHA512 5cd8b14d8fd8b46e1eba55eb6948c4a9dddb02b32c7afea88600b05a9e789260e0b38432cdbadc03f8e7d6fc2446743a065ec16ff037bbcd111a0a8fb3f621eb
+DIST kipi-plugins-20.08.2.tar.xz 1644452 BLAKE2B 303f2954f327b85bc2a3b9f7c7be207246c319c071aeac5b873225320a5782e5f1e487939e6860e64f950737f1fe6427f5f2e8ffde6f0c2cc7f7295a7cb15f7d SHA512 d5cbf4ed8299553882300022b812203e96d1d50624cee6f8790b71ad39ac0e044334f3f333a5351c16f11074972b434a175a918a7e4949cb13b6c081073c2a34
 EBUILD kipi-plugins-20.04.3.ebuild 1530 BLAKE2B 49caf422fde59431cb866c9c652313775d40a3914d8322fd7ea145ab071e9a220c89a83dd71e95a4670991ae260f26251d66f1dc13b453ae4d10f72a502f364a SHA512 6c23944078bbd963179a69d83919cc45b2ce6f0bb534a607cfb0ac22e73c40b6563611d19d4f3e9d0256783fbc1cfdb998b3301128c5db4f41ea8fccdaa0765c
-EBUILD kipi-plugins-20.08.1.ebuild 1533 BLAKE2B 513a8e9a5c157451ee9bc4b7b48f781134568685693d97f28ba76e2064b6d521dce0bb2172bc098382e3acd83f26ab2d5cfdaa06fbb439b5f0b3586c0ecbefd8 SHA512 ed6cf531e9cb986aeb9cddb5db538cd096d143fd0058da811dcfb73d2a6384055214e32f318351caf3e1a541dd426c69d7f2ab5be7f924490cf65e1c43a95dbe
+EBUILD kipi-plugins-20.08.2.ebuild 1533 BLAKE2B 513a8e9a5c157451ee9bc4b7b48f781134568685693d97f28ba76e2064b6d521dce0bb2172bc098382e3acd83f26ab2d5cfdaa06fbb439b5f0b3586c0ecbefd8 SHA512 ed6cf531e9cb986aeb9cddb5db538cd096d143fd0058da811dcfb73d2a6384055214e32f318351caf3e1a541dd426c69d7f2ab5be7f924490cf65e1c43a95dbe
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/kde-apps/kipi-plugins/kipi-plugins-20.08.1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kipi-plugins/kipi-plugins-20.08.1.ebuild
rename to kde-apps/kipi-plugins/kipi-plugins-20.08.2.ebuild
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 1578a90432e1..3260d0528d8a 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-20.04.3.tar.xz 373304 BLAKE2B 1448f7d0af28fc682bf009e144dd9bf29f6b82828600329b6770fe8adbfcb9dc93a278681860bd2dd8d6f03e427de0919cb17702dcbe89ce8dda8e6018fc2501 SHA512 5f4d6eff93c3432d5606644ac4a30b37d37fdadbb0f2a05b5fb115fa99d5f226078dce16aca0ab6549d82f77131c802e7bd97d4fa67dd739b7ce3945030c54a7
-DIST kiriki-20.08.1.tar.xz 378864 BLAKE2B ebbd84631cfdd19c2551ecf228f6ecb6f8b0a3052501a02c5d5fa0ce80d63ad52acbd21deb0d4a64df06302e37556267962a7cbd075d7c053c8b497f36141c6f SHA512 eb57b5957cc57f2cd788473410663c789236ddb217b7a4901ddadde0ed671105dcb7a12a6e4745f3f5c799d03a96a54e22c1e30a63e446449e751f115c85ef61
+DIST kiriki-20.08.2.tar.xz 378772 BLAKE2B 7332d0edda2e29bda898bbf6cd5dae463a4ca925e25ca873ca9ed3838e58ceb8c7b0861052cb7ec258c50eb0f08871823def83fe38e1b15b81f73d8a58d8b342 SHA512 1f87c73f5157f49fd5d282f038efde95b360a2c76157584ea60b655ef147dd024c3bd7697822fca23f5a8f09e8c0352e6f79a0ff34183085f34abc51232f981b
 EBUILD kiriki-20.04.3.ebuild 951 BLAKE2B 5486d3c9aed917a9bf0baad01c1f4d9410068c9e34834a0cb768eda67dd8576fc0526c3d2173ef243b4ccc25ca32a89c1f3819a0df04e6f669e10de1163e9684 SHA512 ec21a579b621455b1c6f9727e2ad73de9197f7742d1baf02b00f2861c0cf27e25656eaefe9dca62acff3e7f41fcb020bd7d687e2b5069d96d7350a9a4301166e
-EBUILD kiriki-20.08.1.ebuild 954 BLAKE2B e28f1205360126451ec6f821af0ff9323a5ac8e7fb8e78a97e80e19c73dca796a57110d908434b45bb6b12070cff0c21cbac4e529c6d614e32519a60d6103c64 SHA512 759f17f4578c5a811f62e8b584089adbf3432dba4343d3697a5ed9ed044ee6e14c2a4d3f0b78b7e8d5a0230e2e0204b662ce3426231ddc95124fbd885e4ff872
+EBUILD kiriki-20.08.2.ebuild 954 BLAKE2B e28f1205360126451ec6f821af0ff9323a5ac8e7fb8e78a97e80e19c73dca796a57110d908434b45bb6b12070cff0c21cbac4e529c6d614e32519a60d6103c64 SHA512 759f17f4578c5a811f62e8b584089adbf3432dba4343d3697a5ed9ed044ee6e14c2a4d3f0b78b7e8d5a0230e2e0204b662ce3426231ddc95124fbd885e4ff872
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-20.08.1.ebuild b/kde-apps/kiriki/kiriki-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kiriki/kiriki-20.08.1.ebuild
rename to kde-apps/kiriki/kiriki-20.08.2.ebuild
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index f3c4145fb6d6..7b56cf190b5f 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-20.04.3.tar.xz 11286096 BLAKE2B c9f5d4a3c4a755d39593877ea083f379011f727fb11b94d3c315078a1d2c05ad4c3c6e75c0f905c4ad9a7c1468af3dc08df2a6436c22da7bab1cf4eb5f3b6665 SHA512 7d2a11354ee2070ca02b733a2945530f0baaba0138b66973b1efac5bb9475a0bcead6951404af02d1e18d676c125c6e17f367f0d41e2b5e86bec874c44eddad6
-DIST kiten-20.08.1.tar.xz 11296412 BLAKE2B d00dabc642e31aeb899bfd920f9bf793ae2107536af8177cc09d5169237ef3269c7b34fbfcadad14a7a39242231ace7312758e75dd41fc4aa1bf70fb5eeb73b9 SHA512 2878e4d12ccafa927d4bb2c115765a2430f5e7aa25314953f02fad7fe4487cb600d7bef36735dd97cbc5f95e21797920c48e1e10b45afd651f726de16f3a9590
+DIST kiten-20.08.2.tar.xz 11297296 BLAKE2B e5c0e964cb5f43499966579f4362b7778f4320bbedbea2d639f64d8de103b1a9e0daafb27197574570bc9f7e5f311e4fdf52646246404f57ec1288f0619bd9ea SHA512 637d77757b3898e945e757953210bf59b75fecb0f3c5facdbe6f6ceb98416d4e0a0c042e26d9226cbf8bb0dc5f21b82f5c3a751d1f286a4162608fa6f1894a6d
 EBUILD kiten-20.04.3.ebuild 1101 BLAKE2B 35400d66e7d02988ab3406008f0aaeeb4baf4a195f157d2241bf1745a84c53b390096622b1f0af71443e4c74b0a98ca0ba4cfcbf6467c8b4d4c1764b91789179 SHA512 a154083bb80c6e119651263d4540336ab68527ef15d2eda9069aafd31a25c9eb7949b5f0f5dc24a7aa90a74af19aca6fdc6fb15bbaff64df825f427b05f16c6e
-EBUILD kiten-20.08.1.ebuild 1104 BLAKE2B dce5e125ed7d1f203eb369d11af795a7ec528f6e8f7aa21caff731add940481ae837a6f8dfd9ca3cf482976776a67b6500d0fde1981bc0e4e04c33b2e3bf0da8 SHA512 3fba7a1b149e87e241e5a3798f8fb8d2e4e3786416e37c77de3e3c4b6e7bb9e8e0c5611274d8e952efc3812958493615ab77090b68c4df923eed221f25f0b0bb
+EBUILD kiten-20.08.2.ebuild 1104 BLAKE2B dce5e125ed7d1f203eb369d11af795a7ec528f6e8f7aa21caff731add940481ae837a6f8dfd9ca3cf482976776a67b6500d0fde1981bc0e4e04c33b2e3bf0da8 SHA512 3fba7a1b149e87e241e5a3798f8fb8d2e4e3786416e37c77de3e3c4b6e7bb9e8e0c5611274d8e952efc3812958493615ab77090b68c4df923eed221f25f0b0bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-20.08.1.ebuild b/kde-apps/kiten/kiten-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kiten/kiten-20.08.1.ebuild
rename to kde-apps/kiten/kiten-20.08.2.ebuild
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 3dd719b4b466..630fd92bfc76 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,6 +1,6 @@
 AUX kitinerary-20.04.3-poppler-20.08.patch 1115 BLAKE2B a368b6c91b0ad14e99fbdb94110f64692217b51ece3fa592372e3dc9ffcd62fefea0eb7e9f91481b3eacf1c425d0e8d53e5db9d57c6ed5a3d20382326d51cef4 SHA512 d4ee7f4423e2943575925fdde7c8e7056562d5ad485191a38c5a0183a46c2a71d9f6957db334d576be07ff03ad484c535a821cf616a57b37b8de1ae075d384c4
 DIST kitinerary-20.04.3.tar.xz 1280676 BLAKE2B 17e02987ed40985b8adcec81f6499ca968a89f22919cd6af2f16d6c5623b8b767fb43142aa4ff93e8d24c6ba483b553e7817d0e74c68bebe8b897d689704e2ca SHA512 eee734fc06373aed09e0eadd7ef232cde5ba07adf4d0996117bc4a0ee16cf80fc7f607ae1dc92033ea404e70eb8afcf5a676ff71e286613272c0d1051d7b7168
-DIST kitinerary-20.08.1.tar.xz 1756104 BLAKE2B 8e34aaeb25f0f89c012ba33c68282a263905a30bf6e91d8feff59c90d48b8a0e6b0a5d0c58c47cdf7ff8b732176ed0d29cc0316461d3ec7147a889cfd7c13e4d SHA512 20e218a988c54be15432ac4a070647901547383416001178c2151a20e8d3044caf98bbdbb82fc87379ef620069409a7f0026de2112f4e35cd6c51a3ac14c7760
+DIST kitinerary-20.08.2.tar.xz 1756516 BLAKE2B 4e9748ec09f83b1c745b3f8511393a87772cc87a55b9874cd77f240cc1da2e3540525a6e1b46523b8bf10b256018d6f5069bc6e3156414d4946725ddeb6ef0fd SHA512 f207fea12b51d15548d4fa0186720f5f9cb4f313f8ca6cbe88c283312f31872bab7ec333566e85016c7a018772f155c867592bb5f0181a7316c2bc8c8e135f52
 EBUILD kitinerary-20.04.3.ebuild 1091 BLAKE2B f7ab0838e92215cf2e435d086b0fe74aae97960d57be02da4eaffde866adc672354bdeca3ec1a273325b68dfa9132af073a62c98126261f584fa7ca3efa75fa0 SHA512 ac4d28d69baed98b5724af39166508cc9ef202b8bdecd4a8cb166ed5e7def1e93eaad591e7bd23315591926cd0048f226595bab9044a321f5caaff4f35cec5a9
-EBUILD kitinerary-20.08.1.ebuild 1060 BLAKE2B 608c65c5a507c20d5fec6d9ae48a2796af62d2225852cc982598a0378a7728ef8031b411578bb46c8f0c6ae3d71d5b356fc146e6be6308ccc7b7d3c39f223f88 SHA512 fa55c4c1e96959a69ec7ce0b89fb02edbdeb516a6623f9bf5bdcc123a651963fb0c08613a8960caeb807bdb935c840a54682063737e52d84fc0b81584c54a48a
+EBUILD kitinerary-20.08.2.ebuild 1060 BLAKE2B 608c65c5a507c20d5fec6d9ae48a2796af62d2225852cc982598a0378a7728ef8031b411578bb46c8f0c6ae3d71d5b356fc146e6be6308ccc7b7d3c39f223f88 SHA512 fa55c4c1e96959a69ec7ce0b89fb02edbdeb516a6623f9bf5bdcc123a651963fb0c08613a8960caeb807bdb935c840a54682063737e52d84fc0b81584c54a48a
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-20.08.1.ebuild b/kde-apps/kitinerary/kitinerary-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kitinerary/kitinerary-20.08.1.ebuild
rename to kde-apps/kitinerary/kitinerary-20.08.2.ebuild
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index a6a7357edfc9..d7edd3856edc 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-20.04.3.tar.xz 289004 BLAKE2B a66668d2ae887e29434e55dc7fa8a40bc059aab6b03426592b78b1889a6240ad01f46333d9834841e159f88ce2bb30bc610a07a161067f2b319e7b1a9dd81974 SHA512 63a37453020c2305efd8833cc223f5709f08f0f0ef3ea1a5dc8e5b0aab763ec9180199b249c7e28119bc5c8db16d525fe25d606a5b6c5c057c8fa889ad5b3e45
-DIST kjumpingcube-20.08.1.tar.xz 290492 BLAKE2B b6bef813c9a2e094de441feff86f59218d6fca2d2649383e640924a651a11dadf324ff18c25e7d607b10c5be68e7f63ef039dfe39a7940c73b04e18f7ebc7480 SHA512 c13e13021454829eb76f9a152fe503ac3b38092b1177affa3a96f1470e5de1b1a7520c9bde434b60a55d61ee0069e55f9705d04fbb5c669c9cd257a700216282
+DIST kjumpingcube-20.08.2.tar.xz 290604 BLAKE2B be09ac4fad1ca73197fa33639eafb66c0f99552bdb2d09043f1706ef01046736caa3afdf810aadd4b84e0903063840e6fb6309fc71a82fd298f8130b66857070 SHA512 f7047a1af963729a0df2b9861922a6e1253ac0ce5beb75c6a0764ce4b5bf3e7f711c631e4fbbdf9002ef10436a6511d70eff6b20a0c3a67c71f31c01caac9200
 EBUILD kjumpingcube-20.04.3.ebuild 941 BLAKE2B 333ff4ebb4f4c7e0b07b2cfee85444467bb99aecda8dbe5ddb5c841cab9d8ce12ee1d058277d0cc624358f7156f43d28ca0ab3ce7c465e65cc0dfb3714a459b6 SHA512 5ce32e0af554f7c6d6950d2f8cc05b6e0de9184a7daad9a5c1f3e563d0c90908fdc1d0b29fdf471ff51f3d72c8dcd242d867210c9f128bf41fa39b99de943921
-EBUILD kjumpingcube-20.08.1.ebuild 944 BLAKE2B abb063a9d99cc99a0381c9076d322b61e41d2e9219665ca93c2f437db928a6590f6e505efd6fcbb1413d6de60cffefd242f89b1242e0b1b2e1a8b7ec8e27e13a SHA512 2b0ca9ccb6ae21869c57e02d9d183a608dac9eb47153444f63b95b991fe1961f81cde693094f7301775c9e27c92e12b3ad070410d12fd4076c18bd6b8421950c
+EBUILD kjumpingcube-20.08.2.ebuild 944 BLAKE2B abb063a9d99cc99a0381c9076d322b61e41d2e9219665ca93c2f437db928a6590f6e505efd6fcbb1413d6de60cffefd242f89b1242e0b1b2e1a8b7ec8e27e13a SHA512 2b0ca9ccb6ae21869c57e02d9d183a608dac9eb47153444f63b95b991fe1961f81cde693094f7301775c9e27c92e12b3ad070410d12fd4076c18bd6b8421950c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.08.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kjumpingcube/kjumpingcube-20.08.1.ebuild
rename to kde-apps/kjumpingcube/kjumpingcube-20.08.2.ebuild
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 9fd9d92f2679..ef3fcbaddcdc 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-20.04.3.tar.xz 149012 BLAKE2B e94d495dfcf2b41de9174595338004b486d99e1dd286f84de03bdc3977ec77167068fee96a5603b58e2139fa6fe4a71fb8515a419c1e55d57f35bba2a074ab83 SHA512 6ae46a9ca2bc6d44c4ff4ba17d9681e74d20e50307af2a924b323487f368ade746a8d13060b8d2410b6f67a7a8577df2ef413f3987faad5c73eb49d4ac36d303
-DIST kldap-20.08.1.tar.xz 164268 BLAKE2B 45d67cf4ec7648b3583fc4cb6969ed9d859a5d6c2385b502ad9821af32d8b7d4462592bf2379e94c2245234e0cd26327f335a1dcc8d88bfcee3574b7ca11b12a SHA512 3a6993941767cb3f14a024213502d207fef12b6f1f47a7125fe13c38f9b161bf91133915220ae29a5fcadc5192bc8b539ecf5ed9ecb06622ca505724b746cc2d
+DIST kldap-20.08.2.tar.xz 164568 BLAKE2B b690397b9be8e41bf2aeb0e4734570beb803238d9fe47708e634423c11af949bc7fbae737d071d518891382905ee73d71542ac682dbf4ade7da25bf2358d30ff SHA512 eb35a04e11fb32aa600667c9165fbdc4e868bd3a5b5287d1bab3b4548a97e31f456412f9cd717a8a3d02df9a13279cbd735c967aa74917d6f366fa80589accbb
 EBUILD kldap-20.04.3.ebuild 828 BLAKE2B 748fc3954d23458914efd41754a2e8c0129e823f368a830a6c90615645bb35c23cf9b477eb7a1a1a18c152056c96709fe7d993b5438a76f0260a2cc3394ad752 SHA512 c03afb1fcf5c068a5343a406a86e270a2082b4768ae8c8e1dfa4b329cee748724d4b540d1afce1ed7d4793a01c8d4d76c0c93f6181b5bd731bb299296b3948f9
-EBUILD kldap-20.08.1.ebuild 659 BLAKE2B 97c0ded984ca44040b14322c28cd84f1416664912db6f6c819eb8226d55cfbac46e0693a0ed77b0d69a7d399f57f1698b6acb91ba28c8b8cb43047dae9fb9177 SHA512 e06f6b1cd1bcf0a636d47528eb270c9d43ccbde29c67c9e5b439266dc452a1758af2eb68094b6d05f782d13c1456e1ee3602712d7b8128ec11bc355d030266ef
+EBUILD kldap-20.08.2.ebuild 659 BLAKE2B 97c0ded984ca44040b14322c28cd84f1416664912db6f6c819eb8226d55cfbac46e0693a0ed77b0d69a7d399f57f1698b6acb91ba28c8b8cb43047dae9fb9177 SHA512 e06f6b1cd1bcf0a636d47528eb270c9d43ccbde29c67c9e5b439266dc452a1758af2eb68094b6d05f782d13c1456e1ee3602712d7b8128ec11bc355d030266ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-20.08.1.ebuild b/kde-apps/kldap/kldap-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kldap/kldap-20.08.1.ebuild
rename to kde-apps/kldap/kldap-20.08.2.ebuild
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 1e21715453a4..a91458970cff 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,7 +1,7 @@
 AUX kleopatra-20.04.3-CVE-2020-24972.patch 5485 BLAKE2B 1836b3783ddc67791e847f310da68837a5a5e244326514cadaea334788b1df44c2d0ab68482921f227343627b00421ef4566b79d8cba3bb2d6807e753f43ba62 SHA512 0eb8b7ce25e86e9e4733f9fe155cac62a4503db83f02f1bbb43c9c46af02c0a41cc842413f2a9d97b76e110fe2fd48cf55cf95a3be33042aba7167498cc16442
 AUX kleopatra-20.04.3-exec-w-double-dash.patch 4138 BLAKE2B 92b1512c437dce78efebf5b248fc6cb8fb2447fb37ee24aabc92a3c907f8af4bd025a6aceff2118518379ef3fde111d4d01b32b762626f380e626c3a099b58a5 SHA512 7ecc38876df91934412ea9c3a16a566d3454369504a0bbe0ff865cb5e6435a40e964d4ba49df9becee8a52d7964bf6b9f0a32d45473f9d084c831468db982df4
 DIST kleopatra-20.04.3.tar.xz 1935784 BLAKE2B 3c64c29762c06ce196149f0e9de3ec1a3c9970e2dce03dea600b4096da2100a1138548ddbc794bd0d47852e1b6e2ff962ec38f5b245a453f4a9953c1d846b909 SHA512 b72ffb37b3116525d8a531c056a0457e6fb3257081d639fc1c175c8dd4566e4f3c0989cfc696c43c92b630b43dcad90f667a9f3496fede0121065553041c554a
-DIST kleopatra-20.08.1.tar.xz 1937140 BLAKE2B f37a4cc458d851db833febee58fc1a4e535428c1a359ce4643ea944a5cafb824d6fecc12eb9e14b9361c56050311394a3c2c3a7368bae4ed9c921e6839f02a54 SHA512 6cbd3caa8c773380e4b7f7b396ba45f7a21ae39afc3e6b55d507ea0ef53c6a5663635de1ff494c325b88a57918665485a68c8100b67fe77292b632451b67e63c
+DIST kleopatra-20.08.2.tar.xz 1943076 BLAKE2B 52f638ddffa247dc6fefbbc2cd64827de264b81c1e8571e11cf8ae753f46815b39434d5318c6d3dde25c53ad929004c51e0d84078cdf69ab9974562d4c6b8c35 SHA512 792dbed3224e827cb4d71214b8ecc13e5a2338b8c14abb315f924997953013ee0cedd446cd85ff47c5e5b1598f5bbea2e13ace273f3824d3ba66481ad4f181f8
 EBUILD kleopatra-20.04.3-r1.ebuild 1590 BLAKE2B 500d250a7ade1cf0883be418c53398704c48255ed9e1bc810d9ed509aef69aa361b88f9c2e764c02ac795d7298bb034836de61ca423987c42df88781f79f4703 SHA512 07fa72c5b06fde135f28f2e3d7e04213ed311ac81d311cc609a89e264b536ef2f0cdb24e62821e786f751214a2473166d05240379f63f6d87857eb3e599a11b9
-EBUILD kleopatra-20.08.1.ebuild 1494 BLAKE2B 365dfb25105e2193743aa8a47e97cec6595d1fc655f03e8cb2dbab0c0bbb92c3f8940b68793378c7ccc6400f5d718de7a83edc0f1b40b349de1e9d545b1f63ce SHA512 9c003dcf7fa6eae1b6d76d4ceece4fdd37b9bfc76e3904a5ada420b9e85faab68617b13b322d535a3c2ab9e92c4e267625e477f140fd16e5302b55c21d0ec507
+EBUILD kleopatra-20.08.2.ebuild 1494 BLAKE2B 365dfb25105e2193743aa8a47e97cec6595d1fc655f03e8cb2dbab0c0bbb92c3f8940b68793378c7ccc6400f5d718de7a83edc0f1b40b349de1e9d545b1f63ce SHA512 9c003dcf7fa6eae1b6d76d4ceece4fdd37b9bfc76e3904a5ada420b9e85faab68617b13b322d535a3c2ab9e92c4e267625e477f140fd16e5302b55c21d0ec507
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-20.08.1.ebuild b/kde-apps/kleopatra/kleopatra-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kleopatra/kleopatra-20.08.1.ebuild
rename to kde-apps/kleopatra/kleopatra-20.08.2.ebuild
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 6b755cfb26e9..5fdd232a21a6 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-20.04.3.tar.xz 46833040 BLAKE2B be330b1ece36713c772f9bd88bf1dc1ac862639e9aa6dd7b069e2e541815f3ba727a5721c3a73eeafe5cebfc3f6d7e340f6f792edcf17aeaae2123752cbcc898 SHA512 e8fedb9dbbb0f7d19cf7fe2f0687d56371eb716d8e40da762eef7798f40e462da137430497cc13331766c87652c9b32e65c839a0d7b5279e6ef36a59b0fc1ae4
-DIST klettres-20.08.1.tar.xz 46836072 BLAKE2B 705a0394f4ea5a8d7069463e126551451ffb33228557626f9aaa29d418242f6c69f7bd980fc58561178e2d75274c7d0cf434cb0a2160262a97bf318cde883c65 SHA512 83e2735f53c7fcadd26944ce9c10cab29acdbf87bc92238fc94fe935f648f845ff17b19f323274d8c2782a9d8142ba5cc779c5bbc2b591836baaa844401badff
+DIST klettres-20.08.2.tar.xz 46835188 BLAKE2B af2ef0e83389b0a05a3bb49fb78a1f920a6b4b9d2c9691cd62320ef716d30f6291d83cca0ab8d5ba8538bec8ee9df91744cedc743a3b8aae167be5f5944b9398 SHA512 7f8c72e7f8e26d9a93825083c8f94e34b6d9ac1e96be37d717d81db445d7f8ff3aac406e8d5c30fc46ee654b757a9e49b8a3078eb137366e0540cbc8c1a672b5
 EBUILD klettres-20.04.3.ebuild 889 BLAKE2B 35e0ff74ba04bbb7b328fdde51839ccec7858f6ce551ac612babcf823b7e241e3a7eb9be1da9980e821535091d3879f55ffb412a4d225d7a9d89cc0321ea70f2 SHA512 e475cfb7fbd5e66435acdcdad6ef7dd12c01c53b10c0dc9cd739aaaca9f01d85a9e7cb8859a5e54c80bf37782c72b80de4e2f4131014f413f9aa41eb0eaad530
-EBUILD klettres-20.08.1.ebuild 893 BLAKE2B ac2869db3ee02ce62ba456468a20455ef1375d474e4fa49b2c02ebb767347567d0c6fcdee489c96e5bae9b7dfdb1b2a5364b2270627d7bfe9aa6208049c9ca00 SHA512 af3ba6c9e01051fb2047df4b5f43520d439039d258e8a053f2679a37afe0d7bac03a2de1812160ec6735679f97097d2d6383b0327ad5c098ff725d9161621d2c
+EBUILD klettres-20.08.2.ebuild 893 BLAKE2B ac2869db3ee02ce62ba456468a20455ef1375d474e4fa49b2c02ebb767347567d0c6fcdee489c96e5bae9b7dfdb1b2a5364b2270627d7bfe9aa6208049c9ca00 SHA512 af3ba6c9e01051fb2047df4b5f43520d439039d258e8a053f2679a37afe0d7bac03a2de1812160ec6735679f97097d2d6383b0327ad5c098ff725d9161621d2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-20.08.1.ebuild b/kde-apps/klettres/klettres-20.08.2.ebuild
similarity index 100%
rename from kde-apps/klettres/klettres-20.08.1.ebuild
rename to kde-apps/klettres/klettres-20.08.2.ebuild
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index f733e3e84a93..b54ec00a3141 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-20.04.3.tar.xz 1390524 BLAKE2B d3d2193ad40ec6ba37691f63071f423259fcde0b1d29b4fdddd4a6f2f2ffd08aeec8fe696f28722ab5de8d7081f0976891d641b95cb6e273749ee5f057d7f6ee SHA512 617b8d4d4a43a3056a36d29a36ff7c9948311f206567b4d8dba35ee55cf69059653e10de99820f2ea663e07e0427450a3a43c1a7146bdbc8c98dc269e7c6a870
-DIST klickety-20.08.1.tar.xz 1394628 BLAKE2B 0a8549b8fca73c4892f90dd213b321884ff9368307dd7dd4edd2283c0f1a6abce92f99eb56b943d219b0f918aea2d7c88c3ea59e7e5963dbf3573d8bebbc80be SHA512 2e1bea8f7011e4a83096caf220a7478e3736c47f2cad70f963939549dca5c035e4a868a58d389f1845a830137b7cecd6c8effad5b9400627c3e51fdd8b0ee5db
+DIST klickety-20.08.2.tar.xz 1394704 BLAKE2B 103c9c644c4db6a688ccd52dfd1e5e61255a7d0a0bbe8752622150073f361edf8b0a01d448b4225f72867fd2bd87a7f391858864ce9babd00504464a615c4800 SHA512 980c4626981797c33ab3e6293c648d33f2cdbb16fe43cbaf4f6bd2b52d12dab0264b260f2ce3563143d98a3d19e4d455bb1217599f838d65c914f924dd0d5c02
 EBUILD klickety-20.04.3.ebuild 1041 BLAKE2B b6703038f160e83c85a4cefac2fc2d78e654c589d691bcaf630a1a75bb262fa4aaef8cce37a0fb57e230c4834efad2c0866481e5236d946c269b38e5449b174d SHA512 1acc18cb4c83f3ee7d3707b7db18f23439c14a369338d7d546786a59730e0d368c2a36763e31bc8b53d6f7b39be7252f51739637517bc498b1ce50c67262159a
-EBUILD klickety-20.08.1.ebuild 1044 BLAKE2B 660a4c3352b34768193cd3734eebde34418d71aaec2ba0a7676aacbefc0f71d2b9cfb11eda159971afc6bb46bc31a0634808c3fda8dc94e695acd8019684e63f SHA512 d5a685dca4f143ae2a1b667837f6a1f40d9e83040c3af0b3c1c1dafa1e80d64c85dd362fa313cd13ff676149343801dbbec564532a5d16fbe34f6609653cd1ce
+EBUILD klickety-20.08.2.ebuild 1044 BLAKE2B 660a4c3352b34768193cd3734eebde34418d71aaec2ba0a7676aacbefc0f71d2b9cfb11eda159971afc6bb46bc31a0634808c3fda8dc94e695acd8019684e63f SHA512 d5a685dca4f143ae2a1b667837f6a1f40d9e83040c3af0b3c1c1dafa1e80d64c85dd362fa313cd13ff676149343801dbbec564532a5d16fbe34f6609653cd1ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-20.08.1.ebuild b/kde-apps/klickety/klickety-20.08.2.ebuild
similarity index 100%
rename from kde-apps/klickety/klickety-20.08.1.ebuild
rename to kde-apps/klickety/klickety-20.08.2.ebuild
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 387024347214..9d82c51cf9e8 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-20.04.3.tar.xz 1782200 BLAKE2B 2202fe4fee596e761deb52e94088be5a2f269123c7f60cbc359ac8e9822f26fdc80530079280a9c49451c2c018496b26bba8c4284ed295c7837d9e266ce3c763 SHA512 ccdb8191589ae8cbe3cd74d117acbb39828eb4e9c197e31af169f2acd824086f4e96adba59dd6bbc6051b78992899c234316a2ded5fcf5930cf83045fffbeb30
-DIST klines-20.08.1.tar.xz 1789708 BLAKE2B 8bfc3ffb0a1f94f6a164de7329197c2576dba9bdeacb3161cfd1e316aad25392fad6884ffa4f64268a2e3e3bdbc27b3a31ee3a8ffcb964d8a5f100a994e9d5e2 SHA512 5ed2c4041943dabb6582efa16831715862b16f45d038b396e13b999d61b6e2d94406302418bceeda10e72a2938de5c7d6084b216ac0b8a1c3c7e859a3c4c0b6a
+DIST klines-20.08.2.tar.xz 1789448 BLAKE2B 49ea819e971ef38e3d9f80f8c4e1626df66c05d53299598d14d648118238af066a43f96a03060e05e7acbbd5a4116291dab5842ccf550f11708eae2654dc718f SHA512 85cf7a178d06ad0b8c30a20fb691056ed628faa8eac2db878be0c28c91990e867f251fe28784e6844dded8b83a0be85c915df87943588c8bbbc664c237bd7dfe
 EBUILD klines-20.04.3.ebuild 945 BLAKE2B 48b724323f6198f7ed5dbda2a1de4dce546e6b709fd65e939a62dd85c4721d9f78672166a5aa8bdd102b2b182fb6f5af3a3cbc3d71171475c38d8c22b2e182a5 SHA512 2b23e5c642b829bbf523ea08dbbc3207c7b09c1ceada29dba31a7aef7b29eb3865845d682535c98c50a5af4d2d15fbdcb2f54b9efa3eed4c5861d78de1705df0
-EBUILD klines-20.08.1.ebuild 948 BLAKE2B e4734897df299c94991e92aa787edab41d4e51776213644907e26461a4df3a951c90aa92f12564326060abc386fcc6a3fcc24ce6f9b295e52632b64bc3e7e0e5 SHA512 9bf895d77ab5ca0035f238c171abc8a65162a31ab3a5c83efc9f8ea5fb15839a6af97b4f74d5ea5dfdb8b45b84cf6a487a907364e1191d26f0f73fa91dd9057c
+EBUILD klines-20.08.2.ebuild 948 BLAKE2B e4734897df299c94991e92aa787edab41d4e51776213644907e26461a4df3a951c90aa92f12564326060abc386fcc6a3fcc24ce6f9b295e52632b64bc3e7e0e5 SHA512 9bf895d77ab5ca0035f238c171abc8a65162a31ab3a5c83efc9f8ea5fb15839a6af97b4f74d5ea5dfdb8b45b84cf6a487a907364e1191d26f0f73fa91dd9057c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-20.08.1.ebuild b/kde-apps/klines/klines-20.08.2.ebuild
similarity index 100%
rename from kde-apps/klines/klines-20.08.1.ebuild
rename to kde-apps/klines/klines-20.08.2.ebuild
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 78228564c309..83eed860b332 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-20.04.3.tar.xz 674356 BLAKE2B 0efc5c41bb9ceec003bfdda14ab8c9de3d98df389b41ec068108c918acae0e78531657c7bf8573b35122f586f705c960dd015cc63a507a3965feee9dbc3a9d04 SHA512 44806fa8130bc2fc96fbd7484da157c0a75e2f2a00c8f4b1193dd755f13f23a4f23dbb89aa51099011628a96e5126e5bdcf99f3344d0903ccf351b62e52b1909
-DIST kmag-20.08.1.tar.xz 697776 BLAKE2B 56ba86f233092aa9271daf49d83c348e5c7f996185b46663c88f6db46840880aede82ac0fa5e658f3c5c0b9a047094c2341dfb275e1d068e94886e83e3538aa9 SHA512 44a6e161953f7557959a7a258659a276058c6230198d2bc1b50cf140d4a6af5436b40d161ff7bb611451ddf0748ebe33be39d4396a1d2fe45042aab38ea51ff0
+DIST kmag-20.08.2.tar.xz 697768 BLAKE2B 175dda95cffb89106d480a82325bbcaeeb023f704bf98847f23efc90848e0da63661ae692e5971fa9a4a1ecf980971e790142635f1fc8f7a877456a6f495ba13 SHA512 1930740e4fc5c7f99f7d85ae7d5caa651dc9e801938117e1a677aed3a9e7986693a24f75668179853386753ac13f8cde42c8480a078168e34b8e3964d65fe0b6
 EBUILD kmag-20.04.3.ebuild 963 BLAKE2B 5f580bd7ca2deb53f17370c83f30e0a82020d4948913ea5c6d22497a8ddf28528698ec8867d721c7ef431de313790ebb2801944b0fc05763e2bdba233927f959 SHA512 dd1e0016b683ae61656f40a0aa8f6f5269c9e46aefcc816bf38658f643bc044b06a71c04d0c3521b9099eabf7d3380787bd661f651adc335c79afe3e0802c92e
-EBUILD kmag-20.08.1.ebuild 966 BLAKE2B 3ce3815dc1c85094ff09ab7e1b3550ccd2e2e84a286baf19996f9f2af370532e356db366469a8cdc41ae097e208da09d87cb322cc8843e7a36ed71880fa047ae SHA512 f40d6152b702242277055be0fb04b4801f035956a9c12aee7dcf1055234d54452c474bca374af456d3f3ba0a72e834d2573e0ead889782384c225ef6ca636262
+EBUILD kmag-20.08.2.ebuild 966 BLAKE2B 3ce3815dc1c85094ff09ab7e1b3550ccd2e2e84a286baf19996f9f2af370532e356db366469a8cdc41ae097e208da09d87cb322cc8843e7a36ed71880fa047ae SHA512 f40d6152b702242277055be0fb04b4801f035956a9c12aee7dcf1055234d54452c474bca374af456d3f3ba0a72e834d2573e0ead889782384c225ef6ca636262
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-20.08.1.ebuild b/kde-apps/kmag/kmag-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmag/kmag-20.08.1.ebuild
rename to kde-apps/kmag/kmag-20.08.2.ebuild
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index e8067a77cc38..92282ab2c04c 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-20.04.3.tar.xz 3428000 BLAKE2B 3cb94d10598cbfb0d7455179637184fef58f3b572c2f81ac9f8374323d98457f0cd0bdca9a2585195f012c51f61fe8a3620c95a42479dc458d10e75ccfcb9520 SHA512 4a59ce38dc083981ba619e1ed039159a8655884dd515cacd095a1ac1ab16f35bddee202eaf6cd41b56237f0ce6bf0e5a0f0ee853d80ba169e0bacbd4f57d3aa5
-DIST kmahjongg-20.08.1.tar.xz 3434872 BLAKE2B d96ccf947f8c38ca06ad42bc2febdc0bba0515bf9a99520bf19c43ce2e7dcd4544e0409341ba8b52a1d77de92736dce1c7e795c6fe5af4ad189be9fed22e7719 SHA512 ab599f34502bbbe8563295f7061a15b779b2cd4ac2aec69ad0dae97c557dd83fc0452e0a9798c9a544fdf3e82c63cbcc32d2d62d984791dfb23751592c77c514
+DIST kmahjongg-20.08.2.tar.xz 3434876 BLAKE2B 168386810c7e98424b690d53447e7e67e950cab611ccea4b7633fe69738c8393dd97aad0a34e0e5b64be91ff131ac0d83edbc2aaf4422ac4866e7005cb93337d SHA512 027973197352323b08519da858807f5cbe45f85fc469797f492cc98f6cd27b1e5b448d439a765468753f1f340bc76334e32e8eec828fcfc18b86a20347506690
 EBUILD kmahjongg-20.04.3.ebuild 1105 BLAKE2B 8698373f62439b15741a3464f770d5d3d142e1eb2979d90bacea5c3e6e3b975bc98112c32fed484f9a509ae52de823b78940951dd838ccf45f6226f98e1d3a1f SHA512 6829217397f2bda82215fb9a094d748706a02db7c6f3105bdc56bf4bc3474d08039fd79ab5437fcc67af4f50670957414c7634748b679bdcf49b7b6550d90bad
-EBUILD kmahjongg-20.08.1.ebuild 1108 BLAKE2B 1e4c00b7a4869d11345d225e78c8eed0e7aade7b1814d289ab7cde08f75560a4eb6e2e238861c6c887375e57f0dac2d3a3e200396c311c559bae2c7f127afb18 SHA512 be015d06e249bfa85dd79f38673dddbac4b9ed43e822a46e5713331370bf7acc2f1bac99174bab93205bdba82414a43856aa22ef1d806314e1a44d6799e018d6
+EBUILD kmahjongg-20.08.2.ebuild 1108 BLAKE2B 1e4c00b7a4869d11345d225e78c8eed0e7aade7b1814d289ab7cde08f75560a4eb6e2e238861c6c887375e57f0dac2d3a3e200396c311c559bae2c7f127afb18 SHA512 be015d06e249bfa85dd79f38673dddbac4b9ed43e822a46e5713331370bf7acc2f1bac99174bab93205bdba82414a43856aa22ef1d806314e1a44d6799e018d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-20.08.1.ebuild b/kde-apps/kmahjongg/kmahjongg-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmahjongg/kmahjongg-20.08.1.ebuild
rename to kde-apps/kmahjongg/kmahjongg-20.08.2.ebuild
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 5bd9a4addf86..e1825e2f54fb 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,6 +1,6 @@
 AUX kmail-account-wizard-20.04.3-CVE-2020-15954.patch 2790 BLAKE2B be3a02e7d3c12d121196a0230c42094a2f9cf6ad562adcd3de2693a7702c1fa1df6c4ceb3f7e20547b83627350db0d8566688ef9f9c62d18691ef2ae46aae3d7 SHA512 d680fdd9cc506cadbf3f62e639acbf152a958230fb0b5b014a99af9fa0a25f54aaf95cb005b213dbdb005f3f41012319154594b79e68162ea4b5dcd436df4a2c
 DIST kmail-account-wizard-20.04.3.tar.xz 158132 BLAKE2B 237e1d9535c1dde19ad21ceed08177da0d98cc773a96785afaa14a8e780573f30ad4ab9ba946314ce440093923acc3dbc91406c598f02b017556a74d9fe8df52 SHA512 71a305dcf51fe20d700c181f0a13981bae243e2a3d9080e58cc4ec24a1adc625f500936656b732fd419cfbfef9258af1ace45789c7756687a22788fc5d9da296
-DIST kmail-account-wizard-20.08.1.tar.xz 160400 BLAKE2B 7c4b803ce018ac039e38d3f9aaafa6ae26452bb0af699c9b1e69e8b6ac384dfd85ae47c035202dfd6dc77f4d081c3882ea6d280d487b019b5c1708a98aa04d7e SHA512 04a61fd9f1bfd4d8373ac94bcfdd694871295c6e57564f21ffa130f6c3e815a7af6782275c35da8d5f8b1906699afc94ff0b236df1e4860a6e4e0e8c6bdade8f
+DIST kmail-account-wizard-20.08.2.tar.xz 161920 BLAKE2B 9abca5bcf61e0bb6e4d58face28133090d6bd52c9486848f338f147ff9634807ea560cfae01aa92144cab9290eeb7b4d6c0087d831283836318ed3191c1424e1 SHA512 86905ff19622a31c2504065038ecb872a1c8ecef3c17f5898c473c1b17c898cf1fbe415ca9f871a51376364303baf0c818afcbdb194e0ded4c8d0a022dc49388
 EBUILD kmail-account-wizard-20.04.3-r1.ebuild 1632 BLAKE2B db3fe8cef0f2c010ccd9b1dcbf8984ec79ce5f7901984c993326c823eaf33cb616817378e2d0a915eb7bef4f41931cbcadb47a2687a6d3401348f78d27a041b4 SHA512 e9b0d0426be1b930ac49a336e8d028ca38099e1692cf7d8f4b2210aafe9ac8e7cc856f8cda088a33370f78b53d4671a28868bdb04a1d9e6650a0a030ea0e2fbc
-EBUILD kmail-account-wizard-20.08.1.ebuild 1582 BLAKE2B 301c1a58e408a9567cd88a7947b9eeb0a7a32e463f8aa14a7692399e12889210f41975aae3c2ae440916c54d71b0ef62fd56af1d73d3ada3fcda4635a989fd92 SHA512 b374197fb6b084ec5efde7cf603a3c049b6b6c8ce6d3c155d4620a58dc795c63bfa0ec85cd5df2303e12806ebf7241be4eff528293bee44596e2737b59de5e33
+EBUILD kmail-account-wizard-20.08.2.ebuild 1582 BLAKE2B 301c1a58e408a9567cd88a7947b9eeb0a7a32e463f8aa14a7692399e12889210f41975aae3c2ae440916c54d71b0ef62fd56af1d73d3ada3fcda4635a989fd92 SHA512 b374197fb6b084ec5efde7cf603a3c049b6b6c8ce6d3c155d4620a58dc795c63bfa0ec85cd5df2303e12806ebf7241be4eff528293bee44596e2737b59de5e33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.1.ebuild
rename to kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.2.ebuild
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index a635fd8f8d56..75f7da8aea9b 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-20.04.3.tar.xz 4719852 BLAKE2B 4e116a47a4335c1322de6f54e4b8f8e7e060d531bbf2daf93778fb2892c6a20ba6854668655f9a7d25aa79e564aa2f4b26b9147dd163948fd3efbe7f829367eb SHA512 d0dd10bad186c6c03222909089ca46c046807eb3c2a0b5193560c6117990681adbdc95ef56a10e8bbbf64d4999420e451a892758250a6851eaac7c9fffa238a2
-DIST kmail-20.08.1.tar.xz 5153040 BLAKE2B 448bbfd7b1ee0a7405de1eb0f6462d755aecb8b94012ea01f9b4c7a975c6eeb9c680564b4edf4ba323f3a8a3bf0b182d775fd09c280b66629e293981cf966233 SHA512 f3814d26dbd0f29290bbe633b9ccbc47bdfb4b9747af4a93d89bb6d599e6cf9c96f31b3c2cf8cdd40d4deeebb15ad141aa3365889b1eae9f88b5e982fa2c1680
+DIST kmail-20.08.2.tar.xz 5155128 BLAKE2B 21e494b28531d124d39da71611c517c5515b97597db058d7afd35825274d1cb165a4e9b3d867054f8b82ea6157bf541e566408b54571c676d30609f0a7e7e549 SHA512 d77e034c77bf91cf9cab7e0bcd8587109a13e5d34d81eb3cc769b1a061cce24e34edc14d673e6843a792c7fc837ba1adcc42a505acc7d45d3784a7c2538fa957
 EBUILD kmail-20.04.3.ebuild 3843 BLAKE2B 93510a5cbaa7c61afcd23ba13951448801bdf4ec7918a2f433d977d06b436638aa1c2530ac0d4b62a0e1d6d372799c9d1720ac60be8588780541d779d4f3ea4a SHA512 b950108635efaa73f15c7883d5a0a4a8c7ac41ea4bda53c33a343aa988d348068e5e1296eeb991267cef682a2ef496dc737e9f36a3c482fb0ab937d4c51ef24f
-EBUILD kmail-20.08.1.ebuild 3712 BLAKE2B d3f236177ac13739d566eb3cc51ce96ec20d3c4535b5823b8b80335e90bf69956c7f366b3bc0baeb0ea7774f7e8f31a8149dd984c7ebcc78e818aa269e082332 SHA512 ff2dafff5b75e0cfb41df4a0521a7363fbf99bf15012265c9fe282257ab7f893326be0ec55223d8263fb8f9bfff2699b93e62d3886cee9b7fa3171bff5bc1bb8
+EBUILD kmail-20.08.2.ebuild 3447 BLAKE2B 36468f5a5634ea0d0d364c05563a970dccfe25199230696bce1dad9e885e06624f25579d15274cf9c291f8bb4a7e0c00f7301aa5d09704e60a53b5f5a8706c5d SHA512 e4b01f2e37e525f7ce8bbc93e602879c81a097d0d0b1161307bb1615838ffad21ca97347fcdaac8393c8beb67cded0c508b1ca89caf16f011f58d1a5391b6847
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.08.1.ebuild b/kde-apps/kmail/kmail-20.08.1.ebuild
deleted file mode 100644
index 47ceca275abe..000000000000
--- a/kde-apps/kmail/kmail-20.08.1.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "KMail supports the following runtime dependencies:"
-		elog "  Virus detection:"
-		elog "    $(pkg_is_installed app-antivirus/clamav)"
-		elog "  Spam filtering:"
-		elog "    $(pkg_is_installed mail-filter/bogofilter)"
-		elog "    $(pkg_is_installed mail-filter/spamassassin)"
-		elog "  Fancy e-mail headers and various useful plugins:"
-		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-		elog "  Crypto config and certificate details GUI:"
-		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-	fi
-}
diff --git a/kde-apps/kmail/kmail-20.08.2.ebuild b/kde-apps/kmail/kmail-20.08.2.ebuild
new file mode 100644
index 000000000000..21ee221dda7b
--- /dev/null
+++ b/kde-apps/kmail/kmail-20.08.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
+https://kontact.kde.org/components/kmail.html"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="telemetry"
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${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/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+	>=kde-apps/kmail-account-wizard-${PVCUT}:5
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Virus detection" app-antivirus/clamav
+		optfeature "Spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+		optfeature "Fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
+		optfeature "Crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 3745b6a13fcc..6bfaf3bbede2 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
 DIST kmailtransport-20.04.3.tar.xz 166368 BLAKE2B 50f7c74958bf6c8031f8538849acff4de544b64e79b91a2d60a18399b5eb1285c17f892c67515aa11fd6d5fb8d1c08bdedb3cb0bb2d12f176f6131c6ac92a124 SHA512 c49b5d5a4f58aab8bcf7a7a5bdc10df38d91caa61b05501cc57530e09a68046d527cd2bfe2fc634d64fde7fb24f41fb2ae657a9eb3bbb4b2dea2fede0ccadf93
-DIST kmailtransport-20.08.1.tar.xz 167688 BLAKE2B 0a3a7abd1c72ed5928da04794f460b61771954e2015d053ceca97cf7b638da791c414048e7cde8101e4424c095900327b6f5ec519ce2f457b0532bd58e3461bc SHA512 409475cf4a34b15f7f2bed4d5e7612c8c72e90cb39cc778ce79f1132180cde311a2d490e2172787c1461ca017348faff74fc10203aa482f51ef81550a15e310e
+DIST kmailtransport-20.08.2.tar.xz 167876 BLAKE2B f0e128e3079d004aa4dc2ce417835e96075fc2c3ba4623f529dd15d16cfaaf29af492ee22c3e07b8025a9c24bcd2738d7817e3de5dcbc39e02b1508ba8ef2059 SHA512 f0de2bed322643f5f22e1f9243517a817a2a3064ba6d87228ab67169db7ca281ce9082903c0686e89b9c5a2b21b867b32c9c4670e1647e4af6e38d2d0e3b47ef
 EBUILD kmailtransport-20.04.3.ebuild 1028 BLAKE2B a05d61c3dc850b1ade9682cf100f0395ba6b351e1a857ba197e7d149dc673d0f63bbbb7827897f6426c304c3c3fd7177ff6eb6c4b985c17aa28994803fd2eca5 SHA512 561e92ff6bd5cff9ee4d00d4e448481d838d9eb23a8c90c7104e0623b15aed4ede25e9e5a249a23ed7a51841036fe282e1fa234d47d6505d2abbf0a6976e184d
-EBUILD kmailtransport-20.08.1.ebuild 1031 BLAKE2B 35a4c89202546319d457dcb7a17009f231c4cb3215f944050158a0a69387c22607cc2c7ea3988e522f74688242541baf7ca506013fbd7f5c01d8cd00847e052e SHA512 6850c8a3b8ca7efc068a1587890cc8ce7376ec1c19cb49daf216f3fe7e6e92357bf886f2064aae7d57f729e3edfc5b6d185a8768b5c50081a8a97d86c23c9acf
+EBUILD kmailtransport-20.08.2.ebuild 1031 BLAKE2B 35a4c89202546319d457dcb7a17009f231c4cb3215f944050158a0a69387c22607cc2c7ea3988e522f74688242541baf7ca506013fbd7f5c01d8cd00847e052e SHA512 6850c8a3b8ca7efc068a1587890cc8ce7376ec1c19cb49daf216f3fe7e6e92357bf886f2064aae7d57f729e3edfc5b6d185a8768b5c50081a8a97d86c23c9acf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-20.08.1.ebuild b/kde-apps/kmailtransport/kmailtransport-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmailtransport/kmailtransport-20.08.1.ebuild
rename to kde-apps/kmailtransport/kmailtransport-20.08.2.ebuild
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 2f7d7a83b26e..a467c6666558 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-20.04.3.tar.xz 24692 BLAKE2B f0f728f5ae5c1e9dd6f6c493d8b4fc6cb6c4da5636fcf18944b5115f0e6fb2c8ea57576aa8315afda7d009723c04dc4bcbca9a6546d9f37ab2e5f0947d5bbeb7 SHA512 13dba358b31a6bd7e7c702ff74a06582b53473230959c598ed39a68c262e8e3631b3515d2d602f3d8e9ee4770ac2aba4b1a0a1cfb1e467f3ab32f211125b41cb
-DIST kmbox-20.08.1.tar.xz 24796 BLAKE2B 20514b431682d8d5010ba526a44572a686323a5191c180a131de32dbebea68a4d5fa92e24d3d77739b16cedfc0ad4d36c6630f70546344efca5bee0825b4dc92 SHA512 8b47e4cd630c0483940a8885f85899f4227e19f5de3decf5f98d816bb6c7beb507f4d3126a9f92ca305f21a8cbb3c52336ea4e4265a70411d3eb2021b38e976f
+DIST kmbox-20.08.2.tar.xz 24804 BLAKE2B 12962630bd10bf072225144984186b9054f37045701299bd1860a7460f244e206ab88c5ab45484b8ecabe8aa37fa9e371015ba6c665a0e2e8dcadb64dee3cf8f SHA512 0af81c2a485301443ea52952261c392608cc013d20dc9c60e212fee88543415e3d4c75bd56e037732b6f9cd9d4bef7541310669a3acf875d390620f03d124f2d
 EBUILD kmbox-20.04.3.ebuild 353 BLAKE2B 7fdf5a6ddfbe61f0c332ffe1ac9c320c4198300d054596879eabbfed1efef0e6bb45a874a9fe54dce9dc2d274fddcc1a7e7b6b54b7d661df7b726b56ee7245f8 SHA512 50b1ca32c3def8d936d3bd5484339a19f09fa2ccfbbeab3009f4bdecee192f5e3eb6235b6132da2572b3bba6268eb40025c4e41e54aa6d4774e143350c91165e
-EBUILD kmbox-20.08.1.ebuild 356 BLAKE2B a5e77ba20d3672f63b9d1edd6a4dca01e3bbbf983bae58504401389d40ae7bf2d28176f630f2aca7534f2b69c6eaa7c55718bc9dc523da4a0750bb9dcaf63b4b SHA512 8dc40e24d25302b7a70d7d958ab508d758eef6cf7418a7f5237482379a30bdede45ee637eddff1e12e51b64c0d9120b0660e14640d0b64aec4ca0e3aa6596ed6
+EBUILD kmbox-20.08.2.ebuild 356 BLAKE2B a5e77ba20d3672f63b9d1edd6a4dca01e3bbbf983bae58504401389d40ae7bf2d28176f630f2aca7534f2b69c6eaa7c55718bc9dc523da4a0750bb9dcaf63b4b SHA512 8dc40e24d25302b7a70d7d958ab508d758eef6cf7418a7f5237482379a30bdede45ee637eddff1e12e51b64c0d9120b0660e14640d0b64aec4ca0e3aa6596ed6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-20.08.1.ebuild b/kde-apps/kmbox/kmbox-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmbox/kmbox-20.08.1.ebuild
rename to kde-apps/kmbox/kmbox-20.08.2.ebuild
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 09ad090191f5..f12299c77980 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-20.04.3.tar.xz 148540 BLAKE2B 8c5777900ca053cebb97c5ca1fb9b537cc0bcb054c7e3259f5a855ee99f988957e273dc099480b8cea7255bcf6e64c2d979edad1871d99599b0a012e01c79a80 SHA512 2f97616a576f02e81ad0ae2386c4ba4570a1b068e6221837ac34552810e51aa75407a0b55078c0f104ac149720d2bfc61efe73cf045548a3f435b7028b186ddb
-DIST kmime-20.08.1.tar.xz 151644 BLAKE2B b45235cc5b30bb5432f4af2f916630f91905f39a6f459eeeb43fce10e90477f95a1d5bbf21d417be1dfc923c992bc768255d007fab0beda8a3ceb16fee1b8193 SHA512 aae0322d0805c1730757c0fc57d270215e15340ef9963d023f9f9259c209934eff153f66fd691d8033f175a06938be00ed638311a84da408bb6a8ac5f9b8430c
+DIST kmime-20.08.2.tar.xz 151776 BLAKE2B 987f9b12ab030df95ab72fd05c256852934a0668efb166947894ba3c6240e6d5b89600f5f20060cbac656726562f40172add918eebbb12e94511c9bd44efb036 SHA512 03136e02f3f80b3098259d6984b5c85e50f75a101ed7b57809cf113e11aa50b78c46d6b041118ffbd7e6a19567b32f53d7bd7fdf66ddb64226a7d27c0a55280b
 EBUILD kmime-20.04.3.ebuild 407 BLAKE2B ab6422123bd0c2e0f9a5bafee0d94be874cf68fea8bc63b1df3d7e35ec8274fb3433965705d757d4a92bb921a60b64a3abf5eff773cd81a7334d9d35258c5719 SHA512 a18294f959075b8e4e784703ad04af048378e1049c3abd8307a81ce9c7651f5c79126892314cb7ec97ca2e0243b560476630da93fd684b4ac316f2591f27bdc6
-EBUILD kmime-20.08.1.ebuild 410 BLAKE2B fcdb54b20d61ed366393d18371cd1f9f7edd15f530a5ba90c60271573a2076839c411e9e33ed166d3abe422777f140ec466c024d4ee75fe2a6bb51022668ddee SHA512 4cae1aebd5fefe2b56f84e8adeeb332dc883b479d0c2bf2148105dd512f90c03c394f6e2619b60e76a58915843b38a3a5ccd18538929c3e77c596bac41f70c73
+EBUILD kmime-20.08.2.ebuild 410 BLAKE2B fcdb54b20d61ed366393d18371cd1f9f7edd15f530a5ba90c60271573a2076839c411e9e33ed166d3abe422777f140ec466c024d4ee75fe2a6bb51022668ddee SHA512 4cae1aebd5fefe2b56f84e8adeeb332dc883b479d0c2bf2148105dd512f90c03c394f6e2619b60e76a58915843b38a3a5ccd18538929c3e77c596bac41f70c73
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-20.08.1.ebuild b/kde-apps/kmime/kmime-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmime/kmime-20.08.1.ebuild
rename to kde-apps/kmime/kmime-20.08.2.ebuild
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index e5a16f8fa90a..5d1cd9d2a99b 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-20.04.3.tar.xz 899972 BLAKE2B 2bd70900ce20827fc137dc7522966ab6463f0574413fd8894cac518f6b354982d6f3a6807eee5ade97330db2ea8863a4a16b57aec5ed638ef8c28cb4fee00462 SHA512 cb13f8fcaae9134941d942c2b9457849fef0397bbada55387f47a3f0a147bd33e308cf41c78124ab4abbb249db0ece6fbbdb8e23e47a250895b2f4f10e9bc7c0
-DIST kmines-20.08.1.tar.xz 956976 BLAKE2B bedbc33395203d57e56fddedddb1236f99ac8ecbf4d9c7110369fcf5452600efa8b6f7ea009619403b09663e2dbbb2fb6b8eb026cdd945b6edac94d94ab6fbe1 SHA512 2e991306367697af2657ab9ca0a8251d7ed9d43e7e97893fa5267c52f4c26686a16a997d3f75b71fc4d54af4a1318d97c1f69ba3b694697a4b2b79eae1942294
+DIST kmines-20.08.2.tar.xz 957352 BLAKE2B 6722417ae9a29382d3a7422d6a9f294c4df8d8c0f72cf01f9f3835e23101d42ebf05b8e2739b93c72b58aa48c28a535d90ce46bc08036fb32eba3716b50f6448 SHA512 389435268963627f870ed97cbcd92f7dc6898d3eb1ccbfd954c806fb45516bb83affdcd2f5597b44ddcf7e662c4f6ea6fd9c768a5c5038713e21894671b35587
 EBUILD kmines-20.04.3.ebuild 938 BLAKE2B b9929e97d37ec0765676ce0fd2f72bf819455d8e26d571c88e81e5ec4f1f11b4b48cdb8733e8b2e3e9fb3c95632b79f2bbddd3570909a563abb88b65b54826ff SHA512 9ec97040c5cbd896495c4e35a327284a01a43215c3b78c856611d665162d57c71f252d9041d2b0d7ffaa0f5e3e889b2b494a57f550e03589ea47c9afcd814201
-EBUILD kmines-20.08.1.ebuild 941 BLAKE2B f8840d2106f19f072804c64b6a77144835a3908deb095d9a89b2b075361a722100f65706836c3b1205a80a34a189ea6e5b1dcf403c6bbcaa684ff5087d1e1333 SHA512 1fdfd9e8f95df950282395f889eb9efb513b7404d3d6e76c69840b6949a9b6137a82da78f356e0a5697154db4d15a8ce6ad255d21a3bfc5b49698201110538ee
+EBUILD kmines-20.08.2.ebuild 941 BLAKE2B f8840d2106f19f072804c64b6a77144835a3908deb095d9a89b2b075361a722100f65706836c3b1205a80a34a189ea6e5b1dcf403c6bbcaa684ff5087d1e1333 SHA512 1fdfd9e8f95df950282395f889eb9efb513b7404d3d6e76c69840b6949a9b6137a82da78f356e0a5697154db4d15a8ce6ad255d21a3bfc5b49698201110538ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-20.08.1.ebuild b/kde-apps/kmines/kmines-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmines/kmines-20.08.1.ebuild
rename to kde-apps/kmines/kmines-20.08.2.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 28adbe1a79a1..56ca3bb3cc39 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,6 +1,6 @@
 AUX kmix-19.12.3-no-more-kcm_phonon.patch 2511 BLAKE2B 553c4766bb25f04b6977a66c229d13c39caee17145af4f26919141fb7924d49bd88058410adfc3a02136071fc5150db1f089e2d5cd9e1f79ef402e6a2e9d4661 SHA512 f2b9dac29c93270a785c35441cfa46da1fe9daf96896210a6ee9fa3c5dbbb422645f396c4f73d943352fb8c49caddcf59fe60858d3e020211e70b8b6eaf67692
 DIST kmix-20.04.3.tar.xz 1006804 BLAKE2B 0707be0dbb18ca6377b99a718b98fe4ddafaaabf129b319704d8da826b48a08a956c538eba83859adec3471c1267150d94889b602dc7b4b6550d717b45bf9fd7 SHA512 80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78
-DIST kmix-20.08.1.tar.xz 1107064 BLAKE2B f02364671c7fcbf966331801763192c2b01e238b99c9c8d27be2489a04d98970ee2c42d867b24acbc82c55dbc4a726f47a8a08683451d06a830aeccc2a8f6d3d SHA512 7a5de71d7b9e0b1965c82ac9775ba518d3362d33ea0ef16c3302f1f48b54532a9806431fcc76d603402ac74109d382d2e4ef271d8561c3a315f67ae8f331cd9a
+DIST kmix-20.08.2.tar.xz 1107444 BLAKE2B af362b55c4227ff51d70ac42e1f5e32296d3f284d220d69b2c0d03205c65a06e513b31293666e00b34ee12835bd3c27a93a4bc6ade4a799772a1c2d031efb504 SHA512 29891bee0bc0ce993f62e1272b7e628df20957e7759cbb9192aad529f2a47b70d115b7ab5f4568b76135eab9327a37d12cef9e641c8adf79eeb6a5dceb7af1a8
 EBUILD kmix-20.04.3.ebuild 1599 BLAKE2B 5266c8cb9358c458e24d917f6621a4fbc4f028a3b32935748b26020fd6e73f11157cc3190ba71c19faa3151859e0e70370c2ac40a6abcd12d8a89fcc64a1bf21 SHA512 eaa24c99944006fc3ceb680472291dd4b25827d1a0c5e3e7c6b224ca2f646575a2baa93b912230972bb6682d792a3ad6d8efbf18aa1c986ae80058cc0a04631e
-EBUILD kmix-20.08.1.ebuild 1463 BLAKE2B c368a30f303f9d7f17f185b25376e1c55d2a17b50d85b3ab911b77065453c11884318b22f1b209eb427820443762336e27281f77be42ebf80d58c77a39e2ce8c SHA512 a25c90b9ba8ef71ff57595da7e5ea3ffccec75d0b8961eac4258299bb8877cb51d8c0767a5d19f41ca5dd42e3012ba24b58b55429e2ec435c70eef0e65f2a844
+EBUILD kmix-20.08.2.ebuild 1463 BLAKE2B c368a30f303f9d7f17f185b25376e1c55d2a17b50d85b3ab911b77065453c11884318b22f1b209eb427820443762336e27281f77be42ebf80d58c77a39e2ce8c SHA512 a25c90b9ba8ef71ff57595da7e5ea3ffccec75d0b8961eac4258299bb8877cb51d8c0767a5d19f41ca5dd42e3012ba24b58b55429e2ec435c70eef0e65f2a844
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-20.08.1.ebuild b/kde-apps/kmix/kmix-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmix/kmix-20.08.1.ebuild
rename to kde-apps/kmix/kmix-20.08.2.ebuild
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 82d7e7d1ee1d..6bdb49802d0e 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-20.04.3.tar.xz 113316 BLAKE2B ac8742126998650c10aaffcfd150e302c62d4cdd571fa18c17179d434ac2115d70c2583e37384c42822dc20aa2b8e412a4e58b4dca748bb611135198a34bc6e5 SHA512 d949c5c54a3bbfdc1ae6ab1795efaa7d2f08a18310a528c196ebba97467894a32417be18c555bdbbf5e485012b4a5492451d4aba00e9cf1847e31a27abfa0f56
-DIST kmousetool-20.08.1.tar.xz 116032 BLAKE2B 5f3d72a7c63338eee381ed8c8741d4115573ff992a1e88124c1c6253d8f817e31886e0642779392e1ad07b9e5c4f8b9c998cd269d9263e88512a40390645dc50 SHA512 4393e41e796705a0555be67a2fe6925593f72a4e738f70d3010d77bfaf65fe219edc8669a9c662397ad1d5d8d378e416c73ccc08fa15156c078a312e88cf74a3
+DIST kmousetool-20.08.2.tar.xz 116088 BLAKE2B c5ad0994e5d890238f3956641fab2929fb3f0c954197d421a8fad22db24a3c2322708f3bb8a1074fe66730376e5e2aada97426db80c2dd057da4b3e999fc9d00 SHA512 a764a05210d979af62aae8ea8c78825753643d628a97cccc16be0754a62ed3145d7d02d64ea5c5c95bb410d3a30c2af2c36d5b2907ab086469f0fd587a54007f
 EBUILD kmousetool-20.04.3.ebuild 881 BLAKE2B 02b59b5004707db94a80bf4392648f2e41c28148a1ee29943a3e482d0fa28c91c1fb285a6a5f6a822923a892aaef4e310fd48df5a868b94473f6b37c5dd02330 SHA512 8dccc596b628739efe4af39f000a5e85b7b5ee35767a52302f82f90a3c2b5435dfc9afb8bef0b495c7525efcf09d99d68bdf01d9315f577d53470a4cfc2b0de0
-EBUILD kmousetool-20.08.1.ebuild 885 BLAKE2B db4e773cd957d50301546ff93d2b5eb3d8f8c7a66531469ef4e8cbfee7b922d40c1c969995fa378f1cf3d19eaf5e125a5e0c5197c4d9f9cae1928afe26406ec3 SHA512 90d76e559155a746dfca5f2006104f7ae442c3004339170d62c6633bbbaf9239dc8321a8e81deaa12522ffc18a347a825c9a1dd984429cd2ddd0676835673e4e
+EBUILD kmousetool-20.08.2.ebuild 885 BLAKE2B db4e773cd957d50301546ff93d2b5eb3d8f8c7a66531469ef4e8cbfee7b922d40c1c969995fa378f1cf3d19eaf5e125a5e0c5197c4d9f9cae1928afe26406ec3 SHA512 90d76e559155a746dfca5f2006104f7ae442c3004339170d62c6633bbbaf9239dc8321a8e81deaa12522ffc18a347a825c9a1dd984429cd2ddd0676835673e4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-20.08.1.ebuild b/kde-apps/kmousetool/kmousetool-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmousetool/kmousetool-20.08.1.ebuild
rename to kde-apps/kmousetool/kmousetool-20.08.2.ebuild
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index a1a60d6be945..2ae3ce02bd86 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-20.04.3.tar.xz 1964136 BLAKE2B d2c1c78ec2c4bbc868e95938207e950bcf5db95908aa3d50a247d2c4c3e8e20cb86efb4b8be8af3191a1f73fe401fb00e7b4c52e40ee04ef0f5a53730327b445 SHA512 1c19a847559f840513a8cd6895efd05fd822606267131845bd5d0c87b89766f7be9bb70d9634fd3711f31cd4eaeb53cd2f15b1da5daecfb20e87001efaeae16f
-DIST kmouth-20.08.1.tar.xz 2083968 BLAKE2B d34264f018fa50d11d877612f105eb8b352220cc66aea8153a15add1f9899c4b367def8f6d5c7a0c691232c32a2c14ab958643a865056c853cd69d042baae248 SHA512 7673e39bcc0a32924d5016ddcb10ba96926f6c978afbfb0a720d581ed515eff93a81d7e7a7200845359633c82508ad05d6f37c898f2840636d629b18b501a02b
+DIST kmouth-20.08.2.tar.xz 2083920 BLAKE2B a09288b46f699cc7c9578b9cb4c3c5551f823f951f6ddabaec54a41e7b420b885edbe5bfde9abb98802f2e5a96f516275e8a495cbbd4a649105911b4f0c3b37c SHA512 19e23428f18e0a0aab35a67af751be32d2752f72fd5ec76b64bcfd4a9ef538e4252d1f3bfd611758f41f13d72b48304439e39e4e1aea4c938f72833512b7b7ab
 EBUILD kmouth-20.04.3.ebuild 911 BLAKE2B bbe919abb48646400828b7a83c2d54e7de8977aa2416325c0f2f07c8298428886a928fd1460501cb0db91f380eec1c37ab036ab87838ddf1d285f6b1da92f71d SHA512 406193f197780239f18f62e7873bd9eefb00dbdbb4d2b337bc0fc7cb15909a26a0ae45f602049efa8bc1ddec20078977acf583c19cfe5cb074a926de3defb72f
-EBUILD kmouth-20.08.1.ebuild 914 BLAKE2B c30c53d54cff83ae6cc9db9a73e0548be68eda0db5c113f4f4480408c2423a36f4fc8cc6910914fdc2ea5a927f981e2e165414f5f2a8ba48c1ec5892a48f1b73 SHA512 6cfe1a90d7f92b0be397622260ca43c88f82bd352a1299fcb93a1876f5785b2ff979456d8798e8ca80a55c157dd86bad6ced5865220b9b2f83d5143a47fde57f
+EBUILD kmouth-20.08.2.ebuild 914 BLAKE2B c30c53d54cff83ae6cc9db9a73e0548be68eda0db5c113f4f4480408c2423a36f4fc8cc6910914fdc2ea5a927f981e2e165414f5f2a8ba48c1ec5892a48f1b73 SHA512 6cfe1a90d7f92b0be397622260ca43c88f82bd352a1299fcb93a1876f5785b2ff979456d8798e8ca80a55c157dd86bad6ced5865220b9b2f83d5143a47fde57f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-20.08.1.ebuild b/kde-apps/kmouth/kmouth-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmouth/kmouth-20.08.1.ebuild
rename to kde-apps/kmouth/kmouth-20.08.2.ebuild
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 0d869a9f45e9..edb31be3e780 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-20.04.3.tar.xz 3054968 BLAKE2B 3d4bd91206af25b81736ace1a6ddbffaa805dd8f99b7936969328111f333523e5fe095b19ba6a870798732f5d047cc971079d6838fa85ca64ed12c1a4e49687b SHA512 06cb19924e6d460b52f419d29e028ab4cb13cab6ab14f1a27216d3d0ecd467676d337ec04d2c3fcc2b081853d3e0858ce2f2cc46279efc8fe692b8ab6a4ee5ff
-DIST kmplot-20.08.1.tar.xz 3055536 BLAKE2B c25ce0099b9ea9c5e8045763cbaf94231c397a79ca0d655601a2028cafd80b5882c9cb117dac780c0cc21bcd2c259ebfb6b21ca869bcfe7b27bc1020aa9acc93 SHA512 2a53daf7b0581558c30f9490363f7c07806671a6e5a76e5f3384718e9104a047042ca9a2bf169ae0a327997f3701ba206c6007f088b3bf326cbc499329cc573e
+DIST kmplot-20.08.2.tar.xz 3055588 BLAKE2B 1fda60e94d6c8e18c9123cfb5eee502c84445ab8be20a3d5010449676c386c7d34cdebb769e5b971f5e4095fdc9b7958f78ad405ffa1f4ca8d27ee9497539fa6 SHA512 a5ab803c6f71018d8681d2b280cf7d054aaf3ec501c563780b72d7845d79cd9b4f7ff87558e2236dabc81b8ea2791689c6ae4226346893707a98fddd85fe0245
 EBUILD kmplot-20.04.3.ebuild 1080 BLAKE2B 8cfdbf332188462c5390afe135cd45f2c966a026ee0913abc866ea18ca735f964ccab8e758ac9b8444f410fd6f1476ef34cd46449cd040dcd3befdb7c239def2 SHA512 61cb074e725f135e2573476838d627368f5ff9c3f266cc208511e71443503f9b651c2d74202058bdcd0db73d9411a03473a8f29568beb48f7db4d2e4c1447970
-EBUILD kmplot-20.08.1.ebuild 1083 BLAKE2B 3de553fd31178c448fbd87e53bec82a6ee7fc4e8f6fc798bcabfbf102531f1862db5a8684f006ced4d1355b5056c4f5448e5b39716288de7fd021ac487daa21a SHA512 209e5bb263fbce72e37893901c5ce11fb97165fea1a6632c4df274cf5eb668c48b56e5f523b95ef7e6e5fcc7e3c6408c56358e0d0bc0bb8be68a28a4661cd7ee
+EBUILD kmplot-20.08.2.ebuild 1083 BLAKE2B 3de553fd31178c448fbd87e53bec82a6ee7fc4e8f6fc798bcabfbf102531f1862db5a8684f006ced4d1355b5056c4f5448e5b39716288de7fd021ac487daa21a SHA512 209e5bb263fbce72e37893901c5ce11fb97165fea1a6632c4df274cf5eb668c48b56e5f523b95ef7e6e5fcc7e3c6408c56358e0d0bc0bb8be68a28a4661cd7ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-20.08.1.ebuild b/kde-apps/kmplot/kmplot-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kmplot/kmplot-20.08.1.ebuild
rename to kde-apps/kmplot/kmplot-20.08.2.ebuild
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index b49395895e0c..2444185c7b36 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-20.04.3.tar.xz 1282708 BLAKE2B e849104faa3012987b6370da482dcb0198621f64ee9e98ecd6cdde7dd0e3a7905ae7d4a8ac53d2679fa7b5e5f9a06afe14726ee6240b11a3bbd185dbc63a80d4 SHA512 a4300f137f45adc62d1741239712e27e8033581f26c16feb8a32097b214c84e0e81602a27f7cfe078cf2c3d27896bd5f8b3a508e8fd8632c378c72c176ae4de4
-DIST knavalbattle-20.08.1.tar.xz 1287336 BLAKE2B 68620e35d8ed766b739ef081baa9245f2bdf7801b21921803054bd1a1c0f1996e930348037645c48a9a146327f0416fd82bc1ca6f496bf3bb3f0d839ba0f22a2 SHA512 4fb18a15b2ccdbc9ff9794f15ceff76dc5ceabd4ca252ef352071e29caac7922a30b3124bf6bf8955afa287f6417c66bb6a319a25a1172610e707eddbb638bd4
+DIST knavalbattle-20.08.2.tar.xz 1287660 BLAKE2B 39e6539aa7e5b4f5acfc9195c4cbd5b904014c53afd3e309ed363485d6481b42d8992cf1a22af7540f6f0322607cc168f7c034fcb5d7295b1b6a62593b1a1cff SHA512 7904d50cc94f9fcd6331666192607669b5911c1753e3c2cd9df376822704553a88ee7c23498560b0ca21bab12b584b72023e5eef7784edcd1a24c7fa8ad96149
 EBUILD knavalbattle-20.04.3.ebuild 1056 BLAKE2B db7c9d0d2307d959fdc1e8b3f9eb6b6fdc3a996f7226945e59faa61f2e348ed1f31e0410d2c348a1f628876b93f886f6f55c5655648d0b50110dd23c4870ab12 SHA512 055410aba5518281e95b078ce28725eca25a2b2ddf09249fd6e096f2fd2349efbe96bf02fff0ed4f10ddb46e09f28c976785086a697c465eebe7c8061540ed6f
-EBUILD knavalbattle-20.08.1.ebuild 1059 BLAKE2B 83d044e8387211d271f1fe0e2b846ccb551fc57e18098318ee93b561318c6c958dcd519aa19edc5625c968f27a6420c1dff1ccdfd83b1589d9be74e8b4eb418b SHA512 8e4b3d568878b82c1169cc13cdce47ba2c9df0d6f33fd5a701986c4cfb410b0f378e9a3cde66ef9c3c04714e9a907c708ef20582d3d1c64a4b00d4316e43a3cd
+EBUILD knavalbattle-20.08.2.ebuild 1059 BLAKE2B 83d044e8387211d271f1fe0e2b846ccb551fc57e18098318ee93b561318c6c958dcd519aa19edc5625c968f27a6420c1dff1ccdfd83b1589d9be74e8b4eb418b SHA512 8e4b3d568878b82c1169cc13cdce47ba2c9df0d6f33fd5a701986c4cfb410b0f378e9a3cde66ef9c3c04714e9a907c708ef20582d3d1c64a4b00d4316e43a3cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-20.08.1.ebuild b/kde-apps/knavalbattle/knavalbattle-20.08.2.ebuild
similarity index 100%
rename from kde-apps/knavalbattle/knavalbattle-20.08.1.ebuild
rename to kde-apps/knavalbattle/knavalbattle-20.08.2.ebuild
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index db15b3eecbdf..677aa404e055 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-20.04.3.tar.xz 1259352 BLAKE2B bcc54c60caa8d068a17ebba973a94e617581ead9c7704f8db699c160563d3656518ea30fd734812a3a24fd46c4aa1bdb90dc2d948d14d88296afd57a25124aee SHA512 b1466213ff25b5e8352669e4fbc82da444897934faa21e27b758b15d65e12c59384c5edac6400700c57b52a59a67a9452687f834000694a93503887b576296f3
-DIST knetwalk-20.08.1.tar.xz 1267744 BLAKE2B 52c2f5b168e116e4f7ad30027e8550465fb1a6408d650843740bcbe964aba1f6bc262a2e727fe8fc1cdbf61098d71414566055aaa925cbda07e873698b15614e SHA512 4258f52b501ee19c20ec08d3ad9f27e6c97a254fea83b4e87da90bb545c9fbf7d8a63687f0c3a7652bc93d84e9f2a96b45713d69dbfb1bce98e60d7c414d1477
+DIST knetwalk-20.08.2.tar.xz 1267676 BLAKE2B 0776749a7e5866dd8ff6378b7c25ade34321d760c3d41ae5d5c11baa52d6e61b046e8a706ebf64af87786942250962d80e4fc90f64ca2279d338959baf5241d0 SHA512 6786645fe70963e89cf739996e4872568fe355e4a551bd6504330d7e8e6ddc8266439908f1515d1dfd0ae7f984baf290060a999b7a9c3739f38f45b2cf70956a
 EBUILD knetwalk-20.04.3.ebuild 1035 BLAKE2B b9907ec2a040b6b8f7335628ba15aa1eb337ab6516aed172f3050da417dc354527fad9851f0c54a1521ac2850d7f3617694cdc253f734feb23ae4c60352ee000 SHA512 80c54a71ddcb0a20cd85cb9b791f70ac164894ad58fd6bd55170baadadf71c24d49909d0aaa2c12b128852aed1e06e0736964922b4c7a32999a4a5e09382a584
-EBUILD knetwalk-20.08.1.ebuild 1038 BLAKE2B 3ccff4c1cf9ad66fed6642dbd0bb5975753f9f3f384f6fec825791adb6223c46cf1750789b4cb53510fffe1320a69fc087ecafbb1d54450136787f1c60997f1f SHA512 9f989b3c71fb94ad153d499e9adcc68d69c59c8fdb656ae97407a6972f6b300f6e77de51b29a76a85354384b1b4faa6f61dfc91229bb7fece88419a30c6649b6
+EBUILD knetwalk-20.08.2.ebuild 1038 BLAKE2B 3ccff4c1cf9ad66fed6642dbd0bb5975753f9f3f384f6fec825791adb6223c46cf1750789b4cb53510fffe1320a69fc087ecafbb1d54450136787f1c60997f1f SHA512 9f989b3c71fb94ad153d499e9adcc68d69c59c8fdb656ae97407a6972f6b300f6e77de51b29a76a85354384b1b4faa6f61dfc91229bb7fece88419a30c6649b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-20.08.1.ebuild b/kde-apps/knetwalk/knetwalk-20.08.2.ebuild
similarity index 100%
rename from kde-apps/knetwalk/knetwalk-20.08.1.ebuild
rename to kde-apps/knetwalk/knetwalk-20.08.2.ebuild
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index abd02b5dbbf0..ff7cb60fcc0f 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,5 +1,5 @@
 DIST knights-20.04.3.tar.xz 3522832 BLAKE2B b3b1c060cb211e60cc6966cb79ef0bc7920902b064cc15ee23d31a0aa1fcc5fb7677e8527bb7b54deec79827238e71c34207a8ee508b14f83f8f580eff07402a SHA512 c6c8af467ec0494a1ce3c21ce299ace47eb6e1441726d17bc512b20bd34c528f337dc8d4554411038a3908459f7c94f8df2d4a4187250afe2a60aa2530e19c39
-DIST knights-20.08.1.tar.xz 3534716 BLAKE2B 435d9d0c2bf25a1992e5b3f01a7cd461efafaf9fae73ff084c3eddda6235ed5f53e2850b8bf0a2e3e367d4ee9a8616fbecb78b3a7a97fdeb6b9f7c7f0865ce3a SHA512 414426b6390387f88d6de3a68238f022103ea7fa679a4d6cac270d40ef05aa61bf7d7509734caff230f0dad7bd969d44f7b4d341262adff76bf61a907fc00856
+DIST knights-20.08.2.tar.xz 3534628 BLAKE2B 77839fc30123e1a6120b8141ac70c17083497363e9ae9c7002670931e7709a68cfdff4f44db2a1ec35fc072c9c588d116bb87638a69c17a6538d423f186fb933 SHA512 54fa324591c2d640b9626ce166e72bc0015162bff989231045c50d531a77e6659520ffbef7f671722289c7e2002c5362683cbb0395755aab7c49e6fea4e8b68f
 EBUILD knights-20.04.3.ebuild 1352 BLAKE2B 9e8b8f088c0f072d0890bb393f25610fdcca0665c6e56aa603c6299dacfce49c4019d4d2a431e36b86f38039866824fc7fb7e1ff47f94309e55f671bc337d570 SHA512 708da8d0611372d663f54490c0cd13aca8aaa04e0f74c1e6c5994a4312c5076fdd81c3b0b3ee263d7352ee52451766ca8d2f7a17039c90153e00cc41994ea31c
-EBUILD knights-20.08.1.ebuild 1355 BLAKE2B 65d4e18fde3d5cd90f7771725ff7fd9c7cbab26f471b8076ea93905e9feee233b7ecc47ed5cf65e7f9314e4c1ed82f2d9f5bfa17b16dae43bf8452582bb59cb1 SHA512 d3a1fd57909f3621206c7ae4aff6c1f07bc73c6365e5db187c19e78825ea7cbfd20bd01bfc4ecea4d5674ec4edb21b97eca9c47bf070024e8a189019d6dcf3c2
+EBUILD knights-20.08.2.ebuild 1355 BLAKE2B 65d4e18fde3d5cd90f7771725ff7fd9c7cbab26f471b8076ea93905e9feee233b7ecc47ed5cf65e7f9314e4c1ed82f2d9f5bfa17b16dae43bf8452582bb59cb1 SHA512 d3a1fd57909f3621206c7ae4aff6c1f07bc73c6365e5db187c19e78825ea7cbfd20bd01bfc4ecea4d5674ec4edb21b97eca9c47bf070024e8a189019d6dcf3c2
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-20.08.1.ebuild b/kde-apps/knights/knights-20.08.2.ebuild
similarity index 100%
rename from kde-apps/knights/knights-20.08.1.ebuild
rename to kde-apps/knights/knights-20.08.2.ebuild
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 952285412c86..7bfaeaa97c0e 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-20.04.3.tar.xz 320856 BLAKE2B 03545965cfdbd55c857c584376cd46afc455de449b66f986dd45b0112d638fd77eea1bfe33bd7448c0e62ffc1435ff11a198e5ecf11236c8c5e5d0a2153f80a8 SHA512 560eaace0c0c0b74e639b9c9276e2d07eb28a24ff3986459f1011422b447d653b6afbbc17469b28563c0afdc14ff821b073686d3cb155aa2ad807834594ebf50
-DIST knotes-20.08.1.tar.xz 322388 BLAKE2B 366adc9ce270d0230a63bfd69090ba6d33912929e4cf22199afdd55c63f57d9720f788fb2454d909c18982a83228db4a288167ff147aee7b2bc805d34e06891d SHA512 19030e36b66714aaff7a126aafea6bb78a7e5fdf58c25bea3ed6875d79939c825c031ed0f4bb58fcfe34e736861f68ccc834a1c36f17f01345957fd39a12c7b8
+DIST knotes-20.08.2.tar.xz 322452 BLAKE2B 69ac82e191082194ead672f3829dc21d74d86e21815c3ae0c621192ffab5c84ce162e5b59f4052081018c4c67d1c09d9c1cbb2b2479e3388890c5c9ae67d2fc9 SHA512 95445373cf6ea7ba59d80769f5336465e7cd4285d84398bcf1f0fa9a1140864aa72c8beba428565390c832a576792cf3fc860360035c4a43cea6ae7dab4c3777
 EBUILD knotes-20.04.3.ebuild 2157 BLAKE2B d410e515050975eb884b95ec2b9d364d5bef1a9bb682796f32d38d624a45231bf19610820092ea76168601b4b95eec980e8fcc2124612b716238a31df93cd05f SHA512 323f90f3cc1333a091dd71c3c53163a07392e8eb74f8dcd5b8da2851b83b59f53a732a9f6624e6a213dd71b821f0baa55a8b1241f5f320400fef968027ee739b
-EBUILD knotes-20.08.1.ebuild 2160 BLAKE2B 06a8f085eba9d4eb30361bf9f6e752be6d214002f7db01baf09112d9e893c84365b6d42e080bea90d086bcee809d9447ef75d2e5eee43b7a75c9ed65a971f4a5 SHA512 72d21ddb4fc0a5dfe8060dd98b69fe07ff1c178793804439b7ea87388f8d83eed068831376fbd47e861d154556e59de6890e03050cbe0d3045406d6ad3fb98b3
+EBUILD knotes-20.08.2.ebuild 2160 BLAKE2B 06a8f085eba9d4eb30361bf9f6e752be6d214002f7db01baf09112d9e893c84365b6d42e080bea90d086bcee809d9447ef75d2e5eee43b7a75c9ed65a971f4a5 SHA512 72d21ddb4fc0a5dfe8060dd98b69fe07ff1c178793804439b7ea87388f8d83eed068831376fbd47e861d154556e59de6890e03050cbe0d3045406d6ad3fb98b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-20.08.1.ebuild b/kde-apps/knotes/knotes-20.08.2.ebuild
similarity index 100%
rename from kde-apps/knotes/knotes-20.08.1.ebuild
rename to kde-apps/knotes/knotes-20.08.2.ebuild
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index f936cd7ab1b0..020305814590 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-20.04.3.tar.xz 1021084 BLAKE2B 9350f1302cf9370fa1b1e531ee80646741542b7566c92385c3ad5a64b5035f075a8fb53f71353a9fbf88251db62c7412c9b180ccf5e2eed1a1cf415661a7de4a SHA512 a1f5a1502a609f7e3ab9efefd22506a660d3d5b331fe7890ad52d3ef26372daf7d511ebe251aeb961343f54f04884d204fb2c675d5ee5b482152b8db46c32b37
-DIST kolf-20.08.1.tar.xz 1028728 BLAKE2B 16af2d8aa374050ce700a4ce4197f468fcab2dff67e095a77541b0dd7ba64fcbb830136a6229ec19eb444b9aa9fe28ec70d0405071c87853ccdb7bf62179ad02 SHA512 ccafb536e2d68245d50302442536dbc1d70db6c836bab82d9ee29889a4a57b3af3ce09dc62a8e1b33fba8308f5499fa55c820adb192ccc83c20a1fd5bf3eb060
+DIST kolf-20.08.2.tar.xz 1029024 BLAKE2B ee9840164135729208ffe4e9695aaefb827f7689e6598ec1d56db401868a15fb34fb432c32381b13a387a4351bdd3dc60d2bc10051b30d7cbdaf71c45140705b SHA512 1544b2ee24d6035312d64295a58bc30b94ac60059ec4c878111c77d4a2fc0a87cd54ca742d8644f8a8142846bd9519e68a19a23512bf9f9ee6980b6f65655be8
 EBUILD kolf-20.04.3.ebuild 1011 BLAKE2B 742dad21e5990e72bdaecf6d317236b5cad3659d126e9696504c5c0bdd07101e5bc3bbed319f833b3fe9cb24c52ad1e41c14b625526166e44c87e28af2c40710 SHA512 9e1b31cc514b783515a26d420a1e5faf21ee9515b44369aec4788b1ed462f32d3b4839c6332b9e421ad9ff27eca40c9da8472972fd9dde00afa3efea887a116d
-EBUILD kolf-20.08.1.ebuild 1014 BLAKE2B 9697514cab68e1f9c2158b6e2f659f0cea5c52d8c3a71a068c6de6c863cd393e01233ccd374b4fb927548cee7b539b1881c38f4b00dd721d8246e769a2ca6c1e SHA512 c99911f8d63d2ac093b8f796d2b3421fc23d97fe648d28371a2bb43c89261ff16aa7e4da4857689558030bc8dc760a35a54d3aacc94cd304bbc4eb1a498cff35
+EBUILD kolf-20.08.2.ebuild 1014 BLAKE2B 9697514cab68e1f9c2158b6e2f659f0cea5c52d8c3a71a068c6de6c863cd393e01233ccd374b4fb927548cee7b539b1881c38f4b00dd721d8246e769a2ca6c1e SHA512 c99911f8d63d2ac093b8f796d2b3421fc23d97fe648d28371a2bb43c89261ff16aa7e4da4857689558030bc8dc760a35a54d3aacc94cd304bbc4eb1a498cff35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-20.08.1.ebuild b/kde-apps/kolf/kolf-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kolf/kolf-20.08.1.ebuild
rename to kde-apps/kolf/kolf-20.08.2.ebuild
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 1b67e6fd6da9..d21163c3aae1 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-20.04.3.tar.xz 280940 BLAKE2B 2c09705f43636fa7e8729168ddaa16c844ba5eb4312d37c66b61e6ec97629fc66e07f0bbe9f23c73520902286b4b2f24a94855586f257a556c2affc4c5eb55f4 SHA512 42458c1308d785c06019da797bb1948066a82da5de2607878299e17766b2ab3279efdc2382276b4afca24dc3d922fa17837a93fca12e0879a3306b0fd68ce155
-DIST kollision-20.08.1.tar.xz 288300 BLAKE2B 3146d6b2b6df58740f56802fcaa632a930cca6acc01ba7abf1e041298b258168896ca3c42678b292c4ba3dc2474ca50b8662916a746f99d8fc9b72e157166324 SHA512 d9c43ff5c82b4c3bb1d5bf8c908c8a6d51a2e98dead0aecfb99e2cab4cf94ef6358f7f22d13d822af89ccaf3108dc1dc13dfef6ffdc9eb71626ff74d0b58161a
+DIST kollision-20.08.2.tar.xz 288672 BLAKE2B f10d46c5d68fb004da639b5b3ef242aacb7be675264d37470d316c47f9f21474d0ac0703c44cd9302d47ba2d8136e539ba13ef9637d9a1eb631ba06f44cf48ad SHA512 43ff9337bb938e0700c7b576fa5f9ddd30a0a08c6229d67332e76a2b552e4452b6d7b94dea19d3afc3adb767183428340e2ab45899b5012acccfd5645644f01d
 EBUILD kollision-20.04.3.ebuild 830 BLAKE2B dd92972ecc5e2abb57da7997cac89e917c0e6989a0969fa17a0437789e88e75649c463e133cd9111e423341967b9a0f0ab4c0896d85d9a54cb6230d6f02a397b SHA512 288ac03f94c836dbb212d37040547a27d54ab1ec2dac52e65c267f63be2874501d5e4018d7633af9616d6208ad7c54484b589a2252116e258138051d1dd9e4f7
-EBUILD kollision-20.08.1.ebuild 833 BLAKE2B acb5fbf5b6cc1816af16f6a17c4609cf7d9c51d1884c43efdda941c428b9cc528c389734ec54b269b6c5411c9992a3f4819a43dab397cb7eff98a8398db7e4e5 SHA512 b1efbf5d0ee0dbb579422f10eec59e0031a4d02fae41638261a8d8a5c25900cc1235d010e0153ad4a41b8688ad729cb07f8d903b64eabcb6c3a4cbdc4b4851ea
+EBUILD kollision-20.08.2.ebuild 833 BLAKE2B acb5fbf5b6cc1816af16f6a17c4609cf7d9c51d1884c43efdda941c428b9cc528c389734ec54b269b6c5411c9992a3f4819a43dab397cb7eff98a8398db7e4e5 SHA512 b1efbf5d0ee0dbb579422f10eec59e0031a4d02fae41638261a8d8a5c25900cc1235d010e0153ad4a41b8688ad729cb07f8d903b64eabcb6c3a4cbdc4b4851ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-20.08.1.ebuild b/kde-apps/kollision/kollision-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kollision/kollision-20.08.1.ebuild
rename to kde-apps/kollision/kollision-20.08.2.ebuild
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 130d2807dcb8..5509a73b16e7 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-20.04.3.tar.xz 5651568 BLAKE2B 30b550a0c41b4414a474f8a068a5681cfebe12d03bd7e2260ea39aeb8ca331fa7301b6adf414a8aafc42579d2460dd5549ea5955d30941aca4d6b17d45c524d5 SHA512 fdefd7de9cbb65f791b1cd243d60a3ed81994b6ae4243a76efe024d7259e64f214f5bb6d67e6dfdc7339dd6dec93bb2498d0b4a3e80104b89022bd881ad0a1a1
-DIST kolourpaint-20.08.1.tar.xz 5686668 BLAKE2B eecbbafd03daaa5bc26c36f87e65ef0ad1a0ab230617dfd67213a79644e6387a1545744abca3c705dc317ddf2eb44b46c7a61c209c2b4034279128ad21780960 SHA512 e871b6861459750d3b4d9ae0eef9636693be0902f78ca0902ca77ab5a6570d5e8723274891c7c96d65be4055d5339ff60066378036949524e0fe4859bc741b5e
+DIST kolourpaint-20.08.2.tar.xz 5686648 BLAKE2B 1eed91f67e646e172c92e6c40cfff3c7aa004b5d937bad6f7967ea3f691503f08883640f7e1cbae5f18a81853c47fe28ee2c25fbf50da812383cfa2a375315c1 SHA512 04cd4f5e34e59097658921816216b2653926697b30659d8c3ae81a81ad5a4c18269e95bb66e7f62dcd80b3ed0656b0f8ef265524ce583dc6427bc5d8996e19b5
 EBUILD kolourpaint-20.04.3.ebuild 1167 BLAKE2B f10c22a522314a8cfabe76fe4ce57dde126db879e12a6cb18f7b9104b26432ca7fae6d34ed8d978fc0baeeffae9a2ed124f4e8d885a96ef3030d391e026a17a5 SHA512 d4efec44576c5952ae8b4dc16dd1c9790cd535bc72fe47988b83358a91d548540ff72b6cfdb12196ff6148cafe63a25503a9e1604bd8ce1510c26d8cc4b419ed
-EBUILD kolourpaint-20.08.1.ebuild 1170 BLAKE2B ec061dfd58a341cdf79aa14acc1e51afe85a1b467c00f9d81b167b17123a59aa5bc399b80f13dc35c930df50ef2c96b347a3f265f98fdb5deae41e0458ae5c18 SHA512 cd2dacef2509fd6993752ffc39e775a2c4cd49b11463cb4100f3ca5d5e3e1c0e46b53770e53f4e3c0e77d0e706201f844dcc5d50feb8d5d7161ad5a17df5fc10
+EBUILD kolourpaint-20.08.2.ebuild 1170 BLAKE2B ec061dfd58a341cdf79aa14acc1e51afe85a1b467c00f9d81b167b17123a59aa5bc399b80f13dc35c930df50ef2c96b347a3f265f98fdb5deae41e0458ae5c18 SHA512 cd2dacef2509fd6993752ffc39e775a2c4cd49b11463cb4100f3ca5d5e3e1c0e46b53770e53f4e3c0e77d0e706201f844dcc5d50feb8d5d7161ad5a17df5fc10
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-20.08.1.ebuild b/kde-apps/kolourpaint/kolourpaint-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kolourpaint/kolourpaint-20.08.1.ebuild
rename to kde-apps/kolourpaint/kolourpaint-20.08.2.ebuild
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index b0a6d6b311e1..266aefcbe97d 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-20.04.3.tar.xz 802396 BLAKE2B d32a1e59540ff565960e9d6c0b36940e2920fb9309ff27d9478efc4d6de72f30bfef41fae2bb9a0f6fa4d57992f42abfcbe7913a88543d22c4f29d2005b1a4fc SHA512 5eb80a8e6aaa4bc05b24297f86ef5bb018f078a62d7eb99345ba49b0d95fe637eef75df0c5caf469c75f0b32c5d8afa6b40f10e3f3c9f2730a71469ead446ba2
-DIST kompare-20.08.1.tar.xz 924460 BLAKE2B 4a4aa29fb29a438b331edc4319dd76cf92e780884cda606a8efa2d211806a47b160a099f5ddda4ad8455e45bfd8dc9155e83cb440bc30503f33495e280dc6ef3 SHA512 524a68563c18d33118f8b58aeb16faa718e8830fa071a2318ab0d8cfc218de269035650ca68e8415e5e6da5e037ba697bbe6d802ea68da76f9c66a93340f42ba
+DIST kompare-20.08.2.tar.xz 924000 BLAKE2B c8d2370cea3399ec675be1e5b762b714704e9e4d331da653f798d3f3fa0887dda29d54c1ef069081e9dca729f55dbeaec63a5e277212581f9920da5a3aaafee6 SHA512 0ebd9bf0cd801c869ce7a54ad2aca383afa7a3212e46de0761b8cd42d67cee6a4d72d3b39bfae817635a6f427152b181f605b9390b65c737414d706313533b08
 EBUILD kompare-20.04.3.ebuild 1126 BLAKE2B b5d8351c7540acfb628dbff09aa915e4660720306420158a4520b8d5135cac4e6bf8b566048b2dbe49133d2d76be5af8f00c098412d3b339fc55a9e4c881e9fb SHA512 54dcf634b8cee390d354912ba09f0f641c05bbe16b8613bfb2b92cc240183c86f40d1d9bec2bb081599dc5c83c70868df86ee882da6914aa8af0c236104bd129
-EBUILD kompare-20.08.1.ebuild 1129 BLAKE2B 4378cb4900f3c81f65b4ef9a24db73798a3604067e0d8bb1c0778388f8e274606400a5dbb2b25a88e3ce89e49513169e9035bff39de96d13b4b8e8d5f21d4934 SHA512 08a85e7291442b5b0767c84ea0f6a2b08f6b375526326ebe0996939ccefe3b7d44dd929d020fbe5096d870dfa60a967133397e337d7ea14021aea79359774e72
+EBUILD kompare-20.08.2.ebuild 1129 BLAKE2B 4378cb4900f3c81f65b4ef9a24db73798a3604067e0d8bb1c0778388f8e274606400a5dbb2b25a88e3ce89e49513169e9035bff39de96d13b4b8e8d5f21d4934 SHA512 08a85e7291442b5b0767c84ea0f6a2b08f6b375526326ebe0996939ccefe3b7d44dd929d020fbe5096d870dfa60a967133397e337d7ea14021aea79359774e72
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-20.08.1.ebuild b/kde-apps/kompare/kompare-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kompare/kompare-20.08.1.ebuild
rename to kde-apps/kompare/kompare-20.08.2.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index ccca125fbe85..ab4fe8da2fd3 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-20.04.3.tar.xz 7374364 BLAKE2B 4ebab4a5f264f23f130b56a329269699553369a682bae6ce6636bc286c7a810edd00f6304f386f0add094862a7c37358f8d377350fc257fd9faa668f32073c58 SHA512 b9763e99e6b0703a704575174f80745e607effbac1d615031dc184d9d2af7d2dcb1161a6f5277baef285c04a0e36a88da1fbd802aa5e00b99c1367ae53cb18b6
-DIST konqueror-20.08.1.tar.xz 7172384 BLAKE2B d4b171308020828a430662fa6857bf39e85da8c2e308ec0e555b4b6a7572ef9d96b5864871c9fbfdfa5097282d77b9efd3448ebfce78c70dc7de463f30cb3442 SHA512 1022a5a8bb0486f48a485a1c37c89380996239555f36fff5bbbe81b1ff1dd9537ee8eb8deab63b2978019036aecdb017ea8b0c5f882c00e0d764227010054e7b
+DIST konqueror-20.08.2.tar.xz 7172028 BLAKE2B 214c0a0558c2e89448214d599112f4fa03919c00488b0d72923e19e22c210f9314c9bc317b7488faf3f9a04ff352fd992d7d79d3be8cf9112c5c0bfcbfc11b00 SHA512 d7851ab9aa7b70af32e4860842937570ff06bc0d18711891cef0f4a8952231f1347c7052e06efecc756bbea72b07daf701ce20dc51a3f05fae74e40aa79966c8
 EBUILD konqueror-20.04.3.ebuild 2907 BLAKE2B f71e31aa5d18e76512b815635e377150acd39da8aa057959656fb774b8ab2d89fa0d9f6b581c8e9704ad056d9bbfb04d5811c3474205d73681bd3cea7fc5d033 SHA512 f06b0befb8c1db9cb383a9fb2801129d84a8b7ea360708a0796c1cd368729cf2a4fe23767394e341fa47fd7786e1b588d4dcb271a8d254cbccc39983b8c5d282
-EBUILD konqueror-20.08.1.ebuild 2910 BLAKE2B 5f0d2a6d7a8b3044813f3f7700392246c856ed045ebfc1559cf1f1c3b1e85d37d263e09f6f2c2c9637229cd95a63290158c039f97cf8506f10abe737ba20c33b SHA512 4aa4f6fb7d4c8348675fdf10484ca196aa42bb6c4baf28b7918203688b03d6f97817a862917b2b3a1746e40c8a12fdbc1f8d70780ab2639fe92db68806b5e59a
+EBUILD konqueror-20.08.2.ebuild 2593 BLAKE2B f2d817e60d14a878a9e944c1cd6fcc58873e085e8da6402c1a1dcfc5dc84dfbfddeaed4f20443744a0f05c7ebfc2cbdc45bda64cfc43c282ff81f9ea39b68bb8 SHA512 2a6eef938c1b8846581843b26adf1353e5257cefe3b6fb29fd6bad6c78a4a963eb67849f33a25631e109edd124ff2ab6bf1c37712bf10eabf617a3b33d35b730
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-20.08.1.ebuild b/kde-apps/konqueror/konqueror-20.08.1.ebuild
deleted file mode 100644
index ac8e4586ccfb..000000000000
--- a/kde-apps/konqueror/konqueror-20.08.1.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
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-ECM_TEST="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech X"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kfind:5
-	kde-plasma/kde-cli-tools:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-			elog "For bookmarks support, install keditbookmarks:"
-			elog "kde-apps/keditbookmarks:${SLOT}"
-		fi
-
-		if ! has_version kde-apps/dolphin:${SLOT} ; then
-			elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-			elog "kde-apps/dolphin:${SLOT}"
-		fi
-
-		if ! has_version kde-apps/svg:${SLOT} ; then
-			elog "For konqueror to view SVGs, install the svg kpart:"
-			elog "kde-apps/svgpart:${SLOT}"
-		fi
-
-		if ! has_version virtual/jre ; then
-			elog "To use Java on webpages install virtual/jre."
-		fi
-	fi
-}
diff --git a/kde-apps/konqueror/konqueror-20.08.2.ebuild b/kde-apps/konqueror/konqueror-20.08.2.ebuild
new file mode 100644
index 000000000000..f7124a046888
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-20.08.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+ECM_TEST="true"
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic ecm kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities speech X"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${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/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/kfind:5
+	kde-plasma/kde-cli-tools:5
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	ecm_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+		optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+		optfeature "SVG support" kde-apps/svg:${SLOT}
+		optfeature "Java support on webpages" virtual/jre
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 5a4de5d256a2..f0a903e5a822 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-20.04.3.tar.xz 660212 BLAKE2B 25668c2e3a36db20c4e55db0fffa82eaea8575327dd8c1f7910b28f052e47397dc69badefc696a2d65aa57eeebb9e53a9d5bf5880ab18accba2e0818f2d39348 SHA512 df78794926668a2f58434df50a24d3093d2f60e2c29906d46b98b3323d5f766a774431bf4ae20740a8e55bc2a13047582f8607165d75f06c57b7942f1bb06e71
-DIST konquest-20.08.1.tar.xz 665684 BLAKE2B a0fa1e253aee197725d9b2d8500e61efb55d17c49050233eb95cd9d28699ee3bbadb23c21710ae249901ff4a91b552b116a34ef1f991639d03c0158f6bde9a94 SHA512 4bc34101aac2de4f58156af85bc1d5a1bf7a806e05dad892b55c365fb48143477b67fb4baa51b3550eaee9602ebe6f0ee3971a6ccdea4492747f629197e61c16
+DIST konquest-20.08.2.tar.xz 665640 BLAKE2B b6a5420c7a36dad4d549c9b7acbfa5898b4cc1eb99ff4e434f70609dd6014874f88df9e316d73dd4c5b5201e84e2ee3bdfc38844c67a7b2db19972c2221b076f SHA512 17f210a9a9ce1a167d1301e0d2348f28234a3aaa26a3cf2c82cf82ca8612b4a5a0479515951b908c908c64d8e7eb8037c97d440456e024f7fb9f9593e0082b87
 EBUILD konquest-20.04.3.ebuild 924 BLAKE2B 5393d6e1ec835d40eac5776838ba4b2482ae9d9577e1323aab40337ecaf0cc4ae4da91234c5295c4df59dcb47d930bd97aa31c89799a2461d1e6fd385ace88b3 SHA512 201a8f3d3daa07055d5e3ef4e5b179351ba9f56351376f4f8399775c7e33317fe8c1237bab9ef7a2b15e58cb7c66cc4b56f1de440f003680e0ce75bc59c88d75
-EBUILD konquest-20.08.1.ebuild 927 BLAKE2B f5824edec9ec6b492b1f1c838ce84407c0b5dc766d3dd35d21e97d1a7062792c4f220c068a25f61f15b96248b83cafe04a61fce4e75cbdf05a8e4f952a8ac8ac SHA512 4a1d488a84a6fde503af759ef19de996bdd84a65e2aec5ea3aaebdcccdfd97e6671ab6c439b2ab831de2423d54d79e1f102f81d5f43478b79b66b6dd82262ce1
+EBUILD konquest-20.08.2.ebuild 927 BLAKE2B f5824edec9ec6b492b1f1c838ce84407c0b5dc766d3dd35d21e97d1a7062792c4f220c068a25f61f15b96248b83cafe04a61fce4e75cbdf05a8e4f952a8ac8ac SHA512 4a1d488a84a6fde503af759ef19de996bdd84a65e2aec5ea3aaebdcccdfd97e6671ab6c439b2ab831de2423d54d79e1f102f81d5f43478b79b66b6dd82262ce1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-20.08.1.ebuild b/kde-apps/konquest/konquest-20.08.2.ebuild
similarity index 100%
rename from kde-apps/konquest/konquest-20.08.1.ebuild
rename to kde-apps/konquest/konquest-20.08.2.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index f2f865dc536d..493540718471 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
 DIST konsole-20.04.3.tar.xz 1174128 BLAKE2B bfd5ca2a01441666e4d72288b5b662f50b212e2c23847ff59c17e142d81ef9d48c6d4edfc18d051d8431e92d1f8b29db74d987115264a418c754fd6cabbff6b2 SHA512 37607f7aab099b48478179eeb7e40e25a75c3c0b1b20496ae34ccd883d6f30644206d7ee95ebd56e9620b88b80700a03157671dfecf538767e6cad476632d813
-DIST konsole-20.08.1.tar.xz 1210736 BLAKE2B 3a5c967468b4970366ed57e94b0e306de30813eec5eb8a1107bdc5d0ee4363d85db0870f522fd795e11ecac6f5284c52250f0abe59857355263a4417aff72ce6 SHA512 3321b97ee738eee10a7bc7f1085b1180a4cbbad67c587149a9acacd96439b89ec5e463028a44f9b9590308614d2c37acca7b31748e290274021031528ec7b995
+DIST konsole-20.08.2.tar.xz 1212248 BLAKE2B dd1bd736b65e914a11ee0f496bca8d8c4dfd059682d1ec70f7e544f34e2fe02626bd26ba35917820ee735530436ef48a79a1c8d2f66b2a08a261e58104431af6 SHA512 fec5065d1708a1a45894fe658eb7600cc074343e0173e08496346718db6225368c39a5d7c32fe172ecd5414b7d3ef3a1d859078540051ec72aa4861c606a5cf8
 EBUILD konsole-20.04.3.ebuild 1788 BLAKE2B bd30b057633454d863858e4b7e633b42b9f22d527af75a00358198eaa3271d41bb3ab6490c7dc820a51688740184788ce09b439550eb6325fea59be8d8392c41 SHA512 b7b61c56bd92c252aca222cc1947c429074a2290295dd2e828ccf32c25bb040eddde856fb11d5effa79007253f1bb86a138be11c68b3499d764c7486be721d5e
-EBUILD konsole-20.08.1.ebuild 1791 BLAKE2B b50df2290f60e42996d08d220a4593ed2cb0e59dd46242866dc30d38f42c470759bf65bc81d4d92a776aa8ec511dce99f63badf2fa9a92d77099bec2ffb86dd9 SHA512 7b4890120f0e5068f5fad7d4c03539ff545d3a38e13bce8dd9962f6b23495b536bc70c5d26344939a23dce7ea34c8638851bc457686fa1e406c809aed2adc55b
+EBUILD konsole-20.08.2.ebuild 1791 BLAKE2B b50df2290f60e42996d08d220a4593ed2cb0e59dd46242866dc30d38f42c470759bf65bc81d4d92a776aa8ec511dce99f63badf2fa9a92d77099bec2ffb86dd9 SHA512 7b4890120f0e5068f5fad7d4c03539ff545d3a38e13bce8dd9962f6b23495b536bc70c5d26344939a23dce7ea34c8638851bc457686fa1e406c809aed2adc55b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-20.08.1.ebuild b/kde-apps/konsole/konsole-20.08.2.ebuild
similarity index 100%
rename from kde-apps/konsole/konsole-20.08.1.ebuild
rename to kde-apps/konsole/konsole-20.08.2.ebuild
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index e8924a938a0d..3b1fd3f7b5bc 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-20.04.3.tar.xz 224784 BLAKE2B dee144e70ccae0cba4a84a11a6b3a9d18a8801da6257dce963e1b77d5a80bb3b18ef86ef97a383b966c249d0bd0fdc43967297b6a13b8212069cdf2aa3d8ab99 SHA512 58acc5a2f82daf1948be21e8a1a009c096588d1e0e20ca3e4f11afcaa3a787001f084966052cafc462f0c8d3b9f284aee8b25bd566876e6d86bb457ce1f46be5
-DIST akonadi-calendar-tools-20.08.1.tar.xz 227148 BLAKE2B 1ac5ba99b78be40c708257b7c6cd93d7de718f79a31b7f1022e0e60eb7c9c14bc23c55b865bf7b23628bc7e8d9150c25bba4d36c1a615722b6c27bb79ab36ed0 SHA512 6e7229951823b296b8b050cc9ef7e592eb1f8907158999713694a11e988e9a966260ed945498568e2a435da07bf9a97bb8fce13b93799210235f860e2243d14b
+DIST akonadi-calendar-tools-20.08.2.tar.xz 227152 BLAKE2B 1b4decb957ec9319cdb33731ea3cc6977e989713cdede4241ef7a4b9fde1aa32d85474e95fb9b9751f94148adcdb05a47de6554b94d175f11921b493e5921f5a SHA512 1e7807a04f08d4eaea8f3cb5ac449e92db85e6c159029d3757202fd7dd623e453ecd1138f53d01f846580a4f82bd4f2a183bf9074d3fe0869de71089d8003015
 EBUILD konsolekalendar-20.04.3.ebuild 981 BLAKE2B 8262410abe9c0330d58b8671da86a08f7696f0a9fe23b39cf15a7a48590044a1a8a9e52dc963f0224d94b1bad995bc9bf352769fb7c7e4d839b779fa075bfc3d SHA512 ea6d52a27bfeaa3fe19438eba13a5a500767377ad6d43065c1efe8d01b15b1f6541fa2a542458fa282c21801477144f8b667c410e5750e4b3b45eb599da72ef1
-EBUILD konsolekalendar-20.08.1.ebuild 984 BLAKE2B 963242148b85e5a4dbfa23982c27b5aaae287fb6ab959901d340c4222c332f901741b062e4d3ba92efa66fbcab6379104f685b91fc37b4f98e39daf7bb324861 SHA512 d83e6747f100cfbdcf015e21f6dac861847c628aa54e4cfd2d6538c12033cab504d30a63bd34fc2909c1eae62472ec6c023e2694bb2cd6a560ffd41f2d18b415
+EBUILD konsolekalendar-20.08.2.ebuild 984 BLAKE2B 963242148b85e5a4dbfa23982c27b5aaae287fb6ab959901d340c4222c332f901741b062e4d3ba92efa66fbcab6379104f685b91fc37b4f98e39daf7bb324861 SHA512 d83e6747f100cfbdcf015e21f6dac861847c628aa54e4cfd2d6538c12033cab504d30a63bd34fc2909c1eae62472ec6c023e2694bb2cd6a560ffd41f2d18b415
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.08.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.08.2.ebuild
similarity index 100%
rename from kde-apps/konsolekalendar/konsolekalendar-20.08.1.ebuild
rename to kde-apps/konsolekalendar/konsolekalendar-20.08.2.ebuild
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 4db6f21b2739..71e389a909b7 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-20.04.3.tar.xz 793420 BLAKE2B 3e5294ae9f14a50b409cb1c32e3ef73f02386771e6ffd2187fbcd244376e907c96e8c2444eea9442561d02b2fd7a26003676acadc132eebb19437d2809cc53c7 SHA512 9de648715080574e63129a5eb79acc0a3aeaba9bd4560bd8b9f5c6ca894de27f7e647fb3a8265f4be720e10fa4a06f7b6e4a7f7d37a560aa431756055981c245
-DIST kontact-20.08.1.tar.xz 792968 BLAKE2B c1c520bddb37b2dd1094bac4617a6fa41fa301232d28ab0aad60e6a4506fa193b1dcab41c4177a152c7bbab7ad0e08b5bff4ec99f8db3bae60aa21bf77d8a5c8 SHA512 387ff420effdc06d8f8dc4575f55e3232bab8689f43c214911368cc60b5993f0dca5caa12b1c9fdb76c76abf9b98cf27096c29454ef27778fbcd596bf1a03e11
+DIST kontact-20.08.2.tar.xz 794588 BLAKE2B 9f3e2c10754b9d4f91955efe65876769c0473df141b2deddf6ff23be4eb652d1a1e5001d82b2245c6b5756fd9cf331b5c38fe4971a1d8c7fcd46d799fde86915 SHA512 f8912faf66256c3a1ea0ab663e6d667a671caa19a936d667b33dc7de11d864907e1d58116089ab452dc01043da388a5fbad3be2e174acb7519a1c8a06f3e7b67
 EBUILD kontact-20.04.3.ebuild 1469 BLAKE2B 1bf04734861ca7120dc7d6828ffa532f7cfa3145d4a966f7b6faa087c7c621d6086e5cffa14e6f6aea3042db57c218369637ab41936ec811a4445e6976041a0a SHA512 2b41bb7a67c9adfa336546d1a40828302989b48e1c9e5c2704a2afe24f2695749f77c97f0d1d3bb63703ad41fe288a1317c780353c7a9b97fefaee5976b89397
-EBUILD kontact-20.08.1.ebuild 1465 BLAKE2B b03f5687548558ed6e0bce8bc9047911e3e35b00251ce6f89d449ba48c3d45557d9a2bb94c1b23f0dd24352d42982fee727c3fd25682906c19e14d08e3aa112a SHA512 690797ea201acdf2245af287f7e8727b25ebb30b0dba0e8947b7e1865eca5cbf9d6c363ff563bfe504eab2244cbe3bbd9a8fe73c2f647c187e3b5f81f726fdb4
+EBUILD kontact-20.08.2.ebuild 1465 BLAKE2B b03f5687548558ed6e0bce8bc9047911e3e35b00251ce6f89d449ba48c3d45557d9a2bb94c1b23f0dd24352d42982fee727c3fd25682906c19e14d08e3aa112a SHA512 690797ea201acdf2245af287f7e8727b25ebb30b0dba0e8947b7e1865eca5cbf9d6c363ff563bfe504eab2244cbe3bbd9a8fe73c2f647c187e3b5f81f726fdb4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-20.08.1.ebuild b/kde-apps/kontact/kontact-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kontact/kontact-20.08.1.ebuild
rename to kde-apps/kontact/kontact-20.08.2.ebuild
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 09f017780c33..e13cdae2ac22 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-20.04.3.tar.xz 33076 BLAKE2B 5b8066b924bf94541d61036c8542559a997ecb987a43ffb2f7268ae8c2cb6d7d67796393a107bdf115b4dc774fbd5576b8b5be24eabcd9b6b02eaaebbecd45da SHA512 a702d601ed90c6d90442bf13bf739917180670912dab6c3c4792046daa545ccb7294c8cb6a206dbd9fe6ef411eb7cd4cf113bc87e6b6f2f4517e8180fb4a6c87
-DIST kontactinterface-20.08.1.tar.xz 36092 BLAKE2B d5c2b7cc181ac14f4eecebef8694c31a50e69ac7467378c228f867dce7ffcc3731b97887be4cc2254c2b40f54be01a0f3ef31df30d696800646c24bdb92057d8 SHA512 65e741bce8b7dc7732ae03b772af7de7f7e90a0c17e0bdd3afa86e799a43cd5987605a48ef5b1e8b3342af1671111ca4248494e2f2c6262134dd83e81c3b40c9
+DIST kontactinterface-20.08.2.tar.xz 36076 BLAKE2B c9572c23f95bd94343257b0714ac22477d82094882d1ac6e3246be3c8f956b1daed4bcff21c63b044d535815f556dae8e1725cc3575043f642e0cf99b4572b93 SHA512 8683b962c5a59dc2fe27e767c8da184f3959854b4723255b3764dcd367795625ad809315155618d4977513a1be2af48f1f82900c8d207e1ab78847135f17cec6
 EBUILD kontactinterface-20.04.3.ebuild 704 BLAKE2B 8bd4b05176d98dbeedded11fa8acc4eeeedb60547345e4a7f29c1a531f9c3c001a24023cbaf84fc4e269308ce1e63af95da09054590bea1f95829268c2fe230c SHA512 7b27fc400e106a04670764c586a8b8ed7d9ac247ce129d1078ebba34a1f15cd0ac6f2ac8329290b3317cbd536f390881322f24bdc3a66c1270b6dcf1614add06
-EBUILD kontactinterface-20.08.1.ebuild 707 BLAKE2B 94575eace7e3f8af38e95b8885a628d24083d46e7aacda992c41208b02274fb2b28ea6dd3c392ebdd1c6ea6f86102f559826edec5c8bac0573b5b0dcda758a56 SHA512 a13402ce52b51300ea56172f293e97a3ff74fa5e83d5e0acf885c8270ec5bd2dc29ce6a55ebdf14c1f0aa1f5af490e43dd16db7e95f4195d940b7268e2308546
+EBUILD kontactinterface-20.08.2.ebuild 707 BLAKE2B 94575eace7e3f8af38e95b8885a628d24083d46e7aacda992c41208b02274fb2b28ea6dd3c392ebdd1c6ea6f86102f559826edec5c8bac0573b5b0dcda758a56 SHA512 a13402ce52b51300ea56172f293e97a3ff74fa5e83d5e0acf885c8270ec5bd2dc29ce6a55ebdf14c1f0aa1f5af490e43dd16db7e95f4195d940b7268e2308546
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-20.08.1.ebuild b/kde-apps/kontactinterface/kontactinterface-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kontactinterface/kontactinterface-20.08.1.ebuild
rename to kde-apps/kontactinterface/kontactinterface-20.08.2.ebuild
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index dde111e75801..b45e804283e6 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
 DIST kopete-20.04.3.tar.xz 9371772 BLAKE2B 467a219dc6cc761c9ec2721138c13abc17ccfdd95e0021ad4f1625feb38517286967bf2df967dad009612623c9dd114f0e4bdb2c90292c0d9043a788131282eb SHA512 979f84c986f78aaab9bd23fb9e0df265ea8734d855b8370c93adbe037d6dfeb4271658dbd27c2b315b363731976a62750e2ed5dace45bc69e72c0645a533b5a0
-DIST kopete-20.08.1.tar.xz 9384840 BLAKE2B c2027e2445dd2f42acf58d926be9a27196bdfc25d8b116964c3e76b99e53d29639520d76e1336a8b2da553a2e7095cd6925b4862be0e81442579c2237c9f5c2b SHA512 8a02f93facc113e5ae13de27e8c96087d970f6c5df4abba4d3ea9e6c0d4554e735420e578f1ff315a6c75f34d63eed083958dbaf3dd3efe2ec9143628b261bb7
+DIST kopete-20.08.2.tar.xz 9385476 BLAKE2B f0f4022948aa9dde728bd2ccc30ea085bd6eb317d53d955f0acde6f30da5a9874e38db4245d8aa1329663a7f0cef7f793f549e72d38f6797e5235e5a8c607ed1 SHA512 deb514fe96d8092e58ef83a3529e8e7e7b44cc2a3900719b7977ca1040e2fa7357bde26c43a263dd183132d3c95041a5776e8f876212879c9b5d21e09a3fd663
 EBUILD kopete-20.04.3.ebuild 4711 BLAKE2B 4cb57c7bc710df5aa27438b8a6bd1e8d45609ee53156d815133278534e230469653610e7056c5f90222eee4922cb51b68caaf2f14f3533cd9154a4f2fc7f6436 SHA512 5f283efd5e2c3e4765aaf9925182f5ffa01c0b66509da37ed32ac70cde0e0429f6545a54899154d7b4425c96d74949783fcb8ae028334825e3b8f773fc663ef3
-EBUILD kopete-20.08.1.ebuild 4723 BLAKE2B b4c214e3f4339def3c4b54a86b4543b6675b32a9f9136bb48a9deee36db3ff6a10a368e519ed409fdc376b604c21f7b0338d7ece9d98015ff4d09b15e3a9c5a3 SHA512 aea15a58b93f70923899f2abb1991875fdc1a5c794ddd9e1cb46d41e2735f4f589bdd502238b69cda27a3eb506f0db843cad1ce3c8b656cd8850026f729037c7
+EBUILD kopete-20.08.2.ebuild 4723 BLAKE2B b4c214e3f4339def3c4b54a86b4543b6675b32a9f9136bb48a9deee36db3ff6a10a368e519ed409fdc376b604c21f7b0338d7ece9d98015ff4d09b15e3a9c5a3 SHA512 aea15a58b93f70923899f2abb1991875fdc1a5c794ddd9e1cb46d41e2735f4f589bdd502238b69cda27a3eb506f0db843cad1ce3c8b656cd8850026f729037c7
 MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-20.08.1.ebuild b/kde-apps/kopete/kopete-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kopete/kopete-20.08.1.ebuild
rename to kde-apps/kopete/kopete-20.08.2.ebuild
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 606f07253bc9..352c78eb9a19 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-20.04.3.tar.xz 2240728 BLAKE2B 32ce6641e3360692381c736f56632064bd7c528683bf963301c6f58ce26262b0b1a80032cb90f892619e6df3057dd934af9510eef66f8e37410d85bc15024ca9 SHA512 cc198f650538fabb627564474583cc13a04db1617412eca99b09022e596516bcfc2144cc338cca83ecec7c199066a9fad26cdc955af47764e2c56ed38cdcf70d
-DIST korganizer-20.08.1.tar.xz 2251628 BLAKE2B 3e6a92e649389683b44ed696b7a05948a2f58e1111d3b6c15c4cd7446749ae3864da832d39f14b7fbc47b4aabc42489351ca4cba2fd9b40ea57fed2ed6b18a17 SHA512 b88909ac363cb72741633fba86c18db32da7b8d7c66bd1f15cf0eff618a90dfb9cd3b738fa6641276d1eb7e7abd30ca37e99b019b5c7ddc6a542def3f3735836
+DIST korganizer-20.08.2.tar.xz 2251372 BLAKE2B 59d2b8dd76d830dc84e04ad0eefbc8966a49183e8b653d8398751cd8381020f825bc2b26a2f68ca6db216137441483d9110e639ee9ae0fe1b5fda1cd86e827eb SHA512 6fe6bb9fa16a6df86ef8c96cc7386bb071cb8b82ef02970e84f4aea3ccae313a65d1fe3301aa50ac2c0e328e28c4cf1b7fafc0d37e18f3cc59d1eff3eafdd7fc
 EBUILD korganizer-20.04.3.ebuild 2860 BLAKE2B f66812a692e775934b0d392dae2f84949c16a657a90fa7b97a7ef5ab97874a590c402a2186981adb905356422c989a6aea315faac56aa5a8be9716391473c0fc SHA512 215387b84bb33c24fd0ff5a7b962b26d1ef8be444120ea8607697fc56c8a9a824dd549e9b07a8d8328d5eaa4e506908ac21347b4bbf1c7159692a89763933d0e
-EBUILD korganizer-20.08.1.ebuild 2782 BLAKE2B d8ad02d67fb9613c14ba5d35ee47d0f97cbb40ebe7074065e72fe10fa1c852e4ab04df31ae310aa837ca02f9338f09698318e7392b0403aa08e014ee02b7f366 SHA512 5c1ebe4e9be0b4f63d3fa995c64a85d95defa55f72a4d4ca49268b9305596161f838b7f82f360978a432e496ce6428203846f2e088fb38da8fa8c80bb7b06444
+EBUILD korganizer-20.08.2.ebuild 2782 BLAKE2B d8ad02d67fb9613c14ba5d35ee47d0f97cbb40ebe7074065e72fe10fa1c852e4ab04df31ae310aa837ca02f9338f09698318e7392b0403aa08e014ee02b7f366 SHA512 5c1ebe4e9be0b4f63d3fa995c64a85d95defa55f72a4d4ca49268b9305596161f838b7f82f360978a432e496ce6428203846f2e088fb38da8fa8c80bb7b06444
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-20.08.1.ebuild b/kde-apps/korganizer/korganizer-20.08.2.ebuild
similarity index 100%
rename from kde-apps/korganizer/korganizer-20.08.1.ebuild
rename to kde-apps/korganizer/korganizer-20.08.2.ebuild
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 6cd45cf2af60..05f059fd992c 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-20.04.3.tar.xz 3579116 BLAKE2B c034e1cd545c8ead4b34994f0800cf63d8ddeef97e1a5dd695583bc7df69a57e4fe94f432e6d960f205f25b55de59eb0ff7a19a2e01fbf88e76c34324d45c79d SHA512 d178a1360b37acdbba9fa33de56929b51c19b81ff6ee01d3f8780fe507800d9c9c1155bd0ae4e2f8b6baff5410133020c113aa6ed3f86aee2238f448216ce7ad
-DIST kpat-20.08.1.tar.xz 3584660 BLAKE2B c1eb1b33cd20a7cba1a110ab32355ad11cf60e1ae13eaec5e77518b7eb90748a5d65998b73753b17c63ac4411a41f6dbe55b06240081d0e7ecab30739bef5f55 SHA512 6b762070b4ddbd9cd02de0a6500edd0e08d047571dddd3e310a18e852faccd5f439761b8dc5ee9b93d871098790b3a4423098428b55e446667388ee4720f9826
+DIST kpat-20.08.2.tar.xz 3585088 BLAKE2B 6460b8479c317fb4364a77d24680635bf44c9c3ed81579795b74e9060cc4488f28be2bbc99b26b0e12191d82cf2140576c9154c44838ad6a5136866b25e8f701 SHA512 c6c4b1c442dda171defb9d7a45c944f181b4e4cf41916731dfb17c2c1bde8a97bb816b70cffe31f0c14f05437d795fc602f26ee129a0c063da9973719b37891d
 EBUILD kpat-20.04.3.ebuild 1091 BLAKE2B cfeb17b501f73efba7d84e173c928e568a74db5af5b9815047d8a7d16fb4d4da93330c024178a8bf1e271c15a3eb00e7347e43c319ef484c8d556a0d7695ff78 SHA512 8d9473d38fcbb212522d1b5041810da484a129b75390836db44a8f1fbe1ab92a71359c556313002837d365f08e620f8b3dcd5a1ebbf9ee90cb149d7a6fd78a35
-EBUILD kpat-20.08.1.ebuild 1094 BLAKE2B 2d9b09e3fd5c42f9dc18c5243b9da23d73d37e141beeeba6c36dd8a100eb314004c49991933b74e70c0860d8977178b6f62bcd91617e455f2494a13c2df46b3c SHA512 e9b45d415a147aee8da75a7b9b9094dbf32b928ddb6dc1b17c94179287ae32472f3719b28604feebe04874fb0315b9de3c761072afa15a6f864d2909152bda22
+EBUILD kpat-20.08.2.ebuild 1094 BLAKE2B 2d9b09e3fd5c42f9dc18c5243b9da23d73d37e141beeeba6c36dd8a100eb314004c49991933b74e70c0860d8977178b6f62bcd91617e455f2494a13c2df46b3c SHA512 e9b45d415a147aee8da75a7b9b9094dbf32b928ddb6dc1b17c94179287ae32472f3719b28604feebe04874fb0315b9de3c761072afa15a6f864d2909152bda22
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-20.08.1.ebuild b/kde-apps/kpat/kpat-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kpat/kpat-20.08.1.ebuild
rename to kde-apps/kpat/kpat-20.08.2.ebuild
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index f159b97b636d..d5bbb3bf5a8f 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-20.04.3.tar.xz 183228 BLAKE2B 337e5aace59b74de7b08702cafa67ee796e2687a3ba94c8e35acb16546a7a87f71e5921c741665bb8e71764e3db7cc9c3eb39efd51c239499da308cf9a99215b SHA512 0d7e0d84d9c25dbeb28413350e7f17f45c643e5335cd26fac28fb5e4e2bc2797d223f9137cbfc2f9fe2f13806ab321ba2a058b7dc40c02762707170285336abe
-DIST kpimtextedit-20.08.1.tar.xz 188780 BLAKE2B a253ec91c1296f8095fa9987981ef0119d10d5d968ab8c04a0e93825527cfe73ee24160f6691e09acfe5a78eca98052961990fae690939819da2f3f4d1484876 SHA512 778a5d51fcd37f1003437e2929990ca0b0aadd80855798184e379d1d2ae09e6f1ba7a23249e36f96d076782f8121284faf2b9f2b35a339e97c6f176d4ff8e229
+DIST kpimtextedit-20.08.2.tar.xz 188816 BLAKE2B f6068a5be4b42fb879a6c3659cdc4c9385a66a78f69ecbf760e21632b661cda0ec0f49e86975d6304f3797b9d88b7459c53503772f0ea9e5f48bbf31e9f80472 SHA512 e2c0b4d39a160acccec85ff1edc20c774c81c4bb37eae124c004ec2e5d115dba1b7246f44f8c86826d93bb19126a438ed5cd1f2f9e90af8723e7e36cdff6707a
 EBUILD kpimtextedit-20.04.3.ebuild 1045 BLAKE2B ba427997e286fb4e7b77cccf9424c4d6af95ff1bdf08d7c28082b2af5c888fe7ba27be84645e8d8da2cad416494e50e6d771497cc19018d0d6827b538b2513d6 SHA512 178c16a66141f7a0df1c8cc075bc4343082aedb52d1c5fff5f7467ebc8c5c0776f350686c9ff9bfedbf39971a4f09dbc6a95865b1a4d0c32fb8a49338d2645cd
-EBUILD kpimtextedit-20.08.1.ebuild 1019 BLAKE2B 733f03ac44c0d9bf297331598b10d3fc9854372a508c65a48078194f511b891c1b52aabea89f74408a7c11654fc6408b9e014017f33d9710182a9b108b139d86 SHA512 cd4294b10f3b50c57e8063d1f52a4476f93143577ab0d399e4fc9794add46b7e3a5cab42a2d883b91d5f8a8fb16aa20e67afe82ffe322408c1c58f0d08f0ad43
+EBUILD kpimtextedit-20.08.2.ebuild 1019 BLAKE2B 733f03ac44c0d9bf297331598b10d3fc9854372a508c65a48078194f511b891c1b52aabea89f74408a7c11654fc6408b9e014017f33d9710182a9b108b139d86 SHA512 cd4294b10f3b50c57e8063d1f52a4476f93143577ab0d399e4fc9794add46b7e3a5cab42a2d883b91d5f8a8fb16aa20e67afe82ffe322408c1c58f0d08f0ad43
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.08.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kpimtextedit/kpimtextedit-20.08.1.ebuild
rename to kde-apps/kpimtextedit/kpimtextedit-20.08.2.ebuild
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 5335789f21f7..f9c0f052010f 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
 DIST kpkpass-20.04.3.tar.xz 23356 BLAKE2B ecc28b2d42bbfa48238c5e8a70ba3bd8513c7f32f2d59d11c976b00310efe9d699ac9a0af121fb83ed8e7fca9d8bb8e3b91ed3a13da63d8eba629626690bb81d SHA512 8ab461ca561fc0aeb3fbcf8c96184a8f8bb756582b987840badf781c86a0a16c51ae4200b77799c74c2541eeb857f586364346cb8702795c893d97cdfb96e144
-DIST kpkpass-20.08.1.tar.xz 23360 BLAKE2B 7fe3123020f03f04f0cc0135a35c3df3c3c152f907ca8bb8c7ff3dce86691c6d52ec557b63ae7c812f84fc394294817303ad72b119ff6918fbda2eba4852400f SHA512 8efad12d4b7bf9d50168263104f69e27aeee4fbc26457a027991be74a51900a44e31eda1278779ddb514f38164b31235edcc3dfbb9ac9be86ebcaa4bbd347a08
+DIST kpkpass-20.08.2.tar.xz 23364 BLAKE2B 026b4594e349b7438355a75480233f4cc7a32f1c7d54ff1915145d7307035418edba2625fe681a74955efc97413675fcddc84169899e0e6793c2ecf58389ffcf SHA512 804b1c77aa857ab38d1a735e4170601e044a5ccdbe975291432c1a9a13b8908d181b9ec2077671e77ac7c1faf1e04e613dd1598c99764f15c6bc223e178051af
 EBUILD kpkpass-20.04.3.ebuild 514 BLAKE2B eabffde1bc8460cfd8e0bdb6ec2bc14920185fef0f3072696dfee7836af89b3df5139766f4fe0142190d572243e86b63ca44f4b36accd89f5255fa1b9bf567cf SHA512 5f5bf4d2fe621d44686ee2a500e8da909540f35a64ab2569212ce28e09b86a16ef5ca457fcdb83bcec3b07fe195d33642bb7253a8e9558bfc2d5dcd593d726c3
-EBUILD kpkpass-20.08.1.ebuild 517 BLAKE2B 1f85d1978e6f32b555a4ccbca7b63fcdd6a7b543a5bf80d81bd339381b712365183b0484f2f6662fe0889d7266afc90338fd86850c307b094e5e87c03738fb82 SHA512 e86071e1095e9df148447d1be06ac9b83dc04bd0b458918723b4ad17e05e37cae6c0dc1da6217cf06087e98163d5877794d180d7d49d15ccc79fdbfd7dc25b93
+EBUILD kpkpass-20.08.2.ebuild 517 BLAKE2B 1f85d1978e6f32b555a4ccbca7b63fcdd6a7b543a5bf80d81bd339381b712365183b0484f2f6662fe0889d7266afc90338fd86850c307b094e5e87c03738fb82 SHA512 e86071e1095e9df148447d1be06ac9b83dc04bd0b458918723b4ad17e05e37cae6c0dc1da6217cf06087e98163d5877794d180d7d49d15ccc79fdbfd7dc25b93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-20.08.1.ebuild b/kde-apps/kpkpass/kpkpass-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kpkpass/kpkpass-20.08.1.ebuild
rename to kde-apps/kpkpass/kpkpass-20.08.2.ebuild
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index a47bf175e3ee..730cd502db24 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-20.04.3.tar.xz 25624 BLAKE2B 396e6082e5d12af20020dc751841dd3361e85596319c2b9acdc30b84d90e0510e50be45019014ea8f85a46fb5d344bdb64542519a3d74cda643edcd42d0ed1ed SHA512 d1dd3fdc6eeb757708c26aa4f7486edfd747f7a3ddf786400329199ed637f4c6aa863d2d646aabd5610b1e4cdc49635e98bd75f7e62236cde60a09145f14e98c
-DIST kqtquickcharts-20.08.1.tar.xz 30136 BLAKE2B 713590f7d806dd8af734fffa5423ee3bf237a0abba8c336805950e02552070c21cd63a57c3821bba0d463dad3a8f47ccdbf102eb8ac3f27d3591f0cd133bd67a SHA512 5afe1b3ff391692556950dfa7a73cc3d0bbaa200181df58a8cd961ba993d741f8857316d7b8660bacf150d39201bd29414bc4cb23a9304bf1b3c261f9720732a
+DIST kqtquickcharts-20.08.2.tar.xz 30132 BLAKE2B 08528b3daf4035f2fb5c167195ca3de2b7aa147d25504ee9608fe67af18545a0e0017dca92b021e4d24378facdb9594c744040a70c6194bd3f3c8cb71e4d71c2 SHA512 5fa7e7f214f69a4ed9012b2e0313767d26aebc5c639b17bb2862cdf4544bfac7126aef398a2284efcfe8f72800e65f7e4d332e29d39b0302060e2086dbc33dec
 EBUILD kqtquickcharts-20.04.3.ebuild 383 BLAKE2B 280c717eec95cd0605aec538b331d344da81f4715a65024cd632e362443af687900728bd31314bba00f7f6c590bdd09dfc8e854a45d07c9b77f5de474d046c53 SHA512 5277e707dc77e62e5470ea711c1081ffb4b91a330d69be28827a3c546880f7b908f1968f9d5a78552dbb4e61884e5cabdf6eb0f1311cd427d6d66e020126e81c
-EBUILD kqtquickcharts-20.08.1.ebuild 386 BLAKE2B 0186f875db834240899239985f6d9809bfde6f46bfe44daa7b628fcc19e6fd45cbd161757e2ecc511ea66ffa574907dd8d13de7156b677562ac6ebd18f4cb5b3 SHA512 3c4941f4c9d8882819de8be1d9e3a84acc5ba2337c428623e4c4491402a98e1bb2be96078b4cf471934c4ec6c4daa7f9b86cc83469c05e35da72b4bfbd0fbd39
+EBUILD kqtquickcharts-20.08.2.ebuild 386 BLAKE2B 0186f875db834240899239985f6d9809bfde6f46bfe44daa7b628fcc19e6fd45cbd161757e2ecc511ea66ffa574907dd8d13de7156b677562ac6ebd18f4cb5b3 SHA512 3c4941f4c9d8882819de8be1d9e3a84acc5ba2337c428623e4c4491402a98e1bb2be96078b4cf471934c4ec6c4daa7f9b86cc83469c05e35da72b4bfbd0fbd39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-20.08.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kqtquickcharts/kqtquickcharts-20.08.1.ebuild
rename to kde-apps/kqtquickcharts/kqtquickcharts-20.08.2.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index f3a2e598e6c5..6731d85f77a9 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-20.04.3.tar.xz 1424740 BLAKE2B 92f3751c14974ea3b79e17dbadd8f89665adbcc5c147bc5228d9bf6bb146e079a82343840adb62e812b31dc4553faa77a45bdd4a176f83f9e4d14f4423b86be2 SHA512 f7ff9be6ffa612e8da0766309f812e7041393eb9b5ff4b1cb58385f1f754c0851357a4509bff7eea76e0e035bcefac9580415710561f1369dab1dd4e9f86a4ff
-DIST krdc-20.08.1.tar.xz 1564224 BLAKE2B ae1187bd2a3cdac2141f2f7c5dd9544fdc162aaf0ea183d72d1e9491cc012fa4f4b36597c34b18fa77ae1fa287ffaec913310dd018218dd7211eb67d7767fcf1 SHA512 5569d0a72ee99b5ef82d01fb746bffd32426d91b49901bb5b2ecfbb57b713ebed7fbf3d2211d4671486ea7704d26d29229aaa5a7b6e91cf7c204e08a0518d21c
+DIST krdc-20.08.2.tar.xz 1564240 BLAKE2B 54e47399e90d1a02d399af41dbc8b49148ac4c7c1111f80cd3e7afed0ff371699bc5ed7e934bbcfa73be0d2b7b7b5eaf1b0ecfe0e38cff71515a08b876891a9d SHA512 ddea9105bca64f0dd5d316ee03f59481a5f1150c9e40ff1002a0e9f0a2bea68deaa16e131e03f92e30016ae86979dfdad35e5572926fc0f52eb82773f1d3adb0
 EBUILD krdc-20.04.3.ebuild 1415 BLAKE2B 5a417f4fedc9887c5e58a0e4b8533cb5c630bff2b473a40217e760feb34641649e7168c8faae44643ed43721b6037ced46c02aeb648ad7cecb768d3d780a3b14 SHA512 0f4508934ba6683c4f3375ae3bfc603f22e8f666ed6135fd24369247bf74e9db94d655544d54c985afdfceef38dc9d47129a94027977414f07c0528305ec0ac8
-EBUILD krdc-20.08.1.ebuild 1418 BLAKE2B 676f21fb069a414263df92b70eb881d826d5e302790bee6efcab5e08cf0cf6bf067ea4b8ce2f2d41e51f05144e0736bf3d59384d818b0cd753b5fa7c7a901ba9 SHA512 98e9450275220f1ec9c20bb09d0cb74c39070622d789504522317b91ce62399da117a64461e4295f31e557eaca812d457a07b59f30dba93fb7e1ec946f3a4733
+EBUILD krdc-20.08.2.ebuild 1418 BLAKE2B 676f21fb069a414263df92b70eb881d826d5e302790bee6efcab5e08cf0cf6bf067ea4b8ce2f2d41e51f05144e0736bf3d59384d818b0cd753b5fa7c7a901ba9 SHA512 98e9450275220f1ec9c20bb09d0cb74c39070622d789504522317b91ce62399da117a64461e4295f31e557eaca812d457a07b59f30dba93fb7e1ec946f3a4733
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-20.08.1.ebuild b/kde-apps/krdc/krdc-20.08.2.ebuild
similarity index 100%
rename from kde-apps/krdc/krdc-20.08.1.ebuild
rename to kde-apps/krdc/krdc-20.08.2.ebuild
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index a9c2dfad7fc3..8071a7194f78 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-20.04.3.tar.xz 946696 BLAKE2B a9bdfd40058ad0262a419d0075c7e3d62c9eed891bfd7d1202f24cdb03b8d2d7bbad04aacd85cb7467a3dd4a66468232fb964f605952e3d915502aec6767107c SHA512 fe211d107b0ba1ce7b3edd0c108be13cbfc7d6a3257c62e5536a248cfae6953e10c7ac0ce47d021bd7dc3e1c6d77799919939285e5d73fc466fcfec6d887fbc5
-DIST kreversi-20.08.1.tar.xz 953052 BLAKE2B 3ca81290895a090d8fe8dd6dc28c1afdbbfe9ccc993562e9bcb96e998a64ea7de951a03689a5c4310c6fd224a33bd659480598cf1446a72ccb6369f91458f858 SHA512 70a5a30fcfc2a5119cc631ec0f912d51ce3c1655d4832d73c0660327f5fe4e69ce8b485bdbe470e2d0f4a9d7d8d51346bb1342b335db90c446cdaf4f20e6b0e6
+DIST kreversi-20.08.2.tar.xz 953004 BLAKE2B 63ba8a9db267a447caea3ceec1d5abcc2949d76b4386a415e7be238dca996780b79dab97d19ff9911b795fe227260925678c0234420e42e656d49f05543742b6 SHA512 faebf03180780b483fcd704c8da44495805c4ed4f4b2b2896ba0f539f976b3e6eddbc9f44636fbeb5fb3ea022dc76eb57fb322d81ed4c22927189f384fede668
 EBUILD kreversi-20.04.3.ebuild 1092 BLAKE2B 7128462a953781ae42088ac7ad2038227f9cc2999db5ce1e10d620d10afa8c1222281dbd15c8a14b39132500740bc1473a6eb7b4d5ada86ddce89533dab72aec SHA512 5cdd0a166904a710a6d04bd1ee393e23ff7f12aaa09500d43c6eb80d01417fd5b35c361e57e6295b048f5424d43aefd06470dbfb521ca3e6b48ac436cf15745f
-EBUILD kreversi-20.08.1.ebuild 1095 BLAKE2B bf3c19e4d6b6bb90fc86b56e569e165a103c119598de9f481c4a4f4585666a392c9414238406591c09e441b7ac1ad90b20277f3c06fc8d554542be7a829b9c56 SHA512 3292c085aba366021c2e938f58d0657507f95463c30b0a5b3dc96886eb098ee660341d57db8a3d713e8a0fac4abca8dadb2d6df3c9b6f6cfe50a5b1ac9c9a96a
+EBUILD kreversi-20.08.2.ebuild 1095 BLAKE2B bf3c19e4d6b6bb90fc86b56e569e165a103c119598de9f481c4a4f4585666a392c9414238406591c09e441b7ac1ad90b20277f3c06fc8d554542be7a829b9c56 SHA512 3292c085aba366021c2e938f58d0657507f95463c30b0a5b3dc96886eb098ee660341d57db8a3d713e8a0fac4abca8dadb2d6df3c9b6f6cfe50a5b1ac9c9a96a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-20.08.1.ebuild b/kde-apps/kreversi/kreversi-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kreversi/kreversi-20.08.1.ebuild
rename to kde-apps/kreversi/kreversi-20.08.2.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 75e1de7080f3..cc36ae9bd1c2 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-20.04.3.tar.xz 1276740 BLAKE2B 75353a35c11979e762085be1d47c8a2b7d2921b54a0381b63aab4199fa548198d009308c45e6f54c874b455e1c2c4021085ce7d48c2cb35d306c66fd2db07adb SHA512 91a8281fb6e9756de262fcc02f98863b1ec74a30a2ed6e2a51a73808e293680ac3dbee555af4dd007f9c3ecfd6163c7328cabf4f6cc31fa55932b7db56cad65e
-DIST krfb-20.08.1.tar.xz 1280460 BLAKE2B 4861c7c6f278ef920886a4d1efba38cff75caa242cc6a09aeb5f356b771265777f17e61017f3b22b9aab6e57b6cf0923da692aed0bf5e309a139d2b59eda6165 SHA512 90b0ec45b4420c6b7c8a8738293b53a38126220f750787ffa935af118c84c767621f59ceb7ea2eaf5344a0f37d236584adb23f26b1b90098640bce2c33b99293
+DIST krfb-20.08.2.tar.xz 1281460 BLAKE2B bed5e9f5d1c751ad78afb7a0fd4ae1ff0449d4a8af05ffc8f93a22b7abfcb20bfb5af8c06016f6a53a8acc75e252ab7a4e05412d6e508b152946c9374bcf1523 SHA512 aa9c619b0e35f217f5b98abff421cf476541f9cd4be37892e0e75cd416912055f13b8b2531b274f294f3b504c0e8b9b7279aec86a371a257bf9fc6bbe474f055
 EBUILD krfb-20.04.3.ebuild 1402 BLAKE2B a072dbe8e6a1be281fc5fd54b91759273b7e8f7944413d1f5977d3d7d443625d133024e8b04e9905809698f6272f8c6fb49d931151a59c24696484100b3dbc6e SHA512 389e679457e9a8f73e15cf2f99a645a4f5b5544241321baa5a08d419a0a458edaf3625420b76523102261a0b0acbd35614fd4129f9f7d8efb216b96d5f038958
-EBUILD krfb-20.08.1.ebuild 1405 BLAKE2B 65e855e94e143ad777e191f8e4789859935d1a943956bb6c3d315dcc28dc5cf123ff8a9756a3a56fa6ba2d02ef1bc83d28028b7e0acc0ec0c224f5deea3d339d SHA512 7cee1abe343088ffbdd48edfa7913e2c292f1a1e09f2b17a655eb639b636a7bb277cc0ce43a3e29eb95cbd7edc7c1bd26c4ec9253cd251595306741c182dff39
+EBUILD krfb-20.08.2.ebuild 1405 BLAKE2B 65e855e94e143ad777e191f8e4789859935d1a943956bb6c3d315dcc28dc5cf123ff8a9756a3a56fa6ba2d02ef1bc83d28028b7e0acc0ec0c224f5deea3d339d SHA512 7cee1abe343088ffbdd48edfa7913e2c292f1a1e09f2b17a655eb639b636a7bb277cc0ce43a3e29eb95cbd7edc7c1bd26c4ec9253cd251595306741c182dff39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-20.08.1.ebuild b/kde-apps/krfb/krfb-20.08.2.ebuild
similarity index 100%
rename from kde-apps/krfb/krfb-20.08.1.ebuild
rename to kde-apps/krfb/krfb-20.08.2.ebuild
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index a5158003ef43..18f52b48316a 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-20.04.3.tar.xz 151288 BLAKE2B 12b1ed6db249dd132b0546fde987f762a0bda67eb8e6b9e0afbffe2d8d7c728640a1f2f6c53a65c8b38bb27364fd8c18eec9d7985707acb527a102d8e6ee60f1 SHA512 82ba94d8450e5dd875142c9cc2d48e3d312a5ec05246f8fafb833cc6964f7ca71f96859c79a3c6d457f350dbda85a219298c2f1d43efe0508cf1ac301ac4e2e7
-DIST kross-interpreters-20.08.1.tar.xz 151276 BLAKE2B a8bd9143f88183aaa3a2ee1253fe57b839f480f4719ded07ee6232debbd4c4c019343631d4d1507c40f9302656a8cf29030941f1b28d2bba67bf3222b74539ca SHA512 cad4234aea2aa9c3b9abf41be60316f0444b72961c8ef10797c6a135f6d47220ee7d0dbb1f49d5e12d6a9efb2485146495e02b59746f04486e8675cf018f09fb
+DIST kross-interpreters-20.08.2.tar.xz 151244 BLAKE2B 73e28ae1bf7aeb5aac6113506e0cee48e6d3ac6c03490df144e72fbbc624eaf062cacc06ba1cf7435a5bf2f2db6ac7243be6d185a1453c96f4e24c6c4a094582 SHA512 f9647eb6e1472a6ed1f7c34aa185e521dfc58384da8d9b41f2b19b568d6f5a20be645a8616802b27b1ede2bda32e4b30364187f96857f8511fd0858507e2a65d
 EBUILD kross-interpreters-20.04.3.ebuild 848 BLAKE2B 7dee42f0ff70c901a609200225206267eb96ca4f06acca1004743a33e21449bee30abe3cbd5c0c345699c954e14e3cfe6b8dfa990fa6a52fe0935219e7a95dc0 SHA512 bc57db10f89d455ac48171d7de5f8ef238cfe074099be7f24c9007646c2e0af08a1568b4c9944eb5f4969f710e4a4213a08b4a0461787926a85e202ad30811ad
-EBUILD kross-interpreters-20.08.1.ebuild 851 BLAKE2B 2e135d4356cf72f51f2518ab61b5f0723d58a5ef45a9b611b2d17577d87891dada8795afff58b6047df12d04e65f763d5050994764f955af3d15a94f3fcc5f68 SHA512 eae3c16e3544b7e431d83741266047b0d6d9035ec1b049c673043eb11a11d297800bd149897383c91e2e87c441f0e30d0fec5030930749747df28a6b90f69876
+EBUILD kross-interpreters-20.08.2.ebuild 851 BLAKE2B 2e135d4356cf72f51f2518ab61b5f0723d58a5ef45a9b611b2d17577d87891dada8795afff58b6047df12d04e65f763d5050994764f955af3d15a94f3fcc5f68 SHA512 eae3c16e3544b7e431d83741266047b0d6d9035ec1b049c673043eb11a11d297800bd149897383c91e2e87c441f0e30d0fec5030930749747df28a6b90f69876
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-20.08.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kross-interpreters/kross-interpreters-20.08.1.ebuild
rename to kde-apps/kross-interpreters/kross-interpreters-20.08.2.ebuild
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 690179af4603..5662dcd64cc0 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-20.04.3.tar.xz 250384 BLAKE2B e39de289d93be03cf4296ee7b5ce19b4ca58b7db3a95701f7fd456bb40e5aa3b6fee7ff52ed2cc4e759e97f250de7df707d3ee0e999db7c582305a67b001bb63 SHA512 c6b683dfab8ee15d84723af481c0ea031f96266b321135a932f6442081a97f9d016392e57c789fc2ca1c0585286bdac230ae9d1cfa4cd18c4a898d7e92754396
-DIST kruler-20.08.1.tar.xz 272468 BLAKE2B c1791459995eeabcaea050eaff6678f8877dbd149334c07346b0b9ab22954a2093f26974fa8cf20229bd8cfe0cd331ae10ebec0a295bd720540b7eda4a662403 SHA512 319e3a98cd0ccfa832d183c7b6ff2285af8935799d882360e3aa5b6c44162aa21b6b68247c090d8c82b41a139a7c980fdb0cc1d01a3f627d109d771db57664f5
+DIST kruler-20.08.2.tar.xz 272436 BLAKE2B 95279271765e1739a92043eaacbcae3c556546f099c00431f44652d32fc0e63806f38171a25ca0c50526601e6c8d196fb64e19e244c8269aaffe105c90b0f596 SHA512 9374046127dc3b5a62baabbfb7ec775bc273f88362740f5b3893bdce24569333084c57334135a4f4fe4cb5c8ed9420d9a409040291a0c4bafb3658ad54c9f268
 EBUILD kruler-20.04.3.ebuild 958 BLAKE2B a86c9334fefdc0694e7d4b4592ae0941bdafe97901e63c4045efabdd83f0dfa14b6bf655e97aa50e14cc9ee06c6901be808e9ee26c19e451cec0f2d50edd1777 SHA512 38caf40d3fbaa39054172dac34ad17732f9e69aa595e323d72f818c5a4a6992f31873bd3936f1c84647c64f44b2fb5b9484d22e336ce2f0cba5262ec1c64348a
-EBUILD kruler-20.08.1.ebuild 961 BLAKE2B f13de24ebb486d0269859477b26a4e43ada64438787000ea8d16893d22660400aad55b363b0cc0c4060646d1c33135e578e0004b4cf6d08dbf79aaa0c33e9f9e SHA512 ef66893b0be3c74adb629b5aeab42e9da7b7b93c5289f00b271287f6bbfa09196402f5c61c4f2d17c3f973c87055444aee378f7cc53a653d3f69756726c2e076
+EBUILD kruler-20.08.2.ebuild 961 BLAKE2B f13de24ebb486d0269859477b26a4e43ada64438787000ea8d16893d22660400aad55b363b0cc0c4060646d1c33135e578e0004b4cf6d08dbf79aaa0c33e9f9e SHA512 ef66893b0be3c74adb629b5aeab42e9da7b7b93c5289f00b271287f6bbfa09196402f5c61c4f2d17c3f973c87055444aee378f7cc53a653d3f69756726c2e076
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-20.08.1.ebuild b/kde-apps/kruler/kruler-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kruler/kruler-20.08.1.ebuild
rename to kde-apps/kruler/kruler-20.08.2.ebuild
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index d97ffbc1d094..74c43dcad50d 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-20.04.3.tar.xz 821832 BLAKE2B ab91219fa6d4713d6e56c97ec53c1fda5a2ed64aca77a28b0f32c9d0cedde4bc1a30c9e9105f3ee83e1e2b5a3bf5d504cdfc297cc6868e68959905aa915d0480 SHA512 15ab1702a08b9616d9fd84f9707cf4344d327410283e785bb47eb9f9126319c0e00f5f480830198bb6db426e1abc75d92e5c142aec37ec01b072c840d3c735c4
-DIST kshisen-20.08.1.tar.xz 826956 BLAKE2B 67df2a9dd45523f6539545a365e993e6c15259ae0aee393b49f2460bb317fb25d61a20fae5b93d354e28ff74b9e951afcad25b7c3745ccab8e55a880ad9c83cb SHA512 57f05b125e09b9b67c31ea729baa4fe5c880e74191cbf5490ceffc7ef7887063d995afc1c21ef048db623bc063dbb0f18a95f2c19a816150b13e477c58a46dfa
+DIST kshisen-20.08.2.tar.xz 827008 BLAKE2B c9fbe70882169c18393c54a4744fff0e18f8ffc226f72e5f0612f5eca3d86ab5a04e56d49a37d2bdc925d5e152676754f73e55a862a078d94d481910c950a169 SHA512 689e71e8ad8644b616964df8c3be7ee1f5d780cd4c5b6b1bc5d51f10fe4b6805f622aeb077ccdd6cac1440ca1be52b90d4b6aceba51c3216b355480303c0bc90
 EBUILD kshisen-20.04.3.ebuild 975 BLAKE2B e401b733feb225f4a96086cf5003469fa8f72b998b244f9170bb2a65bbf4d164d55b1bcfeaa8349ad4e22c2e4f39efa2f18f5c4ff6ac90e6ac1a12defb3de81a SHA512 3a228218be72cfdcbfaebdb44d6dd72493ab0a7214c8a96c3948cc7a3f1e725785b9a8ecd218c6844815e8a58e9cc576beff55cd330ea0fc45cfb6bad0e16dec
-EBUILD kshisen-20.08.1.ebuild 978 BLAKE2B c7fa8957300037e6ed30721a4f3f311c820845b9fa98597d70a10db968f165483ba1228624d923faa26674ce8f34d39638de10484fe7f3c9854be4e405d148d7 SHA512 737ee46ac9fb9c57bd98e101b3a00eb43a5854b4174205444a9ebdd0cad77a9979cdcefe95ccc691c1ba2f022d8afb9b7bd336d252ede9a1356bb3a2a236b38f
+EBUILD kshisen-20.08.2.ebuild 978 BLAKE2B c7fa8957300037e6ed30721a4f3f311c820845b9fa98597d70a10db968f165483ba1228624d923faa26674ce8f34d39638de10484fe7f3c9854be4e405d148d7 SHA512 737ee46ac9fb9c57bd98e101b3a00eb43a5854b4174205444a9ebdd0cad77a9979cdcefe95ccc691c1ba2f022d8afb9b7bd336d252ede9a1356bb3a2a236b38f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-20.08.1.ebuild b/kde-apps/kshisen/kshisen-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kshisen/kshisen-20.08.1.ebuild
rename to kde-apps/kshisen/kshisen-20.08.2.ebuild
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 27e92b7f3daf..b08abe4d27cc 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-20.04.3.tar.xz 6991228 BLAKE2B 879489d8c820c0a84bbeebd03218f1d63a5532c65c1efa026a36c11f3cebf1da7f54362553553e307a7e51b39dd12f12df696ffabf1cf847229660e169e7b5da SHA512 a0f7e1bd3e3b9acf0927bb15b65a9d9cc8f4b9411ecf22c6f17f75402e991526d97defd64f5d98dda4a4f41690c0ff1835e0fef0805c5074b029d47b03b38edc
-DIST ksirk-20.08.1.tar.xz 6993496 BLAKE2B 514d2ce9c26b020db010acf7d073f5d26bac0779c502cff877bc717be31cbc3965cfb00432ba7a8f19996d8c31edc647f80ca4a536997fd57e9bd22afed80bd2 SHA512 399269847a7cb38a8e865247dc6e45e73cad9d54331e42f35d25e061b85a02e109e6bb54a152bc27feb09b66ed0262ab748e7c60e31af8663e157cfe4443b2cd
+DIST ksirk-20.08.2.tar.xz 6993428 BLAKE2B cd14feddf4bed7f7f4c90dc3b6bc65ec2477ae3d524194de5e6334c305c969bc3bba14e5daf171d58704c22174b328ccc71253a7f0666219c9061bc17847fad9 SHA512 712bf95f9cf321306389f8ef245d77039d529b76536a829ac56488c3aaa9a319b937f2e91dbc81174a4d866c3cb9e7c6c4fb3fe47ecf6904814c7cb340a08724
 EBUILD ksirk-20.04.3.ebuild 1171 BLAKE2B 053517d66076e172bbcec36564ec1c0bc80457fc28e16d6cdf451a2a8bb6782e370fb7a618225f833e01c86954d8c4b06daf9d86a43d8c201a46ee227eb7d22d SHA512 65d20683ce24481c5fd060f000381ee6c8f18ffe5faf79102e6e8fab9cfac27d91b17ae27b5b94ff987bbf2c3497d33bee4f2a8a04b4f9095b710924a36b0961
-EBUILD ksirk-20.08.1.ebuild 1175 BLAKE2B c8681bb96c62f2e62677bd1257d8c39b3fa544175fcdb89f5425ffed4999d5567964c1f2f101456600308008e1acfc0ca3fa89db2b2092ce31bbb8a0179e193b SHA512 85b1685f5f9781295688b4340a7a707274c667abc83dbb49b31e94374274a83178c0c2187d1796d8953803f5509866954a3a2d178164258f5fb255424e06fc17
+EBUILD ksirk-20.08.2.ebuild 1175 BLAKE2B c8681bb96c62f2e62677bd1257d8c39b3fa544175fcdb89f5425ffed4999d5567964c1f2f101456600308008e1acfc0ca3fa89db2b2092ce31bbb8a0179e193b SHA512 85b1685f5f9781295688b4340a7a707274c667abc83dbb49b31e94374274a83178c0c2187d1796d8953803f5509866954a3a2d178164258f5fb255424e06fc17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-20.08.1.ebuild b/kde-apps/ksirk/ksirk-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ksirk/ksirk-20.08.1.ebuild
rename to kde-apps/ksirk/ksirk-20.08.2.ebuild
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index d594ce0d69d1..a88ba21fd167 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-20.04.3.tar.xz 41520 BLAKE2B a1689374eb868c414a4f3d1c957cab05cacfff4e4d4f6eecf1cc7436d3cb8d05999ab19d0d3e1c1570f71fac80549407f2f3cd20c99924ccb5d037c7b8841187 SHA512 c9794ca8dd93e25c79dd22fab38f71a421da1612658830ffe87cc8e751db9624a3d1924edd52d6fdaa97044e4d1accef5b6807f9461f857bedccc00f4d54f109
-DIST ksmtp-20.08.1.tar.xz 42416 BLAKE2B a62da93b75ca2ac5cd15910de11bb43e78d1586b625edcc8a9b70e636d3b096593ff7f42494b57173ab0071703dc09149a9f236a7edf8eb6e237d425a52ce4b9 SHA512 2f1fda7840b59a889e1f73c5a84589a37ebb1edadd9255297b3979a722d1aa153b59392c4a2438d896f40b22a4936d724cfb377e932d77d5ee681897c718434e
+DIST ksmtp-20.08.2.tar.xz 42424 BLAKE2B 845f46c32038800c64be5f2e9872705ac2821df96b73f8d171c6c07d25a89e8b95c756e61f56687fb53299c5a84c8e2bb48fbae0668acb0a298bd7f04a0911c1 SHA512 3195e845ee5018e389295432a683fae4688d1105a38dbbe520493de75b8724d465b073657da7eb76879da6a40d26c6c40f33e9759bd948039df5ea537d1c8960
 EBUILD ksmtp-20.04.3.ebuild 595 BLAKE2B 67528bcecab8ee00686bf5a4b26d000b86bc03f4c3f65c97ee54bb9ff89a059b22b525163b1e6a2dd502ae66f84dc78b21509e4d74cdc2713503b5640598af3b SHA512 b0818958f6a154d68311d30eb6337b9c0cf20622b0f219ae65d68a2070d1179935ef0448e02622dd8d3a8fc2c82a338f6e6f490c404e1ea98e4d0281ecd8dac7
-EBUILD ksmtp-20.08.1.ebuild 598 BLAKE2B 345acd3a9926c26fbd763ab4c225276c3c5d5113339408dad80cf426a86308fd35e9296cd9084e232b9f5813af5be56aeefe647b5317a8e998a214718fc52ba7 SHA512 123cc77843695d3228280ecedf32e34845c863ae67aa574754497ca888b41ddf835e5128dec3b08ac4602defe1cc4092e5bc6ad949a63d29aa91087c5c1b5172
+EBUILD ksmtp-20.08.2.ebuild 598 BLAKE2B 345acd3a9926c26fbd763ab4c225276c3c5d5113339408dad80cf426a86308fd35e9296cd9084e232b9f5813af5be56aeefe647b5317a8e998a214718fc52ba7 SHA512 123cc77843695d3228280ecedf32e34845c863ae67aa574754497ca888b41ddf835e5128dec3b08ac4602defe1cc4092e5bc6ad949a63d29aa91087c5c1b5172
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-20.08.1.ebuild b/kde-apps/ksmtp/ksmtp-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ksmtp/ksmtp-20.08.1.ebuild
rename to kde-apps/ksmtp/ksmtp-20.08.2.ebuild
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 308a9db35d5a..1b3b68011d4f 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-20.04.3.tar.xz 605648 BLAKE2B 1472f5f8861b61b9d419b9caa7b19e193787edab6b5ba2ce92efab78ced620366a8e60909fe173eb5ae2ba5a8eca18cf09bdef9782c6fa27a9555ad91162dff9 SHA512 43e336c8eb8a7fb7390d257f176b8f451fc940126fda75a2daaebbbc5fa18cfb0bdb4b7221fb919486575aff7d5fcb7d8efd4812ce6b4065f318554b5461eb6a
-DIST ksnakeduel-20.08.1.tar.xz 543980 BLAKE2B 79fb083216da1720955cc544de7d7ec59138894476ff8b3095d4178c95308a8e375246ee5d7f5a65d0c5d9a1f5900ff23a0fbab804cdb96089e159d0b1e4af4e SHA512 d455ddebf11b0bbc57f87cecddc633fe0ecb03ac23e09b092ea0e9330e13e55e4ba6d48997451c92abcfbde8170a14745e0e070b1f7581302881af7e33a7bde3
+DIST ksnakeduel-20.08.2.tar.xz 544008 BLAKE2B d9df6b8b2b8532d1bce8ba40a4ee1bc342236e91cef7c3d65b317aff70b2e369445d35682666fdf624eb7762e3907fec31734778b8c319d48d66634aff3f3042 SHA512 f19976833b552fca47c624a3edca6be4ad93dc582f815050540dd2c6a3c91280aae0996d045eb5fac2f2b682ae3c9799ccdcc0406d5f085fdcecd742ac786466
 EBUILD ksnakeduel-20.04.3.ebuild 948 BLAKE2B d54b96023d5d234efb9792f5c234fedfe8dea6aabbb582206d33789324df429eac42a95f5babe2712593dd4e7dfe2058939bee6deec246fbc4b18198125f2f59 SHA512 6ffc238048417f352b0cce80b43c0a0eb77cb54d82b93929d43bfe994dc0e9270f4a120c6e26e14dfb3cbbace1b7ab34aaedc7da61822fce0745201708c1dbf8
-EBUILD ksnakeduel-20.08.1.ebuild 951 BLAKE2B 11013deee8be874e95a6f90537b849023285539506b9e15e9b8c45dbe96324479be5c46ef8c08f105c1994f4c6987dc4d2ac0ea24b3a5b9e37f30cbccac2a48f SHA512 8f2fc47ac9f6c73d15e333ca6b88dff88d16528c9d93622e45de69bdecb39fcd23bed1d47dc568755197dc7a2e14e55d88a7ba8bae9f478fe5b42af8a15d8f5c
+EBUILD ksnakeduel-20.08.2.ebuild 951 BLAKE2B 11013deee8be874e95a6f90537b849023285539506b9e15e9b8c45dbe96324479be5c46ef8c08f105c1994f4c6987dc4d2ac0ea24b3a5b9e37f30cbccac2a48f SHA512 8f2fc47ac9f6c73d15e333ca6b88dff88d16528c9d93622e45de69bdecb39fcd23bed1d47dc568755197dc7a2e14e55d88a7ba8bae9f478fe5b42af8a15d8f5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-20.08.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ksnakeduel/ksnakeduel-20.08.1.ebuild
rename to kde-apps/ksnakeduel/ksnakeduel-20.08.2.ebuild
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index a9ecbdd9337d..fb54a456dc4d 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-20.04.3.tar.xz 612344 BLAKE2B 8bbf8cd2deba02a43d023051e06e97941aee98726119c4992d23f255ca3e15a4d7d0de24fee33900f7866690f0c4c9854626211ee1c439f66fc99bc15a9808a3 SHA512 c62b03feb0b91e2e061d0e5b4a342f9f5e6f79f8336c04bf72ea6dc83ec9b5f6908a95aefaeff9583b26e7138f296147c79024baa6b3a5e7d6445c516bbe255b
-DIST kspaceduel-20.08.1.tar.xz 617344 BLAKE2B e2c43aa44e2471ecd5b901c4ebe682af35088df0266e72ed2fc7fc0658797b26d9f2ed81f994e06f2e38e9aa80562b0e0749b3cc7030b35d058aa57354f412eb SHA512 692671f0aa822fb86759fa8144004a87973e9e52a6d28042fcf4a16ba10bd6574b6a505d4b43f0540c26d6d6c366967a83745182a00be830521c1b83672b4883
+DIST kspaceduel-20.08.2.tar.xz 617496 BLAKE2B 5203e704f2a7363c2f61694400dcead0290d4bba729ff2a7ae75a5824d20ede351bcfcc6bbce0198040cf20306c325e758e13043c444453f47613963354ed41b SHA512 429260c3a768b2b7f5baf45a1aa452a48a364565adf2a3b77ad032953dc0932b18a7c4f6013ab3b951b8a7933775403022e5039309c5259cd7147768194b2158
 EBUILD kspaceduel-20.04.3.ebuild 879 BLAKE2B ca5accce31f8d5589e4daa8212caa3d7eea8bb8c5b69a2f35adee240bfa98c3caf33004f47494d19e32af2a33c9cffc8750fed29f6e8e46edcf7d662efacb2c4 SHA512 2abb894e455d53eaf9efd355f71598605ee7241b68bb040051c8bf27e2e17d6eb98be79ca95851411ef994b00b8ebdf1f06230d8aa2fc031e5c60fb5d2477c40
-EBUILD kspaceduel-20.08.1.ebuild 882 BLAKE2B 270092e6af8992686a2f03a703cfe3733608444d91ec4c43e9667a6277bcaef2a091dec43561ece2f9a4dbdf80f3ac04da6608646bf3edcbf1b15315154142be SHA512 c6e24a55b84bfa784004852cfca20aa3815c66c5da89cf728647a63a4b32911a56947b3e40eb5be3c7daeea33b1bb8aaf1a612790ab0a35babf22cda988a98e3
+EBUILD kspaceduel-20.08.2.ebuild 882 BLAKE2B 270092e6af8992686a2f03a703cfe3733608444d91ec4c43e9667a6277bcaef2a091dec43561ece2f9a4dbdf80f3ac04da6608646bf3edcbf1b15315154142be SHA512 c6e24a55b84bfa784004852cfca20aa3815c66c5da89cf728647a63a4b32911a56947b3e40eb5be3c7daeea33b1bb8aaf1a612790ab0a35babf22cda988a98e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-20.08.1.ebuild b/kde-apps/kspaceduel/kspaceduel-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kspaceduel/kspaceduel-20.08.1.ebuild
rename to kde-apps/kspaceduel/kspaceduel-20.08.2.ebuild
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 659c5263cd11..5e37221c188b 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-20.04.3.tar.xz 261132 BLAKE2B f2f856de477d35380de6db9ff9e7729f82a9edb55357a44aff733e2a6e8a32e035630039eb0b6895595a805edb29d780aefde6467d5de88b2a6fbad890d70a59 SHA512 a334f0b990edecbe03441a9595242b057d26ff837014a82dfb8b61491b563c9a0821d7f08b40fd5c667ea1afb755c47f01a5ff3b47ec1c16fa3798bfa3e8f3d5
-DIST ksquares-20.08.1.tar.xz 266436 BLAKE2B ec7e3df3edf1d011ca81c229bec9c105623a69d687aa5786603dbae7593b83a0a612c78fba5d74202c9f4611fb76f24f7c7129cded2813961c8962d5409c855e SHA512 ff266251830de12b89b6048fc01aa637b7f3501df48c40c263cb41119c9397924e6a79e18f384e2d4b8a834bafcc39960d5fa8fa194c8930156b9a7a97900ee5
+DIST ksquares-20.08.2.tar.xz 266728 BLAKE2B 7a0b47642d78bb0a79b117f9b9057a4fa804c5d6a4266b87063ce39d69baf89e37a040f4251279ba571a9f82736b84997d5aaf7fff1ddfc7bdefb019057e8bc0 SHA512 5082d8f8df480622bb32dcf329a30856c043b4ad98af96cb14fb555e7a01a49192c8f6ef811209afc688a1fdc3f22c84cfdf211d817aa321cd43e4a0122fecca
 EBUILD ksquares-20.04.3.ebuild 918 BLAKE2B 2a2c806903bc4789b91112dea01027dac6f6d02b3e2b4d00ce23472a681b2d56495ae9cdcbb57968a7159cfdc046c374ba53596b8714051ce456a21664aa7402 SHA512 7d92f5b7682ba552f9eadc1eef26fccf8f12182b1c2084f9a61425b9987b6cd75ddc69cea6f5bf5e33f91f4ffc51b7bba163f1c6085ad29930c03b58e61ac6c9
-EBUILD ksquares-20.08.1.ebuild 921 BLAKE2B 18c3ff79a3999804d4696c88b37e60a2f9f49504ae2f6905131aaf0ba68d206323d4abfa92313c0c2f82917c9ae6bb19190c3ea5a619e109778bc7150c4ab651 SHA512 62ce2cd33ac8a687065900be2a726fbe102eadae11dcda6a9d8e5b32c93257ad3ec8055ad4f8580e32ccaf478ba06127f548871034266218e6641a46c033ead4
+EBUILD ksquares-20.08.2.ebuild 921 BLAKE2B 18c3ff79a3999804d4696c88b37e60a2f9f49504ae2f6905131aaf0ba68d206323d4abfa92313c0c2f82917c9ae6bb19190c3ea5a619e109778bc7150c4ab651 SHA512 62ce2cd33ac8a687065900be2a726fbe102eadae11dcda6a9d8e5b32c93257ad3ec8055ad4f8580e32ccaf478ba06127f548871034266218e6641a46c033ead4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-20.08.1.ebuild b/kde-apps/ksquares/ksquares-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ksquares/ksquares-20.08.1.ebuild
rename to kde-apps/ksquares/ksquares-20.08.2.ebuild
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 6e796c04875f..8ca3d555d01a 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-20.04.3.tar.xz 1655708 BLAKE2B 3a9d794eb02a762dc2cf8d9191b24c98fb809da3fab46b92a2ce0e6b16567c59f4ebeeaabf69401148e137c79d364c641d9f6c176606c31a7142034dbf2a7bfc SHA512 39002ce3aefcee4d1f166dd5178dc961df2530643b95db53c4eca8a8335c4d4a233524d725bbebc376d93f1326de164b423ecd4b5a84b3dbe50e421a57eb1abd
-DIST ksudoku-20.08.1.tar.xz 1667716 BLAKE2B 61e8e06c345a6a861318060bf3c5eca56633a5f754a21bbb32ceed6355b233a9fec93ef71fc7cea833ec7c32dea392c6b0d75ee1bfc0a89c510294d55d512079 SHA512 ce5a3818282690aae89e146e61aad88e3f433a265b9bf1cfb8db312e739b714be42354d7fbfe606584177e43b7c1a17c7bee1cb8190cc6dd066db769c670e5fd
+DIST ksudoku-20.08.2.tar.xz 1668868 BLAKE2B 927ad2082f3ca6c204d6c9baad8124cf89d5daa8ece170dcb6ecedcbcd81decb2230e4f2ca299e6738d8d42a4977897aa14021b925901322f770dd2428425013 SHA512 409745defef4bb869dd941001a0f51cd9b2dea3b444503c057a9bdc52a91ba8f95fa649a6aee08b239b773c165e2a4c53c10cba4f4c07fcb6ae633102af0840c
 EBUILD ksudoku-20.04.3.ebuild 1302 BLAKE2B 122e11688f3fdca12202ba303220ed10fa28495915af76dd35f8c3f3a11eb513e5e6aa7f68abbcd25470d83d5403cfaf03bde91de0b2bf46e0509ce232d35afd SHA512 004d01aec5aa92c291111962d25cf1d8d6203d3a21ae73313c6ad137710f45977fa9cd5fac6170ecce4fd1e108835fa9a4eb87e1634724d42e6f3f299396c70d
-EBUILD ksudoku-20.08.1.ebuild 1305 BLAKE2B b41ebfdb7c49bf40fa1413ccd96546e760d9f3723c97054fd19bb933c07f11357e98bfb1186784788b9b5d7cc2c4819bf0d210d967626ef5f855a5b1cfc7b712 SHA512 ca4f201d7fa294855f464f3d8ea856ad044563ed41418ed41a7c20e184a96245043e40da16b632230ea2b616dca19970b660c308209625dbcb495cf4c3d4040d
+EBUILD ksudoku-20.08.2.ebuild 1305 BLAKE2B b41ebfdb7c49bf40fa1413ccd96546e760d9f3723c97054fd19bb933c07f11357e98bfb1186784788b9b5d7cc2c4819bf0d210d967626ef5f855a5b1cfc7b712 SHA512 ca4f201d7fa294855f464f3d8ea856ad044563ed41418ed41a7c20e184a96245043e40da16b632230ea2b616dca19970b660c308209625dbcb495cf4c3d4040d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-20.08.1.ebuild b/kde-apps/ksudoku/ksudoku-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ksudoku/ksudoku-20.08.1.ebuild
rename to kde-apps/ksudoku/ksudoku-20.08.2.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 1b7e0248dff8..5090a88fea10 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-20.04.3.tar.xz 1931340 BLAKE2B 76546f9b19c9113e770b6a26d1911a2a97405bc600e138ee74ad8e233d0d77c871fe232eb3a5ddcffa10fe1a112b258a05d65c86ba51673a18b758a3c6e7cb48 SHA512 05a358eac885d1ca2ca8ea0f2a49fc98b6310ff17c9e830f2a931e5c20ba38bbbf0b7597029549ff4ee9a2bd7e769da5b3bb7ed57b9a304be9202ebea20eca2e
-DIST ksystemlog-20.08.1.tar.xz 1935748 BLAKE2B 8b9cd5c79d630052cf165f5184228c4a94bbd24202ab6fcadaf76b9aab72d4db3969472026e92e22dd366e6477e7f37fc12e6cf690c59a41d9db884153b603e3 SHA512 eef230567d062ba860bb59fc102c5546f1ebf15ab98f0042703fe49de6ba41409e010574fe44210fa649034756611b7c88ef87fef8882e4fd91d18ef8fdbcf0e
+DIST ksystemlog-20.08.2.tar.xz 1935920 BLAKE2B 6da54133737c1a6e3c857cdeff2924218a30d1c8b5c9df2522cce68ecab0244716fd812a9626bac28ba15bc76bb5f30dca2865af233eae3efee5df2e7c6404d0 SHA512 5345ca4264ff9e1a426dbfdfd51b4949e5ee0f90d50765b2ce775e3443e080db4e6b4e49eb760a79b6c0d20242939a8c9bfb8fc1bd485f5a4f16e8df552d0457
 EBUILD ksystemlog-20.04.3-r1.ebuild 1630 BLAKE2B 3c76a3d14d07553307d9779c2bf0b84b01a846a7e843a6cc62dc6d34f81dbf534891e97b8eb6bde4238914c289c19196a78879afc4c20cf49ee4e57249c36f29 SHA512 de840d6f57c8e3fff9964cbd7c459d1f7caf982e4284ae482ba9039a0cefdeadc11a63eb2c389db30cc182b39f43c5d15a6c81e529348adc4a9525f5f38388dd
-EBUILD ksystemlog-20.08.1-r1.ebuild 1546 BLAKE2B af9b4d29f75fecb5463794966b37fc5916af5c58656d7cd2606121eaa5db6f32ee67e336235fdb17bba76faf17da6dd63167212cfa5d5054c015d09107685773 SHA512 d011c92e5616b59641624789b05a030c4cf162b76eae1cef988331cb2b2862985e6ad6a1a53700890b89de3feb7a74dac648d5f1cbd5ce1ce1c9879b03e29c8b
+EBUILD ksystemlog-20.08.2.ebuild 1546 BLAKE2B af9b4d29f75fecb5463794966b37fc5916af5c58656d7cd2606121eaa5db6f32ee67e336235fdb17bba76faf17da6dd63167212cfa5d5054c015d09107685773 SHA512 d011c92e5616b59641624789b05a030c4cf162b76eae1cef988331cb2b2862985e6ad6a1a53700890b89de3feb7a74dac648d5f1cbd5ce1ce1c9879b03e29c8b
 MISC metadata.xml 357 BLAKE2B 2004a9f41fec27cb3e4f75c4248fbc4b46a4ab7c52f2d23fbcaa3085e1580b0dfe9ad9980c2b7af0670a7b56860111235fbc21298a2647d5bafa0d2be0bf95c0 SHA512 ba2d8f62d75eee5e8edf3368ad54c0d4b347b92279c2de5a4d326536bf670c82e419490a3972731b698bff84ff10908c939ba7a416f4ce4de335eb914df4a701
diff --git a/kde-apps/ksystemlog/ksystemlog-20.08.1-r1.ebuild b/kde-apps/ksystemlog/ksystemlog-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ksystemlog/ksystemlog-20.08.1-r1.ebuild
rename to kde-apps/ksystemlog/ksystemlog-20.08.2.ebuild
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index a87c23578afc..58ff3809e738 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-20.04.3.tar.xz 286976 BLAKE2B 9fe4e9a462fdd1485f711fcacab5b449604429406d7e6db2b5062e3face7d3895ca7662b9c7fb97c302e23e35743dd8a2d226c0d3550672513c3edfcf407b212 SHA512 1b9f9ffdc2e3b2d1fb1c63459073067af2afd9feed6e437efcd593a61fd6c9dd8054dc4c4e8d40a356abefdae5288d68465fd5e584b0e5f0770b5d4de98d94f7
-DIST kteatime-20.08.1.tar.xz 294452 BLAKE2B b847eb523db9c636c80dc475fce4d546e2e9cf78f6e5d8d5621459f01741c1e105ef5ae9ffc70eca7ac807b39dc008fd2d1aa9583b7ffc9e7df4ef75fa9462a6 SHA512 470cbcb1eec6a2bfdff6f4f1c65b5a85b8a844f5ce264f391df7a1e381a4c786535b6889f66bae72b516faa2cf8e001c57995e9fd9c788f0bb9e60e547822256
+DIST kteatime-20.08.2.tar.xz 294396 BLAKE2B 90b36f6ebd8f7d294d9da16ab1eb1e0f1b49bf5be93d9d891126853bb3e05cc299ac31a8ebefa42a6e01a34fa26544e63de11a354c2f87f67ca01aacc1619274 SHA512 f73cb270e0d31755cdc4ff6bd601634ed6b58053e36f4d1030116e65901866341155906535847f380dfca7c88b4a369f94a6e5884f713939041f415677a005fa
 EBUILD kteatime-20.04.3.ebuild 881 BLAKE2B f2aacf6b74abde5e9578a52c7312b6f73eb15ad6f05d36521886a7b05fabe4840d02089a538f9e9886e12d910a2a4476e3b5170e61258f4630156dd56d017458 SHA512 5f7801134ff4f84ea882035fa3d7e33f8b28d1e577dde48d22498d925fdd93e56c379c4e6b3127de32b3c791be051f374f9a3468901fc4f567bb232a3289ed94
-EBUILD kteatime-20.08.1.ebuild 884 BLAKE2B c794504a1815777a79037239841a2c55a17f6b2f5a7702dec6c18a2796e2fa4dcc36adcb697e28567c61af281caf83fd8e3bd9ad31c1b57c1bfc530ffec522b6 SHA512 f633d2d35d06d03e619d98b1e23ca239fab415770a8b22fc4dacd6a5036d0033e3aa2d0a9c8eabcef1fc29026d5468ea3a60c9bcede7ed15a492ec0361ff4b64
+EBUILD kteatime-20.08.2.ebuild 884 BLAKE2B c794504a1815777a79037239841a2c55a17f6b2f5a7702dec6c18a2796e2fa4dcc36adcb697e28567c61af281caf83fd8e3bd9ad31c1b57c1bfc530ffec522b6 SHA512 f633d2d35d06d03e619d98b1e23ca239fab415770a8b22fc4dacd6a5036d0033e3aa2d0a9c8eabcef1fc29026d5468ea3a60c9bcede7ed15a492ec0361ff4b64
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-20.08.1.ebuild b/kde-apps/kteatime/kteatime-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kteatime/kteatime-20.08.1.ebuild
rename to kde-apps/kteatime/kteatime-20.08.2.ebuild
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index c71b1d73759f..9842d5fa43a3 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-20.04.3.tar.xz 377888 BLAKE2B efcb4f0a5e37226fd503aa91da1147e3f1fa26f650f7ce34a0d807f86160dbc845fd443ebf14522853bb4d66a82e4079274c3309087efa44291ae35ece034a74 SHA512 313ff9e8627cb0553c6e4a9b60349a842c016f9f20f952bcf1347c2500641242f095226e85eb66330a6d6d5292de8d0b26ef74127ac17e226337324e3f517eb6
-DIST ktimer-20.08.1.tar.xz 385464 BLAKE2B c470ddb37098fcc995b618669d882950144d3921c1149ac16d8acd7c0661ad3e88d0586fb8a9e234d1cf8f3a6027395e1bc248b155999d1bc19f12f6a0300f98 SHA512 ce5e1170734296031010e680af9c2b076c90b41620222e53fc8ffd9b665f3a3c0f2e7b591e113f414eb861a0dd764dbf88ee33c705625aa0479ebc5dc99ed72e
+DIST ktimer-20.08.2.tar.xz 385444 BLAKE2B eb4568cd5f6ce3d2da8ffa4f5186f5b32fca5fd5433d711987e37aa68b5ce77f50e6e912a6047dfdcdbae98b0fb15823d14ada3925c97085ea59bc235005008b SHA512 6e036b3c701623fe29f69cf0c97abaecab54a52bb45b5100270014fdb29a4b39775c561843058144a7b59f4ab8260e44d2b6a594dc29f0381653cfe0eb3b9eea
 EBUILD ktimer-20.04.3.ebuild 846 BLAKE2B 97d0e0dbe1cf58ac07d1bc8ba68ffc16891651bb3b0e35f113e069901dacee59b91f310840ece0f91714d3c9a9e5d7769ce542a37415379c5200a512f6e04e51 SHA512 19fbfe5048f8b1611d66d18209db71544c60397e7ad38f61644e3f218c6b7652dd9809d8beb7f6f4f5bc7dc81d7a04c2e3f3a113ef97ac5e498413bdf9246af4
-EBUILD ktimer-20.08.1.ebuild 849 BLAKE2B 126971df04d49edb9084b4f86b4c7a32671d2ebf32ce27e91724bc024d2d0ea6752b46acd596a812be48ac5950ea3b165de22ab9c18cb20a1aa7e3fc77447d2f SHA512 fb1cf041c076c36470e63f0ff1d625981c4154bc83cefcf215617eb13595659ef491861ec3d9ca6484efceb9998f3751bc684b7d3a83844056e72b58e6c5db7e
+EBUILD ktimer-20.08.2.ebuild 849 BLAKE2B 126971df04d49edb9084b4f86b4c7a32671d2ebf32ce27e91724bc024d2d0ea6752b46acd596a812be48ac5950ea3b165de22ab9c18cb20a1aa7e3fc77447d2f SHA512 fb1cf041c076c36470e63f0ff1d625981c4154bc83cefcf215617eb13595659ef491861ec3d9ca6484efceb9998f3751bc684b7d3a83844056e72b58e6c5db7e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-20.08.1.ebuild b/kde-apps/ktimer/ktimer-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktimer/ktimer-20.08.1.ebuild
rename to kde-apps/ktimer/ktimer-20.08.2.ebuild
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index eb9deba68475..e31a3a46b6ab 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-20.04.3.tar.xz 4936908 BLAKE2B f2295e2683b8ed272a4968e2f574fb1ef8fb180d318991b17502a56a7675b33ddf2996314ebe4534f0c814b3564272871935c3fe5c2e4aee4acb53f959fcdf90 SHA512 3ae31fc5bcb439ae0ac6fdf736fd79858e6aa24841d76f348efa12d085744594f6965608e01309b704a5500fdf91cc3b121de418a921c021f1bf4eeba42cb124
-DIST ktouch-20.08.1.tar.xz 4944956 BLAKE2B 3bb65843f082b4647387aebfeea37249fe57329d908210b51cb04c7a034581ecedf74056687380a1d46add38eaf1fcb66a4c8bd9fa9b7dde14f6d2ea2988d1b2 SHA512 ff47d10afbb44f7f790843e92b4cefc5fbbffeaba3cbd26d70a4a4d5d71de90870a4dbc4f4792161c953d0adc05054c59f6c4be6d36050db359a0c23a79c92f7
+DIST ktouch-20.08.2.tar.xz 4940880 BLAKE2B af78bc8593d007325bb97865aa59933098385875b4e64c869199d3b876a0fe5ab86bc0d01bbe61f2f32a0a2051434f854552181d14cc5b50ff2f745862766191 SHA512 368db9b23508b7fae50323a6f16befcde5ca06417d0253c60a1e90dfd664b301e2f2980f0f1d53050e0dac53659937d1fdad84172b0d45aecd96347a18ecbb63
 EBUILD ktouch-20.04.3.ebuild 1656 BLAKE2B bfd3bd522b533d997e0ab59a3b6aca25ae3135b3f15d6aca69696ef22aab7dfad13a242e3743f4607a18324d68d2f77bb9ba5369bcf5fadea4a4f11bddfe6c8a SHA512 ea0042665225e8cb474d0c9eab4d040b479820fac623fa0f109fceddcda6c7f99a4db4fc58441e2869f4c793f513081fb4c24624f64c46f19cbcc8f5c454d1c3
-EBUILD ktouch-20.08.1.ebuild 1659 BLAKE2B 948b955c3c445c69b55b5efedc7a5f8c3dc50d8ffb85f153a201b4abbc84bbf9bd27857b3d8dfa7a7b8890812609cae3d5a9093b1cf943358832544d2615ddbc SHA512 aeeea1ffe284e3eb4e8150b4d0f162553f18786a70d0525ad90d311931a0f3c6a376dbe5b85eba749de9cdb9185c7685416ab0419adf635d1de744e76bd8875c
+EBUILD ktouch-20.08.2.ebuild 1659 BLAKE2B 948b955c3c445c69b55b5efedc7a5f8c3dc50d8ffb85f153a201b4abbc84bbf9bd27857b3d8dfa7a7b8890812609cae3d5a9093b1cf943358832544d2615ddbc SHA512 aeeea1ffe284e3eb4e8150b4d0f162553f18786a70d0525ad90d311931a0f3c6a376dbe5b85eba749de9cdb9185c7685416ab0419adf635d1de744e76bd8875c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-20.08.1.ebuild b/kde-apps/ktouch/ktouch-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktouch/ktouch-20.08.1.ebuild
rename to kde-apps/ktouch/ktouch-20.08.2.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 484c1ac73b86..7bc7d3efe7de 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-20.04.3.tar.xz 261984 BLAKE2B 141e3725f4d7a12f5fc92eae31502ffd86fcc1aa5110e74f2b51f2509053ad8199a7b638a0585a34f44b2447f81304258667dd3f9431d2740635e6a3984f58ee SHA512 0e9c8a75ee36e406cdcafe334170f93eed8ff1d5efc902b29a698d8b4cf95773e2920b0a87f2f052b6e852571ff02ebb115ac6136fec1b2e2bcccf4a6cbc5e6f
-DIST ktp-accounts-kcm-20.08.1.tar.xz 262340 BLAKE2B 9974d10f5dc0e50966aee8d837cc20f41bf24425e85644b3cb5b8532a0f583a0cba558a818cca9fdb512eb52656b538931ea8b284fc68c54a88e0f3161e41b6a SHA512 32ad3e8aed89d3f9a9f59119c94fd3b3aef6a3f70150ef73689a01b1d915384298bdbc901e3c5b9d48e49d68fe627b8e376580cf3aa965be4af9a25ca018d1fe
+DIST ktp-accounts-kcm-20.08.2.tar.xz 262256 BLAKE2B 232573fdc09ece4134f9031ff8c1e8bbe08cc2d8307613c8035d6f9cd52aa47d8ed75fdcf92db5b8bd1ab5447213d16f4b71697e0143fcdeaa26508e23caf336 SHA512 c30f3c006c770eada9cee489b836225d5a51729f41cb3259c71a71129ae3aef8435e7517c1797d37651690bbe4d88414698766d49333cfd32279a247583c6e5f
 EBUILD ktp-accounts-kcm-20.04.3.ebuild 1598 BLAKE2B d5c6b1f03f1b3030d07b2d47df6b89b98ee22a130e6b31ad4fccee29248f35e2bcef8d3f2b8f658dd3ce567b1f2bb4ab336b4621fd135257e2ec3d99dde85026 SHA512 8d9124564fef87e8766144b0045c7413cfb67e35a75cb1b6c092624c2197a8e1aeff8a56addf0e919b4f3ca09d771d62839a526fa4c627ba8de94a8c0c770436
-EBUILD ktp-accounts-kcm-20.08.1.ebuild 1601 BLAKE2B d4f508ad23d72168c1d5612f14ab287ee9b46f5f22c7361311f4b300b8c8c3e0e1c91a4170c0062be64a22ce130f871cfef37889812b144472c9d4093e40389d SHA512 e020d111c401bc83f21d180dad51f52b96937d6c614039c2969e064e6e03f9f5d14f6fa7d75046546ed22263a8b547d38b8d79dd9ee1f9c5d59569af80326dfd
+EBUILD ktp-accounts-kcm-20.08.2.ebuild 1601 BLAKE2B d4f508ad23d72168c1d5612f14ab287ee9b46f5f22c7361311f4b300b8c8c3e0e1c91a4170c0062be64a22ce130f871cfef37889812b144472c9d4093e40389d SHA512 e020d111c401bc83f21d180dad51f52b96937d6c614039c2969e064e6e03f9f5d14f6fa7d75046546ed22263a8b547d38b8d79dd9ee1f9c5d59569af80326dfd
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.1.ebuild
rename to kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.2.ebuild
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index a04942f027e6..a870b3c50f9b 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-20.04.3.tar.xz 37256 BLAKE2B d57f3a047f6cc0759be768f95670700e93e62a4612507ff7f1c75dcc764fb1fb024e281e907cce6b5fbdc8d231da58e006521684dc41e4ff3e98b91dca8171d0 SHA512 31c768d6fb0a234c219dc598e0e37621e377b0774957e96be9906236254d8dd5792fa8994aad861c81de2c1fa81a4b35cde68b31bc2e15608bc1fac2d828b181
-DIST ktp-approver-20.08.1.tar.xz 37376 BLAKE2B 969338140456f7dc5affb7413837f7a9a320620ed022ad4d2d1650e9ba8f488c22dc95dfa631c9f1aa0ccb9bad7f1eb6c5d42fdd053ed3900ed49c834cd13212 SHA512 b90ab16370230000ae5350355340a5ae573b68e49d6aa2643b3c3a662f66e8135db9ea9c88f94ac82267cde0da4cb775f47790c7e065b9bcc29c040de18bebdd
+DIST ktp-approver-20.08.2.tar.xz 37360 BLAKE2B 6a519683ad5c74ddba0c4acee17ab0748d55db32ffbc876c5db03dd2768b7bf908e40dd07d2e7192e3234bfdaf665fbe98b5c80fce3428e53d57236c2f8e1aea SHA512 b3ef06bf04d4bf7f94550c5810983ee28dce7b286005cded2a321c64701ddc610d593b643a97e5bdff41272f711f6bad513f10a84f894634f28d25a894e24d06
 EBUILD ktp-approver-20.04.3.ebuild 769 BLAKE2B 595b94d833b086b248ad299b367945ed303ed36045fd29087c17c6970d7e61be9b59a9e2e818b7d570afe6ecc194e72d25be19bcb7ae9109f52402968ea1d635 SHA512 cabf93b726d8d832c87fc45c210ec7d029859b6ce50a4623c23f5aaca221ccfa4dd655a60bb92cf7e9a9f9ef1a0ea20f121d87f662539b75c4792111a5008de2
-EBUILD ktp-approver-20.08.1.ebuild 764 BLAKE2B 974f70db09edc4d766cdcc63440d87ac75766b0b5d1a12cdaebab76ae670a71076b756b1af9848de3246c28918f8220c4ea26b1595fb7b1e8a58d561d41786ec SHA512 139d96b25348a9c6fdd898c79ba99458174fe90ea65e781b738a6d4fa621b1725d8aefde3f95f105877212023e521ed3fd525f6b876e9f220bd7f10327e2b6d3
+EBUILD ktp-approver-20.08.2.ebuild 764 BLAKE2B 974f70db09edc4d766cdcc63440d87ac75766b0b5d1a12cdaebab76ae670a71076b756b1af9848de3246c28918f8220c4ea26b1595fb7b1e8a58d561d41786ec SHA512 139d96b25348a9c6fdd898c79ba99458174fe90ea65e781b738a6d4fa621b1725d8aefde3f95f105877212023e521ed3fd525f6b876e9f220bd7f10327e2b6d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-20.08.1.ebuild b/kde-apps/ktp-approver/ktp-approver-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-approver/ktp-approver-20.08.1.ebuild
rename to kde-apps/ktp-approver/ktp-approver-20.08.2.ebuild
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index eac66cbd43e6..a25948011250 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-20.04.3.tar.xz 46332 BLAKE2B bc2e8bccea6f61c35054be72f2f3c728024304f47e78b2e82a0c5962930806dc02cccc1c371bdd758489e3a8c4f7d72d1b27cd171e1564c23e08a6c9c70dce6c SHA512 83c4c525810b0a4aeea65fa4c7342905c3c5d71d3194e4aea1d77f4e2a876f78e48639a10d84ca137a59ba930ac95d4376765aa1cdc7b94d98c3e02a5485f1f5
-DIST ktp-auth-handler-20.08.1.tar.xz 46376 BLAKE2B b9203f521875bbc030c9dfb5b388a6ec4a3fc5438eb03e04efb7fabc8ce67106193cb3670f7de83043cc4acfe3f0d0543db7d7140574b599daef5c6775085a2f SHA512 88be1c42ecdf73c12baae8a4404ac6e12609a025305eab94f00ff545118a9a32c438fb8922697e05790bd4051230783ceea7c4c7d02ed223d707581aa5988a8f
+DIST ktp-auth-handler-20.08.2.tar.xz 46348 BLAKE2B 8123627fd78f527f195996f649e4cfd6f4da8e457cd89f0019652562483b85723afa015c12070e19256185599441c2522d1c57ee3123f74a97488b156b38afaf SHA512 b0f582afeaa22c4fbf0d491a27a80ce1f25044e2402329a47223fb499e07276e3c5d4bdc4d046bbbae15ad0350c628b8bf7f149b21d9d2b429b25ce627c843cc
 EBUILD ktp-auth-handler-20.04.3.ebuild 921 BLAKE2B 7c64b9d1d84e0ba4fde5670d46249340564c3f2ed87e32caeea4a028a4847a216233336e3f65e42fda7e365ca8cc5152f6eaab5a001b56d5bf1a6083d2a95a41 SHA512 2371d8153dfcb05f02c074ecc37c70c04a49a2ef24fe9b6f27c438f9393088a84ea7e5bf61dc3a423383d97f331fcc4e4916e75a92117ad0c880b76482235b4c
-EBUILD ktp-auth-handler-20.08.1.ebuild 932 BLAKE2B e9c6dcc5f234cbf7aaab7448478e7f9f358d87551783e09eedc028a3911a0db371a63781136afe1ca222796a8404166e06a0d5852e1b876d3de70657ca5a92c9 SHA512 0fcdb1ef74571727f2fbe66494ab9dafa9cd6d9b39d8d20031a626cbdd1b44ac0524f0070657ef1273fd42ab34b8bd1821ee244f6d539ccc4beb5ef0dc0ac6ed
+EBUILD ktp-auth-handler-20.08.2.ebuild 932 BLAKE2B e9c6dcc5f234cbf7aaab7448478e7f9f358d87551783e09eedc028a3911a0db371a63781136afe1ca222796a8404166e06a0d5852e1b876d3de70657ca5a92c9 SHA512 0fcdb1ef74571727f2fbe66494ab9dafa9cd6d9b39d8d20031a626cbdd1b44ac0524f0070657ef1273fd42ab34b8bd1821ee244f6d539ccc4beb5ef0dc0ac6ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.1.ebuild
rename to kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.2.ebuild
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index 40773eebfc8d..3ae299fed36e 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-20.04.3.tar.xz 97164 BLAKE2B fc37eb1e5d7e07cbfde9aff720c418bf6f1b7f0df2fe8271f33461ec6bad929cbc14d694399c454cf59582d91032e5bd98d515397d2f2428492d2852c6533c22 SHA512 0d9bc4ec193463251fef5f3b22beed08d83b116550878b76b0cde997e4e81b38335618484b2bad068b92e8199f35db9072dfcad291316fab6e52e196eb1ec490
-DIST ktp-call-ui-20.08.1.tar.xz 97252 BLAKE2B c7e0b1133c279bcc4fc4b41c90b3015843b002850058da4f3e22f289c35f834444a2761dc4d6111a416e4369152e29aa01d611aff842595bfd5c2d369c54d591 SHA512 c77c88a90c75e7e5a8e593afbca20b19e9df15b7524aa29d6490d838659db4604463f669315b74310afe2f41e542f62b824c74ce38ccf3f7fe89277f4dfd33f6
+DIST ktp-call-ui-20.08.2.tar.xz 97248 BLAKE2B 6c3128c35fe5c76bf749a76e29faa6dc8d6f8928191f9f1ae678e0389a1bfc974571d684f7f5657378b8f2e375670601eadaf9d055671a144a06a2031f77fff8 SHA512 0050f94bb8c9fa2e389ef2f198b6d07ad204ff19cea71f49d3fa29519e9874250d7ba834bf1a3172471c48d4796a8972f3cbf13b3f6be2902a70a5a57b816de2
 EBUILD ktp-call-ui-20.04.3.ebuild 1179 BLAKE2B 6e90c0a04c845b3f95bf1eee83c6b24ba2262e950204c36de4857778b324188cd042e4367a819c6ec63493b9e88ae701dbc66d8b8dba51d1848609d16b9fed62 SHA512 6ac44623b3f86138318326620f4f1663735ed35f6ea860988974457cd98ad8ad3d108934ae44a0b0ec4fcc8d75d333faf12e749439cbf61eddca363415341374
-EBUILD ktp-call-ui-20.08.1.ebuild 1184 BLAKE2B 954781a4e836187eda9ec699d6e34e085adc0e14cf8d5aa4c78ff6297e6f2de5c8f18ab3a4a573cc2376d574854962865643b37b0bda2059ff8158d5d71d807e SHA512 454a85d8a7e6ff4bef0b5415f8b6c6ab121feb3700d547588351c0d875e5b9c80dce258a279185dfaa7e90ac469bb0f44cfec5872dd5c5ce8ee9db57ba62dba7
+EBUILD ktp-call-ui-20.08.2.ebuild 1187 BLAKE2B 9b70c9cd033432c9ae2fd1eff23c6f011f5391c656f58566fc50e5f9fa9c94c9142637ef68621332315919cda5ca359098b22c674b6687acd1a8eaf1556bfaed SHA512 07c66a8fc85a76be734a369ba7e2bdba60de091d2483006c1082864c8cee5845a8efd260bf095d3e0ba0b6c22edc0960b758cb01c194a72de6b923d54cd587a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-20.08.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-20.08.1.ebuild
deleted file mode 100644
index 8f8fee0ea2f2..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-20.08.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=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy audio/video conferencing UI"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}: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]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-20.08.2.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-20.08.2.ebuild
new file mode 100644
index 000000000000..513be6c6a207
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-20.08.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy audio/video conferencing UI"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/ktp-common-internals-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=media-libs/phonon-4.11.0
+	>=media-libs/qt-gstreamer-1.2.0-r4
+	net-libs/farstream:0.2
+	net-libs/telepathy-farstream
+	>=net-libs/telepathy-qt-0.9.8[farstream]
+"
+# TODO: dep leak suspect
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 0a27e0f0321f..7eb10007267b 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-20.04.3.tar.xz 449392 BLAKE2B fa8e8603b09d56af9445a4b94e86714d58f0383de87ccfaf74cddefa5c9bac4e776f24c881991dba9e7fa703e7ca9d30a2b2f15d00749971bc069ad31f436130 SHA512 444380e2b704f470987a90e49f7305481532e688b082066dd501e88a29ab9844df7301fd942153060488d945db13c48399ab5b9512f0803616219dd57e562870
-DIST ktp-common-internals-20.08.1.tar.xz 449604 BLAKE2B f8ee6b9021dde559846c135177ae75edd6402a27c2389fbc6a55b15fcde2e856b9808c72342a203c67df592ea6ac64409b8f6a2aa32fd4bbe224b30eacacf842 SHA512 19be41e5604906b19140660b7bd8875e32ecc5fac51bec730f8cbad374ab8410cde3601dfe612efc9189e93e8e62a1b4472f35e93e7da5089f416dbb7ab5829b
+DIST ktp-common-internals-20.08.2.tar.xz 449644 BLAKE2B b04f0306d7a632a991b7df0a6361801b10014199ca84276ab92b4d64c1808430a6438d03fdecd6b1304cbe677d826a2d9505a4fbe1164f3706b38d9bc11be306 SHA512 e51199ffacc2a49b6daea2d92d66d79f31a2f85579c829aa2f20fd06b2d471741bac407634a76e39a61597ad5448aea8a12902abfcd252b6fef383b88591e54a
 EBUILD ktp-common-internals-20.04.3.ebuild 1719 BLAKE2B 382b12c5a70c0a4acd20624a82b8865f05c9ffe014a859819d78987e6012934783754d1f330930b298483f18b05e7b074edad6f9f6821afab4620ef8a8a8e616 SHA512 4cb09545af5c5214748fcff94e388f771701a087ec0c6ce45522c22e05e842615c4ec23c6d0efab52ae03e00436242fef83b33c9502522373a10bcbff335cf25
-EBUILD ktp-common-internals-20.08.1.ebuild 1714 BLAKE2B 26aac54dcb72df121f4b62d4dc66098a21c0f8fd18de8dcb3f5d8416a09810bb19410b520dbb98cd9e43c89ba8dadade8768cf8a454003d30fdeb7712a907f89 SHA512 1c155dbf795aa478338139a9474d0c40c5bf141b8535fcc90f0844814956e63dd460e9ae5fae6a9e00db352693221d82278ff2b4827fac4501374ccb8a2349f8
+EBUILD ktp-common-internals-20.08.2.ebuild 1714 BLAKE2B 26aac54dcb72df121f4b62d4dc66098a21c0f8fd18de8dcb3f5d8416a09810bb19410b520dbb98cd9e43c89ba8dadade8768cf8a454003d30fdeb7712a907f89 SHA512 1c155dbf795aa478338139a9474d0c40c5bf141b8535fcc90f0844814956e63dd460e9ae5fae6a9e00db352693221d82278ff2b4827fac4501374ccb8a2349f8
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-20.08.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-common-internals/ktp-common-internals-20.08.1.ebuild
rename to kde-apps/ktp-common-internals/ktp-common-internals-20.08.2.ebuild
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index b06a6d9afea9..e16df8373132 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-20.04.3.tar.xz 148888 BLAKE2B 2796daa235a7b4c4d41d07a539f803cd3cbdecc80fc0374e5d5b6465da69e3bcffdb0885be6a280f915ed18bb298fb80d8004f6c2a254374a999784c8049341e SHA512 e3b196250fb30d7ead44b98f7cfb6954d969de28707856b9b9949c0f22665623d61758b1f4641e6ecf22f59f35d36f1991d1a671705dd503179b68d744904874
-DIST ktp-contact-list-20.08.1.tar.xz 150092 BLAKE2B 8843581aa191e61bf0911abb70286b0150d1823dc9448b04802a7143632d6152ebaada0c9847032dedc5717c7b4011801f3ebe2391b0a101f671c95255621ad2 SHA512 86a98c104deed75133cabf6d6cc0f0449363ada10a479a2c30067cc600f7674d7640adc48aea51e2aafc24b413630230d9feb3540f99791ac65e0ce149752df3
+DIST ktp-contact-list-20.08.2.tar.xz 150012 BLAKE2B 18281b8e27f65589784cf952c5a1e7f5806fb8960de4afbde5114a43e16f613125d1b663f086431570eb6725fedd390e9e4a5dc567d1703a030e8b4e22f313b1 SHA512 d6cb74623c6d11431d7d3907ae9026750ac165c9c0d3d566a5d1ddec59ab972ff825a67b36bda3dcd21d2203afd014a0409a3b61d63d400f73de58879aa7c64e
 EBUILD ktp-contact-list-20.04.3.ebuild 1183 BLAKE2B d178377d33091872c520257b6619af0584dfe31ad37fc9882da27108fe1426c974b2b15ac7607ba1ca20466c97dc7a8002b3266a00c508c0a874a463cfed6fa0 SHA512 bc46a0e21469c5727c1c03594f11032e7b83bdb0f7a7f05ae6b46d24d700ec65ab254493c367de566ebdab2097d3cc5d5be10c1b008e1c9d6464ab97df5427b2
-EBUILD ktp-contact-list-20.08.1.ebuild 1186 BLAKE2B dbea778d78c5187687c59d6c84878cc960d68f66a72d271eb1b7ef89c44f05d4927636a531e32fdda6aaee25130a6ffadf0fa8fb30b421362da82fbe16202044 SHA512 72ff53a770bbec6591998db6cecc4f50fefb2037fa6a263f6640e45c46f88f14cc659e34842dacfda898b4e717f370cce7154c2e05fd6d195ea8de214c6ce75d
+EBUILD ktp-contact-list-20.08.2.ebuild 1186 BLAKE2B dbea778d78c5187687c59d6c84878cc960d68f66a72d271eb1b7ef89c44f05d4927636a531e32fdda6aaee25130a6ffadf0fa8fb30b421362da82fbe16202044 SHA512 72ff53a770bbec6591998db6cecc4f50fefb2037fa6a263f6640e45c46f88f14cc659e34842dacfda898b4e717f370cce7154c2e05fd6d195ea8de214c6ce75d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-20.08.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-contact-list/ktp-contact-list-20.08.1.ebuild
rename to kde-apps/ktp-contact-list/ktp-contact-list-20.08.2.ebuild
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index dd03b671e70a..0454741a1cbc 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-20.04.3.tar.xz 42936 BLAKE2B ee60897ee304fff509c31947d98f9eaa34228fd7b56e58f3fade59f34b7528beb471d0a78f7fda911e815cba7f1a03ccd02462de9167c00a2152361d44302de9 SHA512 4d63ac3cfba838275c8e97cc89e7f6618a16cfa0389a14af524c573a7f34cff3f4e711c564c55b4d5a3bf5f654be8f81a7949c5b4b9cf3b09097d9757fa986a8
-DIST ktp-contact-runner-20.08.1.tar.xz 42924 BLAKE2B b959cdbfe0a7c825f38447266201e6f3c47dda7f9df2a50ebd6169d5b72f53c89ee431bdde5ac4238ee9afe32f5176445d21ab588255c62372cf3c51b3cf41d6 SHA512 3f41582881afd9d003bb3affc17113faa983f8162ecd0d5505460721853620d5b05f819d0f1231580cac1a015e80aee2450ff25f3afa39639cb35d57e2bfd8e4
+DIST ktp-contact-runner-20.08.2.tar.xz 42900 BLAKE2B 9919160a845058f6a035d8b072dfe60b7c081c04ecf1646a790dc78e9ce1c29cf12e3187a8dd891ac2130b55e9eec81a98be5507e7c77dc6422183968def0ecf SHA512 55b5f7f6756aa7cce9d49678055740e20405531c8e7caf4f86fa8fc1eb963be46291e477f8f321c0e4431de15e3912fc83dfe4a1f6608e7db5c80dd2437138c7
 EBUILD ktp-contact-runner-20.04.3.ebuild 675 BLAKE2B 16762fd3fdcd51730e0ee59e0cca05ebaaf08fede039544e120f3664cbba379fb4dea66b3bd8573a2c3f8504d77ac957e26a337fd1688f56d8599a0a6e954ed4 SHA512 aad69c81470dabfddb5e4183f5ea03d3d6008fa0086d3484fe7d7c51c106d96c35939545aa7eeda28d97725d231315dcbd1b901009717d085002a2c6cc08f80c
-EBUILD ktp-contact-runner-20.08.1.ebuild 678 BLAKE2B 951191ae98a4e21175e65d03de26ecfef8ac3056216814d8355846d87b3e03acceed0705e6256a21c7e10ebcc95b00b94daac0b447a3d8352ca01843880420a5 SHA512 0f58d6165188c096ba093190abddc646e0b8d4d5999efe42aaaab0ce44629dde08dfa0a0c475ed0f2b7b3c3122a8d1fb7f9c53d3726965277408e33546de01f8
+EBUILD ktp-contact-runner-20.08.2.ebuild 678 BLAKE2B 951191ae98a4e21175e65d03de26ecfef8ac3056216814d8355846d87b3e03acceed0705e6256a21c7e10ebcc95b00b94daac0b447a3d8352ca01843880420a5 SHA512 0f58d6165188c096ba093190abddc646e0b8d4d5999efe42aaaab0ce44629dde08dfa0a0c475ed0f2b7b3c3122a8d1fb7f9c53d3726965277408e33546de01f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.1.ebuild
rename to kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.2.ebuild
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 92d9782421d0..3a06650c2e7f 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-20.04.3.tar.xz 43652 BLAKE2B 62d43027ec7c679ca47fabcbfa925c4bbebc0a60aa41cb2990151bd1df364027e12b044c44c2342f386f51e754adadf1f9851311ccf67925e7cd38c80567463c SHA512 e6b173e8d8097089acdedd1802f93fa687c6f7dae6c3f4493f17b05b7c8ad11a452665c244e31e58bedfb3de79d73be0caad7b088f32ca654ed6ea00451c0004
-DIST ktp-desktop-applets-20.08.1.tar.xz 43692 BLAKE2B b7c305290dbd8ad3a123854b49de957c311d3cea725f20a25a7d2338357f0187aaed9e5bc354aa0b0b14f97684f94d5128e3a25abc46a445fe4f7ca375a79d2b SHA512 8b3d22ae6fcdfd69e54318e090150ee41332eddbed86c6e22735a896659eb315d8fd52cddbc85762a42bcf00979f8a70ee711127b46a4e14ab0db7821ec57c35
+DIST ktp-desktop-applets-20.08.2.tar.xz 43712 BLAKE2B 1e9fefa0be96dcbf6246f6cae939057e277a6c2d0da19366c7e54be4fd35e8749a886baef4cdee2afd8623fd69af7fd62d804c84194e97d7056880990a21087c SHA512 89027ba2ef54abd02eb40fa7bc33ecbe1da526aacd1fe7b09e012ba62f9ad9ffc60a8fd2d396fe0d5af55509b6787b61d8494793fb574f7017fc0794138fef56
 EBUILD ktp-desktop-applets-20.04.3.ebuild 615 BLAKE2B ab6f7b6d5f62c04bdb6c8065d0c8c575319a84de2b4ffbfd4f26d40abfb95063f74e611d59bd86b2b0af352e83844c16ba75b8b5af1445beee005b3c5482487d SHA512 19238ba6fa27b4f63e27e833e3a665651067cb7742654e538edb6489278d3be822220728d33e8fccafe73d748b0d782b695b41bb0c7ec50021aeec72b73ea0da
-EBUILD ktp-desktop-applets-20.08.1.ebuild 618 BLAKE2B aca991df6ce350724ab3888c52637d5a36c4af3df80b773f79fa51d80a91a58331941a45ee54edaef17030d44e79e24b65a0683c3f5e3d0ebee812bc7013f5d2 SHA512 c158e3f447b73bd64b8e773b16201911dafef56490904ff8d68ff62c19e956231dcf64801d532ff53911f5376bbdef622c68077c4bdd320c41cca007386b0417
+EBUILD ktp-desktop-applets-20.08.2.ebuild 618 BLAKE2B aca991df6ce350724ab3888c52637d5a36c4af3df80b773f79fa51d80a91a58331941a45ee54edaef17030d44e79e24b65a0683c3f5e3d0ebee812bc7013f5d2 SHA512 c158e3f447b73bd64b8e773b16201911dafef56490904ff8d68ff62c19e956231dcf64801d532ff53911f5376bbdef622c68077c4bdd320c41cca007386b0417
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.1.ebuild
rename to kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.2.ebuild
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index abfef2020039..98769b2e0730 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-20.04.3.tar.xz 46140 BLAKE2B 983c0b4cba6f823434aef0ce95934d592fb3628dffbf930f9c2a1ba5395061ecde67b4e25a4b621c8b1f9cab603ce894eb2ac8fc4783763edfc854e16fafcb03 SHA512 861d0ff8fe44cf9574cebe8a73d1abfcf5eeac14f9b675e964e2f558a6f9f89e7556d0aa1a636ec3684ea2d8f6e80b2a24b35ed220a951ae9642f541a94ddcb8
-DIST ktp-filetransfer-handler-20.08.1.tar.xz 46224 BLAKE2B a06389e08235014ae66fe142f60204ddee5606325d3678fd938df0470d342d5006b1ed0851a28fc40369de47bbfaf57979c6d2de99624f56cee101950f5f5792 SHA512 f589468c2e9819c1727adf935b6575e52c10fca3141484292ce705d1b0c60406591405aaf76a1956439cdf0897698c69b413354220d51f0f95afe543b2214942
+DIST ktp-filetransfer-handler-20.08.2.tar.xz 46212 BLAKE2B 1b2bf122c7ba9e782b36b63718cfc809eae0196e8a4a356cded19154fa5f42ccfe380d8d44a347b74038813b73009bf8b9a21dbba9da38a53ccfd817e5374a16 SHA512 7534473482e2fa42b0db87587de72d43223f02c66056396f1df7ff7ea686926fab69228f6c55ee98f173adc68c55e4938e1e6f1f14dabead71a38d47f8b2b76a
 EBUILD ktp-filetransfer-handler-20.04.3.ebuild 691 BLAKE2B 6aab3c922c8b624c65f29eed7f7254d6287005060ec9f0d8e590495e39945b97bbcb694758d9a166c7fb6631cceb8f10b28612b01fe9c4e7461cd3b91924fdda SHA512 49de8024625d6a5f8c65ae9ee68907f5351ee4dbd7443b9ac49396c447c7cc97d6cf79d1b831db4732f489c2ce250353f3deb92ab26bf77a7faa5ab022052efe
-EBUILD ktp-filetransfer-handler-20.08.1.ebuild 694 BLAKE2B a4fc2de8644cc0ee3650f43dea577e14f320b8cce601b2ae4a94e1517e3086ba624d7e9ad50e9e9582f6907bbd5db0765c0f19f201136e964dcd9fb249ca1a3f SHA512 a17cf246e3813d3c6a2a2a7a9d9f22ee2dd63e755b1a00d3f517b7485d0c365f74d9ad02743bb836b8d6b7ada29a9cabe86a4db7be9f6b7ddc7ff9087a0f9a6b
+EBUILD ktp-filetransfer-handler-20.08.2.ebuild 694 BLAKE2B a4fc2de8644cc0ee3650f43dea577e14f320b8cce601b2ae4a94e1517e3086ba624d7e9ad50e9e9582f6907bbd5db0765c0f19f201136e964dcd9fb249ca1a3f SHA512 a17cf246e3813d3c6a2a2a7a9d9f22ee2dd63e755b1a00d3f517b7485d0c365f74d9ad02743bb836b8d6b7ada29a9cabe86a4db7be9f6b7ddc7ff9087a0f9a6b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.1.ebuild
rename to kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.2.ebuild
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index f1454914cfd5..ba7ffa38fb9e 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-20.04.3.tar.xz 97800 BLAKE2B 2f4444c1e40f0e3951a799c0619bc42da09b6e8eff202df79727f048a155dd7d9aa43a5674e34301d6a5940edae74d4dd218618d320d05eb061fff9f69de8903 SHA512 95f43283090eba874509b78c2711f8d2ac08cce002837546cf183d241fbf144a683a9e5d39b1812c40c2404d34489145e7876bb5be224989267c038d6fd7a45c
-DIST ktp-kded-module-20.08.1.tar.xz 98516 BLAKE2B 31e0ec230ab4cdf7142a75be48ad4089e84a926d519092d54a44ed0e856a000bb36ef29b7ced0e3f2f59bd1bf4648c9130d66319e90d152bd6f02c2f05daa56e SHA512 051db75165d1c505f558c9d145a7b00f6ce2fccee7a1a513eac70ef5b8cbcc6cdddec3f591b9a444eb345f0349e4ca98d24e44fe266ffadbf4390bb69cf5c384
+DIST ktp-kded-module-20.08.2.tar.xz 98520 BLAKE2B dec7ae49a5d6210f744b796fa3d0d5217b5ce2be1cf790c36dae1c5bf2963c3ef4e92260b3a9a3fff0819d45d080d0b78fb1dfc36c65ac77fca12e0e5a5ddf08 SHA512 ab993cde7c2e0d8b00e8d50ac44b4f184cd8b61d24df53d51a6a6c56fbf95865857e3612dbda3c430be780d2a778a3a3cd5c4fcf3723cf905594722eed758b42
 EBUILD ktp-kded-module-20.04.3.ebuild 1107 BLAKE2B d6423ea025483971fcd2bda8d2c0778f6bc371c84415195d78deaf5c6836585c62cb504023281fdadf8d6948c4db0a33e5b9c6b932bc1618333573946594b367 SHA512 ba7c551873397a52bc279972b09035d2058a7e2533d859386b8b3c1c64deedacf24d925350ae409c9f43ae537e4366dc1ce9e2df329bf299e67e4675145cb171
-EBUILD ktp-kded-module-20.08.1.ebuild 1110 BLAKE2B 7e5e2db448cf48f492acb29d86a895f844bac2c8215d2cade78e81aa2c0d3955851eb9a56e96f1084a92c4fbbb670eb20c19d5bc47b3bcfd4c7f0aade560e629 SHA512 a7211925524165072c3c6fdfca9f52b4a60fb8b6328ce87a9ab722a81bf980831670904308862f9c3ad2e4475e50db65eee12fd51f2f62d90dd6251e04dbc514
+EBUILD ktp-kded-module-20.08.2.ebuild 1110 BLAKE2B 7e5e2db448cf48f492acb29d86a895f844bac2c8215d2cade78e81aa2c0d3955851eb9a56e96f1084a92c4fbbb670eb20c19d5bc47b3bcfd4c7f0aade560e629 SHA512 a7211925524165072c3c6fdfca9f52b4a60fb8b6328ce87a9ab722a81bf980831670904308862f9c3ad2e4475e50db65eee12fd51f2f62d90dd6251e04dbc514
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-20.08.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-kded-module/ktp-kded-module-20.08.1.ebuild
rename to kde-apps/ktp-kded-module/ktp-kded-module-20.08.2.ebuild
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index a2d8da4b6466..b76a8e15b0ac 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-20.04.3.tar.xz 27884 BLAKE2B 9173a66cec6dd0e08591192c123c7f5a797b66abd421c9fc15109b0713727320b3b1a8d9f5a239ada63eb3d333c5468acc1fcac9e9859f1be62543c5a1f10131 SHA512 eee783607028613729f08bee61b08307256ed14965c93a10cf3aaee938170585df67e96c0c2a034b67bd9ada8d48ede5bb4bd8f7aa3cbba284d24effb101a871
-DIST ktp-send-file-20.08.1.tar.xz 27880 BLAKE2B a3aa61731375755aed03e95c68b0b9b943fa6d900f8d66af2b19585eee3af4077a7080e82bc89ea4f4ba68e34e3b059ef97a4eb9b44455e52e17d07e2a727e27 SHA512 1a60686a6e3cdab155923fc22b093d9d9552985285a14accc2c447c521cda0da4efe3d1777a0a961dfff704de22ac943346f29bdbe48a74431f6ab298f840f50
+DIST ktp-send-file-20.08.2.tar.xz 27904 BLAKE2B 78a312c89679c3e99798e6bc20efdd58cbf7ecf2b62b2aead5aef8ec96cf0f7de20932ba276bf5811de8364496c850e3f5f3111e6b217e6033db02b020297730 SHA512 bd60519d5b04aa8a0d9d67e055db31d28b7f662a52d5c8e2dad68f5a8ec03b2a49aea85b8cbdc4f9fcce26cba3d4ff182d7470b6c9254089b842594cf0307b07
 EBUILD ktp-send-file-20.04.3.ebuild 916 BLAKE2B 074af957c4f4237d8ae353346b3696489c605c099171f5e3d0655d4b290088f233db83e01b3954190a19031fa4360d2baffcad21fb1f6182af77f823bf878e41 SHA512 fa43cd23db8735940c11ea00aa7c4ebf21e4946db72cba29fa29e7f3b894a72ed55d7e6e95c4b2d2eccc3cbbbcbaf0237005e96dc4120acc31056b09729fbf93
-EBUILD ktp-send-file-20.08.1.ebuild 919 BLAKE2B 9c2b458b7f94a9a6de53a8911872443ca119593147d474dcee10cc1c601637d56935a817c8c87f54657b663c0d4f2bbd09e1e25501d71642fb48548fb22f7f52 SHA512 6dafa667f8e9ba4e7b8984cfec332d0d0101268f5266c5e49460b11f50ca1cd6fa7a13dc61661c7259b9740a1c7b5e80e81972b5fa6d3cd9ee0d3d4e9456014e
+EBUILD ktp-send-file-20.08.2.ebuild 919 BLAKE2B 9c2b458b7f94a9a6de53a8911872443ca119593147d474dcee10cc1c601637d56935a817c8c87f54657b663c0d4f2bbd09e1e25501d71642fb48548fb22f7f52 SHA512 6dafa667f8e9ba4e7b8984cfec332d0d0101268f5266c5e49460b11f50ca1cd6fa7a13dc61661c7259b9740a1c7b5e80e81972b5fa6d3cd9ee0d3d4e9456014e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-20.08.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-send-file/ktp-send-file-20.08.1.ebuild
rename to kde-apps/ktp-send-file/ktp-send-file-20.08.2.ebuild
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 8acac0d5dc0e..92374bf9a242 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-20.04.3.tar.xz 469772 BLAKE2B 93b6165ecdf0a5b710919491d0057e2bebc0c59e5ce7a372eb94680663adf54f0748a168f2635513f2f26746024bae9b3549ec2b4c2d42ff1d9b945c5558b1f5 SHA512 3e7b7e10db29bbc0c634cedb9c19867dc7c6f0df67ce58a595d26af48c99a1b721874b5997e145ef37bd82181830283e2158f480828f848e1d8bd51d0c2b5a55
-DIST ktp-text-ui-20.08.1.tar.xz 469916 BLAKE2B 4dc0cd4f19f32211603c03258a1ab7b5296627108671846352aa3e7d8ee81a5a0a30f46d3a28ab81cfd97cc8173314cf53d1840d78c1ba874c0db6441ba80b53 SHA512 21b99d7861eaeaf07b804236a30559c8d94971aa101899b1a0b6d43fd298dead11d6d3c228e8bae482fe8318b5f0f54611125c626f237cc674b5d0ef2809a4a6
+DIST ktp-text-ui-20.08.2.tar.xz 470344 BLAKE2B 7ba52bc5175e19a0ab3a87d2b9e36f4265f2b7ec65483824f309cdb678e2137f9719b396f3bc200b639e80a910547bc3e33830b23765e401af6a542672929747 SHA512 aaffe1e8f59acc0bbebd07eb4c40f3ae21b4545004a8c6aa7ccd1821eaef4b35f34119e8f69e603ecb51bf1e31b5e550f11cd2bc5403b190ce184dd92ea1fe79
 EBUILD ktp-text-ui-20.04.3.ebuild 1637 BLAKE2B 60e789e55a5a281aca4fa0fa5549b09d501f4de4e0096bc371fa31f3a1abba0763c4849be9649acf2333d9557d070fdb4a1b9dcc6d8cd893044b66c54af7f50d SHA512 077d41ea11581e9f4d99caa076537f49c868a8f3cb6bc75ec68091fc1c2ead339f99f44a7243297e750b638e3af5a1bf22e0a202874c5294f5ca073e83acbbd6
-EBUILD ktp-text-ui-20.08.1.ebuild 1640 BLAKE2B 5419bee2d6fa561a7d205eb4f9c1afa9a15f2187ded1299cdc55ad244e314c2dc6345d20380eec7a5927b5c6a52c12c47852a0cbaa10c8cf3d166a78d2e1693d SHA512 dd85bf291bd619aac04c5a41396dee4cc78575d3e4accf6eb92490362c8f3762bcb655f8320165d98b421c345fc8216f1101f3999266f10476e72051254e0095
+EBUILD ktp-text-ui-20.08.2.ebuild 1640 BLAKE2B 5419bee2d6fa561a7d205eb4f9c1afa9a15f2187ded1299cdc55ad244e314c2dc6345d20380eec7a5927b5c6a52c12c47852a0cbaa10c8cf3d166a78d2e1693d SHA512 dd85bf291bd619aac04c5a41396dee4cc78575d3e4accf6eb92490362c8f3762bcb655f8320165d98b421c345fc8216f1101f3999266f10476e72051254e0095
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-20.08.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktp-text-ui/ktp-text-ui-20.08.1.ebuild
rename to kde-apps/ktp-text-ui/ktp-text-ui-20.08.2.ebuild
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 60dac0deef18..ef8ef134a19f 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-20.04.3.tar.xz 70706016 BLAKE2B 924ba22e1cd50c671b1217434e4ee95b90ecaf4f50db429c6ac40662ec09ef64728a6019b84c5c538aed1d3e6d798b4cd518fa3a8d3beeda562af02298e6c1f7 SHA512 12ebc06af1eef962fd2ce2e578ebed4512a2d5d829daaaa6027e85bb779f61305a29d0d12caa0aad6fac7ecb555c1d58b2a09d6ea1cb6724149c3d3793f12c6f
-DIST ktuberling-20.08.1.tar.xz 70707012 BLAKE2B e3cc34570cdd5a6726dd0f5dc1e7ca4a28770bb6f3ffde630b6a0aeadaeab60486e3d8b253b460b907e3808d37126c1d7d024df9ba6cc4c19ee7a536af4333f5 SHA512 988a07fe266ceeb693d2c28b71905a36f2a9fdb4bbf4fbf306388dfafda6792d3edbb8b7f0ca26115d957b18e31b24fa1034a6e65c1a821dd468d59713e8e213
+DIST ktuberling-20.08.2.tar.xz 70706412 BLAKE2B d29eb2a654905e042c04f628baa1c7c9d6204bf8831591a4bc64042811c047bd9ec61a83ddc097467ad8c377a86e57c3e2eb76bb01632cc63204499bc58c80d7 SHA512 a58383618a093e891aaf0cb6cbc899a53c4e245dfc621bbba101dc880f9b3a53df3b0653ddba4fc22384ac49535e520b7eb9ad698fa0b999fa0c6595c4fdb9ab
 EBUILD ktuberling-20.04.3.ebuild 1131 BLAKE2B a309f56f10163762f9153f5b8f2badfafe418640897261c1a4abd6d840ca052f4bdfc58037a6f9be3735c2c4e6c70b15808225382ab3e26d55fdbc9d786d28f0 SHA512 7fc117eda085096f0ba8e898db02aa1f6b29f55c365d51c5f1e9fd6d9eacfeb7ee84e311b48863f9731236337941a25b870cc6e12e87ede8a84585e570c57e73
-EBUILD ktuberling-20.08.1.ebuild 1135 BLAKE2B dbbaece214b5a97ffb0e05eb2c4a3bb76b8b26923a666055fa8a85381594008859b5c6cab5c149d9ac04f955bf81f372984f6b813209dea8c023a6870806798e SHA512 73dacb222fe25da1cd604298ffe3832aeb7fe19bd2293d020173b595b18843cc7c4a3471cf77c8452a2068e7dd221e0ed55ea14d1b7b8677debca2e5a5875b1f
+EBUILD ktuberling-20.08.2.ebuild 1135 BLAKE2B dbbaece214b5a97ffb0e05eb2c4a3bb76b8b26923a666055fa8a85381594008859b5c6cab5c149d9ac04f955bf81f372984f6b813209dea8c023a6870806798e SHA512 73dacb222fe25da1cd604298ffe3832aeb7fe19bd2293d020173b595b18843cc7c4a3471cf77c8452a2068e7dd221e0ed55ea14d1b7b8677debca2e5a5875b1f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-20.08.1.ebuild b/kde-apps/ktuberling/ktuberling-20.08.2.ebuild
similarity index 100%
rename from kde-apps/ktuberling/ktuberling-20.08.1.ebuild
rename to kde-apps/ktuberling/ktuberling-20.08.2.ebuild
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index c78a00792621..62a44df88e0a 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-20.04.3.tar.xz 1833488 BLAKE2B 749473e93c8fe1d77cb0d5fefbf8e0f7839960bfa46e71848e10c409c9a799221aa13c59bd72f5b386e3b087b612cd9f409fd875641cf9e3d9a785271f5acaf5 SHA512 4e6948dc9fb2b9d14bb823d2f25651352ab7630e82d0d883fcdcd90b7a159920bbd0795873cb8f987775e5319d08f34de61b1d17c1522b887ce6228bd44bb91f
-DIST kturtle-20.08.1.tar.xz 1836880 BLAKE2B 3968f2fcd700a705059f56c832953607759db231b415a47ac6fd8a8d7dfa307b22488f71dcc405ef36c5e0a4ccf31261a37c7260738959bf3f677ec9cf165357 SHA512 345055625a827190dc8bfe21839ddb9d591a1b0ce812cb5e230c739bc155fae43427a854b033b2c371562251710e81e5e5f900f19864499cc338eaef8ee773f5
+DIST kturtle-20.08.2.tar.xz 1837004 BLAKE2B 9b2c4fdb42e8b16b85b802175f1d8e7a535cc1f4b5913f0cf0a12d497047288be1a2647441c087f6693d9a3b7d6f69bddbfcff80a725835336647beaca88f39a SHA512 8ccd925820905067285fb4e2a60fde505fef623d5614306b280029f7dee6e5614b4b6137f96ba97874bc68b952ef66ebccf38ad1f57114947244e55c2a661d99
 EBUILD kturtle-20.04.3.ebuild 1014 BLAKE2B c28e6d50c49467def31df7a1a8a138b5e29b9ae0b5c9f3f52c3e0e3be210f57ad4f98d6037d1c8a520ae809e6d66833559560e3bdad578a8ce71bf9885018163 SHA512 4fb73e92daeef68470bbc42a145b83cfbaa3815631b00476c8ba31d676fa13cfea2ad84bde3c030fae7ef3e064fbc379d57444ce84b8c47010245f1968575445
-EBUILD kturtle-20.08.1.ebuild 1017 BLAKE2B 7ae7d3691f02bec4994ff92ddf655f60055edb1534ddd59893a0024350980d17900af90a895df0f48b06ed6b16e232693f8716c0d5ee21febc7522ccbccbe0bf SHA512 7e48f02f701b2f6f6bc6f0af8d290f04abb2c10b3f60ee4d1f8155fbfcd162a07b02db1ff6d51580e94d3e09297a21e9fdaf084dd50332955f407d3218f776e7
+EBUILD kturtle-20.08.2.ebuild 1017 BLAKE2B 7ae7d3691f02bec4994ff92ddf655f60055edb1534ddd59893a0024350980d17900af90a895df0f48b06ed6b16e232693f8716c0d5ee21febc7522ccbccbe0bf SHA512 7e48f02f701b2f6f6bc6f0af8d290f04abb2c10b3f60ee4d1f8155fbfcd162a07b02db1ff6d51580e94d3e09297a21e9fdaf084dd50332955f407d3218f776e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-20.08.1.ebuild b/kde-apps/kturtle/kturtle-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kturtle/kturtle-20.08.1.ebuild
rename to kde-apps/kturtle/kturtle-20.08.2.ebuild
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index f14970219d82..81d57fdc926e 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-20.04.3.tar.xz 317644 BLAKE2B 7d4b9128d87494fceb99c2e66ca7543c9871d6efb686ba188db749f4f070ac4304198f0d992ebe601c8d379c9e5cd9020fe9cf27dc4466b5eb81d05cdf62ac27 SHA512 aa0c6b0003643fcd38b5e9953be373ecf5957458c73b77d0722c553f5fc806daa1102aee5b31664e459ef98e461efbde7dfdcfbe59f2d7b24236398f6ceb703d
-DIST kubrick-20.08.1.tar.xz 324512 BLAKE2B 934d87a87d4e016d18b09bf73063e186311ef8daf9bbf6a838d232719b26ec473a12d74468d453110eda2b4597e12bb6b7515c5161c472a8f6dd5e8260d145b6 SHA512 53f21b3f6409c991704f9ff6772baa42e847a38c9a98caf60d9dd9a084e3a4035f219001b319cca84f393d283c632ae607583e7c16a00e75d9d00e27e26ba762
+DIST kubrick-20.08.2.tar.xz 331980 BLAKE2B 5f67defd7e5c2326337863e06b9fdf3732edcd51077c0576c3ebdcb625268e0796cc6ce5037523b189d9fbe50bfa98838f5ef4e789ef5fc24361df91dc96e0f0 SHA512 925aeae963a8cd3e4aafdd3d2f3fa9d4728a95e86c61fa07c60630cb96f2c3bfaf8e5076525cd754e29d8d7634733ca4326e677a3daef746b91b971217f88328
 EBUILD kubrick-20.04.3.ebuild 895 BLAKE2B 8d454a0b747c07c90410fa9a5bb31a1f8bbcfed490e7649bae6e615947cdf464ecaca38899ac8ebf2a513687d553aa8762ce0568a6889bc82eea9f2910a2b41f SHA512 59162995c4e2735dac22183896d9b8d39c4470d56cba98cef7f470ed46e5d101e14b90efd1862cfb351ed5415438fa990010d49fe982b750fa832928fe44b442
-EBUILD kubrick-20.08.1.ebuild 898 BLAKE2B 8006dd91f582c76e8460ac03e8727dafe8563980355a31307a54b6a83c7b6a4036ca6feaa5519cf659710eef5aebf0f95a9e6b2e4aee875df8fbdb806a0f9019 SHA512 d07cf3342c830028f14e1fd3114405d5019f39ef5009b9e18ebe87ed14bbab13a6418ecc2fb432807f39ca563aa04e45ee666333f6465c050a3b19e02969a8b8
+EBUILD kubrick-20.08.2.ebuild 898 BLAKE2B 8006dd91f582c76e8460ac03e8727dafe8563980355a31307a54b6a83c7b6a4036ca6feaa5519cf659710eef5aebf0f95a9e6b2e4aee875df8fbdb806a0f9019 SHA512 d07cf3342c830028f14e1fd3114405d5019f39ef5009b9e18ebe87ed14bbab13a6418ecc2fb432807f39ca563aa04e45ee666333f6465c050a3b19e02969a8b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-20.08.1.ebuild b/kde-apps/kubrick/kubrick-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kubrick/kubrick-20.08.1.ebuild
rename to kde-apps/kubrick/kubrick-20.08.2.ebuild
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index bd15af75ca66..92ef26be4d35 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-20.04.3.tar.xz 769080 BLAKE2B 08a5a121595da8cfe7083a04978a7c70772b3a45f05da9f0da4883b3e7b7bfea57af37200b8d12ea56621119454350e3770457b760c94c07f42911c469241e1c SHA512 aa6dfcec025d73d4a1139321436ae122e16e4ce3d57cd624c95003df395ca7d4273191b480ea6cf6849e0d630fd6044b833dae9674dcb8bdec43592f2b8f8a0d
-DIST kwalletmanager-20.08.1.tar.xz 773540 BLAKE2B df9b6ebc81341f79532f7cf6ace5aa16ee76dd656054a8a05a703f366703ecace827bec7cb0dd4161f2aae0a30938f6ba9e34dca996bacbe2c632afa3af4e157 SHA512 3c2428a55333c1fd5d8cbbfac1a7c894e4e0ab3987e824112b004731eeca6f05ffdeb04beffbf26fd8c62ecc3ae1fcd74224cffe4d7ebe56b7d2f13bb74fcd17
+DIST kwalletmanager-20.08.2.tar.xz 773884 BLAKE2B 960e9a6bd49fa080956ad876727ba56d5020d4398d0008385b6c5c53ae2a5bd1dcd297f3a3e8c998ccc894022350e4fdef5fe351e5be52283f6e371915265cc6 SHA512 20430892c5e9a3d4809194368780ac8dcee3e679e90f939307fdfa4e0f6fef46266e1ce3a2b1d412a72c7ddfd78a37260c322054b33729b43bfe99c40e70ab12
 EBUILD kwalletmanager-20.04.3.ebuild 1429 BLAKE2B 5617fb51f2b22bb9430a15ea6b2902640b396bf79f94d4f87c45adc647eeac4d0ff4168b7750a4612f97b05744a6586d9ef292295eb8df3f0f89d7652517411f SHA512 8159acedaeee1ffc23aa3622eadf32a25e8cdf820a3e0343c9f7479c70a7be4e40bb9a472449a71b6cfbed82421c96c918c4cfff1e1b488d079257c7a6422d1a
-EBUILD kwalletmanager-20.08.1.ebuild 1432 BLAKE2B 643012ffbe2c80c29ad7850223e47d7359bc585d9706180278ee6703fd6f907adb1c179fe9a744cf9e232cd7436046042e68940ea031ba52e452f272cd996a96 SHA512 fd9cf5ce749875fcd6b0c8be5104c06afa903758fa0662d114ddb832d28ee45d393bb208a870e3ea7b91bab511e195a1e4471771a7224031b2e3804c5dc3373e
+EBUILD kwalletmanager-20.08.2.ebuild 1432 BLAKE2B 643012ffbe2c80c29ad7850223e47d7359bc585d9706180278ee6703fd6f907adb1c179fe9a744cf9e232cd7436046042e68940ea031ba52e452f272cd996a96 SHA512 fd9cf5ce749875fcd6b0c8be5104c06afa903758fa0662d114ddb832d28ee45d393bb208a870e3ea7b91bab511e195a1e4471771a7224031b2e3804c5dc3373e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-20.08.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kwalletmanager/kwalletmanager-20.08.1.ebuild
rename to kde-apps/kwalletmanager/kwalletmanager-20.08.2.ebuild
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 763fa2dd721d..b65771ae16cf 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-20.04.3.tar.xz 6195772 BLAKE2B ddcc0080514bf3b096662d520540f8c5759f56bcd1c25b8f6775260cdb31d017c8fcaaf2e9428275c1345327a902cb43398f85653a03db58fb8976daade2b86c SHA512 f57712472ba19695c77904a804c7dd599cc762e7018fed1d16398746156c25832795215d71aa54b143671342db6a1e442f79bfaed491e16657b820e14ac1306d
-DIST kwave-20.08.1.tar.xz 6868340 BLAKE2B 90ea0a3ad3ba48291578fe42d7c57a34c9b03e6082df0830b6ef27ecb084600ccb3600e524c55f21e093d67242f779d0cbcdf300856979b5162cb054c70f8d03 SHA512 e5d53bdfce2953662ab25edb5c6c3886bb9d4dee6f15c7fb7c09f5a559c9b835bc0e7d6be62eca79c8db298c8e51646a3279c5e200ae3aa2117943d52692b0e1
+DIST kwave-20.08.2.tar.xz 6877908 BLAKE2B 04bb5e462931e89b2941707a0e24ccc85d60ed38e2c9fd5d9ce530aa34361cb6ec0bcf957426f7df173348d649a82706aa3b264b00e87bc102ceb07e72be2b90 SHA512 61bdc4ccaa6b476ad453661d8fe984ba2c54abd392af0ad33fc74fa183ceb4ac1d8916d910b15447b6f7a4a7e4d3a1a5bceb659e6b4ba3c9db8ab23a6dcf48cf
 EBUILD kwave-20.04.3.ebuild 2093 BLAKE2B 541e4b97510f1159b9f957c9ea1fb0f38bda907475625adfebbbd9d95560062cedb3eebe8645734fec73bc6d34c1339f31db880c1020100faf878b6a2eec1f9c SHA512 e167e075158042eef82653f9656c94f9d88f5b8aa137c1a77aa1e81320abd14e0b9d52a03f0380620c0516f8053aada95b658b60184c3e1bbedcfa158dc48d62
-EBUILD kwave-20.08.1.ebuild 2096 BLAKE2B 735034fbbdb2e00ff189b4fd1d7512fa7d5654c037d45f5fd16a180587f6ac071cc64c075fbb42317298f18151d3a262d58147835c9e706223dd7cb7c3d59596 SHA512 0d7b2541447c28f9b4aef5cf751d9c88b0c9bcd8c5287ed1a673e4f2bbb76449dfa8a06e8712d6687d9b16053ad0226234146cc3108102a9c8caf63eed7f5c9c
+EBUILD kwave-20.08.2.ebuild 2096 BLAKE2B 735034fbbdb2e00ff189b4fd1d7512fa7d5654c037d45f5fd16a180587f6ac071cc64c075fbb42317298f18151d3a262d58147835c9e706223dd7cb7c3d59596 SHA512 0d7b2541447c28f9b4aef5cf751d9c88b0c9bcd8c5287ed1a673e4f2bbb76449dfa8a06e8712d6687d9b16053ad0226234146cc3108102a9c8caf63eed7f5c9c
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-20.08.1.ebuild b/kde-apps/kwave/kwave-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kwave/kwave-20.08.1.ebuild
rename to kde-apps/kwave/kwave-20.08.2.ebuild
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index bfb39715eca3..cfecc5baf4af 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-20.04.3.tar.xz 4177044 BLAKE2B 1751c12ad1c20e663f5624451443577812902bf9ca6bd2e6c8574839583a16f0eb815cc547bead60a4ee805a0cc32edc0a6dce1263d634f4340995677ab5291a SHA512 3c69549a37266f7228e851b60d2afb13e65087f54373e80f933dbaf21641cf9a2dde491e57afa9c4a767edbc8cd3d8892b04ba51f044861f1637691259c69167
-DIST kwordquiz-20.08.1.tar.xz 4182012 BLAKE2B d51a237d32e3dc08a37c911f09c0b72e02768387646e101f92a23f0b8a8224434e709e12a7e38d30ebafdaf94d861995397b1eb9d29444e29d0ba84aae4ffcf8 SHA512 78440901daf3a34704b1e6defa7d094b60a11b1c6d892fd92624636167b22e345a78fd0e708d9eff76f0f454ae7520fba6b50d471b340c4f9a72f57e3c75e5f9
+DIST kwordquiz-20.08.2.tar.xz 4182268 BLAKE2B 6d766f450be062ae772bb1237cdaf2f186f713c64944a32850affdad7954b018ed60956154214aed6180f3c0865ca0f186993b4930c66642dc8cdc4ed4ccda96 SHA512 39fafdb490a98b4174f1746a7c8f0d1b10d1273a985bb1550f760cc405f6686ce32f3857a1a7c6c6bb82fd7ecf18d4cb37708bb557a8734288e772ed857a5888
 EBUILD kwordquiz-20.04.3.ebuild 1234 BLAKE2B 8852af8cfab0710cf5d9cb408f8384bcf6d96953ed21188aa4dcd0eaaa15e7382e16d199c5daaa999e06720553179f6553a5f4f706d1374f7519511562738cd8 SHA512 6ffcd0dfe9a53d861fec9aed2eb5800c0232c2ae822dd46322756d445a500762faed6ddce6ab52327fe10062e765bcd49b14db568b67505dae01f56bcc6d74bb
-EBUILD kwordquiz-20.08.1.ebuild 1238 BLAKE2B 1f6b553a81174fedcd5c406d9df8890c8fcad2041ea19b8fb7264c78e45cb8f74012a2742289017364c5d2ac9cfd3f5319a58e9126d34d03ec47c86ff0773006 SHA512 2f13bcf82f729aa387b4510efaf2b5cdb322d842d917a58cc47ed0eb4303dac895eed7248b1c4a57a7473314429be9a1802aa198c871734c6d674eaef6f76084
+EBUILD kwordquiz-20.08.2.ebuild 1238 BLAKE2B 1f6b553a81174fedcd5c406d9df8890c8fcad2041ea19b8fb7264c78e45cb8f74012a2742289017364c5d2ac9cfd3f5319a58e9126d34d03ec47c86ff0773006 SHA512 2f13bcf82f729aa387b4510efaf2b5cdb322d842d917a58cc47ed0eb4303dac895eed7248b1c4a57a7473314429be9a1802aa198c871734c6d674eaef6f76084
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-20.08.1.ebuild b/kde-apps/kwordquiz/kwordquiz-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kwordquiz/kwordquiz-20.08.1.ebuild
rename to kde-apps/kwordquiz/kwordquiz-20.08.2.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 17c907a80185..55b8d5d083d2 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-20.04.3.tar.xz 5813840 BLAKE2B bc078ddb20edb282f3779f3f989cfc1e00444484667e80ab8b93d02a488ffa2308196243df44cc3738300ad6e8ecbf09d58d373c81c484ee3250e90ae617c622 SHA512 b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9
-DIST kate-20.08.1.tar.xz 5848940 BLAKE2B 70a8848202d73ffe60a22a1565f9e96583d6a523da5ef55da178ba4a29fd188a103ba2d55fd37abae89a93b5022e48838d9e3299f226dae9292f4cbf0b428b4f SHA512 63d1c2d8371047abbdc3b1ea2e96b94a6f85ccec05ff5addc19f19d593e2b1760c91b4d87145d329516bd40e0bed740a94306df7760d1a2936edf09c87f6982a
+DIST kate-20.08.2.tar.xz 5850968 BLAKE2B 12faf6d848e50e391d5e14166875bdee39e45889ad5a2c75ccda397e8e6b3414006f4b50f04c3e32ff0690d0cf6432513ca6b0543bdd848c7cf5fb21a6fce630 SHA512 c8cfc7e92db47441fdfac66097e12566ebc51fd1d2721711aef76b5d951dee402f485a1e3de14db8f20260d1297464210d73bf02a006ed5109c4952e5614f9e2
 EBUILD kwrite-20.04.3.ebuild 1475 BLAKE2B 00d244b1ebf87f20f347b07d003155b451f74cf4f50ee24feee1122cbcf448cc8157e5b0d5b40749839d4c44d3b2edc040b4ad7454ccec0b690778d6c225d6cd SHA512 4adf5aeb843f167a914324add96c3e5ae05d63af3bb65c922818b6a3687a351b5d874ef9f74a726943b097a9a630f765cc2143c0bcbd8637376db0e8588127f0
-EBUILD kwrite-20.08.1.ebuild 1478 BLAKE2B 83ca80d67c0f6a96cc401a66834e44fea67e94e0d8777d467252812ea00006b4f07b4f493b971569d3c4158d15c31132cfa305f52214f335e4df0b0e0ce76793 SHA512 b9cc9920e574e60835563388645964857fdaa5ba114bd22acd8fd854261490a39bf1fed4e8497d9a200395695bcaf75897d5dffa173686107b98ffafebcbfa59
+EBUILD kwrite-20.08.2.ebuild 1478 BLAKE2B 83ca80d67c0f6a96cc401a66834e44fea67e94e0d8777d467252812ea00006b4f07b4f493b971569d3c4158d15c31132cfa305f52214f335e4df0b0e0ce76793 SHA512 b9cc9920e574e60835563388645964857fdaa5ba114bd22acd8fd854261490a39bf1fed4e8497d9a200395695bcaf75897d5dffa173686107b98ffafebcbfa59
 MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-20.08.1.ebuild b/kde-apps/kwrite/kwrite-20.08.2.ebuild
similarity index 100%
rename from kde-apps/kwrite/kwrite-20.08.1.ebuild
rename to kde-apps/kwrite/kwrite-20.08.2.ebuild
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 925cf24f269d..c88038945f3d 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-20.04.3.tar.xz 31640 BLAKE2B 638b790c6b102e34193226c2e8fc3b255d9f4c674e482c4a2502c29d8705e34a208b02a8890a97fdff195bc552d7ad342cbe9513a184d84aa7a0e4ed3ccfb4b7 SHA512 01481277c745e61961c84838fbcebc9188ed6402328e090c132ae0a79d66fb736606ad10933ad7b1a8a107f1f65b6b10fc3de815dfe05711c52f0f724ed17603
-DIST libgravatar-20.08.1.tar.xz 33388 BLAKE2B f4e7181f1d5f61f26f0163fd42d97b5754625318ef96ac1e64dbb9119ff07d014461b204ba4511470ea37e6fefe6711f2b60ae8ea5ba1560c033870350868a0d SHA512 97b15285b19ab9b58a8b1a9a23e2fed569af50edd2f7b87e95cbbf4d9f16cdb75cb4677b87ceefeb854e70bbeaf1f81f5e8673c6f75349729eaf689165ad5f0b
+DIST libgravatar-20.08.2.tar.xz 33556 BLAKE2B 410019a07eb4dbe9a9b0371c61b5adf9bd7761b1b78fb25fecc1258a3da232bf9915c9717b52e75fa6de1516a9873724d5a11376a5886b13f2b5fcd9a3d8442a SHA512 8e605f46e5fa577e6aca751016fc80fbedf19d766e7f4f8c3703b0374df7baa500d8099f36d69cb4f56fc780565ef195a560e6155f17bd866b1574d79196e126
 EBUILD libgravatar-20.04.3.ebuild 815 BLAKE2B e5223a5d4e39db70d44c78611b00b7d525c4152b595f575e738f08180de6b163eaff32ffcd88f1c9129855079329fdb1e033ff6fdc95f325a72fc2c524d17673 SHA512 e90ae3d5660daf139732ac2809299977c43e6211abcbcb6c18322fa56afb396e077b4b9c3fef352a3a19b6dc470ae70032659edf0bf5bf63b6fba1efacc861e0
-EBUILD libgravatar-20.08.1.ebuild 818 BLAKE2B e6b97c851dffd9b3661fcb01bde53a7446daa624fcff29d59f7e9cb42297d04f9f4af2e27f4432ebd8e01f2a354f22c0a151c67429f5046fbe053608746dc413 SHA512 a1d312db3262ccf5637561a59ae310a97b04361d610d4e8f2e04a59a073fe0f464d40276eea5db33de90980546e756a7fb68af5a90d2c21014837a06757b46d1
+EBUILD libgravatar-20.08.2.ebuild 818 BLAKE2B e6b97c851dffd9b3661fcb01bde53a7446daa624fcff29d59f7e9cb42297d04f9f4af2e27f4432ebd8e01f2a354f22c0a151c67429f5046fbe053608746dc413 SHA512 a1d312db3262ccf5637561a59ae310a97b04361d610d4e8f2e04a59a073fe0f464d40276eea5db33de90980546e756a7fb68af5a90d2c21014837a06757b46d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-20.08.1.ebuild b/kde-apps/libgravatar/libgravatar-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libgravatar/libgravatar-20.08.1.ebuild
rename to kde-apps/libgravatar/libgravatar-20.08.2.ebuild
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 5a4785085990..81f90a99cd84 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-20.04.3.tar.xz 427292 BLAKE2B c3c89dec30b6b4138bbf55422deb32010f230dc3b8f720baf0ad02504a78dab7af54d5ea894900c0577dd1bdfca9e40f43a580b12c5be1a5d3cd67e5aa876496 SHA512 1b9fadb8a7d092999681d3f6bad4cb16960521d737d0fcace74b3b94a6f355984305d7fcdd3c9f53b3eefa65c861ddc3ce625ab56c4b1e505dfde693a3b1fe40
-DIST libkcddb-20.08.1.tar.xz 425356 BLAKE2B ee9efceb9a1aa613617e67159898e30280f1e5488cc357d6e047a05c72459913d9cf0fbda4e5bc67c3464cf61d79b476c5e069a33f50f277317515404dc2ec36 SHA512 4ec0ed8d6f5153072dbfae5a66b74abcfa4b7d274f66dcedbec2540c6c310783a6278ec44b4e30582ad6b4adefb20c57ed2a9dd65f2f30a78f5e7b28d2dea86d
+DIST libkcddb-20.08.2.tar.xz 425296 BLAKE2B 36af6c9e468b0784226f3192b3c2d97a47d0184b86430881f72c24b97ff01cbb686c6959632ce6063273239ecdac68d67e63f903e0f21a376d5bae22ad6fb36e SHA512 b61ce62677b8496830a3f1554e31ec0bd6d84b2bd956653c517df67f7a9ecf548a10f87b0f2b5cc33c38b53a5e756591afb9b58fa853b64d7d28db4734197a76
 EBUILD libkcddb-20.04.3.ebuild 1143 BLAKE2B fdbab8250ced483ad8e662b3eeb415f75d1e525e2f3fc323c0f463fb6dfe16a8cb0bcc0a45b43659377b4c126c62425e85f99adf181c48fd2ebb1d07a1e5e265 SHA512 3128f239c5f340d2401cb81eb78188ad3ad0338982787952eba43f1b9f306926fd8639d060a5b88fda1f7a23907f422942811d8444a43e816177807fd68c6cd6
-EBUILD libkcddb-20.08.1.ebuild 1146 BLAKE2B 82f75d3dc7cc64941e3c2cdeceab2812e7c87ebad00087596fcf7d6b91d44559cd6dca8d11a70c8bbe1e399a709107f67144de542fb188130c78877f04b264c0 SHA512 1c26c5dca111123c49f242d092d4bf85059b1b403c375d02cd66216dec6dea55042dff58530b3158e7bf30db686edf3e2026f1a7afe70bae472ee67e47be55fa
+EBUILD libkcddb-20.08.2.ebuild 1146 BLAKE2B 82f75d3dc7cc64941e3c2cdeceab2812e7c87ebad00087596fcf7d6b91d44559cd6dca8d11a70c8bbe1e399a709107f67144de542fb188130c78877f04b264c0 SHA512 1c26c5dca111123c49f242d092d4bf85059b1b403c375d02cd66216dec6dea55042dff58530b3158e7bf30db686edf3e2026f1a7afe70bae472ee67e47be55fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-20.08.1.ebuild b/kde-apps/libkcddb/libkcddb-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkcddb/libkcddb-20.08.1.ebuild
rename to kde-apps/libkcddb/libkcddb-20.08.2.ebuild
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 65e28f644bdc..463b5ac964f5 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-20.04.3.tar.xz 88768 BLAKE2B 97679d91490ff3f05f6da3f75f8c2fbb93b384fe62468004a95b271b90a12a28ee706f749f44da4d1cf17faeed1958457796c87142defa4c9f8c79129a20aca9 SHA512 82053080d2af326c62a293f8c21e0869eda16d448e8899f797e47ad1576e4815bccedd78f2ea8bb5051be849221b56298dc399d2893dd4b2f0fe2c20b52d4f27
-DIST libkcompactdisc-20.08.1.tar.xz 96592 BLAKE2B 5b1085a44d486093381803132e35a960f34b9d00cc7ee75b6928ee4c439ab909f26d7651f6a15eec4123caae52d21e6b501d62547376100ba6c6c83ea122d1a6 SHA512 1314d79494ae7c0de99edce8b46fbbd659b398099e2305841960f76fa6ff496e7b69d33e4ea7a6aed5202ff15358c09abd79a3b347688326d09ee3151f6a7792
+DIST libkcompactdisc-20.08.2.tar.xz 96660 BLAKE2B a528769ed08f85f3e68f99bec9e62422b6a5d83b0a2a734c495cced44c35f2662cd7c23a64f523e574c9134525a59aef69e60d77ce298de03129f7d58494e3d8 SHA512 ffa803fc33988bf1882c0b09a96e6358227c3bf6a6e92a1d62ae96a9e84b35c3552bb02d469037a987cfbe69be5db4fee24627d27343c821585d0c167df44a69
 EBUILD libkcompactdisc-20.04.3.ebuild 613 BLAKE2B 38c6d0abb6bf09851ee8257b3c9c3a9f8613cb039dd35af5d2e3cef2ef3da7d242c76e1c4c0213a1e8dcf3fe9d7b1ef60656c5fbd48632ecf9f2ca3f103c2734 SHA512 a7742e64154658c984e96e7b6a0ba2df3b75ee3cd9b845cafb27942c8ea09ad8ffaf5489b1efc24bf4ce8bb1a8e8897dee43d5f396ad102fe5256fee3eebe24c
-EBUILD libkcompactdisc-20.08.1.ebuild 633 BLAKE2B 37f6dea054674d559e88c297e73120fc137699b8f3aadbc4e3319bd5fcd884304c03be4f13bc31c91b5503fdff685a789c924d7dcdacd86871b9c72f9e87358e SHA512 3469d309ae20fd5ec97b6312be6face9934e863015268781288d82ae0dbc89093a179eb4ec4174d26d4359c23d49080c4b8c4ecfba576f94c8cb94f6fd09211e
+EBUILD libkcompactdisc-20.08.2.ebuild 633 BLAKE2B 37f6dea054674d559e88c297e73120fc137699b8f3aadbc4e3319bd5fcd884304c03be4f13bc31c91b5503fdff685a789c924d7dcdacd86871b9c72f9e87358e SHA512 3469d309ae20fd5ec97b6312be6face9934e863015268781288d82ae0dbc89093a179eb4ec4174d26d4359c23d49080c4b8c4ecfba576f94c8cb94f6fd09211e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-20.08.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkcompactdisc/libkcompactdisc-20.08.1.ebuild
rename to kde-apps/libkcompactdisc/libkcompactdisc-20.08.2.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 1eab3e06b60d..1f0b2955516e 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-20.04.3.tar.xz 41924 BLAKE2B 3b466ba7e348d6dc42359f90962d4aa464ac9c6359d977065a485fabbd9e7a3a98122cdc52db996a86868ac8ffb257a490e8042396c4122e59d77de83f052369 SHA512 b2ceae6785c356f7f169e2efd8b47d920663dfc187d7e5abbf7ffbec934deb78bbfa096e2417f712c2e298e720bd11c1a8883372ef151826a8573df65e772aa7
-DIST libkdcraw-20.08.1.tar.xz 41996 BLAKE2B c62a9aa51e816564beebfbf4f318e1cc7c6af7cdadd6502838c9dcc5e598789ac2624269757ee33c27653649a36ec42b4c1d7c119bf355b354264d8710a6a7ba SHA512 93a687e361c3d2c6b16c8acbb197127bb614f2ed4a0d511cacb584c7f7d4e263e9f2e1e76ad8c1cf408779f99480f51b6c4278cd75c5833da720e1bb07d4f1f1
+DIST libkdcraw-20.08.2.tar.xz 41968 BLAKE2B bd60e4111d79f6fea10e48f834c6c87a7ef5f96d6adaa2b75fef2082a5456416990daef90c39cae5d88d2835800527ca0a55f29623bed108e0356416718252a4 SHA512 21a37c5a3e5486b46bc654b4bf6cae8fd0f78c4e89821c392d24bcab6d9fb96d7dc4694cbbffceeff25e76acadf5d60e1f03ead4b9c7067a7a5ba663c54a25dc
 EBUILD libkdcraw-20.04.3.ebuild 358 BLAKE2B 34a9567376468fd620404bb27befe129794545d8a9f971a4e086ae8838b17ca4aa89667dbbd9db052cfe7641e0dda94475a2dde55c9be4476039a50cdd3fb826 SHA512 c2e977263f19184c8a2e1d11c83e189e6f526da3cc916694217ba9873c5bdeebfeff951149a79aeb66a3e70277ba9712fcda64ef1d734d385734d2c29e385960
-EBUILD libkdcraw-20.08.1.ebuild 361 BLAKE2B 4e46a6b1825e9d5421c8bdecb50cdbd176e5ebd4b3fb365d0a5200cbd8f2f4d10dfd9c5710e175aedfb7de5e94c371dbee6927865dfdf3778eed755121662006 SHA512 baf2a7c5ca339aec2a7dc26fdbd6417b340e89a4824c42e3f546703fa630adc6166ae720569b3a0e614d8d546debe5c3a0ecc3566198765a315b41128e6a37ed
+EBUILD libkdcraw-20.08.2.ebuild 361 BLAKE2B 4e46a6b1825e9d5421c8bdecb50cdbd176e5ebd4b3fb365d0a5200cbd8f2f4d10dfd9c5710e175aedfb7de5e94c371dbee6927865dfdf3778eed755121662006 SHA512 baf2a7c5ca339aec2a7dc26fdbd6417b340e89a4824c42e3f546703fa630adc6166ae720569b3a0e614d8d546debe5c3a0ecc3566198765a315b41128e6a37ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-20.08.1.ebuild b/kde-apps/libkdcraw/libkdcraw-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkdcraw/libkdcraw-20.08.1.ebuild
rename to kde-apps/libkdcraw/libkdcraw-20.08.2.ebuild
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index a1f7b02448df..5da839145839 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,6 +1,6 @@
 AUX libkdegames-20.04.2-optional-tests.patch 838 BLAKE2B 7eac9c9a2a6c316ee8573205a1a9cdf72806b3ed1b35512c4aa8b817e9dac47745afa72b0858906b8923d0f0607c532256c4151d263685c4cfc132afc089084b SHA512 bafbbb49184023e1e4adb7aa2b754b8d240a11f5ecb1f022b292b628dcca8db39f132c83ede52ab5956a10be06d1b3a01c0e17a3bbe78621701c3db49ba066e5
 DIST libkdegames-20.04.3.tar.xz 6384092 BLAKE2B 8c7137558776f69a5f7c6accaaa22cbbd33665624eb7ce50dd4ec8c79837d8e1bf6f3ad137ce1b94c0107e0f1489eede5680c0217efda970c7eb0b9e3a515894 SHA512 4681b4b37a78796eecd0daf00d231909391510122de4ad2ecb0c50ba7309c3119895c3490e727425ef0088a84e76cae26bc595730f4a673f7cfdf9aa559f0a74
-DIST libkdegames-20.08.1.tar.xz 6380124 BLAKE2B 7e4275c3be18c6a7436cd954816779c05f0f2025d81c26e9efc92c976acce749fbdb2766ede2a6e8047359d0b206531f6f7c8be1e76ac0cf101e106fcfe2f7a7 SHA512 bf72bd28d3db3f7aa7344c284e81fe0ae8a402965892e0338814870c34652575a5ac980e87b42a40e7ee056f1869c305b094bdc3050862ae9f8ff67c4f5b078e
+DIST libkdegames-20.08.2.tar.xz 6399716 BLAKE2B 0f5d904aed32166966e9fff85f348401c70e346f973895c0efb8a95f8fb820626d2010aa51ecb8226c75da0da1b34bc29f9f7646e1df361d4528651e9e7ba2bf SHA512 978e4d16cb4a97f1b50398ff9e7b872110898af80cb51d7c472ab626a2b736b5931ad1a3f007e5e322aea4cff3a05fff0ffc1b0dd5a377aaf70f207086d25b44
 EBUILD libkdegames-20.04.3.ebuild 1532 BLAKE2B 23f3e773e5738c3875238aef96ae9df964d3e15ede015afa20d2638bd72c9dbd805aa619a1793e481df42503a680d62a0fee29c247c3348dc062e6b7f21075fa SHA512 83b7cd378c72f2a114270a78a375b64bb4f071102acdd1f01b9a121af0bcc9518a7348419909f61450a54ffa8e25bba131858cf9f9b8cd875ac743ce5096933b
-EBUILD libkdegames-20.08.1.ebuild 1473 BLAKE2B d8e6c53e24f5c772c8fc21ec54b2ffa6435e414fda6f818f5b36dff73192bd8e6b2ff8699e1f2023e303b5b049c233951cd61dc197975f8e7a5f70346c4626a2 SHA512 5a62fe47fa5c6d73cd6e08aec37f547d3b52605faba3bd25e6b27cadadff8ddc86705f129726e980f160ec760d914d952d69056b3f5916f53cca96ce376092d0
+EBUILD libkdegames-20.08.2.ebuild 1473 BLAKE2B d8e6c53e24f5c772c8fc21ec54b2ffa6435e414fda6f818f5b36dff73192bd8e6b2ff8699e1f2023e303b5b049c233951cd61dc197975f8e7a5f70346c4626a2 SHA512 5a62fe47fa5c6d73cd6e08aec37f547d3b52605faba3bd25e6b27cadadff8ddc86705f129726e980f160ec760d914d952d69056b3f5916f53cca96ce376092d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-20.08.1.ebuild b/kde-apps/libkdegames/libkdegames-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkdegames/libkdegames-20.08.1.ebuild
rename to kde-apps/libkdegames/libkdegames-20.08.2.ebuild
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index cad7e8e956fa..d26ff2400231 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-20.04.3.tar.xz 333712 BLAKE2B 151f983b669755cc4447ccde323eb6aecd91ffe7d969a772187062bb8c9695d47a295180c79062a25fd3001e6d3639da768cdbbdb2b2a1296d13a9cb99a51e21 SHA512 b1be6f143466b52342a659fd76124808354584355dbcb283ffc41b126bdbf79b4bf01028954be6be450f3634ced8748f2be4433ee0393505388f442e7393b0dc
-DIST libkdepim-20.08.1.tar.xz 249728 BLAKE2B 050ba5b35d48bfcd5d49779924db870a66ef7d4cfb504479e71ccaeb02deb1e8a1393c49904e23011b23e949faf7dc2d2323707023275c9ff9e4ee841d4c4ecb SHA512 064e0e9432709dbbcb30e4ff5266d0ce7c960bb35b66cbb1fe4b3feee089ccecb47422cb5258b4d39913d15a02260c4454e174e63c3ce3d2efd37a425e41017c
+DIST libkdepim-20.08.2.tar.xz 249668 BLAKE2B e6fdaa90d058fcfca8e37b7e55b22f75c87c2d757a76f21891b4d87e72af22b3c66eae9e1a2089d5cfa8cf25d37dcd10a36f19ed15f702d0b5b5270ee9f2ee87 SHA512 66af9384953ade56f47f5a7f86c2b2a8c5a26acf407131dcf434b5b51ec9d74c1a53dfc860b65be9e5d96b052871642d643941fa56dbb9dd5caf30e2e5ec9b75
 EBUILD libkdepim-20.04.3.ebuild 1158 BLAKE2B a575ad0a68042f0c2d0074d0c60c78defdb9ade3c08a02a9f06612e67bfd3804cd57aec9be2c827cdf1b4de8f83edbd503375b921e72a0adf59abb687ecb33a7 SHA512 d53a7edec96676f4f95894462e3e1972b8d99f3f5c17a37f6c41c847c5d91120c3182334add5e4a71f722a551870dd93822cf06a91058d2ab20ccc43fef7e3cd
-EBUILD libkdepim-20.08.1.ebuild 947 BLAKE2B 13a2bb4e59b1ce057d4a5feb8f1fea088a4d44752ae4e6fef8bcf3a7afb596709b7ebdb28816545e55801924a3a5ee76f1d8b3f0de79bcc82e1e7f48eaed67ac SHA512 039fedf7bf8e4ae40efb9a48de7f274c500e4508769f654ad5722d80cbf0ca8f70295d4832206603dbc6ee0f4ffd191a56a925fd0de9d63f450a50dc995d30cf
+EBUILD libkdepim-20.08.2.ebuild 947 BLAKE2B 13a2bb4e59b1ce057d4a5feb8f1fea088a4d44752ae4e6fef8bcf3a7afb596709b7ebdb28816545e55801924a3a5ee76f1d8b3f0de79bcc82e1e7f48eaed67ac SHA512 039fedf7bf8e4ae40efb9a48de7f274c500e4508769f654ad5722d80cbf0ca8f70295d4832206603dbc6ee0f4ffd191a56a925fd0de9d63f450a50dc995d30cf
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-20.08.1.ebuild b/kde-apps/libkdepim/libkdepim-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkdepim/libkdepim-20.08.1.ebuild
rename to kde-apps/libkdepim/libkdepim-20.08.2.ebuild
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index bb4d6a8e39d7..b48eaf0b21b0 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-20.04.3.tar.xz 206876 BLAKE2B f62b9df45fc410faba860daf69913aa5db08294dae73b857f750a346e759c8bd7ba70b3f677d06587d2db81f41c3154dff25c81c146479ce7a43c6c5fef46c57 SHA512 ab6d63394302eca90c3f430753daa9535b30a5883ef899b21e4ba3d90fb5faec5990a7593d3c21cd78916238a9b14ac3fb24ee062171035e3afacaeb99ba3d7e
-DIST libkeduvocdocument-20.08.1.tar.xz 215144 BLAKE2B e0ddb4e880b0836e7a6b3d7a0793df12b93fcbfcf7075febc98d6c672c303950ec5dec61ce9a18ef060416f5ce3252d853ff58ebb2ad44b93b0879243c8a8ddf SHA512 a09ae63e9ba1687bc3ce1ca33d530546370e09772f6be008ad21eec965fc2d10ca51bb7bb3613cf86b5516925cf543bf35ae7fc8e3bcbbe227449062e90aced3
+DIST libkeduvocdocument-20.08.2.tar.xz 215016 BLAKE2B 8218fea26526880d072c3c836d9eb192a6cd728ddc51f9db81bc251300c4c464b5d22dbc0c556e41399c40c5130fa6fc658dba143d7f2ba8fcd8e28532a8afc7 SHA512 44098c352213265e7129ca2987631166f7690735136fe8c3e2afe69636df93ae72a9dce470310b78194f88c326e83a6e5322b36744d64ed0b2487d336128c538
 EBUILD libkeduvocdocument-20.04.3.ebuild 711 BLAKE2B d23a48c663f768fc99460896c7555b1872cf18b526ea31a3a4aff885b5e5c2aaabdbc95dbe138086174a5fb23af828c9ca716d799c0d6a609b058bda50790746 SHA512 8793ade3dbffb7bfd0ae9a63ca3aa280688a0da4f6a7ad3c02260f0ef733b1fda89c8428ef23d5f314236448c6eb6907df71a2515568bdbc5a9cdf57cb8e436f
-EBUILD libkeduvocdocument-20.08.1.ebuild 508 BLAKE2B 06021196b60dbf06bd4a3a0cc7f0d2fe1dabe82835da753707fc5c767af05045c131bf8ff4420cd37a9b5d9867eea758f2fe3270a2668fc9683c400ee4401398 SHA512 4bad22f45b7b0845fbbaecf54635eabd0eb1b6abf206ce7a42d036369576e473912cc27eb66eb05de34df8f451ba09939a1fdd046111091480536de2e75ed521
+EBUILD libkeduvocdocument-20.08.2.ebuild 508 BLAKE2B 06021196b60dbf06bd4a3a0cc7f0d2fe1dabe82835da753707fc5c767af05045c131bf8ff4420cd37a9b5d9867eea758f2fe3270a2668fc9683c400ee4401398 SHA512 4bad22f45b7b0845fbbaecf54635eabd0eb1b6abf206ce7a42d036369576e473912cc27eb66eb05de34df8f451ba09939a1fdd046111091480536de2e75ed521
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.1.ebuild
rename to kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.2.ebuild
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 2b0c4fb5f16e..482ae77ac0a0 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-20.04.3.tar.xz 64548 BLAKE2B 49ea448d4616da4f283cee32934d68fd492486a431ba1087d9d8c764aa45a17693e1fe36c9c485bd16b92438d944862e2f0b37165665bf2b0d5aaf2f8fd80fd4 SHA512 88846e87b64e2b0b213afc2765af69e4fb034caa6708f73db3f6180bb52e34a1e6ea14f06416f939ef66ed16cf0e1a43b03d6452eabe0cb24c40faddf39376a9
-DIST libkexiv2-20.08.1.tar.xz 64736 BLAKE2B e8d00655202ddbb8ee48e32d6c3a33ec1f6518036944a98e67ea97524c5916fefc4c6f6b557db6be6c035cd5fcd21dad241e9099b5e85fdb2141e0a8903cb2c2 SHA512 b112661c00cbcf24d26d0ffa1fa62d9593651b59dd7cd374c66215dfefacab36c63afb6a21d97af3063c7c9f6fe8bf47bfb59391391d5003d2d9b63f85779338
+DIST libkexiv2-20.08.2.tar.xz 64696 BLAKE2B 03de83354e86afd2a1c97f73bd0f59b4b021c677cca1ee507225dd2b8f99082761989b5c903f2b786610c41805353c2494e9d3a32605ec60bb77b28037cee014 SHA512 da36c26b7b45df565d603196e316c556d3f4d34b4a525fe58be3bfc9735637c8397eaf9afa532dd33dc94162dbc3898374e96e57b57afb90fc995f140d9f42d6
 EBUILD libkexiv2-20.04.3.ebuild 354 BLAKE2B 3029603cac7d4b8513dfefdb33af5142670e98286f876dd52a5e8a6651f8d441ee646a6f74feea56e5401f608f296bd3262f2b5ec60a02f284d66c271f20f065 SHA512 352f6d2c980de60532681914ef93f9eeb913e135cdcca224e12db813b2170c61bc1853e6d70b5acdc08d6c937414e4b233439770608093dd3ccc765694e03f23
-EBUILD libkexiv2-20.08.1.ebuild 357 BLAKE2B f647d70c6960f10a6f202227a16692c4de07ffce0fb519fd227abe19a8a996e0a91a65db818aa7fe9537c12a43f95d7c530ba8e0777242d8058ebabf76e7aea3 SHA512 0a944068ed7667c94c0425b3f547d0ad949153e7f99320502c52e7b5972f581d015d9437ec46b6ab30b875e7d0e9eae1e19bcb1aa4af84e6bc700b1ac09403f5
+EBUILD libkexiv2-20.08.2.ebuild 357 BLAKE2B f647d70c6960f10a6f202227a16692c4de07ffce0fb519fd227abe19a8a996e0a91a65db818aa7fe9537c12a43f95d7c530ba8e0777242d8058ebabf76e7aea3 SHA512 0a944068ed7667c94c0425b3f547d0ad949153e7f99320502c52e7b5972f581d015d9437ec46b6ab30b875e7d0e9eae1e19bcb1aa4af84e6bc700b1ac09403f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-20.08.1.ebuild b/kde-apps/libkexiv2/libkexiv2-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkexiv2/libkexiv2-20.08.1.ebuild
rename to kde-apps/libkexiv2/libkexiv2-20.08.2.ebuild
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 99af64dac7d1..70e5c0e7481c 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-20.04.3.tar.xz 239764 BLAKE2B 3ed567dc8e9af9287c726a5592a579e35e10bd5aa5f7a3cc56eaf779b118d09abf96c1d608a7e20df7291f96a944d160c89795d9292ea6b991c967651bdd1c37 SHA512 2867e9b3492f721068e43dfd6d58ddccc0d7378e0f5613fad135c380060ccbf2906b1cb187ec65ae3800cf3ba12329a3d7627f6aa1f29fe94a67845b96362d66
-DIST libkgapi-20.08.1.tar.xz 242364 BLAKE2B 92e394b93fb14ba1753721e0cbad3dea766bdc63760c37e3d579301fb271e9d29117ba55d2e3db532e08994b7eca698c9d41d57af28c347d393fb6f1e84fd6a8 SHA512 f51a8bd46d8934990a48011548b042178d852c3348b454f5cfaf00ffe2953a0b1b28467c12acb5fe132246150a08456626f4145846c6f0c2017148f4b35eadbc
+DIST libkgapi-20.08.2.tar.xz 242508 BLAKE2B 88221fbdd748198becaa437dcfa95e40a61acab3c09961a0d72bd7912ae00e51cbd638d249bb332afa2a81eb67c271f465a40d7fab0f3a7bf0241549c88b1a2b SHA512 7145f7111f81dafbd666e3913a94f80f2f88fbab49c6612d14239e03d1569f80be7fba7968f8e46635012b6631110e7b5f92b471a99703ef23e2365c248b40fa
 EBUILD libkgapi-20.04.3.ebuild 873 BLAKE2B fa1eeb73542c9e89d64489b11645aecc0f92d49a93947417342c1f79992bb92bcae582b75b5db97f554b38e5154894294900610b99c9b98a74b1ff4f13367e40 SHA512 a8b235cc378b379f7662b53f308fbb87bac768bf601a16810384f4a88193ef9be5ae158607392451afaf4048bef33d7cc5ebab6b43996cb8ee36d4e115bfd6d0
-EBUILD libkgapi-20.08.1.ebuild 876 BLAKE2B aeb7bc9f2057316840eb107d84ab39b1f8ef2a8a85d7c4bbd752668210589b3c3936273d06368a23f72fd4e162c039ca66b44600c8b70e26495881eda66cd624 SHA512 fd06714e1702597e0e98430a23604f04fe9e8f92418829b7dedf53b0116b0e8a6509a6f379e3868bb5fcea8203f3d629f6cacc1a358242d1452ddb4edad15f60
+EBUILD libkgapi-20.08.2.ebuild 876 BLAKE2B aeb7bc9f2057316840eb107d84ab39b1f8ef2a8a85d7c4bbd752668210589b3c3936273d06368a23f72fd4e162c039ca66b44600c8b70e26495881eda66cd624 SHA512 fd06714e1702597e0e98430a23604f04fe9e8f92418829b7dedf53b0116b0e8a6509a6f379e3868bb5fcea8203f3d629f6cacc1a358242d1452ddb4edad15f60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-20.08.1.ebuild b/kde-apps/libkgapi/libkgapi-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkgapi/libkgapi-20.08.1.ebuild
rename to kde-apps/libkgapi/libkgapi-20.08.2.ebuild
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index e5dc09bf8587..6bd91f1946da 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-20.04.3.tar.xz 103552 BLAKE2B 89cead9d353a60882e4b6ca0c68dfdcdc1e9d6c706d31a40297158bff3404cc520363603f4921f1c2a578496905dd55c93d4c846c83ed4a7b7a084c2bd610495 SHA512 0cd89507fcebacf64c69665e7d2e1c780f478c1234e714b4db0823aced184bc274ed363f78983e44c6e28e4654dbf8ba6792aec0225065e516749b381a8fed28
-DIST libkipi-20.08.1.tar.xz 103564 BLAKE2B ebe0374eae431c5042965c8e8ce4389c69075ef1d77c8d83df5ecf1bcad5dc4d735eee99485aa34270d362073992e725859016dc5a3a6ba3c7b937721040620d SHA512 af98432c47babc35d094af4370b41e00098e51b926a197b8126986b0d90f2761a45b5ccf2ab7122eac686a34a7cd86f55204cc42bbfe713f218d6f942a569231
+DIST libkipi-20.08.2.tar.xz 103584 BLAKE2B 1569e1744e1a0b1e8b4bd58b98aaa8440838037baee62a6303da205f30b17e95bf9c2098d3df30c9f64d3bd3278ff542aa0bec29222e2d93232182e20aaaa706 SHA512 948766d6374ea687176eb2a50edfee8e171a1d921d0b1f4c626be80a4595db3913a4696084a031f25b08ea1f45c77f271e91f6590f78d375b9137482a82400d3
 EBUILD libkipi-20.04.3.ebuild 569 BLAKE2B fffd82c37cbbd1fc001e40924c0b9c5b2fb72fa63d01a2225f34ce8c616ca20c843e66da420681f0ab3a1cfcd07adf3c2e9e8e1550e897c04d99050987ee33ac SHA512 66bd27f3e54df184132436ed5ff7ce3265fa1dac2e99355e70158678640544bac1ab9831593dd1f05c1bb422a6c103caefa922e520ba90a0e69b1f7bfe0839cc
-EBUILD libkipi-20.08.1.ebuild 572 BLAKE2B 2d00270968bfcdf031aabc2af5be043b4af48f057d2f835bd0f3fd976bb71c52b58e6a75702207d01727b05b6cedc1dae60959ac3e5cb5e05fc52a33b097f3a2 SHA512 cdbdeacab8a22de6313c36242348bff7dcdc8a4f53c8f298b33595193473b0b36b98ec39ee80dcd133345bb0a0a1d06866ba47f0a9dc514bda22bf92e77c8d68
+EBUILD libkipi-20.08.2.ebuild 572 BLAKE2B 2d00270968bfcdf031aabc2af5be043b4af48f057d2f835bd0f3fd976bb71c52b58e6a75702207d01727b05b6cedc1dae60959ac3e5cb5e05fc52a33b097f3a2 SHA512 cdbdeacab8a22de6313c36242348bff7dcdc8a4f53c8f298b33595193473b0b36b98ec39ee80dcd133345bb0a0a1d06866ba47f0a9dc514bda22bf92e77c8d68
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-20.08.1.ebuild b/kde-apps/libkipi/libkipi-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkipi/libkipi-20.08.1.ebuild
rename to kde-apps/libkipi/libkipi-20.08.2.ebuild
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 9ee850310149..15dd256b4696 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-20.04.3.tar.xz 351096 BLAKE2B fedc5c443b977907fbab75bff4e6f2d6cd515153f97b5a6d747a19b4da28f8186b62e89a0213da95888f544cb8d0e3c1022cccb42c9f0add9c0cfaf5c5697bfa SHA512 a318ba0517e193e69969427e8edb69c8a127deea9ae7e8ebf6ad0a6766ee237cedcf67322c47e3fb6d65aef94e7f54bc2d6d444743aa9753e0daa422ad23e1fb
-DIST libkleo-20.08.1.tar.xz 354848 BLAKE2B f0cb80610797299cc976547675f90d5773b24d5cc242f96b64dea34521a313ae736e7e209df071b18dcfaa3b791258b47fa86bb169bbbbacc726c3dba86da6e1 SHA512 9cf56658be7de95382eaf65559158cf793c2c66dd3cbaae784a6793701b575ec71b484172c6ac6f85c579bdc10b1955ba373c77b58be0e8329cec8cb926b6f49
+DIST libkleo-20.08.2.tar.xz 354908 BLAKE2B d76982cf54778d3a040befc1a050bf5123c9a0439250495fa48aadd2e6384db2161af4e169586011ce954808c7575bdafd5c5d5f74e11eec535e192537efc051 SHA512 923ffb0256e82e5651b7c8811bb0f588ba7f4a4273a8770f00453876e3a4ce23ebcc27577668302c23ed4f80fafd5763ac71f8ca0ecf3b0c29bba244c0764935
 EBUILD libkleo-20.04.3.ebuild 953 BLAKE2B be2cc481df04c3a7ff9093f46a997162f4007750e448035ae630e1d602a1af392e1371e941c0cd746cc2d94c36c9d041d2a88ceeacff509437906678b8f25485 SHA512 0f7f6c49db3ae3f136b0f24ec99c48fb728b5c32bdebe461171e95b3c4881e91cd842ae5f55880283d6cb0697fcc5dec1e5df5fdd446492c71c9fdbddbb468c4
-EBUILD libkleo-20.08.1.ebuild 956 BLAKE2B 5a1ae34b8f7296ee2a7a62e511aba41c9d2be885e5c0f3f94dda0b1eb5a20f41f1b5307dcac9781d25d18332847f21147536d751cfc3fd97c13b2461573f286e SHA512 95d3cba9fcae337eb52647c3d45a57cdefdf49a62c5779faa3ebc803b38a198a7d9fbff22c50aa5146ac3571058d826a2ff295794cbaeca03b5bba4839fb7c44
+EBUILD libkleo-20.08.2.ebuild 956 BLAKE2B 5a1ae34b8f7296ee2a7a62e511aba41c9d2be885e5c0f3f94dda0b1eb5a20f41f1b5307dcac9781d25d18332847f21147536d751cfc3fd97c13b2461573f286e SHA512 95d3cba9fcae337eb52647c3d45a57cdefdf49a62c5779faa3ebc803b38a198a7d9fbff22c50aa5146ac3571058d826a2ff295794cbaeca03b5bba4839fb7c44
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-20.08.1.ebuild b/kde-apps/libkleo/libkleo-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkleo/libkleo-20.08.1.ebuild
rename to kde-apps/libkleo/libkleo-20.08.2.ebuild
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 0acb9b0c90bd..37061d666035 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-20.04.3.tar.xz 1684816 BLAKE2B 4fad0769faa0cefc5aa10297bd9af66ab53bcd6f461cdb57875af57e5d7fe08f1986d8151ca4aa88ec43225aa13f90ab2b4a6de59a52db11fd43327186ce10f1 SHA512 8ad55d17a0b6e06cf1abdec265abb55bcd5dd5aa80c2d9f9a3ef7331875d89c5a0dfb6bfad3e8e23d34ba7e6e5a20a6499ed0391f8c5ddd7e356aaee7dfd9010
-DIST libkmahjongg-20.08.1.tar.xz 1691068 BLAKE2B 498892f3bdda171e9581312f315f57aa4d1c64998123ced1eca6a0003f4be8463b0782f86d842129e43faa59ebc5876d34950fc849ad03d8f25b4ed80ceb74c3 SHA512 a5d6345460f26ab3a6197c729d3b2cf2986b635a236e3db4881691e416c1834e031790958c8faa2c3fe043a47e4241b5a68dcbe500df58798f7781176d43ec03
+DIST libkmahjongg-20.08.2.tar.xz 1690312 BLAKE2B 3461ec1b6132e4aca7721d49592812878148634653ba1e1c22fe0703b0605da5c3560007d3909f6640c88c037faf65fff52b5d3a1287ee22fa4c2f62c7410529 SHA512 6acb963674dbf82d200f3bd7c0ba49078162789c04e591069711285426b25e09bcb8dcaec060cea585826a5aae1cc3a5208658173c3188d72f9f9984be7c2853
 EBUILD libkmahjongg-20.04.3.ebuild 652 BLAKE2B 5652667712977805f3067d34f2157e7e02c71c97715485c9f716d328429d5c052511e35eec28ce3d9bb0ff752ec8b869c406be84946159765f75ae05d982e610 SHA512 5c8acdcc575173c3ee8094eca75c13d74f7e71c022e64b9ee5d2df4774733fd5ddbe3cdf8d36e47756fa75a018b3b03788b21ae34aa143431370ad36449b8d17
-EBUILD libkmahjongg-20.08.1.ebuild 655 BLAKE2B 19f81114aeb42258c851544c0a431d815bef35eec603207163c137e097ac4e3c7df20ca02b0a13bfb891d8ff959e75ba778e7e7041f7e8132dc71c3ec1adb00b SHA512 fce5adef65a1c19f9fd15060ee747459cb6631c56e0a24fbce831229e583b1d0a36599d450920e1d60f2220baeaaae9ced0733d4766abef835d8b051c93bfc94
+EBUILD libkmahjongg-20.08.2.ebuild 655 BLAKE2B 19f81114aeb42258c851544c0a431d815bef35eec603207163c137e097ac4e3c7df20ca02b0a13bfb891d8ff959e75ba778e7e7041f7e8132dc71c3ec1adb00b SHA512 fce5adef65a1c19f9fd15060ee747459cb6631c56e0a24fbce831229e583b1d0a36599d450920e1d60f2220baeaaae9ced0733d4766abef835d8b051c93bfc94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-20.08.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkmahjongg/libkmahjongg-20.08.1.ebuild
rename to kde-apps/libkmahjongg/libkmahjongg-20.08.2.ebuild
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 041216f98497..04976a4c05bf 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-20.04.3.tar.xz 170664 BLAKE2B f68a9eb8122bdf9e74fa21dfb9a4e5ed385a2c5b71fd521d1e8fe84569865eca5209cd6d05499a9ca628866064bc8ee2bd5fe80f0f94c75febeaddea6977f4a7 SHA512 880b8ed7d8e3df82f82509ef42f0c951340ed5c735e19af067381c9b0613afd43af97695bd42c8b60febda5605f22c6fb215ff2acbc5f6754e7c0076455e891f
-DIST libkomparediff2-20.08.1.tar.xz 162356 BLAKE2B d32a90af44319a4e2c8a4f194c5632e069dcbd7219d3747056a3d1034b88eb39df808113aa12708afaf0957ee0116cb82107cd2ab75949a831fcbcc7c90043ca SHA512 043982200ea9c51f114a80c80865f04fc028b5462c66185f76cf3cc7eac80f54733adc6ff13ca0311525507e13f0fb3eb647f32092542e20a412ae4f859bfe76
+DIST libkomparediff2-20.08.2.tar.xz 162320 BLAKE2B a96dea5bcab540af13ccbed251d5bca793e1e665a42f7678ebd5ed54922f38e216e2e43223dbafec2d1071c95c5cd6b4ca60a2991d969c3da8f6c3ea7df3114e SHA512 6561cd69a908d4fc73c29489733b0bca4b9dc7c182c1454f14baa4ad80e0f41f0a738c3ef86e611da2d72240363d3b3e8e788b60d2e6380a3f96763a3159a17b
 EBUILD libkomparediff2-20.04.3.ebuild 660 BLAKE2B dbf71ed0ea3e12c633d064aa581e308cfa46fc6fe35b106cb98f3a6ce3a0680639de890757df7a08516d579afbfdf7a1f6ac4a12a6d75512dd8616fb464a78b2 SHA512 fc3233db1dd559ac957ef4b788bd40cda6a708a21677c51866eae78d9b95cd6a6636e160befed29b85bf2222ab7b426a75e5526f8a46a94c88d289f82c4a98ef
-EBUILD libkomparediff2-20.08.1.ebuild 663 BLAKE2B 7e84264efe826fcc4d284db5e7a68edac5124e190b824bb4211209c0b6c3858fcdd36e2aee9f707322f745fe29407b4c1babebf63b864a5edeb8d27bb85fb564 SHA512 e14d67f31fc95e68e831a73492e451cdbd39ff5c282ea0541ce13f0239f575fa6f7ea68cd966ddaa961623214551d73d961bb28b997b9fb2624142eaa4786083
+EBUILD libkomparediff2-20.08.2.ebuild 663 BLAKE2B 7e84264efe826fcc4d284db5e7a68edac5124e190b824bb4211209c0b6c3858fcdd36e2aee9f707322f745fe29407b4c1babebf63b864a5edeb8d27bb85fb564 SHA512 e14d67f31fc95e68e831a73492e451cdbd39ff5c282ea0541ce13f0239f575fa6f7ea68cd966ddaa961623214551d73d961bb28b997b9fb2624142eaa4786083
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-20.08.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libkomparediff2/libkomparediff2-20.08.1.ebuild
rename to kde-apps/libkomparediff2/libkomparediff2-20.08.2.ebuild
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 9041133e8141..77a0837f456d 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-20.04.3.tar.xz 143728 BLAKE2B 1de68325628120f62931bb7826a8db5f8c4d1f740c18b119ee343fcbaa93d547be6581e16820a73faef55cb896f1567ffac466d74584cec496cff5f6730b270b SHA512 6c38f8978149bd3b823d94822996dd2bbed2542a23960a3b8e399eb0fedeee5536e65ab27760941ad037101dbc27ffadf51a4103d0323c4e674f25d5fa12481e
-DIST libksane-20.08.1.tar.xz 145188 BLAKE2B f70dbb82e1816fc0589274098337f4d7cdc266fd29dff0c1a0532ff24d28f07fd0d568963ffe99802e74203f6287cfbca5dd5e30d32c62e0d149d5f601c93a23 SHA512 7ee4c83a28194f964b2b15f6d7a00d1b8f301e46a32522e9df99ded1ded8e47e11ca574f8199473060668dfd5e4208fdc80d028e0d413e25ffd98c439fb383f7
+DIST libksane-20.08.2.tar.xz 145380 BLAKE2B 67921896abb665decc47381871ba98f6be391c38fa1728f241bc020a6718f443bb59913baa9914cba1fd8db1ccd9176a81f5adad29ea3722ea26645af5c6e896 SHA512 53e107500c800313a4f8fbe8d6e8f60f478a71a46babfcf89bd7e3f6b56894bfa5b9011c244fef85dbc0bef8e7fd27890e8cc7e31c418827a58ad1e86c525f3d
 EBUILD libksane-20.04.3.ebuild 709 BLAKE2B d876ebb7ffbd4b2969c3e4f9c253ef655be9ba594ebdb8c00d2ce896ed2c6795d66a8eb9d8f68f35e6243be08b74c964c1f404190ec5d5977584a9174f4d9920 SHA512 e71e6853d535a1444ff830827f9ea073a782bc54b79c441c77918254b52294e29c99468875a7680062f714eaee97e726f3ebd14f9dfb7fbab2f95d063185b817
-EBUILD libksane-20.08.1.ebuild 712 BLAKE2B ae0df3a72998502ec1162911840836f934b896b9968c5376e5485013893737ed79da5465db344870c455ff2b0abf4813bfa7018a2aeac07dc733c121f8418bf2 SHA512 c78133a5d02323ca2c08540525fa302d3e09a25481cb8feafd2d0e25df564ae2db5294c358d70fa79dd848bb6eafa623f4dc6a9efac3c212eeb6ad6820dbdca7
+EBUILD libksane-20.08.2.ebuild 712 BLAKE2B ae0df3a72998502ec1162911840836f934b896b9968c5376e5485013893737ed79da5465db344870c455ff2b0abf4813bfa7018a2aeac07dc733c121f8418bf2 SHA512 c78133a5d02323ca2c08540525fa302d3e09a25481cb8feafd2d0e25df564ae2db5294c358d70fa79dd848bb6eafa623f4dc6a9efac3c212eeb6ad6820dbdca7
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-20.08.1.ebuild b/kde-apps/libksane/libksane-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libksane/libksane-20.08.1.ebuild
rename to kde-apps/libksane/libksane-20.08.2.ebuild
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index d630014b85e6..7b967b28fdc7 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-20.04.3.tar.xz 555012 BLAKE2B fb8f94ae447352fb196759df3dd6b1eea966ea3b28aac4eb5e41a094b6baadf45a5cba6fbb51ad52f810c4116ab72cb45fe24474c2039889d1b1a33922c8adfd SHA512 08c6e6bd9e6df12d81dcc51aa5221653c13fd21cd353414033fe3a70db13cf4c68d7f90478da5fc0c434afe02fb2bbd43daa412850007be1dabed3bc50d70744
-DIST libksieve-20.08.1.tar.xz 560112 BLAKE2B ef64556a70dde5b7b36ee9114190d3c74b016f563298475f77bfaaaace64ade52998bf9a99cab67f8a1871b622747526c02536a206d918030f837380f098b469 SHA512 da14213788997031355c6d1763b647a3f4085983092c6b297f2ce7ecb6fd853b58325eeae1671241a2df7e0a5b30fc0cc07708df3c8a5b4324dc41fdfe8fdf8d
+DIST libksieve-20.08.2.tar.xz 560180 BLAKE2B f4d75a61c303191a84509e824d57b8fe0c156e24ba728a935a102fc22ff528076b0975cd9b8c671c3e699800bc124290cdc4321dd49190f4d8d9a62eb7b5bcc8 SHA512 431d638d165dd157f60f32398b9e472b44ddfbf10f463780c9979ec55915e58754d8696c0f6181d5003b1f00cacd80abcfb5ea7b2e4b536a0377fe4e780fbe10
 EBUILD libksieve-20.04.3.ebuild 1570 BLAKE2B 16ccf11a7e32edb21d462b010949a0d9f8b00e0031b2207632d299a985afcf073ae799da3f0baf08bbcdfa367afbfab932c0133f6eb2d8f957c4efce88885d97 SHA512 77cfde4252c09de3fe22f87c87204b26189b1ab11b3524228740ab17cd7bc5fcb8d2f76d173af5374d1588c8c4207a848973611cc33b93904b631279f54ee30c
-EBUILD libksieve-20.08.1.ebuild 1463 BLAKE2B 6ff5a6b4c81383c1164e3e2e561a51e07e8925933e1936f9b8ce0e5c90d3a364b0bbac1670ab55d00faac7d4492cfb44a818d40b04f4e58f53d75074434251e7 SHA512 57b9e8da59fdf4ebdf6df81ab79e9d237f62c0bd6218997fb4b524ddac390b96b2b1410849d5b8a0268cee3f84d0110ae445c3b3457218484e4654a324179723
+EBUILD libksieve-20.08.2.ebuild 1463 BLAKE2B 6ff5a6b4c81383c1164e3e2e561a51e07e8925933e1936f9b8ce0e5c90d3a364b0bbac1670ab55d00faac7d4492cfb44a818d40b04f4e58f53d75074434251e7 SHA512 57b9e8da59fdf4ebdf6df81ab79e9d237f62c0bd6218997fb4b524ddac390b96b2b1410849d5b8a0268cee3f84d0110ae445c3b3457218484e4654a324179723
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-20.08.1.ebuild b/kde-apps/libksieve/libksieve-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libksieve/libksieve-20.08.1.ebuild
rename to kde-apps/libksieve/libksieve-20.08.2.ebuild
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 5eceba543799..4e2be1c069f2 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-20.04.3.tar.xz 299796 BLAKE2B 266452234229323232cd02393c5538aba6d7e207a4ad1659cf3c37471877601ef2c65ddafd9de2f60b44b1826612566d937ab24a20cbf5f00ecfad315ac71553 SHA512 9cf7df507840d05bdba49e01b41eb3d82db6c2630468796d043fdfe1215c5f3f4efdafd676d5c4cecbc7536139d78f7043144ebecb81077d6a7a8bcd9aae5ce5
-DIST ktnef-20.08.1.tar.xz 299872 BLAKE2B 5bf24903b3963a16eeabfc483024de85f4ff1ffcd886d940930229e79ab98b4c95a4228890beda785484ec38b98cda84d3b7f490077e37131ab91d5c3ed1a914 SHA512 043da84fc5910051859dd5cda5cd1bcfcc7f5ec6fc12d518b991fd3f797bc4fec51610f76d6ec8b19565f6fc0ea17b9e62dc1b5fb804fde35318bf33da148b6c
+DIST ktnef-20.08.2.tar.xz 299884 BLAKE2B 0ea0ad19b28fb6c4e79c7c796eeb005f9f3bc3b6f7c72e28823dca5fb1046b4192ffe80547870fb8dd7a4029e766604acc7e15122452684bf47d457824327ce3 SHA512 bbf031e3d230f98c59918198e049fa6d8814f6a998d6ea9ab1a614f9b05728d91b534845b1aa3a3c986e74d21ba5b73de1d4b2387af8269a679aa6dc8ac3b077
 EBUILD libktnef-20.04.3.ebuild 538 BLAKE2B 605dd5fb7181dc2a33e6860d0e509295785e6f684ad59ea7cbff614b8e0d88df6967ccbd8e835f86210f4b46821640e1bbc6de73e9bd1dc1eea29dc0c2f309b6 SHA512 8f42e6f213eed000326c8435f96e6943b0f5b93ccdc7ff97b13647643b2fb7f493631487f43a06eb01143672a438c5874471a2907a7cd7a1403f2c2d10ee45f9
-EBUILD libktnef-20.08.1.ebuild 541 BLAKE2B f1cd8f1bb479c97fb069e0ed086319a5875abf8fa598930eeab2ef3611fccb2136dd610a5fd6164ca21701ebdbd330f84c976e141e4601228f69bb1e2a87d108 SHA512 cc7285f1c18ad664cdb736175bb389f54446c41ad07800718916f8c3885881a432ad160aecfed9a02320122a0817de7f75cd5eb22bdfb9b4f061273fd3b9d9cb
+EBUILD libktnef-20.08.2.ebuild 541 BLAKE2B f1cd8f1bb479c97fb069e0ed086319a5875abf8fa598930eeab2ef3611fccb2136dd610a5fd6164ca21701ebdbd330f84c976e141e4601228f69bb1e2a87d108 SHA512 cc7285f1c18ad664cdb736175bb389f54446c41ad07800718916f8c3885881a432ad160aecfed9a02320122a0817de7f75cd5eb22bdfb9b4f061273fd3b9d9cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-20.08.1.ebuild b/kde-apps/libktnef/libktnef-20.08.2.ebuild
similarity index 100%
rename from kde-apps/libktnef/libktnef-20.08.1.ebuild
rename to kde-apps/libktnef/libktnef-20.08.2.ebuild
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 7f297494f542..ce8e3d7637ae 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-20.04.3.tar.xz 1718604 BLAKE2B 07b4a54a01c23f1f49e6c23441ccccf7b6e25e10d42389a790fe427ab3a5543d27073ff3f56315bca8dab3238b558df15a0b22be0f6a3938acd61a2e3d3d8a2b SHA512 becc88705957386a1012378e28c025eb4087f46e2f0953eaa3d8f8d6625cce3be1d23bf1a92ef38f02793a0f175115141839e360bce7f9adcf6ccd494b17b65c
-DIST lokalize-20.08.1.tar.xz 1984984 BLAKE2B c6f3ba95c924dce7de511d3f8cc9f96e25002a98f1c78ed13dedbf9bb33ae3e86e422f75b6ab1249624c6fc47208ac51a2d27c4beaf739a95b8a202f266bc057 SHA512 9ac2990ee4147114e42ae0098e65ea608a8052d836b5d8a4a4b721d1fa631f6e40a21431ef8c00c03adb7fcc668ea76704f3be207c74347480c33f59ad4f6a22
-EBUILD lokalize-20.04.3.ebuild 1824 BLAKE2B 71f30dce1cdd65248ec0c06a48a099c7b36500dd013135c016f7f7ffadd827049ab08abebfe2e65e541d5a66084ba7aca2048769316e200638a4935e5f626bae SHA512 102ff732b1be7a7b5cf58aa35891f7df3e077cde1dabd497a6fefafa6b8698fb782c5415359d0f6d5f8b6f3511ab331637f515ee0ad62a483bd1389faeeed9d8
-EBUILD lokalize-20.08.1.ebuild 1877 BLAKE2B 2cfea08b928f026c31a14011dc5c02b443fcdead29ab715f1900d7337e8bcfccf54ffa579e997df6f40b49bbf887b26077bad5c2b33e5c0cdc366e884a7fecf7 SHA512 13c633352471f2cc34767327b412e83011193cbbbaa7341c1da5078a541e224bc5c7bb4766eae622d23ee34695aa1da26ff27f6e3f6b907c38b0ff07bb364bb8
+DIST lokalize-20.08.2.tar.xz 1987064 BLAKE2B 47bb93b856ea6033f421e52a6ebe3bc037ff09f701c997a66eeb6d819b99ad4ef88170ab7871c91ab2e971c5fbd4c7b814932f4b90a9c283fc64917b4fa125ff SHA512 5554c162dc6af5ed9a4bcafd8c0f328d0cf00908a5a46ca98668ca61cf318b3493bdccf74837ed3f8c8b43070c0445353db863817a885eb2e9e6731435b3ba53
+EBUILD lokalize-20.04.3-r1.ebuild 2027 BLAKE2B a1ae59f279cceaa368f04f24348f0e3cb7b525f1c7d7c8b6061f0a1cc4126764dd63e029d71dc369b637651627e06966a88d6bfef08c4e65cd811ca1b0b98ba2 SHA512 deeeff2ee72f5cfef0fd830c37bd5fb1c156c754b018aa9eb07004df18fbef14389d5d8a703934aa5877a8895704a6d3f8c4e547b78e20868097e3b3e8993808
+EBUILD lokalize-20.08.2.ebuild 2030 BLAKE2B 9a58f13847056f24ec68e53a8d619cf76beeeadaf09a8d11fbf27c079d0c326e349865754868ca912625f7d2357fe54b3a54ca62f8103472d56dddd0a4dca15a SHA512 59ce16696f511ad69b9aa308c7eeb46745cfca67262bc6cad88a9e778690a429dc5be56cecbaea3461ae0bdd608f1a07908352930cc17684e80d9f6e0157f24f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-20.04.3-r1.ebuild b/kde-apps/lokalize/lokalize-20.04.3-r1.ebuild
new file mode 100644
index 000000000000..746d63ff5e61
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-20.04.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.70.0
+QTMIN=5.14.2
+inherit python-single-r1 ecm kde.org optfeature
+
+DESCRIPTION="Localization tool for KDE software and other free and open source software"
+HOMEPAGE="https://kde.org/applications/en/lokalize https://l10n.kde.org/tools/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT+=" test" # tests are broken, bug 739734
+
+DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.2.8:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_install() {
+	ecm_src_install
+	python_fix_shebang "${ED}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "msgmerge tool" "kde-apps/kross-interpreters:${SLOT}[python]"
+		optfeature "Spell and grammar checking" app-text/languagetool
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/lokalize/lokalize-20.04.3.ebuild b/kde-apps/lokalize/lokalize-20.04.3.ebuild
deleted file mode 100644
index 47b2267aae82..000000000000
--- a/kde-apps/lokalize/lokalize-20.04.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
-https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
-	')
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}[python]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-}
diff --git a/kde-apps/lokalize/lokalize-20.08.1.ebuild b/kde-apps/lokalize/lokalize-20.08.1.ebuild
deleted file mode 100644
index 0748859e7a10..000000000000
--- a/kde-apps/lokalize/lokalize-20.08.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
-https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT+=" test" # tests are broken, bug 739734
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
-	')
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}[python]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-}
diff --git a/kde-apps/lokalize/lokalize-20.08.2.ebuild b/kde-apps/lokalize/lokalize-20.08.2.ebuild
new file mode 100644
index 000000000000..219483699fe3
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-20.08.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit python-single-r1 ecm kde.org optfeature
+
+DESCRIPTION="Localization tool for KDE software and other free and open source software"
+HOMEPAGE="https://kde.org/applications/en/lokalize https://l10n.kde.org/tools/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT+=" test" # tests are broken, bug 739734
+
+DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.2.8:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_install() {
+	ecm_src_install
+	python_fix_shebang "${ED}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "msgmerge tool" "kde-apps/kross-interpreters:${SLOT}[python]"
+		optfeature "Spell and grammar checking" app-text/languagetool
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 69955052712c..5ab7fb8a589a 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-20.04.3.tar.xz 1219892 BLAKE2B cdd6f18f2e854ea13043f7937a376d1781c7fd2982c572901e77ec90b6e451a5abf31afa027a235cd8974e1f6218db3ebba477dc6c49a042ba8ee642f38f1520 SHA512 2a3efc2843ed8749ba145d7d633915489fb3924ec91c7b12a218732fb705a716bf48bc79cced2e4dbd85db5a6576687a2b171a4834daa74e8190074abda0d0e6
-DIST lskat-20.08.1.tar.xz 1224596 BLAKE2B 446331c3a7dae7e35ef8810470f890046690d5addfbd78e84c555b2735b27bac30aded54f65f70f5b7ff054953c6c945a8fdc187675354ebbe16ccfea698105f SHA512 237ebfb3886516f4d2ddcab7c66c0aed23aff7b4a103c10f5010d39accd23ba1dd41e84cd4fa6af31145f7e19cdd2e536783bbd25344374930efbacfbb696bcd
+DIST lskat-20.08.2.tar.xz 1224704 BLAKE2B f4f6b47c200ed1b0b7167e0341b1a1b535ce28daf1bcec8de2391ddc357fdbd394d58ead01e0fe08a08a26b714b41b72d36beabfb698542b91363d68ee64fc88 SHA512 6aeaf54a67d36a206fc26442dab689164a8e3c3f5b3ed70648367347f2e53fb9f3c7165da7638c5c6f6f4b158f6444e078283042f93f51ea7e5206de2ce18a31
 EBUILD lskat-20.04.3.ebuild 867 BLAKE2B 76bc06ecd1d107bc8d5f19d6763a46c0e219ccd38575aeef185fefa1c2c5fbcc317725abdfce8a84b89a32da6a52676716e3e8498b18907b33aa7c393b1572fa SHA512 ef0add85e55537baea7917df359e0669b59a91eb8715582ee590e44659a0c1fceb2a05b6631dc5f59a6277e4d4e2a7004f13412521f2cc79d9841b4e833e646a
-EBUILD lskat-20.08.1.ebuild 870 BLAKE2B 85e15a207dff94168a1962f4d14a6ee6b6940d1ce548566802a6989ac6f999814805939e3a44d627a43d550eff51cf8d83c53d6ea92b26227a84a21fe55637aa SHA512 e74cee3e2ebf8127b848c06042ad90fe56b558fc3b6b0b1500afebbacd70e39d33a0dda1ff730371eca0cc182ee82501ce58a544e4097696dcecc36f53ae0235
+EBUILD lskat-20.08.2.ebuild 870 BLAKE2B 85e15a207dff94168a1962f4d14a6ee6b6940d1ce548566802a6989ac6f999814805939e3a44d627a43d550eff51cf8d83c53d6ea92b26227a84a21fe55637aa SHA512 e74cee3e2ebf8127b848c06042ad90fe56b558fc3b6b0b1500afebbacd70e39d33a0dda1ff730371eca0cc182ee82501ce58a544e4097696dcecc36f53ae0235
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-20.08.1.ebuild b/kde-apps/lskat/lskat-20.08.2.ebuild
similarity index 100%
rename from kde-apps/lskat/lskat-20.08.1.ebuild
rename to kde-apps/lskat/lskat-20.08.2.ebuild
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 3ba791f42246..f6d7c8a55963 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-20.04.3.tar.xz 707292 BLAKE2B 318c1f0384f6308ced4bed1b1534d73160341a3e9a96f0c8cc4eb5aaf7c20a579e7ee3dabe61eae73946f06faccce90668244ff114ca2b4da6e62f793a6f56e2 SHA512 1de1f3d60ad3010029e95847a2eb9fb4b2df19c550e4378e12cf0a48fb44fc3ae11f834139b0f9fe55b887c1006d71d83168ad3e801694549df010d4048b11c0
-DIST mailcommon-20.08.1.tar.xz 708876 BLAKE2B d3b44107d21d91ed9a2ae74aadaf325aba24fef017f0d370e1694f1d52d3a61736a7aff8291956b6a5d65128a0a25a638c68a5458e64baf526e7f8a945e4d8e9 SHA512 1705b6a9f045d4d27c6d01ea36d259f8ec78d92f20cb8d0db103aab4c4cd82e6a422fabc13f68213a22da1bca08e3aea1b0190e6fff24ad1ffab98967d02eb48
+DIST mailcommon-20.08.2.tar.xz 708712 BLAKE2B 5b19d40ea326f2c7d19a05a3276c508bae14b6b0236d375ecf010ebda83df36b91ec95f25ae5c3bf90f2372e1f4a98c3c235fc327b52774025e65a02bb23bf06 SHA512 15571f5011c9134e0c6e88c21277a2e5e9d278dc34817ad7fde4f36dfaaaee8c527bcdc0abc324787fe85963d3960165d6cb4694ad414bfe0d8ef4db48c2a52b
 EBUILD mailcommon-20.04.3.ebuild 1709 BLAKE2B 9a617bc5184bf7ed4510d1cdc0f2a011e8a58cd6aa045607bfe848551b78aedb17653e31df8853f416e152d158c7f043ac4ad05ac284841e77cde9bd1e3def08 SHA512 0b28e16d7004d930c64589002f0393ed25ebfc05268181bb29c9faacfda61a47e1bf3c248a95abe4a06ca208733fc651012b50ba9e1df031c63aff1f7d0cc5bb
-EBUILD mailcommon-20.08.1.ebuild 1736 BLAKE2B 604417dc99a48e36b35d978ad9dad3dd9bc6c300f0952ef16dc70d1d290d5dfa04cecdf00f4de4abed2789c579806743de0e5f0ad2923c03f00848cd3f1a3616 SHA512 f7869c5a5870d2c466c326261010162ad800614fe6fec9538f04498fd58c4e60b493d86b6fab10b734de2901a0e8b46492d5fd8445b307819e2439e896355993
+EBUILD mailcommon-20.08.2.ebuild 1736 BLAKE2B 604417dc99a48e36b35d978ad9dad3dd9bc6c300f0952ef16dc70d1d290d5dfa04cecdf00f4de4abed2789c579806743de0e5f0ad2923c03f00848cd3f1a3616 SHA512 f7869c5a5870d2c466c326261010162ad800614fe6fec9538f04498fd58c4e60b493d86b6fab10b734de2901a0e8b46492d5fd8445b307819e2439e896355993
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-20.08.1.ebuild b/kde-apps/mailcommon/mailcommon-20.08.2.ebuild
similarity index 100%
rename from kde-apps/mailcommon/mailcommon-20.08.1.ebuild
rename to kde-apps/mailcommon/mailcommon-20.08.2.ebuild
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 9b395b5bd737..2f8955b81414 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-20.04.3.tar.xz 540412 BLAKE2B 5e7caa62c19a25e5153aa9438b40e75884b1ccacd4f5de2fcb560501e091ea834286538f0621cdd541ccf85ec5541b946ab83cec9d0ffae936ffe79627709864 SHA512 6b43d614cd1ab1cd9bcf24c40e0d077abf65ef9c74d2237c5c7d02115ca6f85b43c1c2933124b69bda7b98e400af5ee4bf54031d3a42702b49e2634a0c7c5ef5
-DIST mailimporter-20.08.1.tar.xz 541464 BLAKE2B e8c58a739e9c09d06a15d5fdfc4dcd306553c03d299ce4f7f2ea7a3cb2144c8f88171f573b15b219b0aa25e201f6e5cc23ce078deac4a18168b7ca498ae2adfd SHA512 a7be0349417c86fd166c871919198c300dfdc91e146072505724f1e0156058e2cbb2eb39a476e9b37780b779e1902a7c748567d5a622fea2109ac7ecfb5d9f73
+DIST mailimporter-20.08.2.tar.xz 541652 BLAKE2B 93e3a3c14a7d085718a5f29431660d362b7427201ba5b2bebcaf78547edf90ce0b0677311ef2bcf494976d4b2064e761a2ced22781c9d733ca77dbc8b07f3930 SHA512 03d7652d58416448eb1bd3c4086300bc27647f67ec345eacb9d0f940395a1e08572956c6afdbb40752d02a600e1035242df0bd18fb43ff556b7cbe80f8d90c36
 EBUILD mailimporter-20.04.3.ebuild 749 BLAKE2B 4e79705e501d4553042877fe5551f51a02d4871d9c3a60ac9c1acca64115d4a367febed0e29661a0e6f6952c36634507ab8e712f63c22ccf1d86e9e76efd6c34 SHA512 511c528c3ff9853d045e5ba286ade7b22955d2467b5a1425974341fee994d17c9cdf0eea9759f6b6c74a63909b1b131dc7e140b08c5e0e39c2e7044bf4f0fb22
-EBUILD mailimporter-20.08.1.ebuild 785 BLAKE2B e6ea05ecf99170bed4c82e0e0a0beaf85e5d5088876e3fe7d87fef7c8b99bafa86cd3db9fd69c61e87e620e5ead1cd5f29d6399a72d87bde4b765b10da943ab5 SHA512 d56b7870dfff7d9b0c24d3b04a79f0604fe63ebd7d20693c4a8d09836171c97a4f3093954b80f26e692c2582a9f13eb6802062b895e930c1dc31ac342b5952ed
+EBUILD mailimporter-20.08.2.ebuild 785 BLAKE2B e6ea05ecf99170bed4c82e0e0a0beaf85e5d5088876e3fe7d87fef7c8b99bafa86cd3db9fd69c61e87e620e5ead1cd5f29d6399a72d87bde4b765b10da943ab5 SHA512 d56b7870dfff7d9b0c24d3b04a79f0604fe63ebd7d20693c4a8d09836171c97a4f3093954b80f26e692c2582a9f13eb6802062b895e930c1dc31ac342b5952ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-20.08.1.ebuild b/kde-apps/mailimporter/mailimporter-20.08.2.ebuild
similarity index 100%
rename from kde-apps/mailimporter/mailimporter-20.08.1.ebuild
rename to kde-apps/mailimporter/mailimporter-20.08.2.ebuild
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 0dfd63880942..efe70d10ab02 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,6 +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
+DIST marble-20.08.2.tar.xz 52200032 BLAKE2B ce7e9ffbe52a25e21217170a28b61b03cfbd22bd4a83c10b9532f9406dde4c747e94b0144ef747f22831a8b9cf92ed5a82aa1c132a43e5faf0996f5435136bb9 SHA512 8464c1c9aeb001eacc1af1c93bac62f2c3172dc1113f798047b80baa7a53abfd83c45b1affd998b05a7a63fa8f067b1aae20ff3f53276ec6314493e118b1176f
 EBUILD marble-20.04.3.ebuild 2749 BLAKE2B c691aaf1364d590d281ba48cf45ac687b9f677e6a34bdade741b87a6c5b4f0a4f366fc654c64e1c3c31b1de2e150aebc5b04034096292bc205fa39c05e569f4b SHA512 c3998c234e287e5662ac94d6f1d9703370a73092e55390881321e072397f72ff63e991de632cb034b4888413455c3415d264f810c4523b8c47e75436567f456e
-EBUILD marble-20.08.1.ebuild 2624 BLAKE2B c80b29ea7ab282e06e08474b4c9b223a55ff5767357d3b751a42ea7564fb11668a2b248f9ffd979fa80392ef55a7d28cbbe9a377743e01c5df69f2b012fd83b9 SHA512 3dd6c70ab5ef8404289a94a169105f0ed006da27bcc4835c141fdf524645a231ce7f72851cee7a941c656836816b2460408d20271964a1d9730a1152df6cf223
+EBUILD marble-20.08.2.ebuild 2624 BLAKE2B c80b29ea7ab282e06e08474b4c9b223a55ff5767357d3b751a42ea7564fb11668a2b248f9ffd979fa80392ef55a7d28cbbe9a377743e01c5df69f2b012fd83b9 SHA512 3dd6c70ab5ef8404289a94a169105f0ed006da27bcc4835c141fdf524645a231ce7f72851cee7a941c656836816b2460408d20271964a1d9730a1152df6cf223
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-20.08.1.ebuild b/kde-apps/marble/marble-20.08.2.ebuild
similarity index 100%
rename from kde-apps/marble/marble-20.08.1.ebuild
rename to kde-apps/marble/marble-20.08.2.ebuild
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 876a959e4532..592e67b73037 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-20.04.3.tar.xz 33708 BLAKE2B 6557dd2ca82b4f3eb4a86984f2837a671fd75553a4f8691d501c85f5f8b610bc506acb5e79de34dfbff9e3dac75888d2116303e8181a53aef593e262d6ba4a28 SHA512 4557e15d7b7e1e75d9c2deabcf7e838d0a0836dd50cb7d4393e43aa1dcc744236beced6f28f08c74aedc50724a601180271de86cd2d4361c02d27613b19afe06
-DIST mbox-importer-20.08.1.tar.xz 34792 BLAKE2B fde85d43dce3844204af5925d474323772b21074a1f855ad90615c61236f4e5a89570b05846d25ec394c083e0133b3d7f913abf53c5a344ef4bd793812ec5c20 SHA512 50dc8859de38077bd76b094318a9c2b78e9351ff7eafa82d7f5ef882129f69bed459e1a750bd55bafdbdf06f2174dcc457f926c2d7cfa7f5dc61feac0d8e15e5
+DIST mbox-importer-20.08.2.tar.xz 34760 BLAKE2B 140f0bd44f5e74a36c3d379fefff9f290a6a2c5335df9834bb56cabb8014835b8391d7085ddcb519a7febdafe7058dcfb9e0c11a055cfde91d7f070522d1d8a6 SHA512 65cd23e1f7e50ee7c35eefb3d04d50710db95856296beab5423a4d7eb9e77d5e40bac33ecd4097a05f6733dfdefb1b56e57731f2ef669b0406a62e1721130e3f
 EBUILD mbox-importer-20.04.3.ebuild 915 BLAKE2B f64fd6de9c2b1185b16667e778592045bf0c1a177da119532d0a1df558b52f84883de6d4037181f8d5a59a9ca25f0bfb7a11a2f5e9b73971e150c4d467b5f251 SHA512 4682d4d012d88c47b96c79d5eca9340c34832d62da7febe3682bb58848e3570ea7c8ba047e7c4400c486aae7477e0eb7c3d4d3b9dded9a30b00551d10bbefcfb
-EBUILD mbox-importer-20.08.1.ebuild 918 BLAKE2B efe027209027e1ec7354f57849e393c3632b1abbbf8880eae40bf948ee27fe8a307e2f0b87df78fb31f4a47dbfaa46787d0626ade6a21778cefee1845f5667d8 SHA512 f87f111a2ac42d3fd67ef8e82bbb246a3594598a1a581d5bcf62e924f05fb1731996453d3fd075f2a54a7bc746ba387ae5481da180fb360d38a0e1a94d565df8
+EBUILD mbox-importer-20.08.2.ebuild 918 BLAKE2B efe027209027e1ec7354f57849e393c3632b1abbbf8880eae40bf948ee27fe8a307e2f0b87df78fb31f4a47dbfaa46787d0626ade6a21778cefee1845f5667d8 SHA512 f87f111a2ac42d3fd67ef8e82bbb246a3594598a1a581d5bcf62e924f05fb1731996453d3fd075f2a54a7bc746ba387ae5481da180fb360d38a0e1a94d565df8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-20.08.1.ebuild b/kde-apps/mbox-importer/mbox-importer-20.08.2.ebuild
similarity index 100%
rename from kde-apps/mbox-importer/mbox-importer-20.08.1.ebuild
rename to kde-apps/mbox-importer/mbox-importer-20.08.2.ebuild
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index e16b23e4c28d..f9f9a6d31f80 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-20.04.3.tar.xz 10511452 BLAKE2B 5e427f1bfe4239a6a49226c4938a5ebf827e399b55c395bc50014587e7caa717efa6c602a96c0383be02ac66fefec935089ed8be4723b44cb21e554852591445 SHA512 3338794643db618fd86295e894e89e21147a2b9e79e4617ad70de6cdc6415414377f0a71f6001a43bfd4480e580e635912ebdc2396a376407b5f4e4edd8d2f77
-DIST messagelib-20.08.1.tar.xz 10533396 BLAKE2B e8223916babb282ceff861c13060f2c0bb760637c5e5bfefbdc215e1bb2938db892bc1ecde1ffe5de6594530a6a82970f61048e39543c26fab5a19b864a9e8fb SHA512 2bbd0cbcd1f0784c9e937fa4b1094ca75679081aa85bbd3bc26bc76c6a9a937a54aecf0a04c20273bf35ba0a72da01724e626e9618a8b12acbad11ee634f3ce4
+DIST messagelib-20.08.2.tar.xz 10529740 BLAKE2B 88c0441e55ac1415ea0d784f9448d5797c2a8a83ca4ca4f2ade4488da5071ffb7e9ae954bc6f4066c6667a7ac4b6ceb1a7ea962b47275d56c5526bbe06c01ee9 SHA512 aeea847acfdfd908865410e473feaccdf3c3f384880c0f4eeb9fd9da8cf02e6ea6dfc1afa64a77530b9d7edd99d7d4b8b0544352a63bba896ba356acbddbb2b7
 EBUILD messagelib-20.04.3.ebuild 2134 BLAKE2B 21c2275490becbfe1f2f45d7be09b66023e54cd563c41fe11ee1ed2b93160b0dd921a0c7a1e8bbaef85fb5c6d2831beeb6e761dea83c85665da5554981902326 SHA512 3917c53235cc09fa7f49de9c0b2a056cb9fac933a53bfe5795465c4f39769480f707101c94caa00495fb17a8efca4feca3a675cd17d1d705c35f346e06e4dc63
-EBUILD messagelib-20.08.1.ebuild 2165 BLAKE2B c6598bd3209b1bd947fd4e3e5805072553b09519f61f9c89d270981807ca48739c8bf520bd153f1ff5d83285181a686fed83881fdac47649fd986e288cfb0f99 SHA512 5fbae24142e7665d810a3425156a51b07e61d0afc9c57783abb05d0ba66320cd5f352982b9f71dc22fa456bef756a3b5f01dde13a6a3ccc0e0ebfef5214b4162
+EBUILD messagelib-20.08.2.ebuild 2165 BLAKE2B c6598bd3209b1bd947fd4e3e5805072553b09519f61f9c89d270981807ca48739c8bf520bd153f1ff5d83285181a686fed83881fdac47649fd986e288cfb0f99 SHA512 5fbae24142e7665d810a3425156a51b07e61d0afc9c57783abb05d0ba66320cd5f352982b9f71dc22fa456bef756a3b5f01dde13a6a3ccc0e0ebfef5214b4162
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-20.08.1.ebuild b/kde-apps/messagelib/messagelib-20.08.2.ebuild
similarity index 100%
rename from kde-apps/messagelib/messagelib-20.08.1.ebuild
rename to kde-apps/messagelib/messagelib-20.08.2.ebuild
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index efeace18894d..4d884be93753 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-20.04.3.tar.xz 27602116 BLAKE2B c02fea28c659adff4027daddbe8e8381cc31c80826eabe5070c70e0583621a463774145c85054c7898b25ad194d8a4fd0cd34515c0d342672f82c7835586e5e4 SHA512 5353e7c2461b5d53ed119d1ecdd27e2561068347ac244e17a9eda961d269fd0b4ce41a3c61ecdc0f8c48a8f7cca40f4bd3e0dcaa49fb800b598e8809d3c25073
-DIST minuet-20.08.1.tar.xz 27731356 BLAKE2B 9401ec168573097c81e1ea0072ecce9b27f39456850a1d0723eb98c83e46f04d7763493fbdfb702052c1c9d326018d329de56b09f82c817e43cf1d7e171e1c27 SHA512 a64d912351697a7e7928ad1593432b2ccc9abe112be87cbee7649adced17e4e643ab05d3a3970d45b005683fd9bee7b81b9e1f21e27334545a7ddecbd452fdca
+DIST minuet-20.08.2.tar.xz 27730968 BLAKE2B 40dc0b54d06f788603a4eac5441ced8662b36e6748f0210312a58ffc5820f0820de43f8115392287bc02c064457e0de4d88cb879d2c1c5729f545d2c7a47e168 SHA512 e2e0a57c0f8fe96b77568953591c12851337a36e41d5983e66988db0d41017850b4f8bf10fb4849733008a689404bcc795221409c48ddadbb50ca64f705fd532
 EBUILD minuet-20.04.3.ebuild 673 BLAKE2B f7c725cfe076faf068b8bbab3766a3aa6880a99f7795feb66c88c1cfad19731b52169074904558bfd559c6d774f5d7bba87f6a925e355931c858b852b396cfd4 SHA512 974674116ff5e9c74d45ccb89c235dcf5353516bd6de5740f4fc9c6dcb0e454a0604d8095307e8cc65c186c234ab8ba229c01222ee6297ffe976b19a498c7cf3
-EBUILD minuet-20.08.1.ebuild 676 BLAKE2B d747d503216c1ca656ee24d981b054b209ff6d3f98a5f325d4698affa36e566c9629fd803a077c0cf392f95a60d1a9cff948c5d09fef07de648eb7689fc2044f SHA512 c4ec0648d40715021dc58d81a02895c217bf7bdc1618691b1360f39d1b7f8181d8da73381fffbadeed97db718adfe1aa532441e04ba1bbc585a12b80a436c1a8
+EBUILD minuet-20.08.2.ebuild 676 BLAKE2B d747d503216c1ca656ee24d981b054b209ff6d3f98a5f325d4698affa36e566c9629fd803a077c0cf392f95a60d1a9cff948c5d09fef07de648eb7689fc2044f SHA512 c4ec0648d40715021dc58d81a02895c217bf7bdc1618691b1360f39d1b7f8181d8da73381fffbadeed97db718adfe1aa532441e04ba1bbc585a12b80a436c1a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-20.08.1.ebuild b/kde-apps/minuet/minuet-20.08.2.ebuild
similarity index 100%
rename from kde-apps/minuet/minuet-20.08.1.ebuild
rename to kde-apps/minuet/minuet-20.08.2.ebuild
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 5a570cfb0efe..7bd0ba00c6d7 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,8 +1,9 @@
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
 AUX okular-20.03.70-tests.patch 6613 BLAKE2B 46bbb80b1b97bc92ed0c17ae352a977710d7234eb85c647356d9593a138f6c872960511c7f8d8eb24e060b2ffecb0cc5b1bf79ed198ba10e43fb341c1cdc6e5a SHA512 c1a283888b612950eda1080d941f157651b8e52c4032b5fc46786ab45045c5e8d272769516a90cf652a384519b2fe046ec951dc45c4edfb5258c50112b8d2ed2
 AUX okular-20.07.90-tests.patch 6660 BLAKE2B 4adda1438641d31fee4c770bee0970b33b940c3a943f2c66d4c9af819e39f01515837d3496e2595737312de0f0e13ee00cdc0651c1b9d91a7f10bd907bf0a63b SHA512 898a552b401db6abd50cff591fbd3df6f533f70e4e99842570e5c847e55efbe29c464d640f598cb4fcbead445175ec96ffd70809088f58cef5fefb6877535f43
+AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 DIST okular-20.04.3.tar.xz 7236056 BLAKE2B a387a997b1747c08a23d483bc9e72d960d1be877764dc602ed56f322dd80d13301c9fc7a21561b1f267ad197278f8e6510cdb890427fd420c2ae84eded39fbf9 SHA512 1d6a02590a4d1b7ab6dbf63b370f3cceb0e35c763310b54d5aeac3cc5122c2041f2cf0206a7e32ad18c494c7fd0caf51d50e457ae8ca54daa8494e4302110c01
-DIST okular-20.08.1.tar.xz 7515808 BLAKE2B 1b86e4e23a6ce1daf161ae8ae8aae6a343f35b2bf7f290a62aad4cc7b8ed9cd96948a7d438f4049edca3972ec5131856767e927f5ff994319a3c0dc056066f93 SHA512 076e4e676f61625169ec8f12289978675001ab929cabaf9cb746e4487062c5223d562954c151b785b129185d74b680974b3093eb67ef547edf0e56f28791cb00
+DIST okular-20.08.2.tar.xz 7518492 BLAKE2B 5ef845c14a33b8ff281b84190e9589551e326803d7de1186d8fc8998b16502692b451504c7f73189e0d523257533e1d8fb1b0e18e5fbb1456d64251b3c021be9 SHA512 7fd59d6fe45f0a92b9ecfa83ab3e2a244bb033de4e52620be194e715f52af48e5336a6545025f985fae9223c3275f6c616fef77b07ab49b7301c09a34136f390
 EBUILD okular-20.04.3.ebuild 3153 BLAKE2B 0ce38279b296effe97f899a8d6241b8d8690fe4e9631bffcea99f6e74bf4202d9891d6745915187bab04d00bc41aea1676f1f3b7856dfa624ccbe86d2a73ce3e SHA512 ee290026ef28395aa09e22f157f737ef006737d93316a503d5ac2a00791d32e9d6321584a9d158b4ff355fc7ceff3cc363351f8bd67e572cab518be5f9cf1644
-EBUILD okular-20.08.1.ebuild 3128 BLAKE2B 33c80adda0fc3f0e8fd803a5d455184a8429d73a282f1f863be2d0a4768a337e77553ca2cc68610ebaf680369a1c36a44cf454e8a6ae447ecaaf95a96bff26b2 SHA512 c2c9448d79914d4fe067843798bde54609de230bc9184a6344979c22ca2fe8ac8e4ca467b356be1c8188d8cc59c7fc236e139b1b4621885701726f94d85c74b7
-MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
+EBUILD okular-20.08.2.ebuild 3094 BLAKE2B 2ee78a66a0ecb429209c7a887607fd85c3f7bc7858c7dc9cc460bc7d92da87ef6833b8ce0c7141cc925e6bb062555f7f7076cf7c5e4524565dc5d9958332583c SHA512 10ead1eb2c4622bd631870f4e6b22d923a3e33a8aedde3910fbe68d280e4401591b9b1207bd1c9be9681b58d4266bc4fa909dbbdadc55ed11018d3f6b5a16bea
+MISC metadata.xml 988 BLAKE2B f135f2273c80e39631cdb0aad2d04f016ec77aa7eb5c22c06af877b6c5e8834fdc74f08cd752bd713e0c2f33ade1a922b5dcd42153b708bf29a119e8a15c7e98 SHA512 9d16d40f3ce784335716c645e2f5e979724cd7f1a84a57470cbed3277fde6481d3a84e924bbabbd7b4e74d525a1399d794c640cf46425e20647defa5c8bd3e40
diff --git a/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch
new file mode 100644
index 000000000000..175e5c178ce3
--- /dev/null
+++ b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch
@@ -0,0 +1,27 @@
+From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 17 Sep 2020 20:36:37 +0200
+Subject: [PATCH] Revert "Don't hide the mobile app"
+
+We have no use for this on the desktop, but need it for peruse.
+
+This reverts commit 0991819a497594233b7564755bbc189009188bd0.
+---
+ mobile/app/package/metadata.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop
+index f9432748b..0fcf20843 100644
+--- a/mobile/app/package/metadata.desktop
++++ b/mobile/app/package/metadata.desktop
+@@ -110,6 +110,7 @@ GenericName[zh_TW]=文件檢視器
+ Type=Application
+ Exec=okularkirigami
+ Icon=okular
++NoDisplay=true
+ X-KDE-ParentApp=
+ X-KDE-PluginInfo-Author=Marco Martin
+ X-KDE-PluginInfo-Email=mart@kde.org
+-- 
+2.28.0
+
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index b36cde3d0a41..eacad295ded8 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="mobi">Enable mobipocket support</flag>
 		<flag name="mobile">Enable Plasma mobile support</flag>
 		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
+		<flag name="qml">Install Okular Qml components</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
diff --git a/kde-apps/okular/okular-20.08.1.ebuild b/kde-apps/okular/okular-20.08.1.ebuild
deleted file mode 100644
index 9f355af401f1..000000000000
--- a/kde-apps/okular/okular-20.08.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.okular"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	media-libs/freetype
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-	markdown? ( app-text/discount )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	mobile? (
-		>=dev-qt/qtquickcontrols-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138
-
-src_prepare() {
-	ecm_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package crypt Qca-qt5)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package image-backend KF5KExiv2)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/okular/okular-20.08.2.ebuild b/kde-apps/okular/okular-20.08.2.ebuild
new file mode 100644
index 000000000000..4eb4a5495256
--- /dev/null
+++ b/kde-apps/okular/okular-20.08.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.okular"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker +postscript qml share speech +tiff"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${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/kio-${KFMIN}:5
+	>=kde-frameworks/kjs-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	media-libs/freetype
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	chm? (
+		dev-libs/chmlib
+		>=kde-frameworks/khtml-${KFMIN}:5
+	)
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+	djvu? ( app-text/djvu )
+	epub? ( app-text/ebook-tools )
+	image-backend? (
+		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+		>=kde-apps/libkexiv2-${PVCUT}:5
+	)
+	markdown? ( app-text/discount )
+	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
+	pdf? ( app-text/poppler[qt5] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
+	qml? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.07.90-tests.patch" # bug 734138
+	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DOKULAR_UI=$(usex qml "both" "desktop")
+		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package djvu DjVuLibre)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package image-backend KF5KExiv2)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package mobi QMobipocket)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package plucker JPEG)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tiff TIFF)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728
+	local myctestargs=(
+		-E "(mainshelltest|chmgeneratortest|parttest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 1fc946b3dd50..7e6ea4630f6b 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-20.04.3.tar.xz 2071816 BLAKE2B 8df6a21203909845e1d15186e73f213e537b9983bc3f5c4a6aa1a8c552a2f67b624921f2f1db562f88ac50c9c8f549291cf67a06847eb56d88809ed37fe53d0d SHA512 e1048ed8ad2b00170eb1079146b18549ac579804d9f7abcaf7f3479ce1bfa9fb4d406b93e3ea889084cd9aa936dc6b7db884992af379a382eb2a147f7f6010bd
-DIST palapeli-20.08.1.tar.xz 2078748 BLAKE2B f4321bf67a6c16eed8f16a8395d49128ccd2e5fa741f5e34d535537b9038ac911c2768027f5561c7b6c7c2132c7f792486c270f8bcdd04eebec376ecbf93cca4 SHA512 bec442e3a2b3390752bd89293f668e57844f641acc11d3a73f8aab62e1a6dc6c71837b62fba3f2e86cb0366b90c8bedad27e8f5502bcdd5b72ca1ae6ce6dd27a
+DIST palapeli-20.08.2.tar.xz 2078844 BLAKE2B c80f7eb5e3a57a2dd894067741cf2a4916cea56d60d3962e782de1e0c356d3002004be7d5757b128e550a74f091f14404339f7a40e8c5647b7a90d3e1171da16 SHA512 6bce78a9f8175ccd2553ddd88e79b4898b6b7374f0b956700135d22f5c02f764791cf41f4abda9892a4f755d5764f4969bbfaf5d96d98960915a081af95ae2e5
 EBUILD palapeli-20.04.3.ebuild 1079 BLAKE2B ef711a398e92d5ffd0a44d48c22807d7bbb2565a08290bcb886f6c87c9213d7aeb06d1ec153fbc50c7112612127b30b7268059c1fb69d3ddced5985817fb69c8 SHA512 78b4421f9a8ca45b40ece16f3d157e8bbd6d748538f89a00ab0e6ebc068759718047791f385fa9edd9b80e02841ed21e060d15f3d6252ec5715c9800562b58ad
-EBUILD palapeli-20.08.1.ebuild 1082 BLAKE2B a45943d2e1301dae78d8442529f207a3e86c086bc256af99c8c4bfea4aa67b1de90e9cc59aae5cf8f9458396c660260bcd652c5c77baee351e0e4f3a4c5c299d SHA512 06ca54b645f6381297a75c0f70353f1bb8c4c51169260a722efdb34d4c38e31b44a4182c06f73a355e6972fcc6ae7f36e2f550e9eef4f99108b5787029187a26
+EBUILD palapeli-20.08.2.ebuild 1082 BLAKE2B a45943d2e1301dae78d8442529f207a3e86c086bc256af99c8c4bfea4aa67b1de90e9cc59aae5cf8f9458396c660260bcd652c5c77baee351e0e4f3a4c5c299d SHA512 06ca54b645f6381297a75c0f70353f1bb8c4c51169260a722efdb34d4c38e31b44a4182c06f73a355e6972fcc6ae7f36e2f550e9eef4f99108b5787029187a26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-20.08.1.ebuild b/kde-apps/palapeli/palapeli-20.08.2.ebuild
similarity index 100%
rename from kde-apps/palapeli/palapeli-20.08.1.ebuild
rename to kde-apps/palapeli/palapeli-20.08.2.ebuild
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 0883b3b8d24b..9be7b83a68fc 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-20.04.3.tar.xz 8838592 BLAKE2B 2a36a1cbae7775d609fceaf88310f6eb9ee9e6ad338b5bcb4b2717ac09cde7c4d8edbcf2face59af067b079e401428e3e7904cebf81ab0394471867b80c91966 SHA512 09ead6f6f32ec63413aa7e83fbd06751a1649817b1d86bc3404717355214da8b342955b86828b8b2aee13f8ad3e07e81d320d21c2954c935a16d389082a3140b
-DIST parley-20.08.1.tar.xz 8842436 BLAKE2B ac80f64a8aca65d3c7dc1bd7d2e7a1bc775864382bb6f3c46215506fba2e6568fda302de783d1f9b3522cd03335f637f7748a54c44b376e5513efd019df65936 SHA512 a4136a2ebe48ab6378570a0d4d0c63d370c3649177800585fd5e6c55ca3d84b3ecf943379f8ab7cdb79c8d102d7d2ef1297ca731e00a8e35d1f04aa090d253d8
+DIST parley-20.08.2.tar.xz 8842140 BLAKE2B 9e8e726b56db3f839d9d6b4f8f5d52fad74bafffbd6b2dc1f4748fff8ccd5a937f1d31134853354a85a620baebe89e147e947d5e5a91f4a3e88bf6fc6ed9fa0e SHA512 7c1d291cdcbde4f93a2608aadcf6a2e701260480c9ba1296e8a9a21a63efc2b792bd11b97de2572c5d1d28ae27a609e3ea784f343a47b2af05a581f0e2571c8d
 EBUILD parley-20.04.3.ebuild 1428 BLAKE2B 05cffd9f401735d0e75b5c73abad4e4ed5c067f5d960d5609d600535a0aa68e181bc8a78874b295fcbc7019eb41377fb20920dcf28084e75d445a029e31a4be3 SHA512 16e5927ce4a68cd72904c122d3a26bd20b3b4590b98f4c1682a3ba1abe92563e4bb7291a30065b73b54282b45c69684a3207ed867bbcf3bdc43402ac3fac65e1
-EBUILD parley-20.08.1.ebuild 1431 BLAKE2B 03349300e62d54703f0faa7cf63b919f51aa2be11f44561b211ef858c9eea4ce9479812ac897f1e1155f1f02d209ed1c8b03e70fe40a090150e2325de4a7641e SHA512 80a8e5313757556b9753db9c28d3ff2c330de566773aa5f9316da56655a145b23248135656500fc7451b177013dafd35a0d0296a0c2f3e923317277388fa5063
+EBUILD parley-20.08.2.ebuild 1431 BLAKE2B 03349300e62d54703f0faa7cf63b919f51aa2be11f44561b211ef858c9eea4ce9479812ac897f1e1155f1f02d209ed1c8b03e70fe40a090150e2325de4a7641e SHA512 80a8e5313757556b9753db9c28d3ff2c330de566773aa5f9316da56655a145b23248135656500fc7451b177013dafd35a0d0296a0c2f3e923317277388fa5063
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-20.08.1.ebuild b/kde-apps/parley/parley-20.08.2.ebuild
similarity index 100%
rename from kde-apps/parley/parley-20.08.1.ebuild
rename to kde-apps/parley/parley-20.08.2.ebuild
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index b84ff87f4f5e..0ace4be7139a 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-20.04.3.tar.xz 1360560 BLAKE2B 4c0d3a9f386ae39314b64f161457fceeb187f9fb7ac1024ccd3a3e9e6e3d23a7a860ff257b023dd3d409cf3a0fe1a80319cdfb7ae07c9e2b772f010233630fe0 SHA512 d64b73880fcee4ec7f98d70787e7418da9df30eb26f3f136da8773d75589a44e0508c4e5a26d33d7e59e8b56bf2502a44553d0872ce5797b01dcbb03049e7def
-DIST picmi-20.08.1.tar.xz 1367340 BLAKE2B 4e6ad157c1aa207ecd8e346d5dcd3b3ffa729db50b1e8f97443e595597de3c5f0e147a8857f3f07cf13b1afcb4f1308adea5fec8c311a99c114f38dd82423e28 SHA512 18aacb1a6089f2372077354cbe691a7d94efdedca2ef402c02106411df270ecdec8ed74015eaac8b4bc247a86992d19398dca194429385720e27a76bc2ac6c08
+DIST picmi-20.08.2.tar.xz 1367264 BLAKE2B 14296bcbe08e7f61c2a00ce3ef40fce5ef06d22d549fc35dbda1f423d13a2732144d227dc455629d98edd62ea54ef459fc6eee72bf85b35d5da3f00009410fa7 SHA512 a0a4149721139ea0725680197a4709e5997b04afa0e6d4c6858f949c75485dbec17d208aaccf9ecfc94e99532fe37e42abfea5312ab8ce53c32ee309e9af0858
 EBUILD picmi-20.04.3.ebuild 1084 BLAKE2B 5b918dabba28fed6e35c854e37e35f47907636ed0b055f8fbd3cc46a8fc6c93c59ad17cd66aaf1438d547220871224b7f3122cd0d0a7d212bed0462705c820b6 SHA512 bfbfd0d076f0cac12f9ece7a4140e4167cb1694a0c68b0f2191c7c8588cf4401bd6d33c1a6a6cbb29025526f8ba740019df5a1ec7bb82db12527b0eca89903f4
-EBUILD picmi-20.08.1.ebuild 1087 BLAKE2B 5fb680f6704dff1f868f20622cd93ef7fa34ad4eabe29fe0bc05be1cc18febe838bb939fe567bb1a4590ddb8636198a43cd11f13f58c7f8ad1a2b3c1b6062832 SHA512 8e0f87bc0117cd585a6ca7b3c9df8ab7178fffd267c4d15b82f8e2b8ceb1a10b2561b760d3c567b4a855eb0a1acf9976a152a71c515c2a1baf3aa591b9e226c2
+EBUILD picmi-20.08.2.ebuild 1087 BLAKE2B 5fb680f6704dff1f868f20622cd93ef7fa34ad4eabe29fe0bc05be1cc18febe838bb939fe567bb1a4590ddb8636198a43cd11f13f58c7f8ad1a2b3c1b6062832 SHA512 8e0f87bc0117cd585a6ca7b3c9df8ab7178fffd267c4d15b82f8e2b8ceb1a10b2561b760d3c567b4a855eb0a1acf9976a152a71c515c2a1baf3aa591b9e226c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-20.08.1.ebuild b/kde-apps/picmi/picmi-20.08.2.ebuild
similarity index 100%
rename from kde-apps/picmi/picmi-20.08.1.ebuild
rename to kde-apps/picmi/picmi-20.08.2.ebuild
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 3a43aa0cd1f8..a0b73d8450f1 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-20.04.3.tar.xz 277704 BLAKE2B 2de56a09a23440b40fcdd98a2c41f440e5e082c9d2f6adc13e04d54cb7db65320d922cd1daeabcfa0902ac1a27560f831f310e0e40cb6006bef0a902212ef9df SHA512 5d66108ef9a445de932eaf6d99a7534ee7ca6a83db015d715ce0b815c1c51b796ff5b987aab416035a18bbfde823c92119eef7708a91ff2c7dc586ddf7ecb0bc
-DIST pim-data-exporter-20.08.1.tar.xz 399256 BLAKE2B 625b4c36ffe49aab11451e648052d9892325fda4f158cd7a75e9bd7bd5598d0186b01f90b37144f14fbffc314b0fa169b8e55eed2be2391cdc6968f8d4f67976 SHA512 279e006bb4347b1603aecf1f3bd6f424668af52e6b7fbc3c662b21b957c68dec169c3a5d8dbec799b1254cf02d5c90741e3b745dbad4f5afd16d5f111e0089b8
+DIST pim-data-exporter-20.08.2.tar.xz 399684 BLAKE2B a1d32e7ab22826c3a41d7827cbfad24b79b322be005d44657e6ceaecabbe2433c71a3ee8137c9bdb5ced48db2b248e757459e644dfcf81940b1739f559fb71af SHA512 157331adb1bb9036470eec01b5fa72f365505bd0a859d4e0c082ab91a71f64b07e22d4bea127ce9e20d392d5c3ab0ee794ba1a8bb4736299e688df1882e82aec
 EBUILD pim-data-exporter-20.04.3.ebuild 1580 BLAKE2B e53109b33384aac992f2556da34aee1c4ee6733c17ff37e1695b161d62581498ae695429edaaa465a8699d5fbdd9590006d0a198806cef2c387ecb26061c8b68 SHA512 2aa3b94325c246e50d045cba7958431b0ded4ea13277d263add85c177d1c5ac75d1dcb370b7d250de8fe1eca098fa5fe16dae08ee40628d7a47d51b25c9e707f
-EBUILD pim-data-exporter-20.08.1.ebuild 1583 BLAKE2B 0da0c98bbb4437ce0290b08f5a6be92bbbb026c2556fd1f30f198a8f221e5012c22646f599b75f3568aba522204f3c3b1becd92b35129804ce979abe38c0d662 SHA512 9f572405527d10077c5d483dec8232e73376374605fa28d61dfb49b27cb4431989c3eeb32a633a75c843fefaa4d5a450df90defb77010d02474628948433f5cf
+EBUILD pim-data-exporter-20.08.2.ebuild 1583 BLAKE2B 0da0c98bbb4437ce0290b08f5a6be92bbbb026c2556fd1f30f198a8f221e5012c22646f599b75f3568aba522204f3c3b1becd92b35129804ce979abe38c0d662 SHA512 9f572405527d10077c5d483dec8232e73376374605fa28d61dfb49b27cb4431989c3eeb32a633a75c843fefaa4d5a450df90defb77010d02474628948433f5cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.2.ebuild
similarity index 100%
rename from kde-apps/pim-data-exporter/pim-data-exporter-20.08.1.ebuild
rename to kde-apps/pim-data-exporter/pim-data-exporter-20.08.2.ebuild
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index e52fbefc9987..0196881a92f9 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-20.04.3.tar.xz 452796 BLAKE2B ee888665646a1021e956ea5749bfaf78560269f0444c182cc4925c4ec1b16f0a53f8b54ceb5cb2d426553d5c94ac4ee63ce657d18caa412a68b9a1112476345c SHA512 dfdb1dd7edee2fe5b1a59cc02c7d8942bd5fc5fae2f40784ee7b6105bf551050533de93a6df9119bff5941dc236959d6b3eb5aa450deabecb3f6620180a933cd
-DIST pim-sieve-editor-20.08.1.tar.xz 454352 BLAKE2B bbb3ad79a9f964c7d6aa520caa6e53222ef5224bf2e4ca56da1e8522441106443d3ce81869d362e6d156f6062d689316187109fa0d45a84a50dad628a08bea78 SHA512 63bcc14e103150e76c766c11b99a7b5240907b00b5119c4d637dbca877a05c2f20ed1207c45efdc58be3f5127767bc4e54ec2c51c366230bfbab936fe82ef545
+DIST pim-sieve-editor-20.08.2.tar.xz 454492 BLAKE2B 702aac34309b38b9304f72adb20ac6b375eb4a51f9cfecff05b40d1a11e5d983796c223525dff0f53158db26c866a59684e1546342546864a19f09e0c19684b7 SHA512 855556a4b539d67c5d8857e3f6260cf83026368ccac5f2ae66b91366043b0d590581cde0a8c6687799c1ed7c9a22cbf65a0931003daa79575530491c1c16588f
 EBUILD pim-sieve-editor-20.04.3.ebuild 1453 BLAKE2B dedf9549937aaae9d1fc04fe7d36b3889ec8cc4d0a43a89f26288c3465db19b32eda28edb94f81f83ed38fdd1b2ef9ff4ab90bd1d07c26334850f96926542172 SHA512 8605c51b2b3c5a3a551c8f947fba7cf17359e20d824d620009359c7348ebecd34997732c97b44b41ddbe2f83e86b74f9a09a3740fbebc558103a804c2bf84df8
-EBUILD pim-sieve-editor-20.08.1.ebuild 1456 BLAKE2B 9a8c337d17aa27399edcc7086e101d50282ea71fbe41accf3c427af839df7a0cfe0ded706a97d6e5f0a3a23c75f50dd4c2c717ef5b0755bac4c8a105b6dea15b SHA512 b5104988fb2f68695b3eb87731528be03bd470ef1300b6229168ae15897a257abbfc3a4be8abae40bd1ee7dd782e52fd2a1ad4d5bf7557cee8c0f49a0daf3ed8
+EBUILD pim-sieve-editor-20.08.2.ebuild 1456 BLAKE2B 9a8c337d17aa27399edcc7086e101d50282ea71fbe41accf3c427af839df7a0cfe0ded706a97d6e5f0a3a23c75f50dd4c2c717ef5b0755bac4c8a105b6dea15b SHA512 b5104988fb2f68695b3eb87731528be03bd470ef1300b6229168ae15897a257abbfc3a4be8abae40bd1ee7dd782e52fd2a1ad4d5bf7557cee8c0f49a0daf3ed8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.2.ebuild
similarity index 100%
rename from kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.1.ebuild
rename to kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.2.ebuild
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 247058c7a3b3..75e2ffff057f 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-20.04.3.tar.xz 294328 BLAKE2B 0f6ebc6d7949b04f0d74655ef4c6ad1f8c9c24c0964727e9b68b67b4d1f5707af29d452391e61e0f33985065a2d389d2fce987cd1fcb6490f0121b96bd46234d SHA512 63396ba86cbcd6a8e53981cac79f30ead57dbe06eb1772274a185726117b2bbcb52f8c8f0dc9a8d9534f147615d985ed0d6812e466989b6968944b775ca2dd31
-DIST pimcommon-20.08.1.tar.xz 355944 BLAKE2B 5a3ffe3726abd781208038f8e14a1641e4bb246263ae3ad469c474e5067881dc7da40bb7b50602793bd0eb16d6d9204e4f6f9b11f3d84adcbf571dbec0456ff4 SHA512 418c6d10bf789a4554c818d4a476b01e1a7bd21402ee0f4c9fbadced29b853ac9ef5d619ba7a448e4f7adde725e4b72d8c5ed5ed740dd654467e2d06f6e0e28d
+DIST pimcommon-20.08.2.tar.xz 356576 BLAKE2B 95015d6d32291cf9e4ac6d8defdeb9c9c13f9b89f2e84925792ad1a2744c8cd95274f9931503683c573e88eb39cf0db43fa3b15efaa3f1b89436659473945a3c SHA512 d9f003b69edb9bfd340c42b9908a3f88fb021d5cc39b6b3fc16cdc9fdcb142cb52717094f776496a3e6015b5307ed05d1b7d3f92f301409ce051895dca421f6e
 EBUILD pimcommon-20.04.3.ebuild 1580 BLAKE2B 837bd04c9f17b4eb9de25aa0305c6f6445c496289dc0c0c9ec7f8e095f17a3bd08822ddb9a1dbb9305f54cb1437cefb92c1a642f3c321fc2f91065d176a6772b SHA512 ff934e3ba125aa076d2e242fac2ff0a2ba2f58be85f6a4965ce854d1eeffb075e502d2a8bb30a9e0f267d4d2ef6102c894a9ab805a71b7b35cd1663e699756cd
-EBUILD pimcommon-20.08.1.ebuild 1720 BLAKE2B 6170c5df73f1dcf8cfe2f78c75d2ff19da64a6a6a4722f8cf326966b206263fea43df1ee13f707d741ff5d0cbcc3d09e3ac025eb75c693674ef1f9d132294253 SHA512 9c4cf14d0e580736a30946a7e399f8f4277d740460bc576279c60eabdea7a7f646a828f9e2a93f4cbab8750a9a9822c6efcaa5cf9068f3f7a58f371d30ce0df0
+EBUILD pimcommon-20.08.2.ebuild 1720 BLAKE2B 6170c5df73f1dcf8cfe2f78c75d2ff19da64a6a6a4722f8cf326966b206263fea43df1ee13f707d741ff5d0cbcc3d09e3ac025eb75c693674ef1f9d132294253 SHA512 9c4cf14d0e580736a30946a7e399f8f4277d740460bc576279c60eabdea7a7f646a828f9e2a93f4cbab8750a9a9822c6efcaa5cf9068f3f7a58f371d30ce0df0
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-20.08.1.ebuild b/kde-apps/pimcommon/pimcommon-20.08.2.ebuild
similarity index 100%
rename from kde-apps/pimcommon/pimcommon-20.08.1.ebuild
rename to kde-apps/pimcommon/pimcommon-20.08.2.ebuild
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 2499922758c4..d44d7c14dd33 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-20.04.3.ebuild 981 BLAKE2B 21f9e3bf5691e2164e678cbab71bc07bb1c82a45610c323bfca308f84f5bf5d7ca118572c89065e8438b3fe645edc72c18ef0feb18faa7934309eda12dc49c04 SHA512 83314fed4541d7dcdb206f6e346e3153d600e3e8d9feff2cf4de0b17812d2b2546729c084f01bcd8afc3b0d1bc3cc4cccf26f93c58033600c7385e3cfcc6e015
-EBUILD plasma-telepathy-meta-20.08.1.ebuild 984 BLAKE2B faa527426be62f73bb116a470ef44ed8918ad126a92f3f1c2828d24e7c2ace9b03877dc38f7df672c424f73efcc9e73bc468fa642d5dd8822d6c59a3c0e1a85c SHA512 6aa16f8275e6d34526efe6d71127931eb538881965e3945edf9a51af241e42cf6c7f453694fa4bec0bf9c1395335b108aabfd9fb1d374721cdecd99735d295eb
+EBUILD plasma-telepathy-meta-20.08.2.ebuild 984 BLAKE2B faa527426be62f73bb116a470ef44ed8918ad126a92f3f1c2828d24e7c2ace9b03877dc38f7df672c424f73efcc9e73bc468fa642d5dd8822d6c59a3c0e1a85c SHA512 6aa16f8275e6d34526efe6d71127931eb538881965e3945edf9a51af241e42cf6c7f453694fa4bec0bf9c1395335b108aabfd9fb1d374721cdecd99735d295eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.2.ebuild
similarity index 100%
rename from kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.1.ebuild
rename to kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.2.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index c49f3767237e..265ff6f1467e 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-20.04.3.tar.xz 43300 BLAKE2B 51e40ad1067b6177cb7348d608a791ced4f1e72adb5842cb09dad38503a6cb698f0c3cc127a183e99deec9896653e0d9f521f5939b71395f22779ded10145401 SHA512 cd258bb659a8ac110d88971c103ad9cd8bec01494c48d06b5717ee05f50482ae86da284b0c5c88d6a4bbbbfbc8a0b1699fe31c5e5ae5cdb0acb3e738e1967d3e
-DIST poxml-20.08.1.tar.xz 43248 BLAKE2B ac467b19c98a4191fb987a4ce11ab3742bf69aebb663042717cd1622691286259400a04704378bc07c6e10b56748f2b986d462cc9d72df23916f194db8b73cf4 SHA512 bbbfa5aceb2d2d2901fae554f8de718d0f50a655678698c4e3d285117fdf207ec608cfdc5bc20fa032fa98a4fa28533cdf334a8998197489424f14de57a57e58
+DIST poxml-20.08.2.tar.xz 43264 BLAKE2B 78e6919be8a8cc55d6158e809d987122fa61b13071e26b81ac306bfd0e447de6bfd85c4b98834720d5352bd546a29f3268f289159da23ea0794d2e45fbf95b73 SHA512 31c0b87ba1c2a2c5fcf88d8b49b46af08a7611dd18f4c7ccdceb0f8c32a1de58ea369a28922bcb907d0fd9a9ffa15a0d4c0c3a97a09045cf6cfe198d05f92bb7
 EBUILD poxml-20.04.3.ebuild 409 BLAKE2B 49ad891524f33e115c097ebe19fc5aff6a6896291b77f69b38d1b06c67a2b0a0852ad2453faf1ee46f436a3a3d7cc2a6d5305f43b8c2202960df2382dfb37c20 SHA512 7f2ca07703f18bb7581dc4f57522038e474c37970ee0cb6a8de666bddb3d1680eaf00fa539e31ea3404d32451044545b589d2172cf8d721e7f0b82b6c3ddb8b0
-EBUILD poxml-20.08.1.ebuild 412 BLAKE2B ca0e801611aff6a2a943ac72f6b695b3d8dad5a07da687982530b58caf130fc39ee1599227333e917ba07bb260b9f983c0d927da5f9a6b04b21eac24bac05742 SHA512 b44fb5dcd2478cc70bc7411116807b3b12451bb2bf8a671b16443b1d86767510f9d549e898846d99a900b8ced5db7bf33948bcae6079eedabbb960d3ff12303c
+EBUILD poxml-20.08.2.ebuild 412 BLAKE2B ca0e801611aff6a2a943ac72f6b695b3d8dad5a07da687982530b58caf130fc39ee1599227333e917ba07bb260b9f983c0d927da5f9a6b04b21eac24bac05742 SHA512 b44fb5dcd2478cc70bc7411116807b3b12451bb2bf8a671b16443b1d86767510f9d549e898846d99a900b8ced5db7bf33948bcae6079eedabbb960d3ff12303c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-20.08.1.ebuild b/kde-apps/poxml/poxml-20.08.2.ebuild
similarity index 100%
rename from kde-apps/poxml/poxml-20.08.1.ebuild
rename to kde-apps/poxml/poxml-20.08.2.ebuild
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index a582ecfa9c64..f320a023ec1d 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-20.04.3.tar.xz 255532 BLAKE2B 463c29f283c40d5a6b428ee77d6df4a80ac289e245ea9f520e71fb9032b84147b20bfb8dbc28d07dbe815b8b0b7eb1aa09853aaeb4d4adc45855cd2ed28938c2 SHA512 430116f46f69a8019dc891b108778b22f640b2ce2a6f5c4fdbee1eb84cee5f54e83c47bcac9ad85fb1e34a1072499b36943c88a444bdffc0cfb0f3f43d7950c2
-DIST print-manager-20.08.1.tar.xz 258552 BLAKE2B 4bedb7c08a2b5533f1fb0f09ce830ed79dc480c63fa4ab83eb7f0c7a7903918a264a5074f6d02d8976bd8f67fe36279c898a2edf17e2c9b63d6ef307b4aedd59 SHA512 160adb6bda95ef7104acdbceb258eb64ef93cc120b35011db4f0ce134879113d9fc27617f5e4d810ac2857f092870719c0450dd0a481d0bbede0df473338a040
+DIST print-manager-20.08.2.tar.xz 258696 BLAKE2B 9107ee7508153ec5c5d0597ccb5c6a978953e6a429cb57224b8f10791a50a5043708bb663efcf7962362d19011015f9009260fb6842ee0958c6787ea95723c01 SHA512 ae9647debbc5cf02db83b309a6b990e203a5b6c543bba52cc9076b90a42ba1317be4286084ba2e01e9e2c735be1fbe3fbab30e54de2e984855952dd1459b4b52
 EBUILD print-manager-20.04.3.ebuild 1706 BLAKE2B 75abc2d1b79a5ddd3cb8e81880ffe8ac76a1ec47650e668ca4caa6b4bd71f8f5654dda6367857ff7259a88d772f5701bb9953cac7d1ab0ad204bae0d3fabac61 SHA512 c903e2139667e2525fac90d59ef3d60361e99221bc1476b8f4a69d417dfcf8f860546aae67a178453a0d4d29cc04a255e669b6702b58d10169901e2176f84321
-EBUILD print-manager-20.08.1.ebuild 1826 BLAKE2B 42ad4b5339b5ba2df2736de99e5378b41e8efd95808ca02aadf2f1850ce20bb74495fd938c86afeaf8eaac57f840768b5e0e5f9d5b44f449802b623ba61d58bb SHA512 d54c0b6f2d4d0ec7714bb20cf81c861f6a7eca58311790391f5252a088cb43278db82f04bb82c81940935e93f289b29549567391bb2e4b10e566996c0f11e222
+EBUILD print-manager-20.08.2.ebuild 1826 BLAKE2B 42ad4b5339b5ba2df2736de99e5378b41e8efd95808ca02aadf2f1850ce20bb74495fd938c86afeaf8eaac57f840768b5e0e5f9d5b44f449802b623ba61d58bb SHA512 d54c0b6f2d4d0ec7714bb20cf81c861f6a7eca58311790391f5252a088cb43278db82f04bb82c81940935e93f289b29549567391bb2e4b10e566996c0f11e222
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-20.08.1.ebuild b/kde-apps/print-manager/print-manager-20.08.2.ebuild
similarity index 100%
rename from kde-apps/print-manager/print-manager-20.08.1.ebuild
rename to kde-apps/print-manager/print-manager-20.08.2.ebuild
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index e41998a2d107..751f3fc3e66b 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-20.04.3.tar.xz 1505280 BLAKE2B 5ee98b3250db48f41a6a63db82633fc5fed2d3348314deb2db29b77ebb54d032c4162914556ac6c25e8c7c7ebd08aacfb6f241f28b4934af363f354c3415fd2a SHA512 b561e8864a700c832d36ce8fb645d29c09c4c9dcf34a01649ad6448b9d00a25945134821753ebeef56a607c3c66424a59d8a2372ae5561185fd37691709bfd5d
-DIST rocs-20.08.1.tar.xz 1497428 BLAKE2B ce3e9088bf1394c5876652a1a269d48e58bba35a5b6d0505a3fd54e52cc3cceec591c452d1604d7f39b35b93a26369887c880ca6a5463057b208a8069e0b0aed SHA512 f9bc679812caff5f1e1b299ab527cca6cab7f22ea57669bb17f58fe1c6ecb6275c7bb3444af82628ec5aae2ab43a426f51d3b5ca470e6440bd9b270755563e67
+DIST rocs-20.08.2.tar.xz 1497692 BLAKE2B 876d5c3c2bdfe7ea267ec9a8e46f71b709e441b896105f21d8692caadd3e7c8b4bff2a0ff4434e9f5390d306221d1ddf701426a0207e16bed7df23d02b1e280a SHA512 a836850b2f8901c818b7559c7de630cb3008c6dc6822ea0ebd33d4be9cc9b3bde20062884a11f02a2ebe6f16bacfc669bfe072c1af520f0a6ffda32d83046bbc
 EBUILD rocs-20.04.3.ebuild 1289 BLAKE2B 903bf90f0c38e790a5db6d9105f442221b332af8e2f77c59f77d271d5a62e291f78225616f6e8ced8ca1210fe96b5926dec60ee57481466ae6028b4e3f32b8d8 SHA512 7cb675b87a73e2f9f0b9d44f6c5f5a76c00c073976db7d645de18db6177733974962672fedd74296eb317fb64401c2885e0c40093d728dfd57a62fb2668c8f51
-EBUILD rocs-20.08.1.ebuild 1292 BLAKE2B 34216ab26ddde59eba63dbfa6b6f38c508dca65d480cef6a78a614838b3b447c9cdedc5968051d71fdcc291efdbb25b594ec7082473227853dbb51b089188f6c SHA512 5b88f487ad90bf3c732214b62d2f82903d7c061602d5568d4524d163e3550fee93329eccd6a88edc91ee585afc419f30f8c3dcab7e25694d640c6a88720be9fd
+EBUILD rocs-20.08.2.ebuild 1292 BLAKE2B 34216ab26ddde59eba63dbfa6b6f38c508dca65d480cef6a78a614838b3b447c9cdedc5968051d71fdcc291efdbb25b594ec7082473227853dbb51b089188f6c SHA512 5b88f487ad90bf3c732214b62d2f82903d7c061602d5568d4524d163e3550fee93329eccd6a88edc91ee585afc419f30f8c3dcab7e25694d640c6a88720be9fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-20.08.1.ebuild b/kde-apps/rocs/rocs-20.08.2.ebuild
similarity index 100%
rename from kde-apps/rocs/rocs-20.08.1.ebuild
rename to kde-apps/rocs/rocs-20.08.2.ebuild
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index f2f81a5952b8..62da23de8420 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-20.04.3.tar.xz 10700 BLAKE2B 3c42839062d655ff11c520f3ac63a98116699323d39817b4fa6f667c33b970653e357aff08d9c9f4083913555091ad9a0ad6ba0b5db7179ff6876148ba45bdcd SHA512 0bf8612ad93aa8ce6851e7961d80650400f793992ccef893b40ce31dca6cd6e0030caa29e43c726afaf381cc45a62469c18b07c47a6a0bb0877edc1cf9b14081
-DIST signon-kwallet-extension-20.08.1.tar.xz 10696 BLAKE2B 27c906b261f03c64f4727f2effcabf73cb53cd2d5d16d9595d09681c64652619706bc9e8cfc5bc39f22ef1f67cfd40c2963ebc7b85b4782098e549142573189f SHA512 f0b02361b2a8af314f3d9c99ef424e66c4ebe6078828749bac91f6258452f307fdedb3a51fd143464623670f92a35f228184a453d3bce2e641a748faae4888ae
+DIST signon-kwallet-extension-20.08.2.tar.xz 10704 BLAKE2B 9daf78c2741ef6146da102a2f271d79d428acf49407ec0a85bcf1a0114c58cc4acb53ef93eef1493ad677d9977d20d717948a3966ba7a26e442db975f42645f7 SHA512 c8762979929ff79dc602fbcb39a32686f66bfb0b44183241afbd89a4ee70d120b8edfc11c9f55fdddcf12dbadb998b1139f03bd4a092d65be2f3486217406ffb
 EBUILD signon-kwallet-extension-20.04.3.ebuild 364 BLAKE2B 4655c2ea71b35379f0432bbe49a7d930706b4df5467de07704817ab6cf87a9399a7fa522017aba59da5c7515aabe347bb7661a3c8e93e41dacd7130102aa709b SHA512 cc02a66dd9250cf59b56097297e789f2c2e38cbc1e7775143881552c742f78faf729dd9e91a65246a461c1dd63fbb5fb28f4e10e229b0fd9e2a41822c84a460e
-EBUILD signon-kwallet-extension-20.08.1.ebuild 367 BLAKE2B b3b050f473d70527b4187f59094dd91d1af68760d70285e5ee3dc31811c0c7016cd3566fef771a3f8a11609188e3e21bc2625f2f42368a711e629912ce928c71 SHA512 a7bf5ee0b124ff7d37379f4c2a90103dec95f71d63e2ef40b1578e5b077232b4692fe4bc2d42b5d2fbc69a544f27ac14f15c19fdf35d52c37cbc42f1aaed7bd8
+EBUILD signon-kwallet-extension-20.08.2.ebuild 367 BLAKE2B b3b050f473d70527b4187f59094dd91d1af68760d70285e5ee3dc31811c0c7016cd3566fef771a3f8a11609188e3e21bc2625f2f42368a711e629912ce928c71 SHA512 a7bf5ee0b124ff7d37379f4c2a90103dec95f71d63e2ef40b1578e5b077232b4692fe4bc2d42b5d2fbc69a544f27ac14f15c19fdf35d52c37cbc42f1aaed7bd8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.2.ebuild
similarity index 100%
rename from kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.1.ebuild
rename to kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.2.ebuild
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index b4d2e88ffab5..e9d42934189e 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-20.04.3.tar.xz 662016 BLAKE2B 511852f53fe1655838073edb901e8c0e4ae25e48bbef7d6b53be9534093d5ec29f5359c33c57b350856ed69354b84bceaabd650559d96e90e3a19ed926bda5f7 SHA512 ba2fdcf4c57efe213e79638a0b81c3061e2df432a4702b2d4830dfb3ed9c2f10cd6573b678b153a95414fee4807320345001f416db348a2b6633afbc5b93c546
-DIST spectacle-20.08.1.tar.xz 1154928 BLAKE2B 521c51afd46f4edbc63a55d6fa4f514a7a6a6b2f7cd481b6d8f4d4837481423992ac4efc0defc3ddedcf772ba552ac3a60309ecf5d86683a65b6e45ed1ddb785 SHA512 83adc382c66173c3733dc603a7e7b957856b735af7764c66624158f39ba8bc8ce08e12d46d12781d5a21c2e09ba17ebb651f62dcf06ad032c409aae68f1b42a0
+DIST spectacle-20.08.2.tar.xz 1155976 BLAKE2B 6bccb152236c5f91845de8338267fc632c9386853f5ddfc058de160ae25e0369f54d296c05e8abbb96997ea5c25c1f6a194d4e1865e70e2a727caa1b209d08d2 SHA512 3f63d2d25cc840f99ca638090c15ada2cfc2ebac77b691f68606dbd0af24030b1b0206dd4506940b26c56d93bcad5a6b0a3754eb439316a7662e914ef2bd85f7
 EBUILD spectacle-20.04.3.ebuild 1607 BLAKE2B e9f3a34f11d436c537da000e482ed96dc332264a2c7ae7d66f470b40d62329c55789620527c88a2efe7b874be253d64e20d3c42ad209b350287956a669cf2974 SHA512 130e2ff3486a4899c561fa0479669c62c0778c12eaf6301d10867c1916b9e873e6b672d3c0a483c23fc2803e1525c847e7d3e238fa682fc622f37e0979746efe
-EBUILD spectacle-20.08.1.ebuild 1610 BLAKE2B 288adeeb64aa486fab0f016978a15fb79adcf4928400e5f3a6b397d4103a635434e04113ba977530c0ee70749bcca1c7883a39232a268153e930642c73545dad SHA512 5a9a45cb5ccffd00bd3cd157d2468958951fbe64f57b12c8645c2ac299f24d8c91c7049c0dad7a3fd018baed902fc052d75c38880458348d1feb294654d3a15c
+EBUILD spectacle-20.08.2.ebuild 1610 BLAKE2B 288adeeb64aa486fab0f016978a15fb79adcf4928400e5f3a6b397d4103a635434e04113ba977530c0ee70749bcca1c7883a39232a268153e930642c73545dad SHA512 5a9a45cb5ccffd00bd3cd157d2468958951fbe64f57b12c8645c2ac299f24d8c91c7049c0dad7a3fd018baed902fc052d75c38880458348d1feb294654d3a15c
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-20.08.1.ebuild b/kde-apps/spectacle/spectacle-20.08.2.ebuild
similarity index 100%
rename from kde-apps/spectacle/spectacle-20.08.1.ebuild
rename to kde-apps/spectacle/spectacle-20.08.2.ebuild
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index ea19c7778925..901957dd7ea7 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-20.04.3.tar.xz 929364 BLAKE2B 273fce857039052832d1e5a295d9387a0021e847bbfb169ba88ad5c9f0b849ebe494d56a7881184be07912aee3708536c435b08ff1451927d73c701faafc6c1c SHA512 1df12a6994a0f3e62bff837fc8e0ff8fc9b4afb651f51ee1e14e4cdc80905fc21d7a9af540433e0f97a7040e2ed4968d9a81a4f868bb46b07c0c7ad1efb21f96
-DIST step-20.08.1.tar.xz 942732 BLAKE2B e8dc6ebc9649615135efcd195cd9d9b99915eb7b8598cc548cc8d0eff96b3b318499c4801670a1c0c5e7e5cb6179537050419c643d231e37913a23e08ae2ecf7 SHA512 91b28b5758bb43a28c7cc891c48edef3f8efe7821cf37cc501907c373d05ab40080d4e66199b436efc16c117063ab7d6951e9b3b3855d832e304935d6e7be4b7
+DIST step-20.08.2.tar.xz 951936 BLAKE2B afea441e6a28beb1dcefabacd3d0d9e3154cd4880b0d9357c863d115f165b69b7e2360ce7e7844c67a45e4efe87edb50d994a5740bce3446ba1d6b355cec4d99 SHA512 ef7c5941c68b5628c82c87d61f3a3ce2ed8910300eed9f7673a4f67b7c6f74d10fd48ad128891c687dd27655895f4500f818ad3616c8323e5c04c12ade7279e4
 EBUILD step-20.04.3.ebuild 1621 BLAKE2B 211bfddffaa7a3f39940591780162f7969fab239213dac8f2f58da6715a2aa76564d48e7eb4a9752e51b8e05f0c13f784e7261948ea53371e561495c24aafb8c SHA512 2e80237c6aa63c03aa9e8cff69fef09bc705854cc039bfb0c6825dcfb08b21e7b104c09a54d776d06ca623e1a79432798bd7352a73041811933a07852101b606
-EBUILD step-20.08.1.ebuild 1595 BLAKE2B 5f01c11aa642ddcbe5fd877735bf03dff2219668993926df44022d9d403b4b56b92d8ce0a0521e5f6bcf13ac23dd9f46e4a8106b5e5f89cd5c2add8193c06791 SHA512 a85141c26cad296f5a79723126ab39c830a4b514eeb562c8dadbb4ff3b91d25923895a4dc3991135f744afb0d429ddf9b10c9c8d6308793d4cf95559644c8e14
+EBUILD step-20.08.2.ebuild 1595 BLAKE2B 5f01c11aa642ddcbe5fd877735bf03dff2219668993926df44022d9d403b4b56b92d8ce0a0521e5f6bcf13ac23dd9f46e4a8106b5e5f89cd5c2add8193c06791 SHA512 a85141c26cad296f5a79723126ab39c830a4b514eeb562c8dadbb4ff3b91d25923895a4dc3991135f744afb0d429ddf9b10c9c8d6308793d4cf95559644c8e14
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-20.08.1.ebuild b/kde-apps/step/step-20.08.2.ebuild
similarity index 100%
rename from kde-apps/step/step-20.08.1.ebuild
rename to kde-apps/step/step-20.08.2.ebuild
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index e5fd3d0c608e..8edca78166d6 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-20.04.3.tar.xz 21248 BLAKE2B 8c6c66e93d2753b090a3e86e7f9b54120cbc10e552607aaa3619f6ee2b4e176c50ebd943bc4130c55e014ba47de2c90559167cec0c60c2229564efc4fe789399 SHA512 d069894484a1b72b18c4460364ec7d90860f66a629dddc8c57c1dff5663e3e745388690ef0fe5026baa26cb57b2de702e535f8bb308c4a8c259e4785d9c6bf32
-DIST svgpart-20.08.1.tar.xz 21124 BLAKE2B 012e02456ee93d41dec24aad14f6204d479111ba09866eee46290da078c1bb22311cb6ab31271d00dfe519aefbee772c8a71c318a5fd3c7c817083b0ad973840 SHA512 e51cccdf2b7ce4e10fe3cb92e9bdfbbcf9026ace2df961d2a60f0f3d4f7fefd918bc21ccb0ab6eba617a1537b87567b056a7c86db0263d7652dda81617f9a6a6
+DIST svgpart-20.08.2.tar.xz 21172 BLAKE2B 1fad7764801a802085abc7d1f7b76ad5f62a311125318b1c4561402e403017227e4b726bcdf64a7c5740cdc724f47cdfdb40f2fb0927f847f81e82debdc82885 SHA512 fa4a4e6183b382c4ff8b46270fe04a0bfb19333d31ba7a07b20de3ab5045f644b739222d76f2304fef6d0cf3582247556431e46c4d16339f4225d5b2e35fda94
 EBUILD svgpart-20.04.3.ebuild 576 BLAKE2B dcaed4e30199e7a15ddca6367a4744780e18c7eb06c6dd4a2a85a1e94d9017abd5ab935ccdbb7779d75bbbdc7b9157d1a19b9053fad9ae0552239ff94895f6c2 SHA512 a7e5ef11d90b3ff9ce20f74e514816936e6a2c89b3cacc9e4e1eb690e2c7d0805b204af242a13bbc5f4de8471f2a0cc495d85d8cb329173f1a166f6f62d05b4d
-EBUILD svgpart-20.08.1.ebuild 579 BLAKE2B 3cf9a3de5725beb92a9f162dcb60c538c94a000a7121749690ad23494f1691d636d85447a5d310be49f77c1e2dd734f9fb18ad0408ea53e23fbc2f72387b7e7d SHA512 9413cd8f81c2c21bf35c3b24bca4d96c6381024ccd5b5d2dc24b9c3c25ed31b3655d3968f7e2fa8e8b2561a9150ebac08543fbe90092e6c6b97d419ebfc6eb77
+EBUILD svgpart-20.08.2.ebuild 579 BLAKE2B 3cf9a3de5725beb92a9f162dcb60c538c94a000a7121749690ad23494f1691d636d85447a5d310be49f77c1e2dd734f9fb18ad0408ea53e23fbc2f72387b7e7d SHA512 9413cd8f81c2c21bf35c3b24bca4d96c6381024ccd5b5d2dc24b9c3c25ed31b3655d3968f7e2fa8e8b2561a9150ebac08543fbe90092e6c6b97d419ebfc6eb77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-20.08.1.ebuild b/kde-apps/svgpart/svgpart-20.08.2.ebuild
similarity index 100%
rename from kde-apps/svgpart/svgpart-20.08.1.ebuild
rename to kde-apps/svgpart/svgpart-20.08.2.ebuild
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 8e953cd3af96..3e8fae3fd38e 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-20.04.3.tar.xz 368556 BLAKE2B 9320e8bb305c50418b4daa4779edf53826dcb129be2d684324c6c8d263780be33acc70a84ec71dc31bde3f69bf75259c1dbf730818d3f33fafa5aa4ca42e6ec7 SHA512 6c801c29b01d7c75c83eb7853ae31e4e4821d0bba0d6337a224ce0baea578268dc0ca2ae832f600b0c604fcf5dee776441bfa02ceed10b5a29db733b43a940ea
-DIST sweeper-20.08.1.tar.xz 371968 BLAKE2B 96db247f6d71c7904c051d56aa3104bc1261c4d0e472293e87a4dfac4e7b595a5fa3d8d08a41435bf63a55e1b599c4fb5cc12653ca5a63e8437be27be3291c58 SHA512 8f5c2fecc72d7edc2609450ed08d0a78cf56e32d1e72f63aaafab3c8ce02cb77aa2d326c312472e8e2e9956b687efd99ddda9b9f452bb567f8ad5f08aaf78e66
+DIST sweeper-20.08.2.tar.xz 371920 BLAKE2B ca7be6dc10c600ee9621b9ea7e3d867485c58c021d02d8ceb5609903a62db29dc8cb0ae8430de27b9f73b191fd6a31b6e1a0b85ed9052c00612968d6da5d9ba9 SHA512 65fe4ae1c5137cf40f6be3652fe2021e8f798d6fe96ef7d925fbf751694d825f19df3cc101f82c106b18b1cb3425239653df75416bdd986a3d4015643c90aa15
 EBUILD sweeper-20.04.3.ebuild 1035 BLAKE2B 75d65f8164322351118302b9b00323da5cee301d54b3d7490eff5b7cd9717a99df381c8d85aaf08b4923dcd13e7f627c1d84715f59d8ff2e82b21aa87a18883a SHA512 639b777eb1b57e1e3dfb4fd96b41adee04659400c9a4400d68693d59c17bf1bfa8fc4c013994894a7c0dcb1f43e4b980a26e4fba0d93bf45b60739dcb75e1b00
-EBUILD sweeper-20.08.1.ebuild 1038 BLAKE2B 2c33c21f74c45d4c46b3f59f3baa00086a91ebf75974824234ee6bb4754c49fcdbc842003deff6f08145d80db549162e627cfca882160adabad3997f81a6be8f SHA512 82854e4fe0a4530faebb39f01f97949e5319b58d79bc20eef9481581721bf796c85510a86982d52d97da6e0fd8f256b8e18701c51a7faaaad70866a517957b20
+EBUILD sweeper-20.08.2.ebuild 1038 BLAKE2B 2c33c21f74c45d4c46b3f59f3baa00086a91ebf75974824234ee6bb4754c49fcdbc842003deff6f08145d80db549162e627cfca882160adabad3997f81a6be8f SHA512 82854e4fe0a4530faebb39f01f97949e5319b58d79bc20eef9481581721bf796c85510a86982d52d97da6e0fd8f256b8e18701c51a7faaaad70866a517957b20
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-20.08.1.ebuild b/kde-apps/sweeper/sweeper-20.08.2.ebuild
similarity index 100%
rename from kde-apps/sweeper/sweeper-20.08.1.ebuild
rename to kde-apps/sweeper/sweeper-20.08.2.ebuild
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index cad32819d07c..a6d201de520b 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-20.04.3.tar.xz 46492 BLAKE2B 5edb754af03c679f70a3aad979683a3b439bcc753c620a247b27eac829aaef19c5935d120d7a80fd0e605b581697818aefc6be2d1ea73aa80e6604240ef4a30d SHA512 03eebd6dbf39b4d06d4584478158a75ccaa2f5f04c102d542109972a3ce0458080763a4aa60a7a68d35ab822f45c9aa9f1d91cce20557574c2008e768f911c44
-DIST kdegraphics-thumbnailers-20.08.1.tar.xz 46772 BLAKE2B d1a38073c233a660e35d18d8311be5ab3c43a47c32bfa21f790d7a445a4b91dc1116226e491312ca2b8515c122f9eee5a4484caf4e503765599fa2ad08a964d8 SHA512 025ec45838bacdec4d94d098e6a3a94b608023f4de0b2d8fafe8202493ca39f166951125243fa855ceb3ef77528810b6cd838cc5596d33f36d80c82a617d4cb5
+DIST kdegraphics-thumbnailers-20.08.2.tar.xz 46852 BLAKE2B ffedd324e5a46d39669a4c10daa030d5c7eed8886e95a07a098196a81191d2ed52bcba26ac1f50dbc66ed1f690ff7cddd82426e4373218106abb1398459dcb6e SHA512 50fd51af6cd52128f84752c5b02103cbb22c936350ca8cf801e2d9a248a1901db36d3f3318bc41b3c742bbfd8a0f10b83e73470ef687fb133550ccb3c78d1cd6
 EBUILD thumbnailers-20.04.3.ebuild 711 BLAKE2B ed3d0374dc1954eeedc1c64d443715ce6958adedb5d75aca9e2f9bf32a98e4a0fb4e9ef4b151cd5f3739ac7a624ff6a7f4985093b650e1a0386534372519d469 SHA512 635819e842e6900dc006173409d452a8b438da6623298b9d0bab815a2f1723da7454e9810f78d5f597624b0202526658d934956a09c0747785db1827e057da2e
-EBUILD thumbnailers-20.08.1.ebuild 714 BLAKE2B 0511fcbb872ff23669fac745effb1c443c8b5d2ed1695b04196413e7dc6a8c2d2bcfdd2f208e7596142d0f7c7b710c789f0b5b54978bfd8202a7cf856fac5c6a SHA512 f93f042d3f3e23ea96e9e56b54f858b2adddb1892333bf54ea4c1d250415c4bad2e1f38cf6763dda60a2da6a11e2f2b1bccc14ed4674093cf3e21e1feea0984a
+EBUILD thumbnailers-20.08.2.ebuild 714 BLAKE2B 0511fcbb872ff23669fac745effb1c443c8b5d2ed1695b04196413e7dc6a8c2d2bcfdd2f208e7596142d0f7c7b710c789f0b5b54978bfd8202a7cf856fac5c6a SHA512 f93f042d3f3e23ea96e9e56b54f858b2adddb1892333bf54ea4c1d250415c4bad2e1f38cf6763dda60a2da6a11e2f2b1bccc14ed4674093cf3e21e1feea0984a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-20.08.1.ebuild b/kde-apps/thumbnailers/thumbnailers-20.08.2.ebuild
similarity index 100%
rename from kde-apps/thumbnailers/thumbnailers-20.08.1.ebuild
rename to kde-apps/thumbnailers/thumbnailers-20.08.2.ebuild
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 69eb25fb515a..2868dd2b3569 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-20.04.3.tar.xz 5546160 BLAKE2B 4ca97a12b066235f8910a1fb91cebe809a6a621f60fa6b988fa90e77970ed21a4dc958d08a425431bd947cff6b9142b53310aacdc7e4e4122ea3fe48b7723594 SHA512 dd85330578a8c9a9568ce40758d76848fee76fa4ac16a44faeeb064480910038d734876ef9e2475e01e75a13f3d0b8d444fbf78542c9648ee6a8f59b4dc9b83c
-DIST umbrello-20.08.1.tar.xz 5554240 BLAKE2B fe5263b7f4c8af15b185152c9a2ed74abe85d9d2690ed44fcbac70f658649176a816b85d5a5c3f3cf3d7a0fc4ed4629d8f0957f751d20e01d670598a4abcdef8 SHA512 42ddc364bcccee88cd210183148e0a246c0efd2ebe2c5bca0a77260e772738ef0d74d8745133d45daa94e839cf3fe6ac46e65fced23cd8382cc7218689259710
+DIST umbrello-20.08.2.tar.xz 5554932 BLAKE2B 9cfeea3ced5fef606b9a1d74a008e6e1e70ad21e03796caddcd2a5c08e7c124cb5b57d05739bc23acca6747de0576aef940e6be9e4d1173e8b44e3ee124aeb7e SHA512 ba0f668fe0ac152b1087f99fb7e8cefd15b537417da9916ae15550f987ca3dd50801a34d987dbc860dcb06ae44deb4e4d33e54296800814fa5dc21bd22b6de65
 EBUILD umbrello-20.04.3.ebuild 1847 BLAKE2B be0828b9e4f54b28d2f3f7c5b2fdfdb917a806502899e9cdb67138172a085308a36f530d13e096f8341368db0a6a5b3557a7a5d25a71988f97a497da9658b7ca SHA512 e743685f52434521e544434a571e352457259525d77a12fefe3bab859975dd369a300c12c9dfea3f531e4b59d79b3e208cd27b6e74dab69762cfa10842cf4b00
-EBUILD umbrello-20.08.1.ebuild 1850 BLAKE2B 999fd4b8adcd0674580f89489093339d848e49c82fe2d8f10e381451e2db9d59574e07d8580a45e5fc994c61f53b616e933c0fc163fc7dbf1fc701fb099aa36a SHA512 9c06285fec37147376b74d16f8bce1d76dfeeccba81aaa5509c00da40d4bdb5185b0f725f1d0c292d5106a56b821d9fcc5b46b5049168a4a1b2f586a5d872dfe
+EBUILD umbrello-20.08.2.ebuild 1850 BLAKE2B 999fd4b8adcd0674580f89489093339d848e49c82fe2d8f10e381451e2db9d59574e07d8580a45e5fc994c61f53b616e933c0fc163fc7dbf1fc701fb099aa36a SHA512 9c06285fec37147376b74d16f8bce1d76dfeeccba81aaa5509c00da40d4bdb5185b0f725f1d0c292d5106a56b821d9fcc5b46b5049168a4a1b2f586a5d872dfe
 MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/umbrello-20.08.1.ebuild b/kde-apps/umbrello/umbrello-20.08.2.ebuild
similarity index 100%
rename from kde-apps/umbrello/umbrello-20.08.1.ebuild
rename to kde-apps/umbrello/umbrello-20.08.2.ebuild
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 5e9f978adc26..761ece784404 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,6 +1,6 @@
 AUX yakuake-20.04.3-fix-fullscreen-mode-regression.patch 1256 BLAKE2B aba9e6e4be68bbf49050f5fd61ff28aed4e639dac28fbe2b2dd18ff62671984c388680215338c426175fbd59d6646d203d78cc76dc166c38a5df7f097a05ebb9 SHA512 8e5ac666093d6bf78467b78f750e317a5dd18f40cf5d9fc911a0a4e5fc34e0e92b692eaf6e61caf06c12c7e1b8be12fb8003fd60b757822b3ccd193c121f01a8
 DIST yakuake-20.04.3.tar.xz 374280 BLAKE2B aa53e81af0e77a74ac637d185108341b89ec82ff94dcbc3f3cb0a6a8916cb3b7bcd48bad4d127c073de7f6788a38ae7c8a8c4092aaa72ce9d405e7214ea7342a SHA512 a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658
-DIST yakuake-20.08.1.tar.xz 380344 BLAKE2B 918cbbca10f0fb91cf458220dc55cf866209355a7bb0d57ed4fee09a954409db56fc08ce72327d5090475b5a4c94a60f067a917ebeed6063db0fad9f8456388b SHA512 6644bfd728929eefa2ce488f1e31729c89229f09b6b00ac2317974da6ebfe95b5db9fe5a2987e530fadb4cc0cb9a90142e016df2c9623c7ab3d0599c0d5202b9
+DIST yakuake-20.08.2.tar.xz 380920 BLAKE2B 4b06e757f8d0d588701c788792db81a8dd3f37cba90a49a9f4e08071583aab0c561a6b5e590b043cf0ec6252b7dc524fb89bde8ab6c4886c608381dc89840393 SHA512 ecc6eb982ad7ad50521d4704ed999a04d6ca08034089f7b27705322c81d7c724c9e1092b0086f384a0fb86e2d84b1ef47a38c54415c9ad684da76425240fcd5b
 EBUILD yakuake-20.04.3-r1.ebuild 1647 BLAKE2B 5c62f1286f7345d41efb89ea1b73ee9e5d230bd85018851064bd4d279df63ea44b1d9c6124dfd68dbdd8e900acb30eb2a33d88d76c6fd656827a233b5010b582 SHA512 6e1bfc6048c7fa5fc6414b288c3222b94a6767f631b9a70649c5d47137473830c559eaa69b402299396ed887d0c9bee5eb077301e26be2b0f8cc50f77b638335
-EBUILD yakuake-20.08.1.ebuild 1568 BLAKE2B e339e69435f20f11922c82a3210a5ea30ce02338eb974f7c7aa30ef68e29ffdc94067543cd073ec2a1f9483192fc0cd0ba33a949665e63ae34d9ec32f996ff74 SHA512 828815417f89ed05b3f34bdf07ddbeeba2d5c94e14c236bdb344cd1d3e6b56ee6c41b82639bc68172e15210585db03928eb82ebf30342a10e00104791fa53c5d
+EBUILD yakuake-20.08.2.ebuild 1568 BLAKE2B e339e69435f20f11922c82a3210a5ea30ce02338eb974f7c7aa30ef68e29ffdc94067543cd073ec2a1f9483192fc0cd0ba33a949665e63ae34d9ec32f996ff74 SHA512 828815417f89ed05b3f34bdf07ddbeeba2d5c94e14c236bdb344cd1d3e6b56ee6c41b82639bc68172e15210585db03928eb82ebf30342a10e00104791fa53c5d
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-20.08.1.ebuild b/kde-apps/yakuake/yakuake-20.08.2.ebuild
similarity index 100%
rename from kde-apps/yakuake/yakuake-20.08.1.ebuild
rename to kde-apps/yakuake/yakuake-20.08.2.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 95aa62ce5978..336189501dcc 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-20.04.3.tar.xz 42564 BLAKE2B ab2c086bcbd9c5bf0290744cf4ed8d6fd7b2ee53277d9ff230cf7f26e81d09a41223c96061770ac05e8f744370387fe5df97bcbab4b7441ea087c5669d8c9af0 SHA512 bba7d5ae7a9d0b6ddf0e0aa1b110b9b20c2c4c8078f4b720b8abc0f0761db342b88b8195088f28306f979091847834948e13931db5de14e9b7c474c1c997a821
-DIST zeroconf-ioslave-20.08.1.tar.xz 42872 BLAKE2B 747e5ef73e2aca6431ddc59306a6edf4b4859b0103a6ada1824dbb9e8b78f7c01c8a4b8ff23a67cdfd72957680ca3a34ac7a2486e6ab4ec715b864a551517660 SHA512 02b537c76501e3d2cd91409e0cafe932675d1a01454767a812e06b6a01bad92ba69d2fe7b351ccfbeaa95e955e8f254288add2dc79bfad70298a125dd8486284
+DIST zeroconf-ioslave-20.08.2.tar.xz 43000 BLAKE2B 7238fc78074e6966413a17942d14f82f3544f9632a27c783c5406df0b77a67ab1e906d30b2e24938a1e01c060adc0de222cf8f0213adec7fed32d1aec421b120 SHA512 5bcfb04c506491b1571deaa8724b4e80a2464b196cddf76e4d30ad07f2162aefd756eb9b5e968c7a912cb67b7fb4f06911df0aa0d063ea046515e96cd327edaa
 EBUILD zeroconf-ioslave-20.04.3.ebuild 570 BLAKE2B 3e23a226940889172c84e8c34e2d7f0086ca4b248d37a669162c4d0a8e6694009219d49b916748007629c772fe68d2db05b20be9ac781110c3ad24f905afa864 SHA512 5b110168c76bad1b8c89d199148b0f1948a686251235246f353a189e6251656640ed193786886383838dfef5eee074f6fb9c793cd67da67de9dae327cc826e14
-EBUILD zeroconf-ioslave-20.08.1.ebuild 573 BLAKE2B f528644324e5b8843baa64d70ce838c7054ae395a0dea69bb4301894940412d28b4be7977d92a3a3b3de0320db11079f3756933f805cf33b675bf30d4f5fb7f3 SHA512 275c5f661e98f569d32c24dfb70ea8aa84dbd4799412491030c5dd8a22c6846bf623a6436b4673c3c46dd42e1f50bddd68c82a1fe058c6f2b197ff9534943577
+EBUILD zeroconf-ioslave-20.08.2.ebuild 573 BLAKE2B f528644324e5b8843baa64d70ce838c7054ae395a0dea69bb4301894940412d28b4be7977d92a3a3b3de0320db11079f3756933f805cf33b675bf30d4f5fb7f3 SHA512 275c5f661e98f569d32c24dfb70ea8aa84dbd4799412491030c5dd8a22c6846bf623a6436b4673c3c46dd42e1f50bddd68c82a1fe058c6f2b197ff9534943577
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.2.ebuild
similarity index 100%
rename from kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.1.ebuild
rename to kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.2.ebuild
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 6ed332483943..5b110b449bf2 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 9dc40fba42ad..f578aa13438a 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
-DIST attica-5.70.0.tar.xz 67620 BLAKE2B 3773e6b8442d671429d904b5fc6ef82d5ea58f37b494a86d7647e1692a71da5d6539239f9b74011897e358d13ab2d1ed47926c37f2c93c8f7140bc8df3ee31e6 SHA512 bb88e7bf34b1d3c958e31ad1591bdc5620361a300fcba957ecb017c31227b4ac80a94523d7b40f9a62a4a5d45a2840d37aa199c7305e6da471d4ebaee84c9630
 DIST attica-5.74.0.tar.xz 65848 BLAKE2B 614879805233be3508adaf425b71697fb895b99600717de915dbb5c8bad569bfa20b4914638b35adc140c74e4f5a3c0a30389db3b8f92876dd59e06e1931d680 SHA512 261bcec9836c36c3e22df6d629dee35512dac6d8194a393bf2d818432696eb053edee04f5474383f4ab69559f5b875ac392a4c41727eedbea2df9d51b81a19e0
-EBUILD attica-5.70.0.ebuild 467 BLAKE2B e096a82dfcb381e5eb14328d46b141dbacb6a54a280ab88506529e3de60a44eb0f006d934cdbfc7a45ce33e8a832b3bf249dcc190e37064d6bb25901ee15cad4 SHA512 84984c77a00d242f710ee1846121a5f1ce74479a6cead529bd270dde06351f18337d45e5744c632344dc8f454fa03887b378e2e393a543ab09b2ca878c9acb81
+DIST attica-5.75.0.tar.xz 65876 BLAKE2B fe3428cf0d4a9d21b2501ec3927fca36fb28965ad13bb830c1b3be1592bb296902158e6f619a9b21a0b99111d124af8d3b573f53b94b9ff7580e99c7884137ae SHA512 c523057406efd33a21304df2230c0165f3a7f30582e872171a24fca2997970f23f54a2f53c5b5ca7cc6b890f622874a40af9bb2f555d0c58c313c05a9f2d99f3
 EBUILD attica-5.74.0.ebuild 467 BLAKE2B 76d6023230bd1049045530ac6d64a0759410e588564f18f79052f5b02f8bfb114c6000eae070d970a9b87ca59336e86cfc861cc85001529f5d82bc4eb05c5d06 SHA512 cefc15c628e78b14d8626fd5a352096e0c9ebd544d32cfe2386bac5fd2548e321bd4f68f8e93ebbc7cf6111c424b84645bea759a6b9e76e3cd5ee7b569004f8b
+EBUILD attica-5.75.0.ebuild 470 BLAKE2B 8b1c5c047e45075cb1b9c319b7a394957b0379d73c7b64cdf0a15f756da8058d4c183bd4ca5d955a0eb184687ee36c0adccec1b5e49f4601593b8c4b8c016479 SHA512 928587488b0d019c8d97bf7b39f26c8e5afd93c1c29bec579a673b33f6d88ce358de063aaa965ab26ef0db54cae267c3b9b0aaa02a6f08b8f3413f9b990dc331
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.70.0.ebuild b/kde-frameworks/attica/attica-5.70.0.ebuild
deleted file mode 100644
index 6581352c5e6e..000000000000
--- a/kde-frameworks/attica/attica-5.70.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
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# requires network access, bug #661230
-	local myctestargs=(
-		-E "(providertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/attica/attica-5.75.0.ebuild b/kde-frameworks/attica/attica-5.75.0.ebuild
new file mode 100644
index 000000000000..89722278c649
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.75.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# requires network access, bug #661230
+	local myctestargs=(
+		-E "(providertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index c81795476f69..c61521f4f79f 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
-DIST baloo-5.70.0.tar.xz 273108 BLAKE2B 9ece044d50462f19b4c27543f5e108c80031dd9d1782ebfbf46c7b71ce9e96e0160adb5b072afbff239e5a43fb04a33905c906a3f6784bd87274cd0982cb42d1 SHA512 9d2455c29f7f5609897d06271a62c285e03370fdb8d842be252953f8b1644351b6bf8f5dc2f685bfa1cab9ed494747b59eccfd4f0f616625822c72e97692a390
 DIST baloo-5.74.0.tar.xz 286000 BLAKE2B e0759f01364413e5ef232c0746ca7fa54585ecc55ac7073d3cf20bfc06227f055ad2f4a11611dc3f745fe3da736529a42fde3b30e77c761425b8eea917e88354 SHA512 e044b3d0aa924154e32d2a7a66c6de0c4a8b572d3357d5c2600e9a64ae3e32751ea5953a37bbb8a0bde939732b1298486ccceaa64a84400f6179e44cd360ec5f
-EBUILD baloo-5.70.0.ebuild 890 BLAKE2B 7399d3641680ae22b358d43abbf4a52b710f680aa4e160d001b6080852bd05432e193394e9a42f59a71d19ad38789bd918e07bbfd5185f75daa939de54d73395 SHA512 b20798207d159bf16bb33509348be4877b8306c2e868f3baa27a3ce9f7d6c70756bf918d8fbd7b08d27715ea5d0b9ec6e421cce8d1fc2364151597ec701f2abf
+DIST baloo-5.75.0.tar.xz 287140 BLAKE2B c306a54f9d4592005a6bc75dbeadfc4dfbbf63f99c91be07546f42aa12be2c5010e7ff55fd4da3c44ba7edc4a11a363c2bcedbf492bb37a90c029e03ecf8b22a SHA512 6f57c629088ce7ed45b2316b38763b4c0d6ce9e5fca52404e50792d56108ae9b75fea5545ea78306a40f4f7871e6825a7bcd0345b35ad4665a53d04e4faa23cc
 EBUILD baloo-5.74.0.ebuild 890 BLAKE2B 6a26785fc879038d8ad960e3a65af1c5842d93b7e9e786b1dd0b78a4f2a4c537771fd39c6fa3ea5cf7f9306508a38538b02b1a370b07531749b43921ad131c8f SHA512 6c03ba199bbb6e875ec51fe421d77f091fce95413eb567d3216337533799f49af14a6272a8be624bff79e34956aa34f26f7de180a45401e4f96a86f6b67712e8
+EBUILD baloo-5.75.0.ebuild 893 BLAKE2B aabda0ac16ad7fe9c6f60f39c54242a1c93efe5a3278c30c54e58fc883a2ad5627344b4c92f3516ca7eef2b78a938aa08cbe11e0bb53844dc323d146091dd3af SHA512 8340e3846f4e70b939f485472b713df4854a68298f75524994a7a30f76f54af41597dfbb004848410445f4e6ca31023a965bee0ba3a01b151c687a77efffaa1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.70.0.ebuild b/kde-frameworks/baloo/baloo-5.70.0.ebuild
deleted file mode 100644
index d1c33b4d7e20..000000000000
--- a/kde-frameworks/baloo/baloo-5.70.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="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-db/lmdb-0.9.17
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kfilemetadata-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kidletime-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/baloo/baloo-5.75.0.ebuild b/kde-frameworks/baloo/baloo-5.75.0.ebuild
new file mode 100644
index 000000000000..25a40ebbedf0
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.75.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index e7d381e57cee..dddcdd4eb4b2 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
-DIST bluez-qt-5.70.0.tar.xz 102992 BLAKE2B 01a2368018a31502634f3dda2054a0d1bf2c0c55a09995e3257a1950d780beebcfe66def2efa8c3b1cb5ce9eefe0166183fa75460a91cfbeafd4687673a361f6 SHA512 e9ed0c53c1100109ba02c7fcfb81bbc2162b0904219ae35a7455b7653086b1761820168a0bb959f65369dd7b8ac4b6726351e0e6a1fa98fac2bc513f0fbd9df0
 DIST bluez-qt-5.74.0.tar.xz 101916 BLAKE2B f57f138cd1386c9efe7560c10cb71d3c1f64ff348876cd9698fa38fd41296dac6b962951f943c2eb08701aa7c37ca90a9380a36a05c10f223ae95e20ccf8c723 SHA512 dfd13e5610233453596e633766c0da30d4f6ba219af32249ce502f5f6a64e9315d26408a5bfd6fc2f51043df531c73127d9c431ff51a0159a043aa681bd743c6
-EBUILD bluez-qt-5.70.0.ebuild 678 BLAKE2B 87a6cfc822ef5a5c7b582d21e9dbdb1c57e7ed6e1e9d6a035572d40d0ab8f61055170f59956d53b9cbb0d62eae190e3a67a6483d8a4851b29430bc0f06eb8717 SHA512 bf282af5148d2a57c1d0fc2bbfcad9d7d5ec89e2f886e6ad4c833c0f10dfa4a9d1301f458ce1b3f8cb7dd97d0c52bbf39b69711415fa812f98332445e7d74ad0
+DIST bluez-qt-5.75.0.tar.xz 102248 BLAKE2B c1ccb562eb56d94f80c2219d3e8354704bda4f8acfe3072a7d7aee5ce63196d5cb6e39ef124fd255f3a3761285802960fd258e436fd45d7724df1cc00e4e3024 SHA512 e042709e7c07d2f62ae782fb055cb7c1e9bde60e8ac949e84da8084faaf3f4fda02f785ad0ed2166cdc63504cbaa2de0db1a0b47bb7b3f3de21a90a550685f30
 EBUILD bluez-qt-5.74.0.ebuild 678 BLAKE2B 77e9bbfc7e67d62e9bc844fd4e0b19e8af52bf413ea013c67135a8c2ce992370daec910409aa4bedd4f93babbe6bb876ee4e02f37b9c378937d51f6d49d37a41 SHA512 dbbcc7112ae7d63a22ec5d61346ff79b8d7e229923b5760a650dc7de60a720c700b2a56cbd169a28ec87bf8705af800f4f6416660068878aa977ffde0deff85c
+EBUILD bluez-qt-5.75.0.ebuild 681 BLAKE2B 87d46c1b9eb8c2dceb0713a947698db3964f949d79bac9bde6be22fe1118e89d41e9ede6a128ad2b274e670bea930e6b2a0829f4b872813488d01dde7ce48b88 SHA512 a154bf05ea9fcec0d937f89e41a19a17df553ff5156a10d2a3235159e3f45d6207b60da514352eb2dc578e0bc78fca754e2de96e1a9f9cc28ca73d67b9e1b77e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.70.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.70.0.ebuild
deleted file mode 100644
index d3c49e663940..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.70.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, bug 609248; managertest hangs, bug 668196
-	local myctestargs=(
-		-j1
-		-E "(managertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.75.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.75.0.ebuild
new file mode 100644
index 000000000000..adc326faa01a
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.75.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, bug 609248; managertest hangs, bug 668196
+	local myctestargs=(
+		-j1
+		-E "(managertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 75cd76e0aa4d..51d97a7af182 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-icons-5.70.0.tar.xz 2647980 BLAKE2B 133bf41012b0eb981193efa6a3b9e770ee19eca0aed4003bf9c201794944eda1c19afcb0070bf1294f95b339fc7db8c94e56d4f03543942ed8f8514ed29ad47a SHA512 fc82e736fde136d7207e5ce05e276df73d1b419da70a709c882142a232f9fcc91cb157b103b6208e132b12748b8fee487d95e08f87f4111f5a174221bb9c85b9
 DIST breeze-icons-5.74.0.tar.xz 1968940 BLAKE2B bc238f6b408e33806f708a0bfa7ac738e75ec0f6531f16b1b558ae734c417c9d825789de00c37371975786d6d8bc35c6c1952add77bf2c04dafe3e406d3cca69 SHA512 735bfd7349a400b9709a1387119187ba1ca712020a8fbfc5acced97200f17b7dc8a8a6e823d7a3223012e2a990ef46af25293c013b5ffff231526ab18fd86935
-EBUILD breeze-icons-rcc-5.70.0.ebuild 684 BLAKE2B fb44f67bcd238ff26977c9fd572f62a593ac4277c3d5f52810441db04e8d81a24a9013c92b70bc6620e862d034fb8fb02cf70083daa3a54124fd9e7629433c28 SHA512 c7275837cc7330b8cc28c1e9aad07821a48a2cec95da33dc95a5dfa969b92db4086407334f49df2ef4eb8e463c48a5b65f747cbaa120635c5ae6adb729b3ccfc
+DIST breeze-icons-5.75.0.tar.xz 1973616 BLAKE2B eef8a2e32adc315f3bb4931dfea78ce05a19078dfffb8520502ca5d989fdc0b0ccdaaddf817d36081bc2ec714e3860eed18a95631fb5aba8f543b2f1f3327f5d SHA512 be224dca840fd8c82698b512734b03a11e4ba6de333fc35b7c485c90d5b23895f66f733b51af6a58f8f941c0c1f2e5f76774f674ea4c91052d3ea41b47916601
 EBUILD breeze-icons-rcc-5.74.0.ebuild 684 BLAKE2B fb44f67bcd238ff26977c9fd572f62a593ac4277c3d5f52810441db04e8d81a24a9013c92b70bc6620e862d034fb8fb02cf70083daa3a54124fd9e7629433c28 SHA512 c7275837cc7330b8cc28c1e9aad07821a48a2cec95da33dc95a5dfa969b92db4086407334f49df2ef4eb8e463c48a5b65f747cbaa120635c5ae6adb729b3ccfc
+EBUILD breeze-icons-rcc-5.75.0.ebuild 687 BLAKE2B 9f5021261e5b38bc2ea377c4c52ed00f1267a014df7cf18511824fc8926afc215fd69967dbfdb43b231a612d73e8395a829998c07fb2e2e3b9af159e6084e165 SHA512 e93b399dfcee1f83c11f2f5871fc0814993a345cd4e2fe0ba67d85df378778afa2844d7a02e8a0ae4fff3664ac77688451c1c606cc0de81bd972e9585e5e61a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.70.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.70.0.ebuild
deleted file mode 100644
index c846d053b553..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.70.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
-
-KDE_ORG_NAME="breeze-icons"
-PVCUT=$(ver_cut 1-2)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-qt/qtcore:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( dev-qt/qttest:5 )"
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	cmake_src_configure
-}
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.75.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.75.0.ebuild
new file mode 100644
index 000000000000..6a7e3a576974
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.75.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="breeze-icons"
+PVCUT=$(ver_cut 1-2)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/qtcore:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	cmake_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 0f814682391e..e23a74970409 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-icons-5.70.0.tar.xz 2647980 BLAKE2B 133bf41012b0eb981193efa6a3b9e770ee19eca0aed4003bf9c201794944eda1c19afcb0070bf1294f95b339fc7db8c94e56d4f03543942ed8f8514ed29ad47a SHA512 fc82e736fde136d7207e5ce05e276df73d1b419da70a709c882142a232f9fcc91cb157b103b6208e132b12748b8fee487d95e08f87f4111f5a174221bb9c85b9
 DIST breeze-icons-5.74.0.tar.xz 1968940 BLAKE2B bc238f6b408e33806f708a0bfa7ac738e75ec0f6531f16b1b558ae734c417c9d825789de00c37371975786d6d8bc35c6c1952add77bf2c04dafe3e406d3cca69 SHA512 735bfd7349a400b9709a1387119187ba1ca712020a8fbfc5acced97200f17b7dc8a8a6e823d7a3223012e2a990ef46af25293c013b5ffff231526ab18fd86935
-EBUILD breeze-icons-5.70.0.ebuild 714 BLAKE2B c74d4bd0143b85a8108fbd9f836d061cc1d5d4b579910face3652b1f42779490d9885d0b8d2585b47dc5b5557fd6774f431233d5adb747210d64200fdd930b4f SHA512 69f4d6938fb7127398411b82f79bdec1b4f3ac5208ee21d2c4497a2637b0e2777068d055dadaa8ba01b5aa2264ef5352906ce74353a32a1b3b22e1a82f3587df
+DIST breeze-icons-5.75.0.tar.xz 1973616 BLAKE2B eef8a2e32adc315f3bb4931dfea78ce05a19078dfffb8520502ca5d989fdc0b0ccdaaddf817d36081bc2ec714e3860eed18a95631fb5aba8f543b2f1f3327f5d SHA512 be224dca840fd8c82698b512734b03a11e4ba6de333fc35b7c485c90d5b23895f66f733b51af6a58f8f941c0c1f2e5f76774f674ea4c91052d3ea41b47916601
 EBUILD breeze-icons-5.74.0.ebuild 714 BLAKE2B c74d4bd0143b85a8108fbd9f836d061cc1d5d4b579910face3652b1f42779490d9885d0b8d2585b47dc5b5557fd6774f431233d5adb747210d64200fdd930b4f SHA512 69f4d6938fb7127398411b82f79bdec1b4f3ac5208ee21d2c4497a2637b0e2777068d055dadaa8ba01b5aa2264ef5352906ce74353a32a1b3b22e1a82f3587df
+EBUILD breeze-icons-5.75.0.ebuild 717 BLAKE2B 39debb4ba2298b52933df1b02784629997c72f9411c93a84f51561c61e1ccdb56fa3012bcc86d202b8cfb17ab9ef86957bd6cb427014b2e21771e57dd812273d SHA512 a0551216e39ac76258cdae1303579c3f695b0d85cade4d9974c0bc417671f82bf352885069e81a6dde7658d76d8a12506ca482dca6110304fdf4afb386376d1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.70.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.70.0.ebuild
deleted file mode 100644
index 275d9de76021..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.70.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=7
-
-PVCUT=$(ver_cut 1-2)
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Breeze SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-qt/qtcore:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( dev-qt/qttest:5 )"
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.75.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.75.0.ebuild
new file mode 100644
index 000000000000..9904bfe215d0
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.75.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/qtcore:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index a1db6d32da73..a61dea22919d 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,9 +1,8 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
-AUX extra-cmake-modules-5.65.0-disable-qmlplugindump.patch 2666 BLAKE2B a321b9881f643fee4b790ce47063b54722a17d98fcc7a17da4a84fcd412ae1dd5ed959767990ae5953e282fc3a8e9ecd4089aa056f0f366a937aa38bd27e153c SHA512 f43998ab4f9cb334d2a269e589aed9db08bdc8c91f2f5413c6e4ea9c5391068146cb7d9de1c7a0bffe61489075231caee535d1e669d95df3bce1fac6aa4155c9
 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
 AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
-DIST extra-cmake-modules-5.70.0.tar.xz 343476 BLAKE2B efcf47af54decc383c150aff14628408f6e77001ba4c6bc8a6f1636e62e20c06fb435a0bf7d93ce610ed7404ae186b732d994d2a530f2d65207cee70cdac8af8 SHA512 cbee488db0ccef4c876770ec073408208037d791ea67d9f72937c4fa20765f69d9312a3f9e2106526d4fb0a76e25d7fed13178209f8e0b1b3f01b76be17d4784
 DIST extra-cmake-modules-5.74.0.tar.xz 344588 BLAKE2B 00724160628ee9cb628b5f3f3b119908b9f0b135f4c98f5f2ac0b2d707abb0fd8775cb87ff7bad152e2010647b64222c57ee8a042d89c5649bb7d27d5f3b3839 SHA512 5d4f612758bda73d8327cc582bda3550807de90e1b729d24a59ac7e70db127da208a53590f48cda9775f2be6e22a7db47958e3f01577b4baf0b8ef86672579a1
-EBUILD extra-cmake-modules-5.70.0.ebuild 1660 BLAKE2B a50fb5034e3359dbe527670ff439baadc4a4e77f895de0944610887cabfa466aa2e343a30cdbac3f58bbaa04319eaeaa16c6bdafcdadca530fd37bccabdad6c6 SHA512 ddba4f393fcee5691ac437fa9295836b5b3f791389372937adf917693dec8bebc764bef4484a281b75003ab0824c051dee351dfdbcc05d0da79f72344a9caec0
+DIST extra-cmake-modules-5.75.0.tar.xz 348904 BLAKE2B 56c5b7f63a2e26a67ba838d953eff433043a22da0d901de76dc3510fea39869aa5d8061f4dad1158db26f592c34bab07a309ff0afb8c756a2af65681d32e8633 SHA512 b322ef33ba6e910bdc7374e572d218fab540453044218a08eb2633998d4aacd0e925f3dd3b7dd20af43d5853a81d540512e0e47d444cb7d864fca63b7e78731a
 EBUILD extra-cmake-modules-5.74.0.ebuild 1718 BLAKE2B e1a56631f2cec11cc4a3a5395d3c517aa98fa5ad72cc04338154a00e8e89922e69f4ffae1b5d19dc1a2bf68f13835ed1f74f05894e11e153039c75a33a95d8f6 SHA512 cba7a7cfcb42f30c739e540dfc0c653db12d8b1e2fd26f57943e6800b8c815b2aad1943ac4265174ffdebc27ab983648e25c26c9f8afab6af5c1365b9d393133
+EBUILD extra-cmake-modules-5.75.0.ebuild 1723 BLAKE2B 37200b9488e04fe808548abf9d2b48cc4891718300488ba5e29a3095333bbdd6a039d729d6af3df7448e8482635610bd4990286e124f3ec275012f6c6e7daad7 SHA512 7a73a2e019d2ec4fa13a772c45e6d23fefca013637d31d9839ad7874c44821701e892e35228e8f17bf45cdf05d0bf70dd285dbb82841429aa00e9b0b02b43308
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild
deleted file mode 100644
index 36c1e259b30d..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-QTMIN=5.12.3
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-IUSE="doc test"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-	test? (
-		>=dev-qt/linguist-tools-${QTMIN}:5
-		>=dev-qt/qtcore-${QTMIN}:5
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-RESTRICT+=" !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# Requires PyQt5, bug #680256
-	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
-		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
-		-DBUILD_QTHELP_DOCS=$(usex doc)
-		-DBUILD_HTML_DOCS=$(usex doc)
-		-DBUILD_MAN_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	# possible race condition with multiple jobs, bug #701854
-	local myctestargs=(
-		-j1
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
-	)
-
-	cmake_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.75.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.75.0.ebuild
new file mode 100644
index 000000000000..0e86222781b8
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.75.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+QTMIN=5.14.2
+inherit cmake kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+	test? (
+		>=dev-qt/linguist-tools-${QTMIN}:5
+		>=dev-qt/qtcore-${QTMIN}:5
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
+	"${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
+)
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Requires PyQt5, bug #680256
+	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
+		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	# possible race condition with multiple jobs, bug #701854
+	local myctestargs=(
+		-j1
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	cmake_src_test
+}
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
deleted file mode 100644
index 2cbfba7d5ebd..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
-BUG: 387753
----
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 8109ab8..1edc01d 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,23 +26,32 @@
- #=============================================================================
- 
- include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- 
--query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
- 
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
--if(NOT QMLPLUGINDUMP_PROGRAM)
--    message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
--endif()
--
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
--
--if(ExitCode EQUAL 0)
-+if(ECM_DISABLE_QMLPLUGINDUMP)
-+    message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
-     set(@GENMODULE@_FOUND TRUE)
--    set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    set(@GENMODULE@_VERSION @VERSION@)
- else()
--    message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
--    set(@GENMODULE@_FOUND FALSE)
-+    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-+
-+    query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+
-+    find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
-+    if(NOT QMLPLUGINDUMP_PROGRAM)
-+        message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-+    endif()
-+
-+    execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
-+
-+    if(ExitCode EQUAL 0)
-+        set(@GENMODULE@_FOUND TRUE)
-+        set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    else()
-+        message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-+        set(@GENMODULE@_FOUND FALSE)
-+    endif()
- endif()
- 
- find_package_handle_standard_args(@GENMODULE@
--- 
-2.24.0
-
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 967b52ad64da..0e8df57b7615 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
-DIST frameworkintegration-5.70.0.tar.xz 1753940 BLAKE2B 5da86d4b7fe8a696e217273ff468c668ec1e04c138dd756a0a9280fbd6acb99f9cbd3bbce1790886de50335d036e7a99a83f1ea4ad4103101ecc46878d0e071b SHA512 70a72388315c0ca1625bb279b15a9df1693aed9a6dd470af8744b856e5c7cc458b0ffcc384489889e8c3e753edb03062b41cc688361498e45ac3a26d7be70a34
 DIST frameworkintegration-5.74.0.tar.xz 1754176 BLAKE2B f325c8362182c066f7fef108a350e9c9378e084c7955e1395fb44918759dbd7e5f55cae037525b286cf9f6b0c67788a766b62bdf737994378b1978a7ef7dd507 SHA512 4bf533b261c149a10ed4b4607f532b57b989f6e130c417a0398216ddbe1b4b3ab964009aa5c021bdc92960f8c25c7f5c66cf8606ed7956b25adfa401d0f08e68
-EBUILD frameworkintegration-5.70.0.ebuild 1052 BLAKE2B 6e5469f3599240695d2bbcbf6f52559658ed6332056da4e772464ea25cda7aa5c9ddda8665e38eac9318a84fe558ef86bdac565466ddddc0af95ab949dbd3846 SHA512 2fa31b0ca870cfa3ab3c808756230ec5236819397cc4e4498dcaefe1f09c962cb6dc8c477418a6b9a1035b639ccdd858dcc105fedb33ee406ac28fa2d8032988
+DIST frameworkintegration-5.75.0.tar.xz 1754740 BLAKE2B 8a3d58fcfc35da8df3b4482cb4550cef7312071d92b168d87555119f124350847d870616b908f24a73f08d03c04bf944b0a9c9c33d29113656e0a2581ced814f SHA512 38c3182d7278ca985acb9f4a9a8c47fa1e7b61a6c23a8285000fd67d1ae4fdc59d2f05f48471ade38c92a35ffb8fafeb4092f46704f3501e2e0dbb7b94d602ea
 EBUILD frameworkintegration-5.74.0.ebuild 1052 BLAKE2B 5866974cc8754d325a38c00c44ef06b9d7ef93c1a406c73f9093dd6c64238eb286420c96d37bb2a47f3edc5cd03354ec79e9bb9e1b8906ad3794349c7e65848e SHA512 b87b23e01b352cea73985ce0d150478551fa956789b65d6168eb6e3e45dc8dac7d5e60b75b5798276f1827890d4eae55adbd2de4f438f6230d63ab41eed516db
+EBUILD frameworkintegration-5.75.0.ebuild 1055 BLAKE2B 350cafb7cd2e0fdca4158b2f0ff123502142df50f533ffe585e3654bfe08e52fb33d779b17a8871effee6432377a08e4bb7464934507cad192a9fbc08cf80456 SHA512 64fba69b2722e863578e55719cfef80b0e0a50edf79d39140de425848f36b8042b94ade1ec4e7cbc85d492357e38d86241966195b21a53cd4d09db7b87821e41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.70.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.70.0.ebuild
deleted file mode 100644
index 4f1b0a6dcf21..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.70.0.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
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/knewstuff-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-
-# requires running Plasma environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.75.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.75.0.ebuild
new file mode 100644
index 000000000000..2aee64430b07
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.75.0.ebuild
@@ -0,0 +1,44 @@
+# 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
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/knewstuff-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 725558eac8e8..ee82b9b2e207 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
-DIST kactivities-stats-5.70.0.tar.xz 63188 BLAKE2B 44c7505ff689feff668f53f2b2af5cc57838348520ea55eb4cc7c82d0bbe9503295b13d10325375cb1ae2e1b36424f2f29306b4f9f6eeaf1bde7740d6a6d98a0 SHA512 4d04fbb381fbc878d92315e5ba4809b607e54c48f99ecafddf9e77efcf485335f7b364c70e45184c7af4618620a8806f3abcd1c0b56c1de4d75f23f4bbf7e4db
 DIST kactivities-stats-5.74.0.tar.xz 81968 BLAKE2B 51c27340d9058261b955f9f590fa1472d69939b3e3f52b7d996b3fc04cfdbe7148c343405790e04b2c0743ef0147d497eab2c3e6ee390d007e6f0d2f2af127ad SHA512 0caa8afb52b7643cf21a6d3fdaa3e987b632f1414e9888fc174623fe8b646c3eef4a8f57a2d0d22f7d726e9952a074550d1f35fb0f65cc5d061222746a6dbbac
-EBUILD kactivities-stats-5.70.0.ebuild 516 BLAKE2B 97606fded60bf89c3c10b55273183231f02a18369be12b93e191a5c0b30bee145ae340f1ecd0cec6499ffc9a811d6eb13d76b536984defc2c5ea256608126642 SHA512 cf7268b82b1f9143d66454e621066a45b7b5361b6f62535a1c98eecc4c3540f407c0b9b107327bcc0c67c697c41dd18c2927bb321ec2a33f08c262dcf965b48a
+DIST kactivities-stats-5.75.0.tar.xz 81956 BLAKE2B edfc8bfb55380b83fd640a5e8d57ffa1b14210f54748ccedd81438c7c286716044f22c00580a6ecb284c20950b62593a9648c22ba77faeddb8d1a2e4260318e5 SHA512 7954a887d270bdfd3b84e34def0f610370121d430a224a1de32b5d25f7bb9a09a6f360b919a8cb97c2d18d951d75275a3d584996a777c538f670053bfbe2e609
 EBUILD kactivities-stats-5.74.0.ebuild 516 BLAKE2B 0cc7bd1187695a74f038dd0f3fac7d00d09ab8a211f8e9c7189883cce7832055a5005b61805ab758d36c829b4abd7a82335325a3755a0519fdb49385b2596a8d SHA512 67e5ebffe869b019b8cf48f2cd2556f5f6ed111f64b1dba4e6135d280bdff410e861d07df0f90c1a48851972d34d06a57e6f77917ae24ce8ed14e67348f360cf
+EBUILD kactivities-stats-5.75.0.ebuild 519 BLAKE2B 9abb049dfc61a64062ff41aef3fb9361249930a20e6d3b447c1db0020617076093b61c56b4e22612c8c75570005463bd47505e2474901f8e76a4f0eba5994e62 SHA512 ff8d0c58f785c195cea61bac2262e058ab13b68d5389955e8a3c748a2e8c96cd49caf9be52ae776495f69affb9b4c36ee632cc818f603815fbbac8fd55715304
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.70.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.70.0.ebuild
deleted file mode 100644
index b0ae007a9545..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.75.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.75.0.ebuild
new file mode 100644
index 000000000000..e7be636cad1b
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.75.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 3d402d998124..95843b42eab6 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
-DIST kactivities-5.70.0.tar.xz 61384 BLAKE2B b98fe9d53893250478adb8d89df2ddb9c27ab8f59c1586adc0343bd407e180fb7b78f1d989d07ac0ebe21f55c79d4005edfd8cac46566cb66193eee93e6d3b74 SHA512 da5f10f4b255cf38f87b7fb2fc24273b00f571ec138ccbfcb72a08079240ca92bf0c816129c30fb23b4636e79bf6c5bc53d2d14cf337130528568809723b2346
 DIST kactivities-5.74.0.tar.xz 72588 BLAKE2B 4471f68ffb59351ecf054c2aa11b0fa6dfc0e7fc888b672ce5c162800e3a8b69722cdd74170d9b0511297a5f353cc81e5f5906fb19a8f25423fcb1680b6e36cc SHA512 fcfae3047e19dc7b41c0f0752c6aa95a652d635947c78ba9a3d069e365f9c68475b325c591a3a864c63ef285d243b473720f63e92d86802df661bfdd7826b7e7
-EBUILD kactivities-5.70.0.ebuild 679 BLAKE2B 5213587124112b52218f377d49f31167dcf9fd639eee49d4b01e456d84d06d0735145c62f71363032c7ec3a42f9b2ec9b68ce00cf65d6c818fcba7ed62e9dbc3 SHA512 65e530162dd89e3ffdb3679564ff1b966810814b746edb1988634016ecb6e5a9bbea74abc5244902dc8cd88b7ac82c9dff9991942d574451648ce72cb9f26f57
+DIST kactivities-5.75.0.tar.xz 72580 BLAKE2B 093f43626ff244ac9026347fd24fc910ae1d9959a094f4879a698b3af4497b728db4d35431eca3e50eafa1a0e6c1d5fd3ecb01cf1648c891d885268da0201394 SHA512 473eac6a56ee8fee3fe53d6fb71cfbcf495520741a95b9709937071331271fe644f5b5ee6dc2a382f22ff7e5e5976750d753290b7292d34f28bea4e5a1bba4b7
 EBUILD kactivities-5.74.0.ebuild 679 BLAKE2B a1db88f84191883ec774b349b5d51724dce8840bdef26970565964c823fb2468a1f13228428110a539b47409aa0140c5683f3ec4521c0159ee0603a9d034f734 SHA512 85862e921a8fc284f966677ff4f5129f3284245317807a9bfc6da207ebda8eec327fe46381cc80556e7bb1ca9879d42c6896fdca1acd4387bfa628065df3fc73
+EBUILD kactivities-5.75.0.ebuild 682 BLAKE2B 6620862abb232c5f474d940130e6c7978deb3ceac9a8ad19001c9113ad9108869d9ec6d5ef54e72dd4042389cae236bfc5c1d31d43592223aa8080aa7d02fde5 SHA512 6c4fff95379c202240e0462eb03dce8b9a721a0d674cf5bca0c029e8bfeb47286f1dc805d0588ecb4d130f6e2b1329326e470df5f5ec09dcab5d804fa2f82ab1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.70.0.ebuild b/kde-frameworks/kactivities/kactivities-5.70.0.ebuild
deleted file mode 100644
index b074fbf40724..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/kactivities-5.75.0.ebuild b/kde-frameworks/kactivities/kactivities-5.75.0.ebuild
new file mode 100644
index 000000000000..e22283211040
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.75.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index bdad31234cec..c7a6c24efd60 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
-DIST kapidox-5.70.0.tar.xz 158572 BLAKE2B 25b8deaec2ee02290b1eb5c24d85e9b2c66bc01cd073f415b11b46ea73aeb0ec2d44da8099291bad3c6f41b34504d118b89c55ba6f0de74fa6f66b85273022f6 SHA512 846d4b555808052f58d1bc073fe7f67c9bb7f1444950f50f019bde481de7c56e04a10661ce00335508cae252a3a73a15ae46addca2839bc59468e51a12e21b13
 DIST kapidox-5.74.0.tar.xz 158916 BLAKE2B 999357b65fefa4ca2e386f00c59e825cce352fb79726a090a87052f96af7184aa3869ec8efa313930ddb06ab6a6baf090e2bc1087330f977612947b7b6c4d136 SHA512 0292f1836576e67d2a0b439ca3890d10b580ec6dfcf947760c305320ba67f688d2e75323d9976be0673dfbf241f7d1978cfbfc5954de8ff7b2fdbab88bf62b1f
-EBUILD kapidox-5.70.0.ebuild 608 BLAKE2B 528c3948560ea5e00960bb5441090493efdc0d6ab873c0afc583e59733c1641f8d915c8917c4c5274a56489038c4892c67d96330c488844b2486a3054ecc058c SHA512 95600bc0fe7e571d7a9d98b6c6be6ee22d8681147203ae0737968451158a3850b3a3ef78c521776eaec35c6ee4266979074e02460ff608aef5113bcb5c278ceb
+DIST kapidox-5.75.0.tar.xz 190000 BLAKE2B e91c6aa470117e834deeb2d18c0dc054ee93e85cbe7fa51df04a7278b70c06faf49ac4020b3abe1d2a25bb52fe4c88a3209dfe9606f1c886ad54009b1a3d87a4 SHA512 63250a87c8f4d4201ffb993d5a941dee2f7d3c8b4fba73468bc2822acd6652dd1965244a7dc2dd3cbdba9fdc56b7dddcf5d36d4739e706f8a771f5723ed2eeab
 EBUILD kapidox-5.74.0.ebuild 585 BLAKE2B e80fefc488c79bef6b4bbbc762956817b2ef241e2426297c925be3d5d470259d619bfcf0c7ff290c77bd038bf568998996a542ca54ee4155509d2468511b9167 SHA512 ad5573dc7764949c62dbc8c1b829ca9e0dfdb85b9b68311bbb217f698e406697e25dd8e376eec0cf26e5c9c9c0148ed5d1dd9499cdb0c04485a9921ed3dbb27e
+EBUILD kapidox-5.75.0.ebuild 595 BLAKE2B 003280b0f8fd6f50c660fb553ae4d6ddce2c6c519a8976c3f9f85cf720723419b864e81f70eba3ab6b1f1b02a119156474efaaef24d74cab3ae86d19cfe574f6 SHA512 ef529e6b04b70bb614cb6682489e2e28b985c7b44ea6f38e3451b6363e06032ad9e52bfac3c9da3bb8799d137c6393a0633849fff1fb2237f50433fa3ee28605
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.70.0.ebuild b/kde-frameworks/kapidox/kapidox-5.70.0.ebuild
deleted file mode 100644
index 2beb410f2855..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.70.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
-
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-	')
-	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/kde-frameworks/kapidox/kapidox-5.75.0.ebuild b/kde-frameworks/kapidox/kapidox-5.75.0.ebuild
new file mode 100644
index 000000000000..e0a3ba25a3c1
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.75.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL="true"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
+"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 39b791bf8d77..7146bb19983f 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
-DIST karchive-5.70.0.tar.xz 987844 BLAKE2B 01702c2104d0abca1a43f87f072e8c3d34e6850d3f4e076a6d4efaa7e0d144c2e118a01810f2b41aebe307107fa8f4918062c429c2822c66968358bb601afb81 SHA512 3d3408ad6fcafdb7e945997228f8c3fd68f6229d07f76a081a35d1f793b1175be0367e24724dcbdaa16a297c4b7de042e4d160111f15e58a0fe8c6f2aad8ac41
 DIST karchive-5.74.0.tar.xz 983512 BLAKE2B 871fe031a882f36a8a463233b86a26746b85b44242ba493631d5cbf7ba45ff9fe62ea3c7c5496b6983b96a9531a848df20f2b714649434ac3ffdf091b06ca15d SHA512 c43aef33cd5cd1128637ab8ac3f7c8f26eaa27fb9f14ce0f2b5d122be2cf08f4b758fe08147c570969834600f714c1e236d1e7c05864ce1cd2dd8ca2f4e62069
-EBUILD karchive-5.70.0-r1.ebuild 379 BLAKE2B 23e4d303944b7f0a94f479cd1819dd04a192a52c89f36eb0acf693c4309b310eb57af5634ba05cd18007867842be30ae95429aa2f093a3ebcb1fa2d2de780f57 SHA512 db8727a93a72f2f52afeb5c0781fd02f7caba491f1fd7bf73e12f38b523d525ba57482409e93f662a63b699b54431e47203cbd1eabe33a587ebd256dac204451
+DIST karchive-5.75.0.tar.xz 983444 BLAKE2B 4f1533b3f1d35e5bdec526d731f6da871d3e34207bf64566b595c94b2b54d76315dff3dab32d44e36294a2531d589adc1e5afc3800712c1caea878c392d47b57 SHA512 b92a50b013cb14789c886b4b8ba576e60ad87d9ab11b8658a5f9e3c9cdab7a95f95e7199cd57755cb50c39d0f603d9b7387f977dd10a98aff2e407c7ff36f9f8
 EBUILD karchive-5.74.0.ebuild 379 BLAKE2B 23e4d303944b7f0a94f479cd1819dd04a192a52c89f36eb0acf693c4309b310eb57af5634ba05cd18007867842be30ae95429aa2f093a3ebcb1fa2d2de780f57 SHA512 db8727a93a72f2f52afeb5c0781fd02f7caba491f1fd7bf73e12f38b523d525ba57482409e93f662a63b699b54431e47203cbd1eabe33a587ebd256dac204451
+EBUILD karchive-5.75.0.ebuild 382 BLAKE2B ee69707d6d7bfda931e0d06aa48ed7a35487ce50e59da41c84c80817f4d95996f935c20bde5111193d58bbedb40c14204e75bccdc46cd08d2f59e68d24d671be SHA512 54faf1f079c21dc40043aabfeb04918b1ef734d6ec966ee42b248d4f076183707157a0b17336c0bfca781d44c87e66c4c012ffd7c692d99f40cbdd12bb231e1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.70.0-r1.ebuild b/kde-frameworks/karchive/karchive-5.70.0-r1.ebuild
deleted file mode 100644
index e0cf280e5458..000000000000
--- a/kde-frameworks/karchive/karchive-5.70.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=7
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/karchive/karchive-5.75.0.ebuild b/kde-frameworks/karchive/karchive-5.75.0.ebuild
new file mode 100644
index 000000000000..bb212d03f1c5
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.75.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index d4833ecd047b..93c6e6767267 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
-DIST kauth-5.70.0.tar.xz 86396 BLAKE2B 1547fa301a2aa3a2db2257e635df24a1ecaaa77f09bba41180b1fbb02d766c124ab5aa681c1e82abe73e0713a276b6857b9da05493ef415b530b8680d37420f1 SHA512 736c372732bff566f0f7beaa953e8b8ddb930b08cb4269e38174523fbfe6b77041dc3141980f109ec15d176a5d367dd05dd58e1fcca234f7eee828a456fde906
 DIST kauth-5.74.0.tar.xz 87860 BLAKE2B fef152c84368769f8b5e528e01164b9002e702ee02057c173370613a62888d0e99fe680fc5236afa2b24ca6dd4429d6e3727a62dad9074d93ff2a7d617eef224 SHA512 277ff88cf447fdcf6c413997b4a3be871e7bddc0cd23cb379cb35f05c4b93cf68d7f0792eabc5d56ec7f043bf6de53ba9cec223750c4569a72e88c27f8d36036
-EBUILD kauth-5.70.0.ebuild 904 BLAKE2B 464b8498cac6d1cc49b52bbdf6f15c858fcccc525970e691827fa28bc3471665924c447b182146b8c450c9e56052e52eb98a048ef58d8ca63883f021ec4a954c SHA512 137aa89fe5c3b5c69eaafd09ff22082e16860bf39b0cb25e8c7dacfaf1e5936d219830fb62c3c3f50680c23072c591d03ddf0cc9882cbb3d8e358d4acd45e951
-EBUILD kauth-5.74.0.ebuild 906 BLAKE2B b6162cb5d5bbe7f229c2e0b6587ff4e2e8857b640d66115d4c2c8f0bd9e4101ac2147bfe5a07a0e268b048b5f99ad3052ceff6bf6f1a444fafe0c3f6e98f9318 SHA512 b61dbea1bed79a722306e3df429b413e426beab4138fbe182bbdac4a774e1e0c74e96698363791db4c779cadbbd2c339328c0808b4d5635e1c60173ab132f973
+DIST kauth-5.75.0.tar.xz 87964 BLAKE2B 3f1e533a1fcfaca703fb3a8db1cbf72c48eee5c2c7b845092d9e6eac48b1cc57c6488487d2e69b3bb6cdc555f08648f4ec07b3abc3a7c66fa4b70c75c9fd286b SHA512 cd9648dc953c1013b492fd155ef235b58f7dacb5b1131dbc5f1b232ae303403c9a950ac09b3b57583bbe61f304bef7aed2975bbf5e57bb7196393fd90064d1cf
+EBUILD kauth-5.74.0.ebuild 976 BLAKE2B a9f6df5a0562fa54271734aaa00b0e9f3ce9028483115b25011dfbb6448b30ef664da0089ef7f69fb65470ec9bafa84065c2e9cfef56f6a58e4d966c41c09a2e SHA512 dfeff9217bbea40c15268fe10683110a6c674686fa7916e10726aecf5841475b4205eeec3780dc5d0a20deb94c431d310367a7f3ed0fcccd91966e13e89ab9b9
+EBUILD kauth-5.75.0.ebuild 979 BLAKE2B c67f660addddc678b6c250ac016bc2f603834fa10c7c2bfdbfafb321efeaa39dbb213ac3d4da9dd981f3ae7ad3d98eb79c9f87e7493c929e5ae587aa27f450f4 SHA512 04e2962d09979fbe080c047cd6cec14e9f77a2f056477038e335a218423c88c912bde1a4411d84c08a97a4c028cdee36aa47cdc37cb467438d72524784371f50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.70.0.ebuild b/kde-frameworks/kauth/kauth-5.70.0.ebuild
deleted file mode 100644
index c8a3ff5c9884..000000000000
--- a/kde-frameworks/kauth/kauth-5.70.0.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls +policykit"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	policykit? ( sys-auth/polkit-qt[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package policykit PolkitQt5-1)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# KAuthHelperTest test fails, bug 654842
-	local myctestargs=(
-		-E "(KAuthHelperTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kauth/kauth-5.74.0.ebuild b/kde-frameworks/kauth/kauth-5.74.0.ebuild
index 295a08a101b3..08bb212c11c1 100644
--- a/kde-frameworks/kauth/kauth-5.74.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.74.0.ebuild
@@ -28,6 +28,7 @@ PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		$(cmake_use_find_package policykit PolkitQt5-1)
 	)
 
diff --git a/kde-frameworks/kauth/kauth-5.75.0.ebuild b/kde-frameworks/kauth/kauth-5.75.0.ebuild
new file mode 100644
index 000000000000..b1cc5ca0ce67
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.75.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls +policykit"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	policykit? ( >=sys-auth/polkit-qt-0.113.0 )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package policykit PolkitQt5-1)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# KAuthHelperTest test fails, bug 654842
+	local myctestargs=(
+		-E "(KAuthHelperTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 29ca33e4d55d..58d9b1173ef9 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST kbookmarks-5.70.0.tar.xz 121656 BLAKE2B 5d45e10aec1b2940b3124af54ae0f3afc320817292f4ad495ccf1e4177376edf5aad752ea34acbe54c843392a882d754b327848ed8ef26593c532ad5da160ed1 SHA512 8b267b13efc2546fb30a3d43fb17ee4edfc1a09c3ba8a56d87538592862404fb7d7d9424e3f35dda56749e250abf7103d63834375418d262a6dc822744d0e8ed
 DIST kbookmarks-5.74.0.tar.xz 126504 BLAKE2B 8928fa25818fcc4fe30465ef39009c41cfc38f34854435a45df3e91fc69d2612c9bb4666ee5e70660d6a7d2a8f8777ea7bdf60dae3e8b3bf13a2d498e25d3e0f SHA512 c12bf2f54f64bb2bb7ff3c7e4124d404369878f29ae095d919aed2ea57b07b78b8c9b66f8c8631fd0653ea7623a05425a5bc7d383d69ae079cf0cfaeec662be7
-EBUILD kbookmarks-5.70.0.ebuild 816 BLAKE2B 3677f8fcd6ad7aa5621b93a4db5e5385956ee17a99aa3bc83518c6016c6ec15d9c49663a9abea7385702b655c1f4113970b34b3384b614ff04054dd473b576c1 SHA512 c3102d9ae062e022fa912a94605be1df8c99574230eec5d0fb5a520c405f5fe583c89f8a60508182787385a44e4ca7cc71530e688d3fc375f3c6e6efb65c1a19
+DIST kbookmarks-5.75.0.tar.xz 126308 BLAKE2B 45833cae25087d955ab3c73fe01f4cdd6ed813c483406344a9e326cbf5762f0f6cbb4df12f8f3ba24e1ee7778ed7ba5767173be5c46cce0f10a8e47993e5abb0 SHA512 031469870dbc2dbf5d974e7661a47605bc8c54e3fd97a576fba6b0807f653f73488ae7fb662a91e3f36397f95570ee179a0954e48906f2110a053adf2dceaabc
 EBUILD kbookmarks-5.74.0.ebuild 816 BLAKE2B 8e33f146b06bebd8e9da43a1c5136b66f5d6007b8e65f5f524f793cfcb5e989dce13399d283e602a0de5c21495c34bf570300115577219317746a74494d04ad7 SHA512 96d9dd0703e51e9e94c5a3aa1e6e41261e79af2dc6ca77b7711bb11094ccd9734329537d9b36f06e40ebb8c0b3c2a5549f5c85c7ece604c6326cf3566e06c720
+EBUILD kbookmarks-5.75.0.ebuild 819 BLAKE2B d50a5bd3e78b61984e5ac46e880e293ac282629bba5fe43670339a20c2322c7c5b85762a71db2d35c6174d2dd4420c4587b6fdf07cd5548b7683c61ce266fd63 SHA512 74041ad214e487686a7698eb5063e35fdbe352e7517769b23a70997c8ed8ce944e37fe7445a44a3ac5af31983d20b2d57610fcb69cb112f30cbe90f187406de0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.70.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.70.0.ebuild
deleted file mode 100644
index 68e96459d653..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.75.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.75.0.ebuild
new file mode 100644
index 000000000000..d691d0604987
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.75.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 99620ee2d7fd..4134d42edd86 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,5 @@
-DIST kcalendarcore-5.70.0.tar.xz 254768 BLAKE2B 0057903643ba05aeb714faa6833e6e84d51898ddcda4ab60d694dcb1d5ba352a8027fac41362666c657275870c31be0324e6747852955506ff051a7919cd3a6a SHA512 1138a8c45470e4af32a0bbf7384dcba65a666de2cf6598ecd128e42087b16d3814e90cfe610453a1bb5044210e6fac174663c799e52aeffc91863bb5ab7a463d
 DIST kcalendarcore-5.74.0.tar.xz 255684 BLAKE2B 8e2547f784881f031e9e9bd3a461aaa6219d419c43b096be9a7a357ed95fd232c5350577298bc4cc640966023cf6fec51bd952fca4a11cac817d6756fab3b2e4 SHA512 f6b48283d5433e171a1961abcbf47422fb8ce1e6412d0a83de20c16b2e81e065e16c1525440e1a29791b31ec74fbe672878cd554fceab703cc0c9c45c23524af
-EBUILD kcalendarcore-5.70.0.ebuild 511 BLAKE2B ceb5c882d52b5cb0fd960bde3103c3d66f997e1fb1fcf383bc01a35194b4746c4120b2681062725abd757b3f038cb3ce25c8e92e056a36bf55c2665198b01fd8 SHA512 5594ee45f00343d2ba62019d075794dfc4446347457772ab446b073d56ee301e71e36deae19c28bb51de4f94f11f57d8f78ad3c4db4a1abd3cbf7174f3aa1318
+DIST kcalendarcore-5.75.0.tar.xz 254312 BLAKE2B 8ebd043721b152b7b4dc57c0249b845a50ebdcf7901c1c8a768b18b0ec21275d2329237c76d64e429edc5eb914511d74e78bf1fdd4d61a6acd8aba29f6837d8b SHA512 66a18b4c08988fbe821b6bb695d01898f5da4e5a9a135c91521bf343da08ee4ffd224c7ca7aad601c3126918fa2d1c0ca5ce6a27ff966a04e832d1393f3bafb7
 EBUILD kcalendarcore-5.74.0.ebuild 511 BLAKE2B 1a79526a7ba308161c52379851496559f63647501b3fe5bef4383a815310a5d03ab426ce6e223ae3d5288cca040c71e5171099d99dda38b3e99a89bc60c41a92 SHA512 e38c66eaa57e568385457d95b0f7ee45ee776cf1ff4a86c6e7fb0cc0fa4752dba6edc206bfca5cbf8371552bd9ebb27d7c51fb03ec20c18506dfb4a3c4ca67fa
+EBUILD kcalendarcore-5.75.0.ebuild 514 BLAKE2B 35bbb4475b565c172ad74fe6ae414067faab94f0b47291a6d0c4af8db125a35abeb3d6d54de3acda50b12a819ad3aecd8f4b193956a480bab7041c2bd3298529 SHA512 1678713158b093b13cc405813ea22c948f2b43b148a294754cb23839a040b4129e09153d150109f6f9563ba74f7f79300189520d0ebf704f9e20f1bc14a5f492
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.70.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.70.0.ebuild
deleted file mode 100644
index 9abec5db33a6..000000000000
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.70.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_TEST="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for interfacing with calendars"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/bison
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	dev-libs/libical:=
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kcalcore:5
-"
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.75.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.75.0.ebuild
new file mode 100644
index 000000000000..e231bbfeee5b
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.75.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+"
+DEPEND="
+	dev-libs/libical:=
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kcalcore:5
+"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 175c22809424..f81d7e074053 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
-DIST kcmutils-5.70.0.tar.xz 239804 BLAKE2B dd137525dcfe057631891b934077f520dd7d9379f3657e36b3ecd5402b969eb7fc77c6360df7547c9ad32f412154faaf039662ff7ccec94ec2c85ecc1b21674f SHA512 2b1811c30bc003b2f4325aa1ce094cb9cffcb96eead58a55d4c40cd100ef3cc640d38510077ddc306bfd526526fb0598c3efa49f8342a0ffa46c296bac240c38
 DIST kcmutils-5.74.0.tar.xz 256364 BLAKE2B f05f8a5b1a97fcba211acae104008bf75d1b2fa3105ba56a6a08e57b4e4ccab8e18f5e9687d74480deb5a66d5f4a05b0071424dc01b517d7a568cf8f0dc96166 SHA512 105664749e73eeb0b911479d3befe813eef290d7dafa4ec51c134a79c58826361f90e18acf6d8f5d5b7e8d5d6a5956a73bc31e2c6f3de9ad45fec80341963c7a
-EBUILD kcmutils-5.70.0.ebuild 909 BLAKE2B ffc07cf13f4af27ed26da62a67d75cfe1d7bf2d7867d8ba7f9f6dad47e8c238e0267814f388617e5699df338ca4de2b9425e4c78cd91a73fbffb68a475db706f SHA512 e9270139090b7f5fca513ea580d29b9c0bee76d34607aa6a56626e399183251e120b758f9f9d4ff4a77c0443c2fb3c180edfe1b52785158c31c7b8c60bff7260
+DIST kcmutils-5.75.0.tar.xz 256200 BLAKE2B 5fc89ed36f7e2a70b66a090d81e6f5748085f6b0e859a6f237b474e307dac99c0ac5eaa80ce069fc2c086ae1ee48825ad48d121471a5b08ce13077d8a5eb83c3 SHA512 fb665dea08a5e734962b9d4c6d5ef863fb9a88bec450191d47664385e927a6a02d2b2410b4f600f9605a5bf39ec07e574e3ce2ca4671008edfd68082a6b89a14
 EBUILD kcmutils-5.74.0.ebuild 942 BLAKE2B f652f170edf5a46b39acb84475e57c656ca6372a5c97d05ce6dea508e8240738749bf477b1dca2f2058c4e1130f5cc6425ad1d38a95c8d71e9aa9cf565937e4b SHA512 d157a7b9b353e1084a1b464875a03ad389d08b6e932493b0e919ad19575722aea7ba28f7dbc073f74caf1363075bfa97e0b8ee777c6e6928183a40b68648e2b0
+EBUILD kcmutils-5.75.0.ebuild 945 BLAKE2B a11868922cdf7f6a025923c59358caa097684c0ee451251bdfd63650f1bdaa122cbe9cdcc15ee72f4c50e994f9c8b05086e186ff161d6523000f279ab4ead429 SHA512 04f7b37e511d935cf61343edf4d877541f8c7c197dc12af980e98bdda9fb11b76b21ca5a2007a5763bf635dc04fd2dead9138aa65415e32ff214f5a4cb11056c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild
deleted file mode 100644
index 39682e97ceb0..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.70.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
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcmutils/kcmutils-5.75.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.75.0.ebuild
new file mode 100644
index 000000000000..9fefc7bc1914
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.75.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index cddbb739dec8..415afb51d138 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
-DIST kcodecs-5.70.0.tar.xz 228972 BLAKE2B d9330ce4779b1a7764ad824dad4c61e82c5e45f42a6649f319a131cd71d864ec261ea05bc2d7e7fbe1f0479891d1660ebec1492b48a1a2101505f2ec64eda375 SHA512 c784cfd9db8a968df1f5f812e43196dd98297438834ae27aba7c994897e6f08323961b42623982b511a939b5ae0c8f47b12cbbee4db144af0b64f0fc5d933cae
 DIST kcodecs-5.74.0.tar.xz 227976 BLAKE2B 256ca557a5fc5f83ed286a610a056a4f4c76ea36ff49843b08ab92eed377c23f4e6b28a22df2afde8cf93e3d244ae46b1f1ea2911ed23b6b1f3cac762a6183bd SHA512 1858eb0d18b79ee197e780d995a30bf208d63acc17d8f474d27ddb67ffb4e0e7c8a909a1f3750a1121088735b4a6087609bba6d7cbf0838d414adec2c53d6491
-EBUILD kcodecs-5.70.0.ebuild 369 BLAKE2B 8f688e77846c99d216351eb06deeccefadf2a51bbee3bf19064960fca94690378b0a4f9d4982b180b30b93a31eac9a944ef7431d619aec3c4471d337e93b8c6b SHA512 379e668bb0bf48d0dc2a94738610944a4d27a9a90417c4df00fe630087ab660891ee0cdc86ba17bb75051685884d8b1135fff321118461b642cc6737b24bae10
-EBUILD kcodecs-5.74.0.ebuild 369 BLAKE2B 9af46bf82327edd0f488cabbc42f234685d820ec7a1285af3040fe7cdb20121b44f6508faebdcea498dcfeae0a82c851501e116e505f87258a3a4709a561d855 SHA512 03fecc68cb9e6f78751b1b70bddfed804363f8f8c59bf1114be8c3c973f81f7a62e076096b4362a2b29e69812a5a3c4c62ce692af1d0ec6d68af92febb2245c1
+DIST kcodecs-5.75.0.tar.xz 228108 BLAKE2B bc67e15439205dbb19c1c35980f4c508c31ffbf26fa7fc0fa018333324da7a22132a5d65023efbc717878420dc8ab87b0f5bc86f261d4eb9d53aa4940a4c0095 SHA512 8848012d46e9c067aab77d27e1bcec00a7a1a84eb25553bb2e51765bd9714851358f4de50606dc851f605ceac5c52003ad75246d0831e7218eee2521800f887a
+EBUILD kcodecs-5.74.0.ebuild 503 BLAKE2B 38238f208715ace4bbe2084a02288011de7964d49dcfc0ff04d7b4f66e5f96e82f8fcdc6556b1695aec016b28a992ec998edf9475062b114830a427b4179797c SHA512 424ae21972a06ca29524aba18c5482ccf40254cdf12835f5aafb70de667a438f329059f7cc8c49a2e00ef78106177ac45845837d96c1f57fa207668e30ef396b
+EBUILD kcodecs-5.75.0.ebuild 506 BLAKE2B 0d60ff9fd105eb14675194656f6be2bdf4e6a6d9290f46b347f2b4c8790e38064d7c834178bdbee1b7d83252f544ca9cf718030ce7894c4f5b9ae24640457733 SHA512 ca4ee5c7a1687802500e408d47068aec50908dad049dad387ba65d368667abd8b2f4ce35a2116f402a5cdff295a911505dd23e70256e64db2fe39fc7bcd9c10a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.70.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.70.0.ebuild
deleted file mode 100644
index a026052b6910..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.70.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-util/gperf
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
index 145ab6e8751e..83c6a77cf42c 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
@@ -15,3 +15,10 @@ BDEPEND="
 	dev-util/gperf
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcodecs/kcodecs-5.75.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.75.0.ebuild
new file mode 100644
index 000000000000..2523819612a8
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.75.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-util/gperf
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 31096ae7e576..a8e267d4cb2d 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
-DIST kcompletion-5.70.0.tar.xz 120128 BLAKE2B 47b9ff5bfae6c8215799b0b2d8d5c9047ab389946ae30a01ad09e7c6ff5cee656c72320be0bfa548908bd586b6f54093138a7bded89dedec08090c6ff99802f2 SHA512 88979932777ddd7188c28783afee5eca528bc7028eafd32a46b064f8225eff0c8b354f8bb14f1ec02f551a83a2516bd1270043498169fabf6123e8d9843cd987
 DIST kcompletion-5.74.0.tar.xz 121524 BLAKE2B cc0c0b7f37cc781795e7db7d91d88728b0a62d85dd870f2967bb00f4a466dfcae7754921a4c2dcabc7200dfac51ee0ae7642b94fd338c5788a6346616618138b SHA512 d63bb7a1f4a2ed42888b3811328416d0a63ff3f9cd2fd64f836cbaaabcdd5a11847e26d00e96ab2794f08c02cbfd60a969caa53f9210c21c0a85a3ce688cdaba
-EBUILD kcompletion-5.70.0.ebuild 602 BLAKE2B 3517a6bfdacde6825eaf611f2168547f2e490f78f42768700de0462ffcffcc426c82c08d7b716bd6f5c17a8ed4786f220a6cf119e37a2543fc1b2f630b9ba19a SHA512 7ebf4e45a5a7def807a63f33f423986abfd108fcf412978671bb48e5e67e6c9d60fcf628897ee18028d3699c954f1818d3906c514f42e4c89aad6cc8035f0a28
-EBUILD kcompletion-5.74.0.ebuild 602 BLAKE2B cc048f96a63cd1d981f50d67ba160c98703b95c545fa15dae455d02acd02da1a50dc440ab343e668e0dbb61af0daa9012d64caadc664b9267f03f67692979805 SHA512 e251ca9ad84c7223d77d5ef9fb9f21c0cddc6a63afe23c54ff2be4c1f6507b75df78a6191108590a83a498e4309badf62a83670fdcb62d71f4e15403a9cb1245
+DIST kcompletion-5.75.0.tar.xz 121432 BLAKE2B 8a5472400730f7ca981ca0821efe4c303fc8dc40ea31f09cdf88a0a9528d64a8828eae2d7d2e1dbd2010c1f4f1e89fb67a7de431160f07b4a358c57eea32fc3d SHA512 84d973d8b8dee7106fde69f944bc52a902fbaddc440bd4be5c01d2de4d0576fa849ab4ef4c583c7016e9a5e664c69e8ef4e8b68398e1dd453c9c2a3227bbfbbf
+EBUILD kcompletion-5.74.0.ebuild 736 BLAKE2B 006d23470ed1b1ba054bd4c9adb6ce6d96a7832ae80ea0e7a0189e9b8593ad5fdb2fbec9fd1eadb19128e644274c25581d86a438fb0e4e20af68b7985c1a3989 SHA512 631b9d0d7c2e9d64d00a9613dd10725bbc591ca76e47f2afb15f2c44426a280b47e8b105656f250940799e850caa53531e86c5cb1195dd94e504c23835c7f5e2
+EBUILD kcompletion-5.75.0.ebuild 739 BLAKE2B 47fc09a56b486318c215f1ba70bd0cc1bbbf933256849cb1f903c2411204725635c92f3d95ef0c12c38bef6b787b0222cbacd442a11c47237dd358e91065e8cb SHA512 3dcd9ab0a47db094c08e89f17a2fc52a3c0b63a2b53caf089bced5e260a7589c6aaf8fcbce9581d90dfc7f8d43c2a5af9340230f1f77dbff6141a0fbdde52887
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kcompletion/kcompletion-5.70.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.70.0.ebuild
deleted file mode 100644
index 896ed14ab29f..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.70.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
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
index d7d4771d1c2b..cafb3abd8a8e 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
@@ -24,3 +24,10 @@ DEPEND="
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcompletion/kcompletion-5.75.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.75.0.ebuild
new file mode 100644
index 000000000000..36afb9818d2e
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.75.0.ebuild
@@ -0,0 +1,33 @@
+# 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 common completion tasks such as filename or URL completion"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index e8cb19da9f42..48502377c240 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
-DIST kconfig-5.70.0.tar.xz 260708 BLAKE2B 390358342307e3db007e887943512becd49df4353754e8ddbf704ea959f2a35cead0272ce843efac884bf78a086773d82eb48859b8e95723cbc097c8156f08fa SHA512 73618b8e36ed23f99a4d574dc1b15e4e0d4b127ad7b61f0c3d28b85fa4eb61b57d3333ba0df33b4d079fdfe90c4294be89881bdea62253e9e7f4f57b13d0c1b5
 DIST kconfig-5.74.0.tar.xz 261752 BLAKE2B 05d11f2f14d2d6460238233b0f4032917e155d0c1a7eaf57f0ea83d24f67f2500f05783909df28c853893da6df775357beba2aeb87fa883a3047a362644f4bc8 SHA512 6c2bbf8aabef7344e5e085664d77c50b97541f2412e2c60f64f76b553034369b7a25cfbdd251f2b62e3bb91c2cd98749051cea3855ed09fb5baf80a098274242
-EBUILD kconfig-5.70.0.ebuild 717 BLAKE2B 39b59b2110cb2ea421ca74f4cbcd1e1bf6f4016cef9738356146573f31f4a434e9559ba3609be99524e500a4e124831670acd79c2fb63cb7056bd87e65ae666d SHA512 dc3e4b0dc7aebd01abbcaf5223b8412ff777c6d6ec953e97bdc109c5c37f692cf47ce0308d36d5eff001a3c05a12fb415e14425cd5cf79c6d383e97176f6c744
-EBUILD kconfig-5.74.0.ebuild 717 BLAKE2B 6dcafc9724c0b03e20d03d782dc2a893e616bd9cec771950ec8c5677c2b3b377ab26112a66ba92696fc2ed6fffa7a3ccbb413b4236335d0d5cd00cdcb2711501 SHA512 0ffe99c7339bdad6d1e68646e564414ca57afd38804b08994a0657cbc33be265164ce4a001cd44471f7de3565ef79ee7671437f92ccfd85f37e4a997c2b2fdf1
+DIST kconfig-5.75.0.tar.xz 263448 BLAKE2B 04e842202fb55ea51e2ff8e5d290d6b6f58ae7f54de18775424f0a310151490e8053bd5ae1297918bf34926d82cf51b86d8a3881fcd7f925ca16db3506837517 SHA512 06407e4ae39185b93231c09cec2552ee9948a3c16c52095ee9b1b2cf164335158b87ecc0981ee0e93517e41951d20a2b22b28ab0a9a7a73fc5daa1f2dd8118cb
+EBUILD kconfig-5.74.0.ebuild 787 BLAKE2B 79272cb77d2d48a6aeeae2112d5df1161922deea4837193bb7cc6dacb2bfb66dbdca1b3f1ca8757aee7f0caa7997bb1d833e1495f7f66bf5ea0b3f537344a56d SHA512 ce70e506aade8ce076c0cb1b8dd74fe4e1dc047361ae27b19f9a67930ead26504010c0ec11240c38bdc59ba55b02353b62398155fa65984d9aaaac862f7cf03d
+EBUILD kconfig-5.75.0.ebuild 790 BLAKE2B 79be100ed20bd82e34492eb7be318ce35bc7e3877264f2251135a6d7e4841003c072a11a9c382547acd33db5bd915583fcf8066a4d6f35f5125791dc201874fd SHA512 bb25b8af483d406ee960077b32d8cf463d4cadbda661f85fccc36126ce7b98202184a6f76a2b65e76349542b67862c9e1f636136f88c200dc713a45c2947a939
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.70.0.ebuild b/kde-frameworks/kconfig/kconfig-5.70.0.ebuild
deleted file mode 100644
index a440b6b4f661..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.70.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=7
-
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="dbus nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-# bug 560086
-RESTRICT+=" test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKCONFIG_USE_DBUS=$(usex dbus)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kconfig/kconfig-5.74.0.ebuild b/kde-frameworks/kconfig/kconfig-5.74.0.ebuild
index 4d5c0b4a1ccb..2a0d24268d97 100644
--- a/kde-frameworks/kconfig/kconfig-5.74.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.74.0.ebuild
@@ -31,6 +31,7 @@ DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		-DKCONFIG_USE_DBUS=$(usex dbus)
 	)
 	ecm_src_configure
diff --git a/kde-frameworks/kconfig/kconfig-5.75.0.ebuild b/kde-frameworks/kconfig/kconfig-5.75.0.ebuild
new file mode 100644
index 000000000000..981ff01f5e79
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.75.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dbus nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		-DKCONFIG_USE_DBUS=$(usex dbus)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 15955edb3b29..347479d2c6e8 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
-DIST kconfigwidgets-5.70.0.tar.xz 381276 BLAKE2B 5bd32ad65d72354b718657172c4f4829b5c15c27afd43215270565d27860b68a3c30f7a57969bb29c3ff209d07517fe792f7d2aee956f4037061e775a0fecc27 SHA512 c90a935864e00a50ea2304d4d3d2c2b4a8addd09db247a5e0a4aa84ebf5d9ca2def0b64038ba3f9ad8a392aa04f389bc140992b3a3ea130ec4f3ce87e965e07f
 DIST kconfigwidgets-5.74.0.tar.xz 386728 BLAKE2B 6badc87c26cc1509fd85f78ab483c005c8e882177bdeba4f20ed45faa3d21134b54d4eb40eff3f4adab1b20b029451616293da3e684ee092a4acd37639600fde SHA512 c51f005494aed3587a3f39a8582d5cb3e1f9e4c6da0074d9e9ad78038e63663278c891231c6358ca38ee9b41e00fe13da2bf0719b3213507eae8e5da35275e76
-EBUILD kconfigwidgets-5.70.0.ebuild 925 BLAKE2B e14eb840388a6056dbfb1be10fa537c61cb9ab1e98d3df5d85ed7534d14a4fa86f5ad98bb04c49c491251d2e7db945b9eeccff961033ec429278ed30a20bd81e SHA512 b1291498168d98ce78465b5e90d8e7d478dd6a0c8ae0491f0cc7f5c4fb2a5893d1d40967d04580fe3ef3dd33088472487b3f01ba695f5032d1be0ad5dbdb1c85
-EBUILD kconfigwidgets-5.74.0.ebuild 925 BLAKE2B 6fcc07019e8929a1c1d1b0239b0899d5e30dc22650e1e89c2396556c6784e15b70ae956fe1991590653a9349e5973a7c87fd5e41449bdf375bd9a7877b7d9ce9 SHA512 e9d01f7d56aa712873b5643a3ef0cb5a034e7ff8191243b1cac5431f28ee6eaf397132ace75143aa8dec58a51330455eaeb939ce29ce4b069e1d09c45fba70a3
+DIST kconfigwidgets-5.75.0.tar.xz 387020 BLAKE2B 0348a216c00e2709fbb91c3c1ba388dc31a094fa8d086c2a21b2779b751ad33088b009b945243f67c201d13e49774e14588028b1e187974d226d0a17ef67488b SHA512 8ef5f0f09e80a35e6ed169016c9c5b697958b53aa179730a600047e20af71aa8c53fcb67c66e703287bb1c7b6054377d7bd5318fa8044212a5908d0df2d3fbb9
+EBUILD kconfigwidgets-5.74.0.ebuild 995 BLAKE2B d473186b026e99b1f9cfa67347072d33de32a4d449c45e8205df3e4f0f21a2732429da25808ea71f9adb9ee94d746629e56026a8b91aa055e136bdc3f4da4354 SHA512 e9b5b6a59a45c190f278d115419f9b68ab5191122d99ca5fde07c6687a11993f0972d6b2b8b8c8387f3aa91c2c0f7d5b97cd6ea7bf0656907cb06fd42ccba39c
+EBUILD kconfigwidgets-5.75.0.ebuild 998 BLAKE2B a79831aa8a9892a496266e32a5cc370fe222a57ce2b876dad1fd5c9203d5e2f6f96c899394220d63c4166a4b58004295626d03a81ed5930da385cb045826c7ee SHA512 2cea10170e5ffcb3cad78a18894aa10db345848dff1997c9476a816b7bc9b35c8f249c0a2fd162633498b4d60ba9703f7ce0020d9fa657e8c78255d9f6a2b148
 MISC metadata.xml 394 BLAKE2B 28d17170775f8f8551b194b289bf5759acd2ed28b5ddc95a12d966b69ddef1f831badce8752378d83c5e47ce57192853f57c7777339ff152058226955134f238 SHA512 0f8ddc6ff525ea95da5789d9590cdcd26c9a9f9544fc2376f2a7d0f3c06e45c0bf1e5edace3ec30f3b5af0b5663dc4f4e902c773ba6602e942aaa373f50963ac
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.70.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.70.0.ebuild
deleted file mode 100644
index 76a0d085fe6f..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.70.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
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
index 7d98a79ccf6f..821b8d6c694c 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
@@ -33,6 +33,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		$(cmake_use_find_package man KF5DocTools)
 	)
 
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.75.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.75.0.ebuild
new file mode 100644
index 000000000000..f82db15c2259
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.75.0.ebuild
@@ -0,0 +1,41 @@
+# 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 providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 9aa9196a6418..78f5176c162f 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,5 @@
-DIST kcontacts-5.70.0.tar.xz 542424 BLAKE2B 7410aeb18b1c727de686a9767054c3a0df5030f2ab6a0b44c789634f32c32020d0a66832f5cafa6c3cd1e2e8e77fa94dae7bb5880befb196487466066ac57b8d SHA512 ac257e16856ba2c5dc077e9dd3207a33a8fe76152fded355ec66013b5b91184a579a30d03b0b16483ed435a56a6147bf459e3d6ac21cbaaa6d2279e6b6bf1a71
 DIST kcontacts-5.74.0.tar.xz 543200 BLAKE2B c7e00bbdb0d613ea4bbed7daaca00f2b3c9733b961ee12e7bfb2fc9239d9deffc260d4d082c1ffef4f659282af2cac80a38b83340de2f3c9986c3c07c7fe16a3 SHA512 a4c78e0676a52abbee473310924280a7776c79bec3cf2273379f0c90e904ea0a31f5b5bd372472b29bfa5ec3a7ca5764af9e422bfc6a06fe3158287182815c71
-EBUILD kcontacts-5.70.0.ebuild 745 BLAKE2B a76386028d86e08298ea913f525b456347c04138ab279ad92189293bf6ea1198259d903f155b6176d44b6fb2a655b0e8b6e742c30f1d08f5709bfbdd7d663533 SHA512 c686b9d71ee3b660ce8da412a668ecadd2aa2f72ddef822aed48ae96e5737dd400b4350c63b38f66b03db563588a2b62c759b02f55f8a9d8b948e5d8d0792269
+DIST kcontacts-5.75.0.tar.xz 543264 BLAKE2B 46ea53096e5c4f1a7b9e081dd8f89fe32f65d5b7e1466e3a3548812877a584f90eb882108b5bbca268265c27dd15fb8ef0e462171d97a43fa4996233fc5b1d49 SHA512 9e5cf4cad6f8b251fec888f48442af6179172d78a583726600fd67053a1f0e32eba5bf5250bb8c1ef88abaec6a400f970d0f01ad42a9ac632908d109b457d155
 EBUILD kcontacts-5.74.0.ebuild 745 BLAKE2B 27edbedfd7be92726e01d9b6927de19b6e45dc6e17e4c34dcfbd51954bb1a79c13ac0a410748a14754a74ed322f51685df79c50624f7ba32e7d2500b36db0048 SHA512 11db4d21127c528dfee0c8575cf03101d5dbd7001bd76a5d52a679539fbee3526345980f300f7a74d54033fde72161cd3124c2c52c01c667fcfe9a211d4d3e4e
+EBUILD kcontacts-5.75.0.ebuild 748 BLAKE2B deb7c547888430c053dc964f9b1b04670baedf3547a128d33681c752df9d2e952bcf55e590ff58b9923ea6a8640e5e155f9170594add58e50c4561e0c3983467 SHA512 501171091811cf6a646ddb84c0be44b0c62eb86105931a9340f705e139e50d47b0aadd8ccdef3ec79c0bca9e6ab010b310e4a6b26215d053458d29bbba0d4367
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcontacts/kcontacts-5.70.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.70.0.ebuild
deleted file mode 100644
index be1969ec1d98..000000000000
--- a/kde-frameworks/kcontacts/kcontacts-5.70.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="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kcontacts:5
-	app-text/iso-codes
-"
-
-src_test() {
-	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
-	local myctestargs=(
-		-E "(kcontacts-addresstest|kcontacts-picturetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kcontacts/kcontacts-5.75.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.75.0.ebuild
new file mode 100644
index 000000000000..42101e4cb70a
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-5.75.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kcontacts:5
+	app-text/iso-codes
+"
+
+src_test() {
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 2ece3383de9d..7d99328a87ce 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kcoreaddons-5.70.0.tar.xz 381028 BLAKE2B 75bdc033f4592c6328ab242b85c83de74df63c5e152171f0b72804552e7367d0afe7d25aa021dcbe7fda57b10cd027a2d9357c86cb576c7fa35d9c713ecf7846 SHA512 e14994ceef6fd9f65f8614ba3853b78b3cb416cb284c062eef0f0271bd692c153269d9da4acac285941bdca9e2952f75e292f62586f25358a33a646345a534a6
 DIST kcoreaddons-5.74.0.tar.xz 407000 BLAKE2B 00eb816331d2ecf9339c9815dd19d0fcff3a8398f18f2d4ebd12f27700281e84fdfef3d298476ea40a2bd047c8ae7337d3ce11acc5d9c8cb2edb6c41cdf936d7 SHA512 bbb1bdba02cf745ac705753558719d2b8b6b8279bdde2b77013da25f44f56421c5199efc061257f729ee4430e2674c4818941d89fd908b76a5a044628bbf9d3c
-EBUILD kcoreaddons-5.70.0.ebuild 924 BLAKE2B 614b550e209b0f4782f779ce4631b2de56a74239e1c3109bcfd1633568692e10e41cd6c6972b2c6fef2eebc650b3383f24746a55b9338ba68947f03aee54ce41 SHA512 446c54e8cba0ff5a371aaf0e71571197019cd5dbb298c7f579e17424022144b75f8f34a62c89959c379067703d335f285c04f1a6b86fc964eb04dca678506ce4
-EBUILD kcoreaddons-5.74.0.ebuild 924 BLAKE2B 93665e1cde4f20b88031a8c0b5dce84d5ef1660d2dc0034b9456d0135a99a19e750a2438a033b1157746230dc5fbfef3bad39052625f9af022d891877620ec16 SHA512 47849ed19cc4ee192586e6c0c35c47cceff0fb187d98303f6ce93efd5c315743fed11b5244034279b24831c73811a6fa4080600659ef266164fbd1e48a8f9157
+DIST kcoreaddons-5.75.0.tar.xz 409736 BLAKE2B 11b397c8ae861fc2638cbbfe52580829cd94dc9074b5268de4a73d26dad1522df8438d9c1029014939152eddd8bdd9dc1396a9630cad2ad4af159dea0ba92f2d SHA512 9c413a0be85eec459cbfe179b5528ff728207d9591fd1bbfc98d021509f3c59caba0e45f01c7eb8ed70220edbba18990f83d4cf6391b31157b04987bd46d3362
+EBUILD kcoreaddons-5.74.0.ebuild 1041 BLAKE2B f04be390f99c20c69ae96425832b1088242b8681fcbbaaf34977b167b78b36b8a57c3ea10debfc6bad3f784a925720ac67234f68894a700caefc95b21bfd6e44 SHA512 c751bdeb56835176c3b0deec3d1ccaed41eaaa2b900f160d6e823bf2b0080fa0fd556fd70711e3ef0316bbbf417d86fbef1f23511ef45ad55fb15270728bbae2
+EBUILD kcoreaddons-5.75.0.ebuild 1044 BLAKE2B 3fc8dfeba17d1db39e5bf6dc39e019bfb4a67eedbb244527747917c73f05ab7c601a4f312be31d8498c96bfcf0ef46db1d36d30ff702fc2cb309b53ee2e3a97e SHA512 1e96ddb2dcfac4b87fd3dfc6a449371380583ec6863d754dfad1747c7b7762ddcd9ea66460b5f30a55232012afeb41091e172e081e7fcb8608ef74ebb84c4c20
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.70.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.70.0.ebuild
deleted file mode 100644
index 466f486ca2ba..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.70.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=7
-
-QTMIN=5.12.3
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="fam nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5[icu]
-	fam? ( virtual/fam )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake_use_find_package fam FAM)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs: 619656, 632398, 647414, 665682
-	local myctestargs=(
-		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
index b088fd4f6978..6d0bee8c1b4f 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		-DENABLE_PROCSTAT=OFF # silence FreeBSD spam
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		$(cmake_use_find_package fam FAM)
 	)
 
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild
new file mode 100644
index 000000000000..32b23d719293
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="fam nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5[icu]
+	fam? ( virtual/fam )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		-DENABLE_PROCSTAT=OFF # silence FreeBSD spam
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package fam FAM)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs: 619656, 632398, 647414, 665682
+	local myctestargs=(
+		-j1
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index e598299be1bd..e150b94af8c5 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
-DIST kcrash-5.70.0.tar.xz 22320 BLAKE2B 9e622e9c643bb4bfc7c8eddefd7166f2fc351aec2a98905b88e18f6c05f9c8ada69151683fc19396cbba63b955a46f0b6b3eb7837ec51f82ea8e993b0f5bfa3a SHA512 1d038c30f610311504564c2b41b558b27ea2c009c82f8f5ce1b1e468e386cdcfa3ce4571fee5b1d618c2ee79db58649ddb2ec747eb66a1ee2ad18ffc7ca3ff5e
 DIST kcrash-5.74.0.tar.xz 22256 BLAKE2B 8ae601bdb04853ae1cc79f409ed51688a8b61cec818bca51a29fe75f63c798ce477428610a5ebcd35ec73e1c7952f8a7c4ff4259ba681d305b3b800f4c7cb1ff SHA512 082a18aa69e62b05c262111396fbda62a5a5192f345ed9563f9f549ca05be34d6027e7339aef66d46d02a3fa7abc57c362db49dbbb71e94111815644890f0447
-EBUILD kcrash-5.70.0.ebuild 703 BLAKE2B 0f0a0cd207a10c76b8d8e322928d75acdf839bdabd17408523a44ce0bf5baee9ab2133616b5fe2751774ddfcf957eed0359d379cb065d82b63af7ce3e603426e SHA512 7e6891bd88f20773bb18697090448ce49f7f62a6fe5297e95ee43aca51046fe0b1a2e91e032b4e38a648072d22ca9f4fa997314613dc52209af606bf49955320
+DIST kcrash-5.75.0.tar.xz 22252 BLAKE2B 420efcfddf525076d108bc235295169e98b25d49c0efd780e17b033db57554c32f9271f07b2b091640f54cb36803775a98e13346f90afb2d3d05e1596ac8efa4 SHA512 8a6b9e9ab32daa45d3c8ef2ef7c9a8c5f02cbb30e20a473218af2888833d3786364ba48264ea1fbb555810ce82ad50dbdc6417853a3577991d92ea986c90d81f
 EBUILD kcrash-5.74.0.ebuild 703 BLAKE2B 9f4fa284f04471068329c0e6f01758570609bb377f4260ddfe371eb854429af646c49c6a4afbb4e3630524800830832e1efda840cbc40bf72dc3a30b638d409a SHA512 42f87fd9ddba9b31b70a8d55cdf3d9b05bd06e242339a07e8dee530a0baa6fdd41557dcc1da3111f9856100e5a5d354d657d269425bc10cf625e40f0d0a10c42
+EBUILD kcrash-5.75.0.ebuild 706 BLAKE2B 5d0e66b5515f2d3b7d5ba514599800a06dc7ef6cd42dcf7aaa07ebb584ee49e7de82f45eb56a8837519dca1f4ffbbffdd392ff90a53bcfc3f5b7ed00e1ff9b7a SHA512 457f3fe1a0c747cf72c74f5076b34da121d13bbfe982fc09f13550dfa439ae720339585731f3cbf056ea0c4b49c8ecf6b20d09bad8dceff27d60348822db9709
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.70.0.ebuild b/kde-frameworks/kcrash/kcrash-5.70.0.ebuild
deleted file mode 100644
index 982c52a66a64..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/kcrash/kcrash-5.75.0.ebuild b/kde-frameworks/kcrash/kcrash-5.75.0.ebuild
new file mode 100644
index 000000000000..8e8b5ef0ab74
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.75.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 9ba863b87ee0..414a27f0f2e8 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,3 +1,5 @@
 DIST kdav-5.74.0.tar.xz 58624 BLAKE2B eea0d23caa6a6fdd363de3cc891ff366ea9dd11e80c3f82b90c7908101d41d96279ac42e775ff8ed4480b61545ab64fc930757459b1fb94f2e4c08d85e1df271 SHA512 77d789edc670d5930010185f5969c6b34678f39a4e3c0c2e05b79fb9cb029c7bc152b2418ee3a57659fb40472cd9fd8b40beeae4834299cf8dc1f9ede189fa4c
+DIST kdav-5.75.0.tar.xz 59884 BLAKE2B bb44779bd47cb33421c530bee151b797b269fe306e324b3a9ab29cb2f741e62c721c82f7094ba5754f34f6e4864557926e964d6303d7b97f8ecd9ac29748447e SHA512 c187ea9087dcd7ea89e684618a38e7e2442bbfa013b295c3aa1fa74cf8445a9f95dda5734971a4cd7a6fb88febca8189e2dab6d51594fff1efa70f1d394c2236
 EBUILD kdav-5.74.0.ebuild 858 BLAKE2B 970869dd842474130ae0bfe5c5b2f3c7625e43e79403a46d9368a3df2c73dad19cda3319e9030664886d15a8949aede522551e81a01ab75fc6a882a18bee9020 SHA512 f55fd088b55e00fa677b200113af73ff3ef596745e39a4772f1c2d4a00fab20a4cea112c3b6724badabb88838f08b91686259a25d376ae5df3e5817ce8477d7b
+EBUILD kdav-5.75.0.ebuild 861 BLAKE2B e52868ad43dec9e58f75bfb0511cf12b044eb26441909b8f4d19de65a1d2726ecf533d5b6805ca4aa64afcbf56ad8c03ced3cafbb8e981bf3e6ed3195812a8b6 SHA512 32982a04752831f67eae6ea44bbbcb76cab27bd0dd26000e136d19dc27ced4a5a4dcb62b3e78bc36e06d3f3666aaab286d832d58ee613d13ee80f09b29e944b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdav/kdav-5.75.0.ebuild b/kde-frameworks/kdav/kdav-5.75.0.ebuild
new file mode 100644
index 000000000000..dd696d77c22e
--- /dev/null
+++ b/kde-frameworks/kdav/kdav-5.75.0.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="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+HOMEPAGE="https://api.kde.org/frameworks/kdav/html/index.html"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdav:5
+"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 3918e0f74480..ce0552435880 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kdbusaddons-5.70.0.tar.xz 43864 BLAKE2B 4231f0615ac36c183d664af6c9065958d685c6bb284f7dd7964e7d8c160da86cbbd28b96ce9c1958ab380691ae7e0c6efce9c48b9e91b637d15c98a48c0d213f SHA512 96591e2e4334e69781a28f2ae661da6b9e8eefe7e958e7219411de145f38386d8f92ec0d7f85c19c0f55b301add2a7623a03d59514e517e14486c1ca4781de67
 DIST kdbusaddons-5.74.0.tar.xz 42556 BLAKE2B 71974bf22caa01d1b0e128557fcfc620dcc3b5cd3ecfd2b8f76c4c5f30bccb8f9a54ee59ddba8dae31473117f7546f6f2b4f6c7415fbf2513ad6bde455fbb9e1 SHA512 752726ff477e0159491a4002b60720f962bc832fbf824c342cfd16194b253ef5d94963e2aaefa0daad46af73fe62b4afa888a05846123533f2a8b875be90e72a
-EBUILD kdbusaddons-5.70.0.ebuild 598 BLAKE2B 12c76dabc9794445d9293859575b9b3aba2607be002582e2132fac79598247673782ea6011e64d13d8ac066469c4a4d33704533f216cc4161e2217db7e3bcb3c SHA512 3943509666ce0127a643a2540b9eec3caf724fb29bb310d7c67266bc20503cfdf22d0aeddcb579287c679404e4d717840af9695b280b7cd50af23e5a84779cf3
-EBUILD kdbusaddons-5.74.0.ebuild 598 BLAKE2B 47830754754ab7394ff5ec379000d78ff6f054de99707c19c501f462cf816d54f8166ffaa0f42a76b17637fda505da021307a6b90319304723221c6fcd9dfff4 SHA512 2cb882c2ce38857883dead8680a33fa2cefc17a792c187710dceda70053e004ab5261254b3aa0d1bc181c8976c51d0dedbc17acf58c5e721c7a6b3e71be2b582
+DIST kdbusaddons-5.75.0.tar.xz 42568 BLAKE2B 7a65fff7d1a84d25f225d6b20f2f19fc31e490620c73803f1d2cfa066600371438bf5a4d245e553ef72fef1eb4ebc009058a6915661fce9f59d41ae4022eb539 SHA512 4b062d8b50c138deec639294b45e603f81d8a4d9f125657bb89a69a366545c8bf721eacdf88e52be1dabb3b4ea709664eb2c9aac24aa786b0bac382e005677e4
+EBUILD kdbusaddons-5.74.0.ebuild 668 BLAKE2B 45fe49d7c527b058b7096da30af25bab5ed135b3ebeef7dc20e7fd95314bb1597c8130d1f2b0b82a433f43bd599492accbb86a6129e241f4ba62fed7b6237273 SHA512 ff0193f21cc1cbff6787c4b3ec685c6ed5a72e6b697ca6c5bcf887a7cf7656fef2c1af6fd03293182cd70a393b22ef0938a4d6c686df03dcc318715875e8bdba
+EBUILD kdbusaddons-5.75.0.ebuild 671 BLAKE2B 15c9703b7f84e247b673f043f5396bc1b4ad6df94db7f47cf202f9f16dae124c36f36bbfc2750888ca3c71c8a40c7975e3d067567a5c6c1efb4d578b5b85bdd2 SHA512 e3d374f8ceb5b6f6273c79421e27b48803004d93c33323655f33152c506c6082eac4cd8930dce1f698298dc3344be2bc18949cb2f2a52f486a742eb9debf5bf1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.70.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.70.0.ebuild
deleted file mode 100644
index df6867ab4961..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.70.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
-
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
index a200c3d74e38..53bf15f9acac 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		$(cmake_use_find_package X Qt5X11Extras)
 	)
 
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.75.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.75.0.ebuild
new file mode 100644
index 000000000000..399d252b9742
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.75.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index d41c191fbb5a..57eafa0dc576 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,6 +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
+DIST kdeclarative-5.75.0.tar.xz 190756 BLAKE2B 63a1d37581443cde399fcfa519eb0c08fe068f0a37a95079fe4a85ce517e4f8713de3651888772bd5ad637d46cc5a81188cd38d67e0936afc65b4b78a0068201 SHA512 9dac6929cff1c1aeef8f4fcfcf76023bb510ef5584542489c13c6fac408397215c8305ce71566655c85967c77b5beffebaa42a2b24aa77e90752f769c5de491a
 EBUILD kdeclarative-5.74.0-r1.ebuild 1077 BLAKE2B 2ba4faf57edda0bce336bed474bfb658274d8f09c9c80cc1e59cb347ad868cad9f90a0cfd00a420eaa3a8497c46dceaba5ad19ae465954b915212fc67caa3dd2 SHA512 f1784207612a166d45538f08ff1d94c99d7eb2059e968a88a21227277eabd220a7422895d6cf621048c2da506de57314ecb64dca97c2092b5b12c79fed818401
+EBUILD kdeclarative-5.75.0.ebuild 996 BLAKE2B e60f5611affbb10f142e4694a7678fee3d09d59d7301564cbbb8746a425a47290d67b79c5fe20da1e010905865d2ac8bbfa3fef4f468047b12dc584e9e5198e3 SHA512 4896c21762d7d33047fd420bd08679e16151e5de23031d7a6bc19b2b06bbfef04df6af495feb1802351e95df981b532774a3b75ed20197cbc938f405e8b082ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.70.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.70.0.ebuild
deleted file mode 100644
index 4df61cea3d3c..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.70.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
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-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.14.0
-DEPEND="
-	=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/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.75.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.75.0.ebuild
new file mode 100644
index 000000000000..f1974ae53ddf
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.75.0.ebuild
@@ -0,0 +1,35 @@
+# 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/kded/Manifest b/kde-frameworks/kded/Manifest
index 7fca4b2738ab..9ac87e40483e 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
-DIST kded-5.70.0.tar.xz 37884 BLAKE2B 3725e573d4d18c1c90e7f2a9a4427c01ec521f6a72e63dfa9e6a1fddeb550cdd09603fe1459971b7aa102f7d048081d8b730c2d45e89cbff639a7b0f2db5c331 SHA512 fdea2347baa3946cf2f334b2417c717ae8369fb5b917b330f481ca53ce45fe1667143a3f4f9632cdbf5d10e8cbe8ce8401e98156f4badcb56fc58a6f3f3a25e4
 DIST kded-5.74.0.tar.xz 36584 BLAKE2B 2714966ad3d45a5392b5f5c2c7efcc9d992f09881a26a78cebdb7ae58cf5a1b8f7854951564f7810ba16e009ceb795a59a2c03166bbe0065234f52e19f6d10b9 SHA512 625ffe6667a228d3330535d2049870fbee83a4c95ae221b733f9d22c608b37f4795c2e24c1cb91f87c78cf2863710062ea87c57146764323e14653d4baeedec3
-EBUILD kded-5.70.0.ebuild 835 BLAKE2B f414d3aa616b54a68c884f367ca46cfd7ba5a98a834d3fcc40def880cdcbbb74f45cbff1a21087ae8daa12b2a15f4aed842db5816f3ea83f02ad1c9e69d5ade9 SHA512 04041770405e65e1527c6ca0fbc166842ff9ca8985d6dc9a761ffed7f83f84f6333ddfcf603e12c9c10374efbf20fc7a5b40273376c3a43bd2a6065056ef52e6
+DIST kded-5.75.0.tar.xz 36624 BLAKE2B b37cbf879ddffb5382fbb524ae0f6742f3c0b4606d88555426e1c1eeb9296f76d83c6a61b4a2331ef56d9636c251521aa4655d5b6567ed2c914a0a1a9d8d32ef SHA512 9d054ebf1100c61e0364eff67d0b8d307e632126df8687863129047fa1d310b2e0340c45e6c39c2efa58dd41d7d8f54bcea86e8e0159ec6473cb46273782e300
 EBUILD kded-5.74.0.ebuild 835 BLAKE2B e3a9372740ba730f9d2593bf7b2c4bb8ef74d66171aae4857039aae24fa3d0ee22b325b1ac1d4deb867a9a64f0806c99c2f750781fd57d878a2bc6faff9a3276 SHA512 71059a66373c23bf4fb9f5b1f17445e47921eaa31ab4c5e89366154f8af1fd91b3394a3451f0fbb10a5c5d35db1b0e2f37c89ce4accdcdafcd8546f79cb0174f
+EBUILD kded-5.75.0.ebuild 838 BLAKE2B 782c8139a21062e2bf1cdac5073744c648ee19af019d2a8a8ddc89e4198fc3fd05f2c7b22663080c54c7df2ff00cdda2b8d840cd77f735308ffe47dddc0bd02d SHA512 c4bad18c6699159eeddb8780fe0e3d485933e50c16be9b263853ba8719daaf409afca606089041aa289735e2ab281308e8f2e9d4a31a61d2635250ceb19fb6bb
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.70.0.ebuild b/kde-frameworks/kded/kded-5.70.0.ebuild
deleted file mode 100644
index f0cca4c71da0..000000000000
--- a/kde-frameworks/kded/kded-5.70.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
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kded/kded-5.75.0.ebuild b/kde-frameworks/kded/kded-5.75.0.ebuild
new file mode 100644
index 000000000000..cb9e447698b2
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.75.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 449d0473c3cf..3eb68e531de5 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,5 +1,5 @@
-DIST kdelibs4support-5.70.0.tar.xz 3511172 BLAKE2B fc3f35cc4c039761fe928945dcc9b424e045c60f6a73eec0baa61b6d82c06c79d133f54d815715b07b5699dc354041cd19dd22866d0f2d9d9788a94f9f79d236 SHA512 c736a114ddc654a8e5628b7a24b0666fe1469f9abd5a20d238794a11daa2c9769e1bd9afaa8804b99665981b5ea418706a24226586a3a58695de3164856d9aba
 DIST kdelibs4support-5.74.0.tar.xz 3533248 BLAKE2B 712e9304e2de3a167f2bfae07911b2e4ae236eb1002504cfe7f4507e9615500b10488327a5ca28d25412432a1fed992075e3585afa67038ac2e8d440553e6b9a SHA512 a1b19ec933a947a1ebe3a60004341e1fa4fecd3a64de197ee997bbba6a14fae114e3409180d01de04d20e32e52182eeb9e85e131cba51601689f12eff4af3eab
-EBUILD kdelibs4support-5.70.0.ebuild 2506 BLAKE2B f4579d3b176cbcc5133944fd6c17479f1e7e793ccfc1a2f9cf19eb1757d26906fcb99834f87372551af2a25f41492689d67d657b94c939afd1095bf50ce56337 SHA512 cacd5695a6a600f3fa3e2961a83de20bbbc1ac4d1fdb3f6b9d1e233e03b68332cba06aa9d9e79027ece5b0f396f21248b282d5ae151a8e54d153a4f8b6639217
+DIST kdelibs4support-5.75.0.tar.xz 3533820 BLAKE2B 90d275e86326f90a69f5cb220f9d72d46ccfc9312f38d0ebe3c013b1a945c8a975cb6aca742663325bbe5419174b9c77398f855300daf9dcb35afd8d7a2d8d7e SHA512 016a59323476480f7df1cad4d27319dbe021987dd54cf3292e19c1d6daca46a275567f10367de2088a5c0e8fe8b6d1db73bee9b057a5d0147d3674f255e19eec
 EBUILD kdelibs4support-5.74.0.ebuild 2506 BLAKE2B 566e910ac98f4aecd4b78ec53efdc54db228477718041b5fb5ad9317bed0b5f5bc169b63fa18f729b2c3d56900321af161d890d6a5c1d2d0c7eb23bd69b7218e SHA512 5c69a3c63b7a86ded07138340448d778011dfaf169a6f245b263364e31bafe3d0766c3ef354a3bbb95777d7ae1a77e1815ab8d4494733b4c7d88345c06dc5901
+EBUILD kdelibs4support-5.75.0.ebuild 2509 BLAKE2B 05ccebcaaec9a6dfbaad5c54134f07b8f37dcd2d34adfa86befbaad39676d7ff02485cb3435413d546d56ef7ffc5a103bfb49c05aea61c263525e8e70b439a7b SHA512 ca790f6db4865d8da06e0da2ce32bb514f5300db369f16303b8bf6ce1f0fe514a2896f5e019088764fa0d06b793659758483551b113ecb4ef6f6fc658863d582
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.70.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.70.0.ebuild
deleted file mode 100644
index e13415b7283b..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.70.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="libressl X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${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/kded-${PVCUT}:5
-	=kde-frameworks/kdesignerplugin-${PVCUT}*:5
-	=kde-frameworks/kdoctools-${PVCUT}*:5
-	=kde-frameworks/kemoticons-${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/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kunitconversion-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	app-text/docbook-xml-dtd:4.2
-	virtual/libintl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kitemmodels-${PVCUT}*:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use handbook; then
-		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.75.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.75.0.ebuild
new file mode 100644
index 000000000000..28f7a59b31e2
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.75.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${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/kded-${PVCUT}:5
+	=kde-frameworks/kdesignerplugin-${PVCUT}*:5
+	=kde-frameworks/kdoctools-${PVCUT}*:5
+	=kde-frameworks/kemoticons-${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/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kunitconversion-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	app-text/docbook-xml-dtd:4.2
+	virtual/libintl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kitemmodels-${PVCUT}*:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use handbook; then
+		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 1cbd0dc4ed91..8edb79dc9f87 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,5 @@
-DIST kdesignerplugin-5.70.0.tar.xz 72968 BLAKE2B 3d281f9167becda45eda325b73d2064968de4c8e68ee76a2dc4f25c833925f86080ac24c59db7d0f23eff97ee16f14afda898147177d4a6becc4b91f15df0223 SHA512 756ec5b2b13d1084cd57009eec0034333ecca5c4bfb0dcea93f2e9f90db59aa97d3d11b113a5ebc0ad394a6ab21eec135fa544efd12f9a5d50ab2a617d61be85
 DIST kdesignerplugin-5.74.0.tar.xz 73340 BLAKE2B a725a0889a85351e25b0191cfb3751fef8bbcec663686940ddf1589f92cc90bf823077f14303c07f693261abbddad0e0c21bd0813cdd5a5a89f0b26e37b1a41c SHA512 3d1fe367322ace3dcc665775d5503e9d8d413de6b0a8af710b1f774e33cd7b335b7a42ba619191a6bb6729def7913ed7e606cd9adce8aeeee9ca96c5241e899e
-EBUILD kdesignerplugin-5.70.0.ebuild 551 BLAKE2B 3cfb6b5d090d372734a8c5a78231111a4bd329795a51683b9bf77ad5c440e4f3d307669c483e219fdaa354888a3f93a01fccbd71a5d425c22d3ad7ca67cec8de SHA512 a297f634c88b9236ec20087230b860b273bcbd0c688bcf8e99adea71c6e0fdf69585d3ac43ca3a90811589edeba668dd00333d284a031dd882a9006cdc596e51
+DIST kdesignerplugin-5.75.0.tar.xz 73348 BLAKE2B d66946514e0289da55290013ca483eed8d3afb94d830dd4bf508b3eb3f7c418937f3201205ad388d2888eb5f866b3c75de094cd31d570a610fcff60d67a965ae SHA512 bce0be6a6bd03098c3d63a5b3271071f6029f41434af251dbf776a7c2dd02fc5f01313e13f0961e9f3cba52abcf0cd91abb1792e0bddc0bdd89386b55c8fe5a5
 EBUILD kdesignerplugin-5.74.0.ebuild 551 BLAKE2B c52db855ab192997bd3fc53f0a5b7b9602d60942c5ba4ebc2b52213c7b429978af4fd287e22eb9042dbd5a0b923bec950cec867a68f1bed47a612e01b1b68d00 SHA512 62d43f79262f197eacae6eb591c09ec726825530f4a3bebc4859a3e9423dd560404e7f3ec23a986e6cca2f6c345def283343fd8036f6550ea9b8ffda1912f565
+EBUILD kdesignerplugin-5.75.0.ebuild 554 BLAKE2B f9403e99b84811f87cd380c2034c3e1556f796392ceef0ebabd074754665d753d3a6b8c90d0fa49df32e51a18d82556abf29fa606e954e6ad2a99b675719addb SHA512 354cab2658b06f17c8b392ff165cb62b6693cd212d281cbc52980c8cf5a26ad99bcfddf467c54157b5d713e46b09efdf2e7ade94f4a112cf990d3bfdf3eca975
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.70.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.70.0.ebuild
deleted file mode 100644
index aa2457a5eba2..000000000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.70.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
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.75.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.75.0.ebuild
new file mode 100644
index 000000000000..504d9c4e0205
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.75.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 644d8ccea97d..1c37201d029a 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
-DIST kdesu-5.70.0.tar.xz 47176 BLAKE2B 2d4ddae2e504aa9823c40e0143fece0fce5d9f5ac92ba7082457f75dc0134f91793d94ba5fc668775bf4369b3f4723db3784dc077cf788da41c97baee609e79d SHA512 72a62ab24c85d5de070b83dfef3b2afe33345bfa3955df2a237929b999f1443a3091733444e14740d3393e59b2ae92b5fa6c128da07037abde75de43eccb1a76
 DIST kdesu-5.74.0.tar.xz 51280 BLAKE2B 7a56eb0c8cfb0032c4452e5fbc24d27afe2a27e77403ec203eadddcd6d4a36672f17f78e168ee6d363f17b4d1c4f47a621ddb74808fc6c58827d2b472d85ae48 SHA512 7d04ded1fd6e466d4d851bc87475c1ab9d459fe1b8c25f284a196ce90fb1ceb16d0c532a14f1bf75b005cf0f09049d07268270ffb508e0c334b8eb1a8af13b5f
-EBUILD kdesu-5.70.0.ebuild 659 BLAKE2B 48db1531eabed160448e91ce08fac9f4613ebe39ad0176c5e837cb4fc8f6bf485235bc7e709cf2fe8d2d95aaebb645d2e6dd96164e24e2637d879f859db45d66 SHA512 30ed92683538dc202e3442ef3c45b2bfa45ed13850b3aafda793abdca84ed778fe9783b876d6ed472dc04fbbc2e933359691da6f49e7b79180596f745f5ab9c7
+DIST kdesu-5.75.0.tar.xz 51288 BLAKE2B fe21fec9c9b8cf88e85463da90564f40060172d6a7792a10186cd0783c4991682d4c35b242e803548412fd304fd9b9d68119ac51a2445eef8e8565f46b23ccda SHA512 c45e79212be2ce3bb979e12c8ee9aae02a0f488e92d65c39b4a3275bf3efc2afdc306625bfec3492df245220f90b92bad8018b4bbe588deea1c2f3fcdb444a25
 EBUILD kdesu-5.74.0.ebuild 659 BLAKE2B 48db1531eabed160448e91ce08fac9f4613ebe39ad0176c5e837cb4fc8f6bf485235bc7e709cf2fe8d2d95aaebb645d2e6dd96164e24e2637d879f859db45d66 SHA512 30ed92683538dc202e3442ef3c45b2bfa45ed13850b3aafda793abdca84ed778fe9783b876d6ed472dc04fbbc2e933359691da6f49e7b79180596f745f5ab9c7
+EBUILD kdesu-5.75.0.ebuild 662 BLAKE2B 7cf1015f7c50bccb076712bde6c24ac9ce00aabb36e63af4436580724b8c119209e36d34f69cd35ced93d40000e2c8710af579200b9f442ef27d02ae3f255861 SHA512 908e99fc13ee4ee1a18e2732294fc8059a234aeb74ce47a1f02437e6eda13f1755c498679107045ab67bdd76b7e3a2cb000deb7054e9c5ddeb00068967bb7a3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.70.0.ebuild b/kde-frameworks/kdesu/kdesu-5.70.0.ebuild
deleted file mode 100644
index 93a02c7eae13..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.70.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
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RDEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kpty-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdesu/kdesu-5.75.0.ebuild b/kde-frameworks/kdesu/kdesu-5.75.0.ebuild
new file mode 100644
index 000000000000..fc8d98e4b310
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.75.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kpty-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index da7c5e8009d3..8f657845bd1c 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,5 @@
-DIST kdewebkit-5.70.0.tar.xz 29736 BLAKE2B 9e7205afd66366976478f1919f6b6df25a61354d97fc8f7752d51695bd421e8303d422ca2619d46113a0b3cd6d94101353accf9f4e1cae03449e5ff165ec5c9e SHA512 79b57693fafd2a788d22963aa809358238bcbabf7da88b63224314c683165dc11d35a3383252a8ae79874f7a0c14d1a7efd07abe879f53f46cb3a3c21d902a17
 DIST kdewebkit-5.74.0.tar.xz 29676 BLAKE2B 80e827530412b328306649f513fd98e4b1ccee4cd5665a18d0fb0020ff30061b8bd4d74a906daeb35e6a82612303879f7465e63c4b51ccdd80bfeee72cffbbfa SHA512 2363bbcf1d83ddc4ab30c80347c44a0c5ec1a3527772ee476ba488d5e58ae7ff6cba942e5da46d4400844ea56afdd116ffdb8693571753b7d50aa1b73ca53c0d
-EBUILD kdewebkit-5.70.0.ebuild 962 BLAKE2B bf67f833aa08261dbf0814bc46ab3728ee0e13d9827bd214eadb91f02276c526cb6d5083171de6961814231358237d943d3040ecab21b9e758d368a7fd87e2b8 SHA512 1ae0bc026249a9b778b4ee66c60871dba5f8e0f776b825f228de419e3c40893e0a050ce332a311d2a9aa12a5c580a159604c5cb50d66588298607ae1ce5caf0c
+DIST kdewebkit-5.75.0.tar.xz 29680 BLAKE2B 23fb518e8b99e10aac39576df311505327e8f59ac3e20210766af8b2c92137b2c35f57ddf4c53d6e363fbd79f70ac21746caef53380a121f80eeed7ca314085b SHA512 fdeabba712698c456f108987921cd12ecc3b5ada3fa6a5fa7c74b76d8d5d88a07bc92164c339b6dbb1b5802679506ec896b3dfccb19e2d8de2e226ea2b3693be
 EBUILD kdewebkit-5.74.0.ebuild 962 BLAKE2B 102bc185a49a25278ec7d6c7cc642b67a5acdac8584c54b0d757d39db80f938643f061ade764e06262aa02444839258c47be4b1d95750c82f23f686ed1a8ae07 SHA512 f58f01854b797116588b17692f1af4966323de7f09451a276d22af274cc71aecc711e9f69e56b76b2d1e998403f08a28259922856096f5972f9b34d4bc694eea
+EBUILD kdewebkit-5.75.0.ebuild 965 BLAKE2B b4943f390c70d9027a9e74efc5fb22a6f1391a6d7da0f7fa240eb3bea1483a6de571e530c009a7e5e4d1aa812c1c162852b2a7edc7a16b92687efed9c744e120 SHA512 7201c79f95d226d32d47375c41a4fffa404ec1ef570d80d4846c85a1405e09a072f18e4a6bc81c29d0ade21010f0c9cda988e974b63f0b7ed1e8570c80b1846a
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.70.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.70.0.ebuild
deleted file mode 100644
index e44456db3d19..000000000000
--- a/kde-frameworks/kdewebkit/kdewebkit-5.70.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
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing KDE integration of QtWebKit"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="designer"
-
-RDEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	designer? ( =kde-frameworks/kdesignerplugin-${PVCUT}*:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DESIGNERPLUGIN=$(usex designer)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.75.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.75.0.ebuild
new file mode 100644
index 000000000000..8998b1af4328
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.75.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="designer"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwallet-${PVCUT}*:5
+	designer? ( =kde-frameworks/kdesignerplugin-${PVCUT}*:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 73b1e875027c..e3e16d9c46bb 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
-DIST kdnssd-5.70.0.tar.xz 59964 BLAKE2B 2998f08096450a7f37eb52182db0e7509967d1e7aaf983087c2347bc5cec7d775b0d00bb0099a0546dbd0d4ac0cd2005dc596147f0e2b8975075e2d0b2a5bd11 SHA512 32c7d9f54196f181536cf39ebb176cf2d49bfec9d514a598469268403c3726726480997702f94cd82d3bc6e0dcb65ba3c5f18e31a846cd2859f7b0196a57057e
 DIST kdnssd-5.74.0.tar.xz 57496 BLAKE2B 7503941e98cbcdd5ebc4b4fe5e7d41ec82ea639c3ef5f53979d4567ef2aea0eadeb3c7ed337092f8a8ed51220c0acfae692be65aa84f7add23d89a9c877b13f4 SHA512 ec9ad5b4c3117accaabec7d02fea28cff503788d3dd8a3696f35478b677925071dbea2d714e5ffceeb76ad898fb66030f0e4c3dfbcc7cf7292e05a0fd5102ccc
-EBUILD kdnssd-5.70.0.ebuild 644 BLAKE2B 6c44c5b6b339935b387e011a27323823fad22644fc3f94d59531a5f1ea88cfa3ff7b82f807596b9e6b45735feb5c36b213e01abd13ef280664cfdac42202b3d6 SHA512 7387095497dc33ffa1eb8eb86b647a176eb49d728d55bd8bc598a6a39216ffe117d5c3853141f9f74a719f232c6bedc7c2e4be6c67ec0f5e02bb1510f75cb298
+DIST kdnssd-5.75.0.tar.xz 57536 BLAKE2B d7a8e9160f0b9b1bef6d97135f60e1dd4a6c1e0855ddf74e51b06fcd263196c95b7d2fbfb4336f87f316c72ee5dbc1e15186e3fef99fbf2c16e753024d680e77 SHA512 7539345eefc908542e2aafbb371a67d91c0672e00212cffcd68665795ba81870abd08e49eb6c70669549e7fa73953054804823a270a53b44ed78a1ad222e61ac
 EBUILD kdnssd-5.74.0.ebuild 644 BLAKE2B bccb52833cd644261c1ed9300a39dcf6f7e563da0ff2042d7b66a2e5a25110ee5c52e0b6f8dada3552aa65f3b29041d8bdffaf2c54e1219557a711fb4b0c8217 SHA512 680827a977906af8232462393a6ca0470cf403e27f99fe08b47d0b097e7c0d8911d461a6ec085879cfd9a4c59fe55d902aeb394e318ef91b6e62f6f5061d5bf0
+EBUILD kdnssd-5.75.0.ebuild 647 BLAKE2B 6ffa1a88c802bac661fcf63e3be4f37b818b57430d64ce907b5f6a6e0e382d45c2634caa7c347cffa03ff817a28665a10bcf63aeb2e0f49dd07651cfc211aaa8 SHA512 1d8ba09f28a0acbe332eecbd46cb0667db9c69ff0b024ee6f2fe7fedd33ba37bf88da1979921e186b5ce8153309c84edd10641a1e9409348fc0eafdf4dbe2bd5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.70.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.70.0.ebuild
deleted file mode 100644
index 7db1133d5ea5..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.70.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
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls zeroconf"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	zeroconf? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake_use_find_package zeroconf Avahi)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdnssd/kdnssd-5.75.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.75.0.ebuild
new file mode 100644
index 000000000000..73300914e6ed
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.75.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls zeroconf"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	zeroconf? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake_use_find_package zeroconf Avahi)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 86b5199d5b20..639dde0699e8 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
-DIST kdoctools-5.70.0.tar.xz 426784 BLAKE2B f6b34599b074d7720f44b09d62518f3d76b406167a95d0a3920dd9048829512350850c51ce327ce9a254539e4ac7691dfd9bf620a2268f2b823a4a54273070a5 SHA512 646f37a6e4d233affa5d2ee38e490a1da30845d66ec758841fa1f39d630492a80cc3c4aad3d46d9808ecbb73b90af56e5f8009f1aba2e7db1da7d88a19634353
 DIST kdoctools-5.74.0.tar.xz 430240 BLAKE2B 989df1f367721b393079d2cf551f008758e079cc5dd325b1bb22d30268f2ed635f2cfeb0504da5a09e74af320ac8271f72ba8dbe78ebeef1e7787006ed00bb02 SHA512 51a410c7cb9440926b27908be77ea9c26050943e4d3bfc24125b803b4104e22c0ca2963c7ccf968ab0d334846a4a3588fa7ade341cf02ec7d8ede4a06fe20327
-EBUILD kdoctools-5.70.0.ebuild 869 BLAKE2B 988cf94f0d26b3f094304956b05edddc38972b1aabbe9b3d9881393a95ebc98cf1a6650d84847d0f819ea69a2c8450ea6f3b60744018784ba66866b7f06ecc12 SHA512 de8d2be74a37ceecda03b627d28b51032ee860f023b58649a2531bfac161fc7b6873651a8082031f764b27e8277a9dcc088272890d8febec3b1385970fa14690
+DIST kdoctools-5.75.0.tar.xz 430212 BLAKE2B 9ee86da4c451cbf262cb3c7c3059918ffe926a24af4ca7c6c5eb354f5acb10e2df5e951be0831f383401c06cfae2b633983c06011d441cebc63f4414bcf880d6 SHA512 71aaae59abb3c3d34adac16f02aee298e928542ba543457dd94b2faa5a6791bb6e2aef5ad2e61f206963dfd42af2166191b1ff9b4bcce2f46815769563b96848
 EBUILD kdoctools-5.74.0.ebuild 869 BLAKE2B 988cf94f0d26b3f094304956b05edddc38972b1aabbe9b3d9881393a95ebc98cf1a6650d84847d0f819ea69a2c8450ea6f3b60744018784ba66866b7f06ecc12 SHA512 de8d2be74a37ceecda03b627d28b51032ee860f023b58649a2531bfac161fc7b6873651a8082031f764b27e8277a9dcc088272890d8febec3b1385970fa14690
+EBUILD kdoctools-5.75.0.ebuild 872 BLAKE2B fe707dab5d1b4b587a8dc8450b04f21e29c3e6f7aaf4e1fab12d0cf1157157e5bdc51d3c6a1e485e26f80fedb26602838d262fa168341e4c46f5c18c155b9003 SHA512 3ec151bb66c1c7cec167cb832d8052ad911a44b9925bd3657c05a82e39a539de9f3884b3142270c436a2c2dbf37702ff643dab8d1bab598801a0494f8aa2b9df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.70.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.70.0.ebuild
deleted file mode 100644
index 63ad193f63da..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.70.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
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
-"
-DEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	app-text/sgml-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	=kde-frameworks/karchive-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package nls KF5I18n)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.75.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.75.0.ebuild
new file mode 100644
index 000000000000..1754e1909062
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.75.0.ebuild
@@ -0,0 +1,48 @@
+# 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)
+inherit ecm kde.org
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
+"
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	=kde-frameworks/karchive-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package nls KF5I18n)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 665622
+	local myctestargs=(
+		-E "(kdoctools_install)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index d7a06e0814c8..5bf155bfa065 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
-DIST kemoticons-5.70.0.tar.xz 1696704 BLAKE2B 45cbc55a2f14d74a136e34b01e49b6ee2f0f4c5f6536d930f3037cc51efb829d4908d9c42db6ffddc7e82f05b6fc09457b6b920ddc44778f39c14c9afb4676d2 SHA512 78d638bbe758506e2b1c66bb716a539b616350d1813383321ddd15fd02c557304a9bb406a94eccfd9f850209bdeb8098518e3b43e65d4b88fa803e23d6c3ee3b
 DIST kemoticons-5.74.0.tar.xz 1697720 BLAKE2B ab83ba6f54a8f81ba9a79589eb077d6b2c893f0b51a992a0c23340ea63e48e3d65fb2608f553bc5f263a3f656ea7c92eaf98962c6da69514b995acb00b4049e1 SHA512 b4f2a232cac9b997d204b8bdc1a217d643091c7bb723208d3f35268997b6eb07dbb9dff1d26c4732c8dd5f96e0c2e37549293532d412f8c175b5498b6d472ea7
-EBUILD kemoticons-5.70.0.ebuild 665 BLAKE2B 07396e689ccdaf98b65b30f1632464e16f62cf9b51c104008e10be4da4fd1058d5e9e3729391e322d84185ce451f38900cc0763924a58aedc4bc08b16dc8c675 SHA512 7a38d9eef4d39aa005ac715e37061460bc540bb92988e4272285c5ce782912575a05d77a7d7e9c1e68b8ba2ef12291cd790a34572ad461bd52db2ec6191241a1
+DIST kemoticons-5.75.0.tar.xz 1697704 BLAKE2B d8ddab8e639d318df9ba1ee2768d5fcc407ef7c2c3bd9d4014a922e9fcd474e4410dbc46c439a62e65042a90b333c95d41ce0453dc88353b4fa5fb2025552e2a SHA512 7071b2625ea1dc961abf46bada1d6b596b893f02f71a4ff05de25bc5b12a28f5cf5dfec416da8a85e3a5b4cd23e6099de98d5dc872bb8500665212e43af08d0e
 EBUILD kemoticons-5.74.0.ebuild 665 BLAKE2B f8cd68b94ba0e0b4350152a2264bf41a7f80c4fb031fedb619ed7cf04a571182eb40486266b137bdc5e0685cc4e1d46866d1b020744da65422b5eeaad8ca463f SHA512 c09816171d07a7e2d48d3a7d5a8a145f052e81290e09cd76ebbdefdec84494e0632fd0130fdb657882c4cf217745e8285a339745aeb5e1af98da559c90c98371
+EBUILD kemoticons-5.75.0.ebuild 668 BLAKE2B f7bebaedc7170060de66502d7a1de1a352eac7ae33e96893c1442a4f99b8608b558ff290c170533387d3c8a1ebcc759df523ca6b72bb1d6ea0ca83dcf0354bea SHA512 abccb68fe9703d37607078490f572788bc8f2ae004faaf8abb94a0e478ff7786d13c8125e770ab1471fe7ee3af1eb6cbf866322cf51b0198bd5d9155f0888319
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.70.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.70.0.ebuild
deleted file mode 100644
index 182215cc5643..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-frameworks/kemoticons/kemoticons-5.75.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.75.0.ebuild
new file mode 100644
index 000000000000..1b68d5838fa9
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.75.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index c2ae929b75e6..ae12f5c03d4d 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
-DIST kfilemetadata-5.70.0.tar.xz 422812 BLAKE2B f55aab0be0009d0d190c6625ec2ce3a8ec297c62570ecb2724e2ddd4c5fb69397ffd3b2e822cf6301e8af18375de0f29015e61c93618b220c0fda86d1d293791 SHA512 51576765c334e885ef55bc6373821583f8ad1fe81cd6e7aaaa21c4ede9cae27fd162e5bbb29dd553e1cbc045a3396dd8d48d66171ce7dc82d4976d9c698df706
 DIST kfilemetadata-5.74.0.tar.xz 422312 BLAKE2B 9da6b6573692ed512d4831afea3e84f49e989e9c2b3d6b40a43b3ac42ad87b31eec0f4d5b9ac95574a04bc0e73c093bc65530656364394b0e941b7b3fe5f8605 SHA512 7b07d051f1bd339af6e24450c7ad325685d2ba1e4eda2adb14a25b91536f80d3a045d77501b143a41aa54012b043aed3a324f7c24fef60e72e63f42830034010
-EBUILD kfilemetadata-5.70.0.ebuild 1678 BLAKE2B 9d0b71011ddda7bdf037983a716b2470a3ede46dbbd001a5bdccec73a92414f460555670ef6a5b985c6d68f626c51d02be5f1d41d5e128678bd68a3b591b352a SHA512 31c3bad28f9796fcb2fdebe1b72d090cf9c073b8408ccf5c54f1bc67ec9426bf4fd7023cee94c21a89d2c9d09cffeb28667f618c67edccd6f8163639f2fca9c9
+DIST kfilemetadata-5.75.0.tar.xz 422544 BLAKE2B 7aa5229532724eb987453f13faf05596925d712bb0976389fa9c5993ca3a0c3a6543cd5c43016ceea465e7e6cd266b7a649f2409fde140b91da0f8779fba91e2 SHA512 a2ef890021c5aae87b322a6d897ee6bbb0d62852542e5c680bb22f5a20a67525b0fe485f33f2ed6fae585645dc3def375bf28783667e597036c43d97247b4bcb
 EBUILD kfilemetadata-5.74.0.ebuild 1602 BLAKE2B 692bba2573c26ed8cadb3a87bf22d5cfeb632f9f4a8ea3c2bea396290a7fb80d7a0a394d93ceb87a60f0610719bba9f815a78a32f474dfc83cb9cc2cdbf41412 SHA512 7390e1590a7018611567d0e5e5a6f67904f13ef27bc955988a4f28d102f9b98635a15783927a6ff80577b86ea26499f9fbb43e837c4a9ed28fafebe1f52ecf2b
+EBUILD kfilemetadata-5.75.0.ebuild 1605 BLAKE2B d9ca7dc2714554109a7e4161ebca935f0b2e84bdb0493d29ad32268b02516fb96a872186caa154f61f6a300589d000a99ecac76c86313c546e5ba7d3035e7faf SHA512 03c08d5b4cb5c574acba42fb252afc2ba8c5659c684c93ae39a738f5e5fb02e2707f8a8afc390da28dbafd0c942dc547cb13fa3d69d6167aedfa8b4811df877a
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.70.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.70.0.ebuild
deleted file mode 100644
index f05bd25306a6..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.70.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
-
-BDEPEND="
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package exif LibExiv2)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package office KF5Archive)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package taglib Taglib)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
-	local myctestargs=( -E "(usermetadatawritertest)" )
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
-		elog "To get additional features, optional runtime dependencies may be installed:"
-		elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
-		elog "dev-libs/libxls - indexing of Microsoft Excel files"
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.75.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.75.0.ebuild
new file mode 100644
index 000000000000..6be9f03f4db3
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.75.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org optfeature python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
+
+BDEPEND="
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package office KF5Archive)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package taglib Taglib)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
+	local myctestargs=( -E "(usermetadatawritertest)" )
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
+		optfeature "Microsoft Excel file indexing" dev-libs/libxls
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index c5fbaf423df4..4011e3cd5b60 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,5 @@
-DIST kglobalaccel-5.70.0.tar.xz 84580 BLAKE2B 4f3a6703675ea7072b70ff49cb8b7a6f79cb056d6e661b7a55bf9e83112eead90c2acf9d5a93a51c1fee364c6c4fc8295647d59ae3d95f9c46bf4b94c0e6160d SHA512 cf1fd31d484093dfdec7b42518e683fe898f5419e53a2b13507453a21d7b479045e46ad16825272ac58bfd613ec0e218b7a964e4c48f95122925d64f9590c971
 DIST kglobalaccel-5.74.0.tar.xz 87272 BLAKE2B b2daf0eb27422254b0dae7e6f6fda9fabc571d1084088261a2851bbff0e51e172880687503350c523e33393788e842fef36778f51b2cc21e37984c953dffa254 SHA512 c97e35d0b2f2932f622dae406d385f2d98504fd5970ac75f48b66277283da2a5957e5d547fe6dc21369631a32827b561139f99307a30343e7bc93f54c8cd5918
-EBUILD kglobalaccel-5.70.0.ebuild 765 BLAKE2B d2006dbf499ca40a266ed893db304dfb42c6dd658523fdd3acdf34c353c183ffcb8ab7adfeb5697ef4835a9ca92295dac093bb58d66162b57b37469870d11d14 SHA512 36a54f3510b5d1d0d7a643eedeb501b3897d5d0c51fbb6bb85c1770cee0798e377fc293c390e3690bb8bdaee31a2c4bff9260ff4ae0b226d91ac01cbaae24797
+DIST kglobalaccel-5.75.0.tar.xz 87244 BLAKE2B 1bb1fd9f3236c63cc4539194551716040de0afd3c66d6b1ed59eb358307c391317bc28d9c16b7e4e138587ca70916ab797aef9a0eb22abe6cbddb2d086c002f1 SHA512 ded01af795b2842ef0fc6995e67759b54bb8d5ec9d07c5300de215324e6d5ff7333871a97106c2a264e0ed86508f9c45d6e77e989e90a5c4ca450a03ffb5d4de
 EBUILD kglobalaccel-5.74.0.ebuild 765 BLAKE2B 9c032d787211cc7034bbeb81fd32b3f04ddfd7ff7e045cd27daf00090015eaf1fa4d6ee73db3a8145b38e76d00d626d8fdae38bcb9d14445b767a8e9f4073771 SHA512 7c000afd20e6f6f6537326f8345619d5a3765ec93c845cc9d235ca1fe4bbe839a3bd4daaecc6a9c68e9910239f34ddb6622cc1b78974cba5f19fa3e2ea9e5529
+EBUILD kglobalaccel-5.75.0.ebuild 768 BLAKE2B 05087286d0f871f381620bd7d9bae314c0474d47a4aa07f1f9206ab5308e4f6c8ed8d4760e35268b16fd9e545206a4d9188330d4e56ccaa298afccbdce3459cb SHA512 aa9dd50b38254e7be281a2128211e3bd14e2f4956cc766898b883eded8f89f5ec7978f1b5b26ad91dffc717c4a5b582dbc68ebc9f96060379b28717e7e00c5d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.70.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.70.0.ebuild
deleted file mode 100644
index d10153252ee5..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-LICENSE="LGPL-2+"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.75.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.75.0.ebuild
new file mode 100644
index 000000000000..d0e6b8da0a28
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.75.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 011312e54f3b..22a5c3056646 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kguiaddons-5.70.0.tar.xz 53160 BLAKE2B a60f9f3232436b3e72a0e0f320b2e8b629ec52f45e5534a4f04a7033363a4e68ca294a1b7f1ccf0700ee3b1e0c4e189514e9a8ea21186441936c4ec2b81270a4 SHA512 a834a0e7c523499cf11884b32aa9c6f0d54ff6cc50251de09f6892a793d8a78d6cfdb53607c43fb31c5b9987f2021393647fd3e4199276ff3b5d714d82102d02
 DIST kguiaddons-5.74.0.tar.xz 51516 BLAKE2B cb92c948aaf3fd0cbba236c893010200bd70f369eba1b2fe0c60aceb30a3ab2b8ffb34571333a30d91207ead61b9a0b95ad1147da751d6251a6222be32e5446a SHA512 9943b908fefc12a82678102f439d79ccf4207dd8ebd00ac9cd23d0428cbdc5fcc41d11c04deaf7d63a76a1be24b28c1998e80098b620d7a9c7476ae412640686
-EBUILD kguiaddons-5.70.0.ebuild 466 BLAKE2B 209fff99def9644919e9112ff6fd8cce27f5f5353335e33e442420b58e3d8bb06018a50f9a469507e4b0967cc11173de6d911bf3607d35948d09cf8b8291630b SHA512 08b05d02f1399db07449ce2382ae7697a3ef154614451141ed84a700083a86b4af02c5e186e551c0b145e7be7d9cedbce93814cfb3c3656bfbf0c656c986ad0f
-EBUILD kguiaddons-5.74.0.ebuild 466 BLAKE2B 03191c25637986673ed9bf773d675cefb45803b0620fa6b111f8579b720f3b352577c68f2d397dd77786b09bb3486bec844bdd1fea3990dc2cb96afdbb31cf00 SHA512 69dbf4ebd480512cd421995e0edb5ba233aa74e24043fd69a8660d82d8dd5f9c327d7967ba777a32f595744258ae31146f4acf66bc96e53858e5521ac3e7eae2
+DIST kguiaddons-5.75.0.tar.xz 51448 BLAKE2B 2effc24168a43cb35068500904e538f3b937dde86f6d63fa711a44e62eaa738431738fca07940f73bd40a25933ba25e718a1bf2401b9e654b8cb10b64c0498b9 SHA512 43a06401d472f9fd2cf7db0231a3c747f096a9b3f80cf18508b68fd9603e0778f034e3811d38cbcd6ac09791bf9ae1695070a61c98833634ea23ea05e4f84c92
+EBUILD kguiaddons-5.74.0.ebuild 600 BLAKE2B 5dd18b8de96ef35579196e63899bf2bcb7f7fb137c3a195b737ab84943c834820f8f48b90851374e61a1f4f2abc14b2f22270570db4eb282922ac08eb6fbc377 SHA512 f43765de60ca400789f125304290535ed9de1d97f78b4f30cc0c22fb764ddda69f13779e31edd04ec271a386f5bf2e5f30408a555085b786de977ae0bd6218d8
+EBUILD kguiaddons-5.75.0.ebuild 603 BLAKE2B 7f3f6ccc68af9574b948385393986dc01b668394b20acb29ad6168cc61bbc7dc1c1ab7359ff051f525fd8413d82c3dc53d407e8499112e2ad0b7a65ad225e69b SHA512 6eeddb245ed2b4d865fa354071d0fe5682ff3e02b048423efe0d79b778cbcba8be73f6a4c632caaa5dad7bc7de51a711fbc8e2758e27870e1f727a26ffad26c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.70.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.70.0.ebuild
deleted file mode 100644
index 5836dc044239..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.70.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
-
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
index 230b31a31a07..ea80f7ecfe45 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
@@ -21,3 +21,10 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/libxcb
 "
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.75.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.75.0.ebuild
new file mode 100644
index 000000000000..33afd7d7b55c
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.75.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 788233453842..cc3d178c2039 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
-DIST kholidays-5.70.0.tar.xz 221532 BLAKE2B d48a794d3a93d4f8e41043dc724b76963304b1d8e2b8dd2e89e3ae2ce7871537c126793efb2a7cefab2ed626baacc84a43b02e8584e756c8ce7fbe9ecdc0fb7e SHA512 0f6a7849d8bd58c57d86ddf4f7c73ea2dc4abdf46890f77ce03d851b4ceb9205ad737abc7ef704f690790e4b9a6205c8c1254aca7bbb63ffcf522e8c4e019d73
 DIST kholidays-5.74.0.tar.xz 223360 BLAKE2B 84e731e8eae5ce28db12512bf258a34ff75e19fa4a82456ff66137d7581786e8ebd8940854a71f4d105638ac5ea6eb3cebdf735d844f6075b9069ed52f804741 SHA512 f35ba7c9ee42383ff629ed61dbc054656d40c7f59172bde313e897e718ee7151db79c8827582abfeb286f05c5c7b4d875c75d9790800b43c5831eb98a66e2195
-EBUILD kholidays-5.70.0.ebuild 673 BLAKE2B 559cbb3f31b80d69bbe455186e39c2c937e599d689899b8b45fca941e4ee513a1345b77ff0fb76f61511e19443586f5dc98dbbad68aec8a883647049e4314776 SHA512 25a092d640e89ae9868bc0e4d07e1271b1edd3b54bd0076e796a26ee25a188f30529dc1ed30c8f9aaabc96e198889479eb310f70ed26d475a8f35ee9da6f12c5
+DIST kholidays-5.75.0.tar.xz 224100 BLAKE2B efcb728c4f3c3bf77932beb3ed7b81e509bc31d2e75c270dcc33381f1c6a1e375be86fa242093ebc39f4f754f15bb382ca430587a976ed77ff54add4737744e6 SHA512 faeec888b3440c5a11817328bf8776d4e55d316e5629d09eaa33c81d642e708c0cde3d7cb48118c5366f337a557d53d0e9c985374e7540c039207057d7a9209f
 EBUILD kholidays-5.74.0.ebuild 649 BLAKE2B edb8724e3f029241176561b0b6fc16349bdc09f149586201897ba1c7430d01a8efe1e1df9edf7759decaa0e627e951efac98bcc1bdb42da3e389b9e76e42243f SHA512 23ac33edd2d4aee601a7797992e6e58cc326ac64747330d72321cb87a9b13e85256769f76db297fd5c2254f656192f89cb6d93761e654bcdd9f3a3afb394a055
+EBUILD kholidays-5.75.0.ebuild 652 BLAKE2B 374961a9309a2e97218691e10b0109a33ef3cca7b27f301a71f8cdc1bddb4f2a3e4cff4664a9d30520686b25316300caef427b0a9e92429750f675e08ac4fb04 SHA512 23709b450c100a6d13eb47ff3358ce5b799b838cb2a694ca69e5d162569e616230cd0db23231fc3c4a29cc4cc4872c6e95067f67f77d86da453d86ba9462c67b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.70.0.ebuild b/kde-frameworks/kholidays/kholidays-5.70.0.ebuild
deleted file mode 100644
index 4ab8f3cb49d5..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.70.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
-
-ECM_QTHELP="false"
-ECM_TEST="true"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kholidays:5
-"
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	ecm_src_test
-}
diff --git a/kde-frameworks/kholidays/kholidays-5.75.0.ebuild b/kde-frameworks/kholidays/kholidays-5.75.0.ebuild
new file mode 100644
index 000000000000..1106ad6704bd
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.75.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	ecm_src_test
+}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index b9d04d0c6790..bd75e5db89cf 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
-DIST khtml-5.70.0.tar.xz 2083356 BLAKE2B 2290b16cba1b03af16c85fbd0f295f11e41acbb2947c1fd7873d6d8a1670f8b5de75dade9010abeed6eafa32254e9719a1cb1c3c3aef3f277dade68d10587f50 SHA512 9ac0918beb35cce20dcdfc788654e6a56a3fa780ef1967c12ee694074cf1b823d9c505cc7dac30b25cd36240d2efe322dff903267810e856eba75a808fa7c1e5
 DIST khtml-5.74.0.tar.xz 2089032 BLAKE2B bb72c0d67a3a11907f4e0505a9bfdcbd7e7f3fd27a8504f94bb77fcc30906f06a84ca4cbd6732a52cbb2fe85cabe7478bc2e751c07d310890066036dcfc32d18 SHA512 c8c8453d05475196c6d91ec9289d1c396d7dc149d07955912119ce6c9cca44071d9e51676375499b23a923f626e906f18b0bd564db6760e53628985f1b7deb2e
-EBUILD khtml-5.70.0.ebuild 1809 BLAKE2B f284ca85a83ad2492e5e72803a005e8ff3773b2ff26dfc468b65e987ec508fa235a112e01042b839466a82bc8a0b48685677d36b5fd66601f6fbd32f947a131e SHA512 110d4e0534c78306d2cf3f697a9ddbf482ab4815be204a4d068465fd251c4ee0395d0654aa8d42cae2a31951e39200d6b8b27a35b4059b41c0d0ce01b7529420
+DIST khtml-5.75.0.tar.xz 2089024 BLAKE2B f76f2849907f97ed6951ccb978c58a6dd0eef3e861be00b68d42d7e11d251415d134dad452a5ef42ce051ef1ab3f9256926e2ededca32c6d44495097d59ec0ef SHA512 fa3559b933501f5f18787f07c444bc46b51390be73d9b8baa0b7925a59c1fd0c99c97f6ccc719944f480ba64bf7216edaaa55935f9488263e3f846273d91284c
 EBUILD khtml-5.74.0.ebuild 1810 BLAKE2B 9b304e3f53f24ba69e7b6b45ebb09c1df4dc70b0bd6776eb56738c148e3354e0baf46f3f234ef4cc812ff9d7d2680cc97af49daef6752c0740c5c3275a417f65 SHA512 b2a67ff461dfdfc40bd7e08ec92451243a84031a4a45d5bf09bd9d4f7eb3b45d0f203a49061bf71f1b7506e772179e39f92e80b0a238c7f8de6a605e19f83d6d
+EBUILD khtml-5.75.0.ebuild 1813 BLAKE2B 60c321f839c31533472f3b2faf783321d6f32c89bc7e08440de4e13d7df4750b96fec4645342b13e74d19f787e2e270f217bf3805afea65e3873a53d31ef1898 SHA512 5b7c6dce4de314caff7ca275205aa5d1c8ffef3143f6782275edab5205f7a3126f9e53be2cc2f9e50bc0147d334208009bba61338ac5db1a710dd784c63fb739
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.70.0.ebuild b/kde-frameworks/khtml/khtml-5.70.0.ebuild
deleted file mode 100644
index 9ec95d83b890..000000000000
--- a/kde-frameworks/khtml/khtml-5.70.0.ebuild
+++ /dev/null
@@ -1,72 +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.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="libressl X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-RDEPEND="
-	=kde-frameworks/karchive-${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/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*: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
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	virtual/jpeg:0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.75.0.ebuild b/kde-frameworks/khtml/khtml-5.75.0.ebuild
new file mode 100644
index 000000000000..9b1014d2ffef
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.75.0.ebuild
@@ -0,0 +1,72 @@
+# 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
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-util/gperf
+"
+RDEPEND="
+	>=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/karchive-${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/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kjs-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwallet-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	virtual/jpeg:0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 67f12b8d612f..52e35519ab19 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,6 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
-DIST ki18n-5.70.0.tar.xz 591340 BLAKE2B 0a059788fce1e670c85762f5ca1e053c8c503669b7c11fa9ffd840d98724b8512d4ab7b1bfe8ca04cd77c793f46b4597f47cb3bd2e64aedddf85dd6204fcb02d SHA512 d15274d77ae8c192690d7b823bc00c19ec6a4054f390bd0973b0b012c70d0d3144a1eb479a95c51ac8a151c20af8117a2a3b59302c255b550e9810f1377bd2ef
 DIST ki18n-5.74.0.tar.xz 589680 BLAKE2B de50a83ea8cd418fbe4f2a2fe4e47ba6f300c8a3f3220651d982cc07d5781d1bd2b258e3833f4b3f75eec45dff00e5869446e7059c245bf456d86dfb8b4a41e2 SHA512 5027dbd316ea429f72aa45ac215675d970ab5625741fe0908c63957646ec4f12b1d21e7649787364d2d716cd1ceab11a505a4271f28b85a0e18dcbc6c3b15ffe
-EBUILD ki18n-5.70.0.ebuild 760 BLAKE2B 5f01a2f0c161ab987181b6354f9e5aca37068be64b1f263c995a03f20f35ab38ddeb40a7df1b3108d47d2ec2c277a15c8392bcc3c624f78b53883b6d7a3c3941 SHA512 1a4b54b0ae60d7b4f0531a86e6e96b9eb22631229dad2ba03f232d5ec516745c87643c5978d8470e4ac433127f9ac396e3fdf782a78d18450401d22948862c8f
-EBUILD ki18n-5.74.0.ebuild 760 BLAKE2B 7f2ac1dc0c7f1666d077a9ea862cea0591438d34cd6c187e58b6e183bdd8b90246f85b61af96d13ed5f47a5d6aa250970501785f4bcec8b12a4eb38dcf257948 SHA512 ab4d0118bd26a3cf0e42e8d4b562f931c4a8c92d78a5aaded579b4b7627559e2e5cfee99b87ab068728cd7a6bf29e39208945d61da5613401d383f5e59ef171b
+DIST ki18n-5.75.0.tar.xz 589752 BLAKE2B d3cc51d7b17f4e82d5670784673f5f05d728f704a5b635efda8a53eac267e95c154a1156f59e8bdc564f1b7c978ba874e715b5ff7e4681c9b6e3e975d8ee72f7 SHA512 2827fef364ae122c9e5ae554bfb7fe43999f498c93a53761b1a0b6cdc8b46b23a103ed9b9d83b6e5dc15099bcdf6a8cf556d92dea460aa8e8f314595ddd6ba98
+EBUILD ki18n-5.74.0.ebuild 830 BLAKE2B 37075122b18720203e7e04825541fcabfa4a508a03d56b20b29e1f448882b670ac151a23514276539501aea3b0dc3c993ebfac52d39eb70f4c0a1cca8d0c7879 SHA512 8e1c8ef98ba40488d17a598bbcc50a786f516ad25002bbafba8beaba5b68e95f14780a3082a9addd4226fdc995de1e21771253403fc589226be1d9518a315ac6
+EBUILD ki18n-5.75.0.ebuild 833 BLAKE2B d6e8b07978deb3117faa37ba05eba412d7ff44fe3246e00935feccf7ce059982d9a61d6d60b4ff2a788ded09fb51328e73e22d8312f0fe70025796d162881aef SHA512 133c2f07691e6872a587c2d27e012ac4b198a803dd1f108c2d944f710d76f8eae91b0fdfcbee85de162cb696b1eef85a460e067a500c6bd3c012fcc1a46d754a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.70.0.ebuild b/kde-frameworks/ki18n/ki18n-5.70.0.ebuild
deleted file mode 100644
index 7cea70401f0c..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.70.0.ebuild
+++ /dev/null
@@ -1,38 +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} )
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ki18n/ki18n-5.74.0.ebuild b/kde-frameworks/ki18n/ki18n-5.74.0.ebuild
index 2cb5f041aa15..073833aacca6 100644
--- a/kde-frameworks/ki18n/ki18n-5.74.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.74.0.ebuild
@@ -32,6 +32,7 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	ecm_src_configure
diff --git a/kde-frameworks/ki18n/ki18n-5.75.0.ebuild b/kde-frameworks/ki18n/ki18n-5.75.0.ebuild
new file mode 100644
index 000000000000..d1a758831833
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.75.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+QTMIN=5.14.2
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
+
+pkg_setup() {
+	ecm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index cbe89eadc849..02bde4482ef9 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
-DIST kiconthemes-5.70.0.tar.xz 209936 BLAKE2B 1a68f8d514050e28c775dfb2c635a8c764fbc4827c3370c84c6d10cc1260dfaf6dbadb5c35aafb830ee1f1f5b1ce6ffcae1f265a4f25e860efea3c8f208e74d6 SHA512 8138f4667ea25f11c32ebc221abe4ea5c5d308e531edffaab977390c92632286a0a8d28eede337279aa84de4833aeff93a1321bbbea85e0f2096c56466250e62
 DIST kiconthemes-5.74.0.tar.xz 222188 BLAKE2B 430c12cb3953d1ccf6e4e863c9693e99ac73b8464e113266d7eae48cb80e6769da185138890fffdf8527f5a74f837fef8bdf32acab8e8a5957837df6bba57daf SHA512 1d34c98b2ec7c59f6960aacc222a9478212c5224eee883c4c6082dbfcba312d4fbedf164b11b5fc07d6f19a1bac65a593ed91ca65c38f998274f02c5b4ed2cfb
-EBUILD kiconthemes-5.70.0.ebuild 799 BLAKE2B 95ca1b0e5aefa43bfa94e133086d9207354a21141c1fcbd7261f9a497db99e049c60aea0909a4faac9e58b774380035ddf926192787c8f464a079030739d442b SHA512 aeca5c4ec050a001ea5009e9bf095a3954cad3562dce435740e131d422dfe5a3b587b7b9547f3a50cefc17e14c7d3c9387fc657c1ee7a6432245983ab84eb0b4
+DIST kiconthemes-5.75.0.tar.xz 222124 BLAKE2B 912899ff13bda517a8043eb44e771328c87454ed6242f8a039ca7cc6944e2377a00b78b6823b190ed47c99f791e64d30bc196d92ae15c222906a1b69d3d7ab59 SHA512 85518b0d7e3548a7912b9268952a49d3099530c0c9003249c7f291d1bab65eaeb6faab705fd4b6d351f9da31c401032136118eb83c33bda7293e1a720ee1ab00
 EBUILD kiconthemes-5.74.0.ebuild 799 BLAKE2B 180d26189d739eaf0142c4bfaf13283755dce395d25dbf5ad5d4362d2fb4ebd37d703e3eec79b69ee97117999fe3de6b2a3fb84382488aa31f671451ab9f6b05 SHA512 c80a10df702c612fe31b4619133e45f5d2c83c3f5b84a776dd3bc0d76da188fc737115f797082fc19cd60d909c5555ffe2c9647104a76010f2f2721a2f954b97
+EBUILD kiconthemes-5.75.0.ebuild 802 BLAKE2B 118c9c7cfb0a5af374719f3fa750115cd9c44e2e406ee04aa231b0768b47a98f0741c4da24108547cca9711bd94bb7a9425f62ef2e7b9b54ce03a97b49fe57f1 SHA512 fb4e566f7a7dd6fcc50b2bc8e52fff488a51815224fc430969377ef96386413d7990626e90d8c725e7a88fb5ab5d60f575aba61d6dd3b69418edeff4da873ac9
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.70.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.70.0.ebuild
deleted file mode 100644
index 1e390dbf4a1d..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.70.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
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.75.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.75.0.ebuild
new file mode 100644
index 000000000000..2499e790ba16
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.75.0.ebuild
@@ -0,0 +1,32 @@
+# 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 icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 063e4e53a796..dff67abcbb3f 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
-DIST kidletime-5.70.0.tar.xz 29136 BLAKE2B aab42e49dd3abac7a995e27112d5181ed43123d69a2a47dfedb00406a70ca5d52dd4e01b8e6f8ba52483187f519f3a224a18098a94086505b2cd0394fbf60eaf SHA512 c5ada7ee3cb225509966b9a3315fe4b8e136fe0750ea5e5cb9a543010d5a4b279030d79d526ea8d47e1715434bad09e8f06394cba2362db527546fc55b6bc22c
 DIST kidletime-5.74.0.tar.xz 25552 BLAKE2B d08e482089acf0b7afab5edc69dc11c92a18f208ad4e8d1948cb4713b03c04267b4622e27d0b973777faeef75391b1f053ab490a062f5cac3a3b4516aa5be90a SHA512 4edc4b6ac3164da38401552bab8645ee2db025d519eadc87d9c2d93284b7e7d5b91410d18f443d64d7b1b0573d9e58b04945e3847e07401d62dd8826accccae3
-EBUILD kidletime-5.70.0.ebuild 886 BLAKE2B f24ad336ce539f4701268e736640404c7389202f090a2e435a07dabde08527feda2ddd12453fff5b1ac8d2397670e16d2690252c680f822a314abe38db57477a SHA512 e6b7c21579cce6a014fd1562460a0c9c6b6239ac59363628bcda78aa5bbeb6b4432cb1e570955792867116b9544431fec061a5919d0fcf2124ed9e4785b3a745
+DIST kidletime-5.75.0.tar.xz 25544 BLAKE2B 0f7e213170e32d56c95747105bb41ddda806b32d2f7283799efa8de28fbf971abb77cac32c729a3f4086570c7172e4ed04ff1ec347ac38f18291fa2f8b5f2c98 SHA512 59009842f77e9ab55933d40e8d61600fe90396156b5ecb0ffe8c69a73c5bcdc5ae68fced57ad8018274bbafb8e8c310321483c6d8e951fafeb56a37d0e0a4d25
 EBUILD kidletime-5.74.0.ebuild 886 BLAKE2B 7700d0ec9cdf246715039a4f01468d3827e7ea84e5a8b191d3c0fc1880ba7f4694c079b42f1670d418aa427b28a9d93c9d34633afea12d2a711e981500fb7b8a SHA512 ba1d457331256e0c4de371c2118d28081563b40f7594fe067d101a741c1f80cd72e830cb07232eb8b66979154cf259159a4cd5f7861e754aeb1c9efc2a1f49d9
+EBUILD kidletime-5.75.0.ebuild 889 BLAKE2B 8c2b3a2eb5aadf2c8694c1303cc9dc1a75e990ce2be7ace95619a96de62b9e9aded948c5d49b0e40aef030a1d06a7201c63e58f4c8293cd650b346a9dcec3737 SHA512 e8a7768698dc157667f7ea14d2b6092fa1246cd8aa8d7ce307839b20a64f3e07304a2c1440980b92d35023568266c3ef3476178ec4ad2624076f6383a067586f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.70.0.ebuild b/kde-frameworks/kidletime/kidletime-5.70.0.ebuild
deleted file mode 100644
index 5ccee657a4b0..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.70.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
-
-ECM_TEST="false"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		x11-libs/libXScrnSaver
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kidletime/kidletime-5.75.0.ebuild b/kde-frameworks/kidletime/kidletime-5.75.0.ebuild
new file mode 100644
index 000000000000..1f4a34cf974c
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.75.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		x11-libs/libXScrnSaver
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 27870ba86f46..ce55b7dd357a 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
-DIST kimageformats-5.70.0.tar.xz 404028 BLAKE2B f59d774ea18d0302f6fe493e37932f35a351271fb00b606a0204a53f2613b1e0aa047677d6f323366a452bf38b3b3343ff3237cb34cd8b5cbf469efe7a380a39 SHA512 21a7b6936d9c7a55f37f55223da6d658c98b832f6d2ad5c50a435c0c7af80672434c86d3834a85aa22e548f936d710fc424d724313a7b392f8825e997f4085e3
 DIST kimageformats-5.74.0.tar.xz 406584 BLAKE2B 3ea6bc5ef80558e334046368210d8c946584fe6b16b64774b216b75913eb4373c3e8a7f37f12aeb68fb3621f26e4724cd215f357b1019b7101734fa6ab151561 SHA512 08a74183bed30679523993b3b2a170e96f676954d6ad89fda61903c5797fbbf936e5620625f6f382f2a9cbf6c131be779f223603a51e7e2e5e61af6ec818efd1
-EBUILD kimageformats-5.70.0.ebuild 769 BLAKE2B 62e2de15567787f669fb6c677689e62f34fa360ef2e983a993601e9387dc312a196612280ba7d81dfa53c691b1830f90d62754c216924c2eb5654d58539eb550 SHA512 8c6f4f74201d532e3b188d7a51814f5059aacbc200e15fcce03514d4093277f68a99e529f9f4dc2e43b03f3f7725d6c845891fe7add6bd689ffed7cabc8b90b0
+DIST kimageformats-5.75.0.tar.xz 406728 BLAKE2B dd89f3b9544ace7e2dadd83bea1b4065501ad4bd1d9026dfd48ccfbba6062a4985ef1e178bcf109290178587c714de2901d1c48aa658b63637a557bb02e6c23e SHA512 06d6cc483793c993baea30b372f6b41207ca1df907901193b46ad6330299e5a33127dae2b621fbfc2c3d2adafa3aeefeccb4a03bc956a075989117d180071673
 EBUILD kimageformats-5.74.0.ebuild 769 BLAKE2B 7bc4a5cbcc4d5fcc2011acdda317f8d0b1330eaf494559527e40fca8903ff84714b17e0c282c522b55d17fdb683fd1bd0e824606f94626737bbe0ddd8d1bd7aa SHA512 7eced326cff70c95869f9ad65d784e1245f9d8166bdd5f1c2aa60c8e49905daf2056309be72bbb814eeb113fc1a40590bdd21bdfc20d5a416657dceb09029490
+EBUILD kimageformats-5.75.0.ebuild 772 BLAKE2B 75248a16036e484a67efb4489083edf03c0918dea3007aa919a5a79ffa325e83486e247ed94514e23613784a46ab79594abb143ab322e8386f0d28af43fab6f4 SHA512 39cffbb01eb8d4ba86d8250ed5a6de2f669c9237ce9f791c6be0b0d9838dc47e3b42c42fe95da58c043de61df68c4b7ca724dc15c45adb3d6eb66e49327d1093
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.70.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.70.0.ebuild
deleted file mode 100644
index 4726177ed6d3..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.70.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=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="eps openexr"
-
-DEPEND="
-	=kde-frameworks/karchive-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package eps Qt5PrintSupport)
-		$(cmake_use_find_package openexr OpenEXR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.75.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.75.0.ebuild
new file mode 100644
index 000000000000..5e9926dd7f6c
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.75.0.ebuild
@@ -0,0 +1,37 @@
+# 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
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="eps openexr"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package eps Qt5PrintSupport)
+		$(cmake_use_find_package openexr OpenEXR)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 7e3f053ed9c2..f20152d16b1d 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
-DIST kinit-5.70.0.tar.xz 119288 BLAKE2B 6314bd47ccaf52dbcf252a0f5482de64d83442c57e8a55f70a1aa6b13cc86b9c1430c2964cc754a27fc2c9b288fb661e565a9a3d3413e2915ceaed1fcb156c03 SHA512 be9d066c54fdf0a22a16c40b14b55c25cc64e3c8932d69e44ac5aa3abfe191939129dc20f0a75271c2fab8102fea711e5d500735f48dd0a98e98bda9cb2672d4
 DIST kinit-5.74.0.tar.xz 121496 BLAKE2B f31da8f7cbde7a5ec60399ccab81edcbf452defec9fca607959193d524998ece74f2ab721ec45f6757aae8a812531085ac36689adbc6fee0c0ba198e30ed83a4 SHA512 a75e972fc2b4d967c3a7600260b7aef0754b40e0b5ae8803ee29c2186736222fd88b22349431393a9731d59ef7ed9bb184f413a39df82ed735d82130042423a8
-EBUILD kinit-5.70.0.ebuild 1134 BLAKE2B 869a698e66c8b6f74b74759f5d292b997abd0c3b9f35dad676ea5fa235f59fba99f03905f3bc96c7c358db4ca62e21421af93fd48bca86c8a9f7789a4cd00a1e SHA512 c05d805476ea063edc33c1874fa82671f808344ba50742b6b7d1c557e256bb9ff14566cddc044f3b63e6407f77eab42f54b7c2daabada2d4913e4e1d0d9d1308
+DIST kinit-5.75.0.tar.xz 121476 BLAKE2B 1ad3307dd43a4b4041dcecd8ae836f1fccc5093849d496c4eed6d031d9f87085392de0bd96e68b26cc225a96206b2afd69e442a4da6eb78ae0b15fc78b816d2b SHA512 474735a5716ac89d15e0035139fca3371176e0f52726e324ad901ceb306b0efd31a686e7d86f6ada334c7de10c46e5a7ca7ca85cf3c581537f8433cc1ea66d2d
 EBUILD kinit-5.74.0.ebuild 1134 BLAKE2B 0691da65fb90dff3c90d7d9fc727e19e13baaad38ca2759e6cc78096770b7c1bcb1d0cd238f0043f612c3db05bc00a79a08b72b3a2e999bfe0744dc0077fdc90 SHA512 cb691a88bfc1abbff1aab54cfe6e3a9a05b1eed740aa48bf515b6e4b62230a424e5e1a51e8cf1ed915417f69297dd5041892ff4c96c2ad8f042bd7c437e24294
+EBUILD kinit-5.75.0.ebuild 1137 BLAKE2B c5b267c84871ec1aee3feb6f9a7d8fd0ddd558f6bb162277a2f93b342fc7b135a763c56ffd25634b64d692e85249c04127891b1c26078e3a81b2361a690e7209 SHA512 a391d88d376067abb96ffa656adaa4b833b3c3f6e2746bcd706291dd36165319f3bcd7011eabe40afe05bc766c865154058760c21439be900b1b5de7140aba35
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.70.0.ebuild b/kde-frameworks/kinit/kinit-5.70.0.ebuild
deleted file mode 100644
index 6227f4f06919..000000000000
--- a/kde-frameworks/kinit/kinit-5.70.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+caps +man X"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kinit/kinit-5.75.0.ebuild b/kde-frameworks/kinit/kinit-5.75.0.ebuild
new file mode 100644
index 000000000000..7787f7f2ad58
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.75.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+caps +man X"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 23112666e6ca..c3ca0be0bf0c 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,8 +1,7 @@
-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
+DIST kio-5.75.0.tar.xz 3277424 BLAKE2B ac7d4dafb00ca2c16ddbb6a45d0a5e07d61f5d0a9c2d2b26a8347dee7ff23fabdec2184437e7ad14f02c1def3af5778b599d64e0eff3780ae93aca0a9b43896c SHA512 028e4de5897fb61fda7bf80b0d2ccb022bb7df936648ba3429623708b108df8081bf1b0f416097c3658d1cd4b1a96757010d32ab5a9b382195b6915040ed5a06
 EBUILD kio-5.74.1-r1.ebuild 2523 BLAKE2B b2579b5dc68de6f777118dbb10b13dcca7b5be8a8b30de7adcd783c0d97fea01a95fd66b8374d775401ed1739b70cf4bb6a9e7cde39f8644b68683d5eba47fc4 SHA512 c38076dce2534152955ec002a597d05b87419ef44211761a73be032c3a4bbf60832c3e6e01030697ff298a607b1ac063e15cbe2a6d83d34cb68a1fd49c75d46f
+EBUILD kio-5.75.0.ebuild 2395 BLAKE2B 34e8488cf9edd0371b618757ca46a363040fc3766af3a82c833acb0a1e048001d9f8b0962f53857351258ae8706c6285639cbd0f0966ae323cc8c5674241e932 SHA512 8cadbd0d04604844750d670a7316aaf1da657e828a17ee46089b304dd1ec4ba30a3ead2e1bb7fc2922f68b40cd8c3254a71c0c3631bfe18c18a893ca84a12503
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch b/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
deleted file mode 100644
index 4b9b8bf58179..000000000000
--- a/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 6452a34cf01d03d3167b38bc28a2fe8e13569021 Mon Sep 17 00:00:00 2001
-From: Jonathan Marten <jjm@keelhaul.me.uk>
-Date: Thu, 14 May 2020 19:17:54 +0100
-Subject: Fix service file specifying 'Run in terminal' giving an error code
- 100
-
-Happens because KIO::DesktopExecParser::resultingArguments() prepends
-the terminal application to the command line.  If this is a relative path,
-as it is most likely to be (and will be in the default 'konsole' case),
-the "realExecutable" check in KProcessRunner::KProcessRunner() is triggered
-and the job aborts with an error.
-
-Expand the specified terminal executable into a full path in resultingArguments(),
-and return an error immediately if it cannot be found.  This full terminal path
-is not relative for the KProcessRunner::KProcessRunner() check and does not fail.
-
-Check that resultingArguments() is not empty (an error return) before accessing
-the first word of the command, so that it does not assert if the list is empty.
-Also only call resultingArguments() once.
-
-BUG: 421374
-FIXED-IN: 5.71
-
-Differential Revision: https://phabricator.kde.org/D29738
----
- src/core/desktopexecparser.cpp | 10 +++++++++-
- src/gui/kprocessrunner.cpp     | 17 +++++++++--------
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/src/core/desktopexecparser.cpp b/src/core/desktopexecparser.cpp
-index a3b5219..fcf83d9 100644
---- a/src/core/desktopexecparser.cpp
-+++ b/src/core/desktopexecparser.cpp
-@@ -421,7 +421,15 @@ QStringList KIO::DesktopExecParser::resultingArguments() const
-     if (d->service.terminal()) {
-         KConfigGroup cg(KSharedConfig::openConfig(), "General");
-         QString terminal = cg.readPathEntry("TerminalApplication", QStringLiteral("konsole"));
--        if (terminal == QLatin1String("konsole")) {
-+        const bool isKonsole = (terminal == QLatin1String("konsole"));
-+
-+        QString terminalPath = QStandardPaths::findExecutable(terminal);
-+        if (terminalPath.isEmpty()) {
-+            qCWarning(KIO_CORE) << "Terminal" << terminal << "not found, service" << d->service.name();
-+            return QStringList();
-+        }
-+        terminal = terminalPath;
-+        if (isKonsole) {
-             if (!d->service.workingDirectory().isEmpty()) {
-                 terminal += QLatin1String(" --workdir ") + KShell::quoteArg(d->service.workingDirectory());
-             }
-diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
-index a4701a7..cc57b54 100644
---- a/src/gui/kprocessrunner.cpp
-+++ b/src/gui/kprocessrunner.cpp
-@@ -88,9 +88,17 @@ KProcessRunner::KProcessRunner(const KService::Ptr &service, const QList<QUrl> &
-         emitDelayedError(i18n("The desktop entry file\n%1\nis not valid.", service->entryPath()));
-         return;
-     }
-+
-     KIO::DesktopExecParser execParser(*service, urls);
-+    execParser.setUrlsAreTempFiles(flags & KIO::ApplicationLauncherJob::DeleteTemporaryFiles);
-+    execParser.setSuggestedFileName(suggestedFileName);
-+    const QStringList args = execParser.resultingArguments();
-+    if (args.isEmpty()) {
-+        emitDelayedError(i18n("Error processing Exec field in %1", service->entryPath()));
-+        return;
-+    }
- 
--    const QString realExecutable = execParser.resultingArguments().at(0);
-+    const QString realExecutable = args.at(0);
-     // realExecutable is a full path if DesktopExecParser was able to locate it. Otherwise it's still relative, which is a bad sign.
-     if (QDir::isRelativePath(realExecutable) || !QFileInfo(realExecutable).isExecutable()) {
-         // Does it really not exist, or is it non-executable? (bug #415567)
-@@ -103,13 +111,6 @@ KProcessRunner::KProcessRunner(const KService::Ptr &service, const QList<QUrl> &
-         return;
-     }
- 
--    execParser.setUrlsAreTempFiles(flags & KIO::ApplicationLauncherJob::DeleteTemporaryFiles);
--    execParser.setSuggestedFileName(suggestedFileName);
--    const QStringList args = execParser.resultingArguments();
--    if (args.isEmpty()) {
--        emitDelayedError(i18n("Error processing Exec field in %1", service->entryPath()));
--        return;
--    }
-     //qDebug() << "KProcess args=" << args;
-     *m_process << args;
- 
--- 
-cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.70.1-r1.ebuild b/kde-frameworks/kio/kio-5.70.1-r1.ebuild
deleted file mode 100644
index 237cd974e0c7..000000000000
--- a/kde-frameworks/kio/kio-5.70.1-r1.ebuild
+++ /dev/null
@@ -1,96 +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.12.3
-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}"/${PN}-5.70.0-fix-run-in-terminal.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.75.0.ebuild b/kde-frameworks/kio/kio-5.75.0.ebuild
new file mode 100644
index 000000000000..b2b55fc7759f
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.75.0.ebuild
@@ -0,0 +1,94 @@
+# 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 3ceb317673c3..d726e81124e6 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +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
+DIST kirigami2-5.75.0.tar.xz 285656 BLAKE2B 2a70b0092c112ca6bf8e9845b705171d7c127bda61a341d459c005f29ceee0473b6d6a831a6836fa782054412bb53bbcf855fefdde6444e9337f703e5e680285 SHA512 d1b2468bf54a4d890b7797656aaac5357067759b06ba38e1d72c036bc044cfeeb0dd32a125e1a0461b743e3f6c8dc57ebbc826b02ee73e566bd42e86736ef78d
 EBUILD kirigami-5.74.0-r1.ebuild 1115 BLAKE2B 2233ac6eeb8a1ba60e9dd3cd76a0c48ec61237c86ad737b208187dfafba7705ab54dc34a24a8b88c1b4da9e51262d0e9b7b360c8af02a2415d5b1580cd548314 SHA512 94c20ceee82f6039e332c14fb67ef337a88fa892a6a149f8c367307ab77017f818026bd222961c7f8f9914317f5df9fefbd25db002b391bd095d7b3ec4ed2561
+EBUILD kirigami-5.75.0.ebuild 978 BLAKE2B a8fc110a4e61a5d381c094c04ab27ad0edc888bacfcaba4782ad1962aeb8d9eccb008ea1931c347442da2b9f649637f045ec39128b94a3d7e94fa17b8026f6f0 SHA512 b01e3b320b834f82b0c2e44fbf91fb3cef72db08ebeea4af45cf9813f4be906173c6022b0fd4650c992400e3e2f3ef2dcd8cf276e74c1dcbad0255d43112da39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.70.0.ebuild b/kde-frameworks/kirigami/kirigami-5.70.0.ebuild
deleted file mode 100644
index 745ec2d24738..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.70.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
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.12.3
-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=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-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/kirigami/kirigami-5.75.0.ebuild b/kde-frameworks/kirigami/kirigami-5.75.0.ebuild
new file mode 100644
index 000000000000..a916f233d0b7
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.75.0.ebuild
@@ -0,0 +1,46 @@
+# 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/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 0fba2ac848ec..6da97ef587de 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
-DIST kitemmodels-5.70.0.tar.xz 400016 BLAKE2B b0114e1f35b0501151a7fcf8adfa1b3e75567d0d1d16b78a5da5d56644efa12c2f84126fa034209026e8859d75cfebd8ba5c4d162ec113b63da288c5fdb5e187 SHA512 25dd678d06d75c1b9b6611eafaa1b3390d10f03e3f10a1c3253d531c1b5715f87dc649c0f6662d946cb3713c4214340d3da7929a812283dfcc6ea24eaf22f429
 DIST kitemmodels-5.74.0.tar.xz 398592 BLAKE2B 354e3b4c84bc07476cfd919885fc366741585153ce6680fe2ad4a44aaab05552ffd31538f0f2e038592b46cb1147c1a9a5cc57b7a22aa1b68c7741302d4004ce SHA512 f160c9dfb81bf1d835aef2930a7274ca22edbedb31a6423d5989661eb84bf958077f0ef24d63fc74f87a2c0d18b8f96abc110e3a40aa062f72d8c407b5f0d9db
-EBUILD kitemmodels-5.70.0.ebuild 616 BLAKE2B c0bf2caff4c080a46490765fe7a8f26a4c361ad78f780556f77fee0048654290099c6e4c236ab86125aee0d3c42a06626c3ca9087441aada2e2a0298ef343cd5 SHA512 837e4fab75ac46f6b6423077143ec15615c845707c776673c9f56b4ff73db7e2cc3783cbbd8f83df9c72b4d20699f2c491b3449c26f796e6204e64b49ac31e88
-EBUILD kitemmodels-5.74.0.ebuild 616 BLAKE2B b0904a9973ed9b080c577c1b91561264611f6b17ea393e145ea0df0323567fdf38cf8bb96d4cd181da239ba4759e83647befcf822c343b9a60f434fed6253ad5 SHA512 f473fad69f4917dba469998fb2b55c4d3837ab0f9845134bebe1e0d4b82131cc5d734a7ed458fe64c60c0e1e3062cce1db26f82d1851c362e336adb921849163
+DIST kitemmodels-5.75.0.tar.xz 402820 BLAKE2B 0f1b142cf157a8fce5736e22af6adfd366e7a17ec057b7aae93cbb535d706b4c0f70ce7d9107e75da7f73b44d993a14f85f1ab2fdb9236e9d432396b9c5c2089 SHA512 bc78fd5931758562c6dc3f0f9826d638a81f6ae891fe9a24dffe1b85b04c0ac880a65785ffaa9ca1b1262d27649bf1762021288fbc3b1d9ee87473fe62947b7a
+EBUILD kitemmodels-5.74.0.ebuild 686 BLAKE2B 4eb95f87faf19d9f699019c760e647e8e538e9e1291348111da960dad1709de358236182e8ea1c098c34bc79f5b5fb17a6f81e7c8b9786bd7ba3fd8c39d912a6 SHA512 ec61b5edb5677f5efbbcb17c84dc24485db435e1a925a4db95cf0bf48dbafacd6dbe118079a7698672cb16d471884bb1a0243f528fdffe197f70d0c5d2a6d092
+EBUILD kitemmodels-5.75.0.ebuild 689 BLAKE2B af6e2d1214f5400633d54a0b243fd7c1101759c258eee6d73219b25a4990cf7ea3ee4f0db641ceb968f181f7b43cdfce7a2f4acaff77fc411c3e214add7925d2 SHA512 db3b4e219f527a568b0dba7a67f2e2e189aee00b153eec4c9413786c8900be9d0d44b79602a09e9c00a0ceb1714e33e29ff38a4c4adcf60983f283510f67f1eb
 MISC metadata.xml 345 BLAKE2B 6ebc0f7092b99e24519fae9baf08d02fbf70a5a648e5110e2bb55fbe37156dc13250e297c6094eee7f5030297b6371af4f7642a2b95002b8f9e2241b4a1b3770 SHA512 5c37c8e0f442b14c74035c501da0b02b9c40ac09d031a098decdf463b0bd5e77c54542aadad406ed07d7860626e668882933dea7c7a9696c922bfa5e0ba4c52a
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.70.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.70.0.ebuild
deleted file mode 100644
index 684e62a114e8..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.70.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
-
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="qml"
-
-RDEPEND="
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt5Qml)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 708820
-}
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
index fb3379cbfd1d..ed2c33c39ce9 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		$(cmake_use_find_package qml Qt5Qml)
 	)
 	ecm_src_configure
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.75.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.75.0.ebuild
new file mode 100644
index 000000000000..9da87afbe1f0
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.75.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="qml"
+
+RDEPEND="
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package qml Qt5Qml)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 708820
+}
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 9f35fe363afd..994e14ca5bb2 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
-DIST kitemviews-5.70.0.tar.xz 78244 BLAKE2B 579549ed3e65da7637b596114bddd5e3c66da6f2dc62a570483f0e5ba175ef4fead283eda66797f6cf957861f0cfed5fb46b9a59b1f4d49b060415a0d9dcdde5 SHA512 9954223216863e71e0d80344274e81e8ca0a7248f23ba0053f36d0cd544f986a19fa63468cd3b86ec880c13d69188991cae3acc9ee5a40521b8bc5c0f26e5dec
 DIST kitemviews-5.74.0.tar.xz 75312 BLAKE2B 44237a0f403ed58c1d31038103b81eb31b339c26e729fd4399666b90f8fc59b117ad6dba59abbb2935d4922f71ee9267e8d98c9255aef0785d17fe51b440fc84 SHA512 873786ec95177b29be9456c39fbf77eb04f56b0dc48cc3dd6e6377c77eb5bfea493b9f044920267fc5363d6cff86610ef4a431f45427771aacedc580859d9503
-EBUILD kitemviews-5.70.0.ebuild 539 BLAKE2B c9dbf1129c057d8d309ac48f88e73bd920db52d427d46128315a99107882cd38623cb6d6467b877e8a53c23bef42b6adf52a09a5ae2e854a0e7e1476f2c4ae15 SHA512 9970c740bc43f52d384d20a39621e711cd7a1eea4fcc77176c79ad31433a3da0ca0a26a7e486fb36c2831f2a29c241497d28b88d23b092a727ba7144a22d0452
-EBUILD kitemviews-5.74.0.ebuild 482 BLAKE2B a2ef62900582bcad03884a998eed68a93a545d5dd91cf0625e01e7da6984760a2f2c43865a5c22fb37337e7f05644017bb85c9a11afeb57c13b37048630c8c22 SHA512 d7f62bb1f01bffbebca7bdeafa1129a69ab77664acd903b952cabf16512163364c4837735861b93df05d52448bacd7a8b8fdc5e238c98648aee54380174647da
+DIST kitemviews-5.75.0.tar.xz 75200 BLAKE2B f0064fafec5931f5912aa7daefd6cff2743d6087e0bc331d82b92cbf9a150c7b29cac5247277d3c1f82e086dc3f7642608c5f8ecb702e7b4e280c6f0ec23af3a SHA512 7ad9c6d12cf91eefbf16842adbd5b4d1d22fc9263727df11778af6133d0cddffd4f5649976ca8d820410a76d2790efa8049a0f90fb72140f26fba98521d40a52
+EBUILD kitemviews-5.74.0.ebuild 616 BLAKE2B 6021e613cb53259d330331a5db0149a7474c7cc71e59a70dc48effc968871749ddbad6d38c55d9c32b1d77e323a9f09826d9f76c6539db8ebcdd38e17651461e SHA512 f99cf284a16a5e17783ad300359638c252702c8fbd5b174ffa6fa5e71ef39e797a95df2dcdb4ee17204aaf744728ca8bb09f076e2b76cbcbca2ab254392ea503
+EBUILD kitemviews-5.75.0.ebuild 619 BLAKE2B d0461eb9530e63d8a7ad75b626d2550d7eb1f1808ccae0f40212f2cd498d2c24c0c3ed208a8c3c7d3de8e988cd513731dce78e6e2649f12a9b9e223ff611f0a3 SHA512 270fdeb8d993dcdafd98e81bf26123ea8de64897aae1c09cede3db504767f8b0877e27588d32bfd12c8cf6cae643dd6686e78070eed7aeb9f730d9ae6b7437f9
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kitemviews/kitemviews-5.70.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.70.0.ebuild
deleted file mode 100644
index 774be223d5d2..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.70.0.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
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
index b27c0d305a9b..7ec7f179341f 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
@@ -21,3 +21,10 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kitemviews/kitemviews-5.75.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.75.0.ebuild
new file mode 100644
index 000000000000..1ac2c82501b8
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.75.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 1f1a0ad51050..2000413e1fa1 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
-DIST kjobwidgets-5.70.0.tar.xz 88356 BLAKE2B d325db26a0702b0fe3dc6e902140ede2667a5cbca25d579fadfecf00abf3a1e57c41a6aa305df74513a34c72f9328cddac2d8858ca623f07e89d516ba425da37 SHA512 309f38927f9c507b0953a155e8869f34dcab50d321a3fdc614e95e34ee6f5b6028c064109fcd76087eea754aa8b1eee48b03fb9bf3c05c8ac6ee7f5481e89586
 DIST kjobwidgets-5.74.0.tar.xz 92448 BLAKE2B 329b2ffbd22a80a01750414d83ece87ce3210b88adf9045c01aa78ff399ca238bf533631aab4e7388010180c5183e300e597e6dfeeda22ab614bfe94230eb757 SHA512 0f7c16f360627b133e101e340e67aa22959b8539581f7495bb950e031ba69e931d6a3a2619b5f6f0c0d5164b6397b2edcd4afb8c8b2e4874477547dd200bee48
-EBUILD kjobwidgets-5.70.0.ebuild 772 BLAKE2B 08803716f915944728a2884cf1bd7faea156da8946362e6a3f1219c32ca1c1e4dfaab9c5b6447363bad3984d1a9e05bde11748ea8bc1cca271f8f5486e0a943b SHA512 16954e335785fe7842a71195595d59a3364c02f60569daaa75f1d2bbe21326cde230378fb01c39f39d1a1cc91389ef1992103d043b4fb64916dae93534e91fde
-EBUILD kjobwidgets-5.74.0.ebuild 772 BLAKE2B e864894df03ba37d7d717ca166b7491ea4b5041a9f253fd65c920fc60d5dea93717116cb6a7d16e015cf524c64ad3a5d8b663ed0058903888ecbcff2a352b449 SHA512 a7ab6c775ed85897a13940cde65ee8aaed3b70e2c3ad08e9fb40801f737ff18e7e444193430c54882d0da354cd84ccb3633ae60571c3e66e6cc247a6feea2ede
+DIST kjobwidgets-5.75.0.tar.xz 92304 BLAKE2B a612a024189a7e5f6fa44b8ba87ded01041b6c631a0bcdf717e95d56ec5f27e6f452a3677e297bf72e0217746ce41d3ca50aaeaf1d48da12e252787f5bf41f4e SHA512 2a3d661ae6fdfefa1d66a4d20b85a5694ebe685d47100b7792019674f0cf5bc3e93dd8d0bfa0990e5b831810f202b51e44d03dbefd7ad7331f62d47368b9fd66
+EBUILD kjobwidgets-5.74.0.ebuild 842 BLAKE2B 44d78d0e5568b3796339ef21525f9f5d66f85346e1ba80343ccee1f80310eaf3682fc18cbe455c598fdb2f57c5b138fe18a9c30bb57ad1d7ab5508f9c67ce170 SHA512 b23e0dee43a964eb87dc6701281118112621682b0aa03a070b17d2758d7b356159f4bf260edaa0852afc2a1a8a338e6396dc3bf097112e348da7ca0aa31cb69d
+EBUILD kjobwidgets-5.75.0.ebuild 845 BLAKE2B 05405e3d6074538537d181a49825e61909f0497810cdcd9f435bac5d75930a8a506f7c78159c8c760fc853d28b1622df5a3eaede90d605ae53c7641c69a1e0e0 SHA512 5c938a75f1c1ec1ca7eabd8660b2dda8fda9597b82eaf2f89a78924cfd8e9eab62e7ce27afa3877840a507310ce70fa55eb305d7120f798432e001c9b8ac08b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.70.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.70.0.ebuild
deleted file mode 100644
index a30c6e940993..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
index 17f9fa543293..358046b740a2 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
 		$(cmake_use_find_package X X11)
 	)
 
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.75.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.75.0.ebuild
new file mode 100644
index 000000000000..b2a4d54772b8
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.75.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 71024c92977f..8f537c00a25d 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
-DIST kjs-5.70.0.tar.xz 338028 BLAKE2B 013615012245e8e9d5fda1df0a534507ffa6b101fb7a5d9a14810b14a8068b4284d83652107fe253aab99152af147ca8153535886a6fc83d209c18dd868053b2 SHA512 0ebbddfb5723bad9abb06cbe118e428e209d86b2688ff0a4f7aa66045119012e42e935ddfcda1a32669267376848cc2b9c76dc8a6481604ea6ef23afcb06dec8
 DIST kjs-5.74.0.tar.xz 337928 BLAKE2B b640441def9c8cd03a960fd0fdb99dc58f80751e7149dc817a8570da3146cf9099ffa6fc5c09fa10be040e7cec818ce05aebdd00c4ddcd4520b6d31290e12b4b SHA512 2b592547048dc7ecd2546e02adeeee20693e5f403e7efb9c8a134aefddb1a105e5baf4c7c55e1d3c3e60072cf0f4c17631c4a7d4c1760641114798a1da0f07e1
-EBUILD kjs-5.70.0.ebuild 399 BLAKE2B 447459d7fe1d72fe2d5dbede1c6e2682af70bbb5d11a18582b3ed21d5e6b3484842ba473ddb0976640ff1a9160d31db165aa8a7cd1297cc56708e794b3913d7d SHA512 5d06641ec99e1b597ef477ffa79fd163da2d2bf4bf9ed9e9316ed266fec8fc4bae23ea558c6ebffc646c73a9cdeeaaad040357d73823d70536f55e755ac615b6
+DIST kjs-5.75.0.tar.xz 337932 BLAKE2B 4eabe1f3cb26661870af56a48490c1a714e57f519e1e4cc377b61ebaa78c1832b7cb90d361139431792fb689ef7eb4b38ee0deb381d85a073383a97d8b3f2636 SHA512 7ca5881f7fabc775cfc0c6cfe9365b1973ff4a5b6fb3595e586b9577d3414d894707d3a010469b84a9018dca3ff8fd52f800055fc9c6677b7af9c1b5ad1cfb58
 EBUILD kjs-5.74.0.ebuild 399 BLAKE2B 447459d7fe1d72fe2d5dbede1c6e2682af70bbb5d11a18582b3ed21d5e6b3484842ba473ddb0976640ff1a9160d31db165aa8a7cd1297cc56708e794b3913d7d SHA512 5d06641ec99e1b597ef477ffa79fd163da2d2bf4bf9ed9e9316ed266fec8fc4bae23ea558c6ebffc646c73a9cdeeaaad040357d73823d70536f55e755ac615b6
+EBUILD kjs-5.75.0.ebuild 402 BLAKE2B c9453c2f2779c77b0328a5822d19a3578da198d030fe841579cfdbadc7237dad6cf733102b5fdcbb3e9e647d1bb0db5cef97f68ce42297712db7a7872bad018b SHA512 7f853ec8da09fba6b357e1080e488969284044e6fe3c4be10ce28da87d9868bdafc39424cdd5a1ab52c4586995ca6a53cefc147ec246b95bf9c10f8eda9ad875
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.70.0.ebuild b/kde-frameworks/kjs/kjs-5.70.0.ebuild
deleted file mode 100644
index 3b9eab2cd3ae..000000000000
--- a/kde-frameworks/kjs/kjs-5.70.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
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="false"
-inherit ecm kde.org
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-lang/perl
-"
-DEPEND="
-	dev-libs/libpcre
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/kjs-5.75.0.ebuild b/kde-frameworks/kjs/kjs-5.75.0.ebuild
new file mode 100644
index 000000000000..19f013d45495
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.75.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+inherit ecm kde.org
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-lang/perl
+"
+DEPEND="
+	dev-libs/libpcre
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 1e3863cc16ce..fff9c1aa3f99 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,5 @@
-DIST kjsembed-5.70.0.tar.xz 170008 BLAKE2B 81503622feb123597c3655e315e06a2c04c7b1e1180a220fc643bc510a46ea9f685388ff3697efc4a7a326a7e65835b546739f935b43163a932b5f5a8e055093 SHA512 21cd2b3e567c1292de215becf72d808d8d43e52d9e158a6189f03fede4ad5fbb722b82a65d5eb96410faaf662ed43d26002d87f19e3fb4b243a792e7fcbf136b
 DIST kjsembed-5.74.0.tar.xz 171200 BLAKE2B bd45deaa18851bbbdc1b504dad5e9725ea6877a68e47f44f1ab98664f9bdb9a3279f92d6b81746d83fb0c12953a221a3987e19830d123f33946b08e1e5982509 SHA512 b9a317b62b4605effd59a24b55e37155adfbad0b802c885da666e7e9560ad8f7ed3ce65ac49622f47c185190394d722b73d5888077510e6e616c8ddcb92160f1
-EBUILD kjsembed-5.70.0.ebuild 600 BLAKE2B 9eef156e694057112e033ad580fb8fe2464b29bd9448f29a4058618d4c59ccdec95d1a37a7b2ffe9193e166b6efc290646d8d23739207dcd9e3986f16ae39904 SHA512 baa1f890c7cd9cc2ea253801194beebc06e27ff402fc7369737b07de29e1d7fb81452a03defd2d662d836ba14f31549bcb0e61d37ec206ef74014250ed4af2be
+DIST kjsembed-5.75.0.tar.xz 171200 BLAKE2B ee9dbd8ad3a259ac8f965d01c930444d1eb221d0df7290b3e076ad2d51fc39bac95dfb7db030bee7c93d918b39323a2f0f68e576de56b64c5c1541678032da1e SHA512 7c4932585c23431fd7069757d6237d9b612139ef9e2b48040233072b214fc55a183b5ad1dbc90c8f9e637c9d2a12a878445fabc79fdad0b1659d9bba1a3f21a0
 EBUILD kjsembed-5.74.0.ebuild 600 BLAKE2B a9354c73fd5c08199ebf751355a57f5b8f4a8a27052f94eabf4a7345893e0e8e713ed9e7d893586cf5a7bd8ba2ff3a5ca3d362be48010945147b10bd0161a504 SHA512 ee27e884b031ef5cdde77e7ae094a7b1e11f53ae3b3ba632d0b2274de9a03c5d6a8ee276a53a0d97c92bf6b177c606026f160c9f895bc4d12ee082eefa88e69f
+EBUILD kjsembed-5.75.0.ebuild 603 BLAKE2B e1656a7eb3da50e83ab54c5e0538cf0c86641013444c1a35c82ad7ecf2e5dad64fc6a416e17415a49e4ecf25b1e9ef1a684615fbec3c57b7db9ba929804db937 SHA512 27935d338802475e3056f584982538f128563a7a58ee40620219a058f3194c16a8987fda2edfdc031d14184cc7f5fa087e329f2d81781a64e2b4be41f5f38f31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.70.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.70.0.ebuild
deleted file mode 100644
index 8bd7c0793f0d..000000000000
--- a/kde-frameworks/kjsembed/kjsembed-5.70.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
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-"
diff --git a/kde-frameworks/kjsembed/kjsembed-5.75.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.75.0.ebuild
new file mode 100644
index 000000000000..7e2bd21a65ae
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.75.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kjs-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index c6f7926388a3..633d660624cb 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,5 @@
-DIST kmediaplayer-5.70.0.tar.xz 9688 BLAKE2B d31cd3371ebe4f343504c778d259218b7a846de19d9a43e9f74084c4223034fb9c09e9ec9996fb7f867ef528f67ded7c860786e38900670dd764c0bc843544b5 SHA512 dc359e80735094a41f4dfe5d29f815a6b901b03141bb08a00f3d33379671e1e6e89d9ecf92f678252a236363280a452d6f91fcb111d2bb996fb66afdb32726dc
 DIST kmediaplayer-5.74.0.tar.xz 9648 BLAKE2B b0cfe327720e9dc5c13bc1b79be87655ded29fcd1c3d50c49bc13ba31dd26aac2193754f8cbb690e682d6188e4502a0f03642d6ef989b1948c72b15575b93c06 SHA512 e7d0ba3d2720b9d1dc99cf4f4b11ab2f7c949181d6f1a8bd83ab476d248a67c4f6440e7786b26424347c08b3b8e03fbbf3de1184ce09a7071de501be452eec4c
-EBUILD kmediaplayer-5.70.0.ebuild 527 BLAKE2B f5b0e8792042ed99ddc98abf940d9fc13dd13c4feae1ab19a0d25009d965f4693a3c4be5959b17cbbd3fbf09c9fd8df09b7ab3e2a111fb73b260f6ffb4bf9375 SHA512 a6a690eae8586680ee304927a99503b1f963a20c5588ef9f04e5eee5a80a82cb4e0b1d9ff9c784178babed633565fe7afd6785739a9b2e70347115efe4031405
+DIST kmediaplayer-5.75.0.tar.xz 9640 BLAKE2B c57225a612e00b1fc9d3faa07ec76dab68bd6a900e87ed064075179df51700cd6475c3ae22ea7e09c2d829960e905b0be861489a9f1fcaf99e33e550396b51c0 SHA512 cbd2e184e83691784fa7640c24543e3d6857b5b6fa8a1caa5994acde1e46dc341cc442e97661cfd0f95de65231f445f3cda9ac10354990090f8cd09dc5d09df8
 EBUILD kmediaplayer-5.74.0.ebuild 527 BLAKE2B 0828c76bb841f0a9279301668f629009c3630c26fdba41ef1ec6e06c1d0e948cff0f2412533c98bc9184cb377f76587b6e70b82c1102db70718f04020d03bdc9 SHA512 74ef99088ce2fcf6a000d07ffda3296682f44408eb6406c9fd2e6225225c1e503ad8f2a442448b75c61752ad08fdc6ea2c54a299a789f6c5662aeef24b130521
+EBUILD kmediaplayer-5.75.0.ebuild 530 BLAKE2B abdafa98bbefc32b1c8ac43e9e826e7641c43abe764047f5abeedfbc4d9c51fe16ac86f0326c798a086b49f0a301318018718b500278c8b1682a24de4b4fe277 SHA512 c918004eb65e9f7f0f93c5047241a82bff6672e3c839cceda531e54c13e75f9f811d4bae3e144e3912c4cac56db1dd825692fbe9322252b9f5a4e92b5b05ffb7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.70.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.70.0.ebuild
deleted file mode 100644
index 0e470cfa605d..000000000000
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.70.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
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing a common interface for KParts that can play media files"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.75.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.75.0.ebuild
new file mode 100644
index 000000000000..e2e38a6860df
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.75.0.ebuild
@@ -0,0 +1,23 @@
+# 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
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index f2b574a1ceb8..4ac358c2ad50 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
-DIST knewstuff-5.70.0.tar.xz 1096436 BLAKE2B 1b2d59d20fba2466eee20175f4040f3aea3477cd211a51f0a5e4b419fc0c3ea48056cbb69f0e26ac01640edc27fd7585b41d67ce94c3bc038bc0f48fbbdd1e45 SHA512 10e336f99370458b791e636b254d497acd7421f109ddeedd0957bf049a15441981cf08b94626df651f459e69f05d42fc54b00a54b964a4c06fd9af3aa0bd75ac
 DIST knewstuff-5.74.0.tar.xz 1143920 BLAKE2B f36956a82bf92960ee78ef61b272363de52b0be4acb2701fa1ad1494a7c05492fac79349b49a998549d2dd7f1c93406daef5e06f8fd28758aea460f667fe3b3a SHA512 038af364cf048035bc2d1a505e4f4c8318fd90efbfdd9c2fdffd9c22b1196a29b0d153643e838a98d472c19094e994a55983f84c63ef50f47574013a8b9f697a
-EBUILD knewstuff-5.70.0.ebuild 1056 BLAKE2B 14b7c032d24c64669b989cfd17ebaa2e3e3d358d5a35dfcdf084d944d1bcc6dd727ce54e30c78104ed385f4e30cd95d192603637e6420cbef6e98d425d38764d SHA512 30f5f65befdf47cccd13b737f0a1ce0c04eab0ac6cc8af2c1c9e740a77fb6292c81667389f3ccf881c082651afc8c6e6d59f1a29ec18de4150ec123329b6fe7c
+DIST knewstuff-5.75.0.tar.xz 1142012 BLAKE2B ab648588dd0039ac48194836a6cc572a1d1fccb7d5e2d3a1ad2569d8d89e122edc91581d1babd18d004df528c7efa26dfed208fa9c40f965d4be8cad73c8c2aa SHA512 612562280ff819e1b68cdc5aa7aec7f0b14183e2906e59d08ed038c2c5166a80ce888075c6e0ddb2a7e5c7638fadf430948767c514a64a8d0800e77c66ef3a99
 EBUILD knewstuff-5.74.0.ebuild 1094 BLAKE2B 24cd855095c1df4b504eabab595e719f8cfc4af7c65186b8ef277ba8cfd1358a9da8f84acb47d93a79973e2670c1d9eddcfe2ed4dc83b564714385134c2f2feb SHA512 14beed78d3994cfa9b556bf49a5802936eb779ddef447754c4a7f3bde0ba1eab7120354a0cce22babd9857f799e2edf203030d9cbf306b7a3e333de14b3f6b3b
+EBUILD knewstuff-5.75.0.ebuild 1097 BLAKE2B fff897e345c194aed1d0455487295cc2da6f19a14e98320ac2396011d70eb212d6094dbb77ad273a1f886e5714e48ac51fa0e70f9ef78d26823e1a0512d853f4 SHA512 0f722b4cc4a8d84088a91408839c41ddd7a3eaa911a2bda9ae1ed59ac731b1e655af84a6402163c5f5bf19464fc328bb7a7c2b8d75af87845174eccb9dfbdaa3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.70.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.70.0.ebuild
deleted file mode 100644
index 34434e861f2a..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.70.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
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/attica-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${PVCUT}:5
-"
diff --git a/kde-frameworks/knewstuff/knewstuff-5.75.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.75.0.ebuild
new file mode 100644
index 000000000000..64520eea49a4
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.75.0.ebuild
@@ -0,0 +1,40 @@
+# 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 for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/attica-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${PVCUT}:5
+"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index fc734b5bb208..6b1707066681 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
-DIST knotifications-5.70.0.tar.xz 119032 BLAKE2B 62de070d12ac9f60a95659594d60f0ac2f1bdb5422669dd92d506a26c1ffb3267de6350114090727f254bea61ba20bf806aeab4a602bc25cc9f9e78d51febe43 SHA512 c17502641b1f447a09c09c41e416e1a1a57f568016e483b38be1bf92c7cadf0847284068893fc6a8dc149474c19e9467271dad8c73bd7a1ef32077a0d8ba1766
 DIST knotifications-5.74.0.tar.xz 120668 BLAKE2B 114978dce5de16aa8c78c59cc844a45bd60df135f918ac8f20a0ed0fc1d65384ce02a1d9f9dc38bbb6a9de58eea953a7152eb2309184973e326b0e454f4782e0 SHA512 a44d0b0ebb7e825adc8c0c5b99f999769149cb3a12c147b81570737736030449136f86b9934b3b2287131f3c41f639c8cba92256ea1ebd39f5083fd6b7158bff
-EBUILD knotifications-5.70.0.ebuild 1143 BLAKE2B a03503a900ae9a6065ba6b72ad7f91819701b64d7e3d904a881e3ac54112091adf087b5d453306c82e6a4c1566d329bd83f0395eae4c8c874f13b43e513b9ec2 SHA512 aeaf66b9f831b0d8bb19b3b7c7244bccf108d673fd54b30880de492db944e2435edb804327ea930d879ec0ee3c6a1e1771a65d7f0bace5b2db33b0f0484981fc
+DIST knotifications-5.75.0.tar.xz 120864 BLAKE2B fdf01b2c33d9b8a32345bf2558f3c142e5059b611c532dc742dfbcb50d0cfc008dfd2f4f4db950c9fb255b5de9e568a9549902f8c39a2ad121c735d0833c20a6 SHA512 26b9599dea6a317e1a838555af19fe0c8ab9bd80a8fc6d6694fb974af32d48f1ae7023b6f58663fe7a176d1c0db9dc8786b600c11b4db9757cd69e07fcda49b8
 EBUILD knotifications-5.74.0.ebuild 1144 BLAKE2B a6109975f9c79b38a8c56b512c9cb0093ce8defcd430b6e715ffb3fa211d4657f32fef7012e018c3855bfd011577881bb35abc097beb3c54ca679b2d8e201c3a SHA512 af361bf66de57865f874d329fae4114e193f2144329653f33d33d1bbc4543fa9bf1caf22762e999f41ce68f11506660faf21a5fec70923e0c6ebe97e16b5e6ec
+EBUILD knotifications-5.75.0.ebuild 1147 BLAKE2B f38863e240e3771e3dc9fd6439da01982759c42b988d20af861ad6006fa6ec2dd2e6241e18c79ff04611e6927c467a8ef0efd6bba41a56d5f23f936f5487dfc0 SHA512 9ffa1a314332344f8525c52affe98c46abcb9adbbc3ad8f046cffb1309351a7e2db187a3a8da557c291f74b097ec6de5092c38daecb5e200c02f24f1a3affdfb
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.70.0.ebuild b/kde-frameworks/knotifications/knotifications-5.70.0.ebuild
deleted file mode 100644
index 6f343e71f6ac..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.70.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
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="dbus nls phonon speech X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package !phonon Canberra)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-5.75.0.ebuild b/kde-frameworks/knotifications/knotifications-5.75.0.ebuild
new file mode 100644
index 000000000000..a0091de4ab9e
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.75.0.ebuild
@@ -0,0 +1,49 @@
+# 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 for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dbus nls phonon speech X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package !phonon Canberra)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index e074b05b6bf6..b086519f4d9d 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
-DIST knotifyconfig-5.70.0.tar.xz 85324 BLAKE2B 4e7a41924f97e545cba52fa23f3983db0a5372536f6c8ea65dcc818f66edb4d82d5a79e674fa808e82e9472c6a890c25163710c7a856cf4ab5f1d793d9eec77e SHA512 49afc7f7c5da3b01a6ac5bb173239907e40f9cc4a7a32f804a5d3669a85f07c40b15f2531b9a792a40039a096c9c76ce7b4a98a486e6563c1ab79c424cebcdf3
 DIST knotifyconfig-5.74.0.tar.xz 84364 BLAKE2B 3745f0ccacad9f16b05d89a9451d1257a52ccc28b656e83dd7031c5d2951620dc745ca43895213a2b1c2788260387807c1de30712f40ebb93091b5fb2cab59e4 SHA512 73957b4977ebccc47c53fa65c6352ff333af7a170a55a6021e5426df3715c167a43170fc6d82ee7a452246560cc57a976341a013c9ed7afc243b74a18c755ffe
-EBUILD knotifyconfig-5.70.0.ebuild 767 BLAKE2B c34cd2524175b8abc98e1aeecef02469e6d5136b30acea745b0052284eaa6b027da40a9c37a7dc3a2b34c41da6c9cf931abfab9ebdc47e7f1862e3875ba873dc SHA512 410361dafc271b513a6585d210fc82985fa694028ccd200409ba7bb3c0ad0c33a2c1c042a751ffb81d52d3b92585f3571e73faa5775f9b0c463f66830b2019ac
+DIST knotifyconfig-5.75.0.tar.xz 84440 BLAKE2B 335f2f683d8c4fc3bf4b04f89306cff369f98298cbaa17c78e9ffe8fb6a21ddce8668bbb8ef52d0b528a56822f7df74cb083149151081e4434b51129304e8965 SHA512 e3d1d47a7d52532f263b4a8e6e187cdea49d3ba99c48f201678d1c308a678426895fb1fad72716c3988d7fda1c6e4e0697e14b6bc341cb605cc4e1cafd8d4b7e
 EBUILD knotifyconfig-5.74.0.ebuild 768 BLAKE2B cb6c15acce816ba4e3d3697e679604fa71fd09432c2316b49675cc4ba1251e3282efc5a0393aee496d0aa83207017092e5ac5298963efd8682c0f353ea569091 SHA512 d4de7cedb7053366538dcf008ff314a72b49d73e8274fa4adfa91346fd617456af8a44f86203d644227a947e215f18537aa07086430002ffa354ce96b4b6bb80
+EBUILD knotifyconfig-5.75.0.ebuild 771 BLAKE2B 288412991d2e60a7062f428abe250a1a7f2f14d8cc6e838dc50fd3284b897fce26a38795f8074648bd58424e35132a2a9b3260478e149a6cc9d2b0cc0718e08d SHA512 2e4b328eac7ca8c2c533db526da8d0088ee56d16e1d33c1a7209dd63c19e281ca22ea5231f8ed4def6df292594223eb16c195fe91d4d09597a5cd2fa041e353c
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.70.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.70.0.ebuild
deleted file mode 100644
index 43b5bf2becd0..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.70.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
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="phonon"
-
-DEPEND="
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( media-libs/phonon[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !phonon Canberra)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.75.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.75.0.ebuild
new file mode 100644
index 000000000000..7aed7fde3444
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.75.0.ebuild
@@ -0,0 +1,34 @@
+# 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 for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="phonon"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !phonon Canberra)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index fd7fa641c2f5..fdf31e2ff47a 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
-DIST kpackage-5.70.0.tar.xz 137744 BLAKE2B 9d40a4523d5f9e9727ba978db4b85afd6da2f45c63fd3361a7e0795b60970a7413b3adbb913f74e23091ef3bfa363df10070427df19ccf364844bc028bd93d5a SHA512 3a7bf919c76a4d4fef851e4320d6d5cefa2b9f168b5da56d5159f73be9923d0f1f9185919ae38f9d3a628715d92ec232a47f19803f5207f3fd825adb260ad077
 DIST kpackage-5.74.0.tar.xz 140364 BLAKE2B a1e61eb9dc8d70edad144fd8c09ef4a6d86d3bb58835d21e2f95ab4ad92fff593f42699342253ed779dc652719d6ed8bd38e43e84d2d4dbf13f53a6f3946679f SHA512 93790ed0cf527c93b2ba434ce0d4e753dcd31ab027c86e69d65a6f8075771b7d4b9ca9628a5164d1ff5aa4a69f84f11093df8f8d63f284127e2943aa8e443e72
-EBUILD kpackage-5.70.0.ebuild 714 BLAKE2B 82dd49ca0d62bb617aef775e5e4f58bc95fa1ef450fde3d7db69fe5ca6f6023660be740080d9f6be3ae739cf77a0887e7fd6f87a9822ad4eaa2ed13b0565ad55 SHA512 67ff3b1ac38a108873f52c23ff8f88772465b8cbf3c88a84fb87799a380c49dee4eeec19711decf49c85173f67519bf95ae406fba798322312deb36e0c825d2e
+DIST kpackage-5.75.0.tar.xz 140376 BLAKE2B 3d6291ce647e8527c2a077273614a4311d472e1f6f076cb8bb45949cc232f799e297ad8f81f3370daf69cb462900523a4278b825917d02fa4570cdd266486c02 SHA512 cd424971d7cecd429e2d93acd1cad87e5eef01a97328c3bb5e6f664fed2a05d6834738966de3f0919c1afa81069041936646bd2b662345bd86252111c8fd85d4
 EBUILD kpackage-5.74.0.ebuild 714 BLAKE2B 82dd49ca0d62bb617aef775e5e4f58bc95fa1ef450fde3d7db69fe5ca6f6023660be740080d9f6be3ae739cf77a0887e7fd6f87a9822ad4eaa2ed13b0565ad55 SHA512 67ff3b1ac38a108873f52c23ff8f88772465b8cbf3c88a84fb87799a380c49dee4eeec19711decf49c85173f67519bf95ae406fba798322312deb36e0c825d2e
+EBUILD kpackage-5.75.0.ebuild 717 BLAKE2B 9664817a6227e2fb0f0f56d03bd4c6adfc78a0f4888e0c710abfc209fca74a3139e265dac13cbfe9d2e918794daae9ed27040258e1d81d449abb246962aeb363 SHA512 117571d95944713ab901814f38e34044b324872bfdc2804025d72cad2f631920784104400e03f44ad4acdfa8c2e23f5b8544872cf3601290fb0ddf7d3aa7f0ab
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.70.0.ebuild b/kde-frameworks/kpackage/kpackage-5.70.0.ebuild
deleted file mode 100644
index 396a714eac63..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.70.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=7
-
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	#bug 650214
-	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kpackage/kpackage-5.75.0.ebuild b/kde-frameworks/kpackage/kpackage-5.75.0.ebuild
new file mode 100644
index 000000000000..2bbcd2bd9285
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.75.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	#bug 650214
+	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 8e9eed96b192..957b54b72e7f 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
-DIST kparts-5.70.0.tar.xz 187580 BLAKE2B 99e6eaacfe2eb0376dc18e565f3a62dbc79e661c5e4500426867713aa14b70d897b99426fdc2053545eebaeb1b64f9d69a21b336dfeab8e1161d8b883695712b SHA512 8f78c216f8e25dc2b9144c4f6f038c9fab5799fc2e3b6962da5062e76235fb1fe2b4a618aef90966207ad32f27ff512a7ca25e3a61a88fa30e95f410c6842dc9
 DIST kparts-5.74.0.tar.xz 190144 BLAKE2B a78bffe9807a7cf6c2368578c94dfe1056e3ed11b93f81406b0bf849ce2a6bea76eb4d5a46282941a5d43710a44b9965a5d9a46492a5c48a7fc5dafaf854e902 SHA512 477dc2bbb9f66ad9064d362e898072c3b33a59267ec46627c140cd0784858b1d2b1c2eddfe7addf50356523e86e37f1cc138c4e73ce80c61eb96711fceec86b0
-EBUILD kparts-5.70.0.ebuild 837 BLAKE2B a230dd495408524f617269a8056b4f85ace3f026a1705046ac1ba6f435851e71239983a1db3bb66953dde3f7b574907f78d13a3a359c88ce06a5218a8977ba57 SHA512 15916dad0c2ac1318197e7e1cf098534220e97e8be9bfb15cfd2ab70974a3b5ef668b8860e88af365cdbcf822c9a41bbd6fd97488f390e37d0acc80ce27fcdea
+DIST kparts-5.75.0.tar.xz 190104 BLAKE2B 4945038727928ef08650deca7a3c7a9ca15fba21cc36c3da7cb2a2980d2e8744a3b14f2c13d8ea55aac96df87cb48d833c50d27ae5cb1c935351bb07550b5c24 SHA512 b7e232c00f6d6be6b0ed0a65b17f857b1e11fe3da3fd6d0cc836e06423c163cac4a56c8b00e48df11e1917e00567cad01eece994b1e4e14cfd7f7ad1215d73d1
 EBUILD kparts-5.74.0.ebuild 837 BLAKE2B 9676361f1592e524ef9ccab4d8a50f7f21703fe99a348f7cf27c5660421ef888f3dff3bb6106be341dd6ea45930468761ccc68c3cc9ee68f7bf6509964e93289 SHA512 3822f4a25552de48ac5eacf03074ac25e92a9a9dc5eefec206b5618e1b27470a25793076fbed603eff1d849d2cc02dc1b86f1d2b818d10b8a33f380aad1846fd
+EBUILD kparts-5.75.0.ebuild 840 BLAKE2B 619a89e6496f084d8c868ce50e0e66c5f1cfdbf3f336880b7adc170b5159b6c477b30b350777bf3e5c7effe04b10bc8a9f934d4f699cc426c525cec439dfcc9d SHA512 9eafd5f21b8fffe52131110fe6395cedd5ed17dea49847a390bc109c74bc3563e7d6a68614557f0d25f3aadb43c278caff5d08a5a27ad8fbb4fb5231d3474525
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.70.0.ebuild b/kde-frameworks/kparts/kparts-5.70.0.ebuild
deleted file mode 100644
index 9e348656bbbb..000000000000
--- a/kde-frameworks/kparts/kparts-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktextwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kparts/kparts-5.75.0.ebuild b/kde-frameworks/kparts/kparts-5.75.0.ebuild
new file mode 100644
index 000000000000..301dad0741ec
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.75.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index e752ca29cff2..2ef78c9b1266 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
-DIST kpeople-5.70.0.tar.xz 62104 BLAKE2B 40dcbd4ae37a7d6b3586f4c4f6c1fa044289886d4c6c908e9e041fe95ef13d757de94a4ddc6b78e230bc703b28f39004bf491136b168f34050bab9c497823274 SHA512 5c2ada1cb352c586769353fc20346c589bddb47b47ed20fe2b50b43262d96fa39561b6e88d0188e96a957b82cad30de48f733dc077c1701e06a0998e5ca2f696
 DIST kpeople-5.74.0.tar.xz 61664 BLAKE2B 96155d2501dad4431dfb372c5fa78cecfd95bf17251bae489d272ddcddceb5c4ae7aa564484fe9e3d3d73b83d265c98246ef9bfbce5f523e70cd85ec52489907 SHA512 c85ed5e3010d25153957159f6bda46882dbe806b9029aeeb5326ecde6b8e4f3a43bd37a57104757563f1ee7014fb216385c962a25bc0438cf4633bb4b41016cc
-EBUILD kpeople-5.70.0.ebuild 870 BLAKE2B 0f92ec16ee4c8821421ff1aa1736934d26e93fb0b2c206806d2b6f15b86ee0e15c8914f1f5c8ebd783000e13a0aadde760e12e49fe8d435fa372f3f72bed44e3 SHA512 5eafc95c1c127d26947c60efb35d82abcbab1246ca4f7bee81f9151b9ede3ee20fdcaeb5a288f2dce809f0896f44dbab3b3c8b4580679a96d92007cb981386e9
+DIST kpeople-5.75.0.tar.xz 61624 BLAKE2B 46861e64b6018df6b560435a50d8c9f4033c430485bc7915cb53e806a708670a8d6aa53b3fec404065dec065c59b749dca3fb591b894434042deb073ad7bec7a SHA512 09e29020ce50c975556cf2488c172778a8f653b370ec9de9e294a9a795c8221387d8186dc68b8c80f8bb8adcc128d9a4109348184684f0d4af70ea55cf595e64
 EBUILD kpeople-5.74.0.ebuild 870 BLAKE2B 445eea24d961d5007d8cbec6fef0cd88da9dbd3858f2c77995b8d2e8d836988bd6c58a11cdb7a08a8a63c75e8fa5b99d076950c92d633f99af8dd999621d7667 SHA512 b9d4b503351cbe11b23261fa0a0e1f5c33e3be2917e9e64e346cebc319dbd6a419c4b25baee0176707d019b465481a257c205b2f2362a41e8ba762b52a367ad6
+EBUILD kpeople-5.75.0.ebuild 873 BLAKE2B 0f3febf5995f736a78e42457ed89e74aba2c1c5617c187a5e4f938b8aa2547426f13720b7afff4882550d446408fb53fd08c9cc3f993c7669a0319b7eda91a13 SHA512 0078bdd0bd82561eb9c952aee9bf0f28501654a3e231b8625606d191627428f6cdfd80a3334fea1f8742ea96aee763935bfb49eff91c8e843830be472543160f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.70.0.ebuild b/kde-frameworks/kpeople/kpeople-5.70.0.ebuild
deleted file mode 100644
index 405dc750647f..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# personsmodeltest segfaults, bug 668192
-	local myctestargs=(
-		-j1
-		-E "(persondatatest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-5.75.0.ebuild b/kde-frameworks/kpeople/kpeople-5.75.0.ebuild
new file mode 100644
index 000000000000..0ce077647206
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.75.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 89e675e65e28..30a361fef656 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
-DIST kplotting-5.70.0.tar.xz 33548 BLAKE2B 351f4d803f3ba8307989af87228ed88492f6e45c9fea60475af1ca2ad7829fd1d0a864c4092f9c5dec1015298ad41e64ebe3306b4ce9820bc9ea12b7eb9f454e SHA512 6718737795ef1bb4b6eae5de7c41d47fb3377438c0737584663ae9174b93598a5fab4d2892d53692fb48ef2896a9a7dec81164667d2068006c907beeca375ef5
 DIST kplotting-5.74.0.tar.xz 31104 BLAKE2B 63434d36d0b67eddefb16b136cf9d608ba3ba0cfc1d9901bc8ee8b621fe18a0749f9522355d6d76130f41f5fd4ea6b6457850d715f3779fd7fe48cdb06a9f7e0 SHA512 54559904c8d2a5ce6827aee23587838c97aff173682652e192e0e180d6643ec98d4dff6e85e89baa7fdbb92e5b8f99079beb300c3f71c589bad8cc2f21bd7426
-EBUILD kplotting-5.70.0.ebuild 437 BLAKE2B e1c52006e0209e14afac3a25861996d365a7d21f0bfdcc339a240d5d2f6943a4d93d2eef545c2f7bacf12b23ccda504757e29fc6b7d5d544a80b2cbae253fd38 SHA512 8fe5d1db421db9efdfc74592ec9d135df128e24606aa97608af9f1311e3f1a7c5f2620df15851f0bbac60ff7b0ad2ee20cd7fd60155e6d1f34553f844cfdd5c7
+DIST kplotting-5.75.0.tar.xz 31104 BLAKE2B a217f06dce8777234894000c6b7f123d89d83ea6397115efe3bdb4393b0398f8ef62c782c003d82415678f3385a2f953ca2f62b4b4b343502a54068a2725cd47 SHA512 ee69491a9326169b032b70de5bad6eda164786b492a81854ec70caf3b6e548acc784d5d89aea26e4682845540cd0457ac4598da4558b879478ffc829b4744d95
 EBUILD kplotting-5.74.0.ebuild 437 BLAKE2B 1f03b67c2c9b1dba0ff0db8dd3c48898f1759367d571cc245257bc4c55ebab95d695a1fa30b7b31bfa8e1b8d65df8e47fcfb070c75beef05270ee79c556c4ca2 SHA512 b7f2b6dd116122d35e239accb2d4a2118bae8718fe299da3eb6c98d1b0f1b79a182c0219ba6ffa9938ebe3735537046006c0cbad379160cf993d45dc973fc64e
+EBUILD kplotting-5.75.0.ebuild 440 BLAKE2B 26039faeccdfe43f43e0665d541a641fde85ad1b4cbb7438174a320abf3e968839058c56d665109621e34428bb887ad3d7e21d8456b2dcfd34ad5d09cae9b8cb SHA512 5cfce27e751b2820bf68af12ede6557a7853ca6836d6167894d9c8ec050a51b41ee5577b6d75f8ba3f3c9109548920536ca9131a73cdbb4644f734ec25acd57e
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kplotting/kplotting-5.70.0.ebuild b/kde-frameworks/kplotting/kplotting-5.70.0.ebuild
deleted file mode 100644
index feb94b302c37..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.70.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
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kplotting/kplotting-5.75.0.ebuild b/kde-frameworks/kplotting/kplotting-5.75.0.ebuild
new file mode 100644
index 000000000000..d37a7d0a0169
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.75.0.ebuild
@@ -0,0 +1,21 @@
+# 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 providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 6b56d3fa1e71..70bc119726de 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
-DIST kpty-5.70.0.tar.xz 58256 BLAKE2B 55585e66dfa244be7cdd76e17ecaace2176c31cc704ec717c6022756d628a0a088ce0aa6d55ece3ac2fce401b6d2f8ba22bd7d8ed9b3d0c00360737a74bfb982 SHA512 ffb003b5fba7c9181c97853322f46b0a573053f4cff465a31f5d952db4f56d5058092d3276495603f03cc179989f1a75731753df32db8c6e3157122ed4139ee7
 DIST kpty-5.74.0.tar.xz 57000 BLAKE2B 92e1f24eaf0002e6a0a255dc9f32488868c1b0597702bdc64f3c66f944717e6bf669a33a1e2432a76a765ad020adb4f1a4244a4af91a8adbdb79bb486eff4468 SHA512 2fda1f9598401e3993d4a0ad1988e92856e4c6b3b682aec0e57cd6434256274a31da43d44b0141531d61fee64120511dbe844dbef9ccf805307f33c9a0d60172
-EBUILD kpty-5.70.0.ebuild 550 BLAKE2B ff4ee52255ef83b89970168accdb25a6eaeec259352be5eae699d92d052aa30a7cfb3fb3cdb19951e5bba87d7e75b03b08c8608e6150280a468c726336e72393 SHA512 54e572366e5e90c0027b1a445e23b905754b9717f0c807ee2a70a1138d06e0c5f8999917e8e52b46fdca7e195423f4fd3a08ad4a16c7dc672378f8ae3e86f482
+DIST kpty-5.75.0.tar.xz 56972 BLAKE2B 102b7901ea509c42a35614cbe3ea3e247c5e881d113c6567a39b513cad50cc4e100ac0729239ff0ae97356f67633c4e4f5d8bebd222b9ba65451a8f3593d7a70 SHA512 4562258eae82093e0d3e4f3bd0762170167b49f3af50eef06bbd9581fde152cb5834e653db8947d5afc9e8ebd3657d7b7b22fdffb090d94eb310809352bcb144
 EBUILD kpty-5.74.0.ebuild 550 BLAKE2B ff4ee52255ef83b89970168accdb25a6eaeec259352be5eae699d92d052aa30a7cfb3fb3cdb19951e5bba87d7e75b03b08c8608e6150280a468c726336e72393 SHA512 54e572366e5e90c0027b1a445e23b905754b9717f0c807ee2a70a1138d06e0c5f8999917e8e52b46fdca7e195423f4fd3a08ad4a16c7dc672378f8ae3e86f482
+EBUILD kpty-5.75.0.ebuild 553 BLAKE2B 7eedd16cef8b168b4ec8a4a329eaa043e484a020bd7745031476a479248afa586418b8a0e2d26e809d218a26d3aeaf2ff4b4c993687e991d8dd79222c3a1b0eb SHA512 31c0e5e8a05742de4789bb124d6ea73f971bde65b26b8291de785a632ff1e4fe5e680bed83fb03b434295663a210d07898d847210ebc54fc66b58b8bb988e8ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.70.0.ebuild b/kde-frameworks/kpty/kpty-5.70.0.ebuild
deleted file mode 100644
index a94241e56fe9..000000000000
--- a/kde-frameworks/kpty/kpty-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kpty/kpty-5.75.0.ebuild b/kde-frameworks/kpty/kpty-5.75.0.ebuild
new file mode 100644
index 000000000000..11aa24e729ea
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.75.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index 9750635b0bd6..0ba2f4b5b415 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,5 +1,5 @@
-DIST kquickcharts-5.70.0.tar.xz 96340 BLAKE2B a130a9106400baba187a98557d15bc0d6957075c9a62c2b0798282bd8dbfb5b0d3bc65eeaa63022e06850eaa0548a45355be3c38acb7be1ff9a9c81d948e1d15 SHA512 0579b7516eacfd138216a854ef5bc9ad4b7b84a5a8255498c2454b931f13f0097905689a5b602e88b24dbd9d2782828cee861974b856a57e0d4ce51ced7117ef
 DIST kquickcharts-5.74.0.tar.xz 96148 BLAKE2B c5a18d1a74ccc545d8f71736e8fa1ebf05114cbf466f980e722622417df0770eccaa8d086cf0ed4097e67cc36cf6264d38bc2c72a0b1e162a1d01cd5e9d2b7fa SHA512 873b5d40b20c995c5cd0ad7e5303dcf29083a8e7bef42f7e5370638e5589728df95fd074de00f7f5276c46a37a37b9b31c9722229d660e024041a8d99ec29e2b
-EBUILD kquickcharts-5.70.0.ebuild 798 BLAKE2B 16771c0c67d9eb9a541e33c4cdba57df6c4107ec9f004ad7c18a418aa84dfc6ad5578b29b1e34405ea51fcb100ededb17b652acb130fa90a93e7822b1e4a8f59 SHA512 c3c534042581a5ff7bf9687b370a514b801587291bfab1098727583974c2abf6ba010b983877618e927abf2b1000e50b81937473439db8816582a0aeb5719238
+DIST kquickcharts-5.75.0.tar.xz 96208 BLAKE2B b9a09f2657ed08fd9fe2937d940a390b810e68022f682abbbc10731d6b85219e25ba1cc7bf4d0501e7a931de133cb914547eb4da38760309948a50a251b88f94 SHA512 12e9fa5f26ead139eb6ded98185263e60a3e4cf480eb5b5fa9987b241e52b8bee7055aeeb91b9e53def2c1c9c9f3f1e7fd69ac17383bba51112d600269eaf317
 EBUILD kquickcharts-5.74.0.ebuild 798 BLAKE2B f17559bafd7ed576bae13dba43d55b7315d867c6605f968ef3b83e17d94b84ae51725e593404d456a7f9d8ce796765f241fc4a5145577e3e64f3e52a6f798400 SHA512 8ba6e736fb84b7ca7beceaacd8b82b869fb7ac6d5ae744851c64aba72082817bc0bc25734dded4824637495d88578d5934b8f7e6a48ecb3684197bb7244d4a0c
+EBUILD kquickcharts-5.75.0.ebuild 801 BLAKE2B efdac2a7a74bf580a523a854165a51708ce30341558a1b5a4d96990c22d5e705f8f736f270fda30881de989476c60b36e81c4073ae0319561ed952bae3fd57e6 SHA512 4081639ec59a4e7623694508293e18eea035925a79fa504d41ebe6a49878274d7537d9e71d5e98fac1d416e61db2323a8533af3b9aa08c926ee6fbd9edc2b6a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.70.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.70.0.ebuild
deleted file mode 100644
index d0a9ff19c907..000000000000
--- a/kde-frameworks/kquickcharts/kquickcharts-5.70.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
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="QtQuick plugin providing high-performance charts"
-HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	examples? (
-		>=dev-qt/qtwidgets-${QTMIN}:5
-		=kde-frameworks/kdeclarative-${PVCUT}*:5
-		=kde-frameworks/kirigami-${PVCUT}*:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.75.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.75.0.ebuild
new file mode 100644
index 000000000000..b481fcf546e1
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.75.0.ebuild
@@ -0,0 +1,39 @@
+# 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"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="QtQuick plugin providing high-performance charts"
+HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	examples? (
+		>=dev-qt/qtwidgets-${QTMIN}:5
+		=kde-frameworks/kdeclarative-${PVCUT}*:5
+		=kde-frameworks/kirigami-${PVCUT}*:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 8896a33fcd91..b6e224f95082 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
-DIST kross-5.70.0.tar.xz 127908 BLAKE2B 687f01c190176b9796730e92f233b48425d897846953875e4a90d7880618ba581b27793951b44561cb22cf2c379c1ffd3ea0fea2ae9bf52f35e8677832d42d98 SHA512 26f2ef5a836c911f8b892765a797c825e0bd1e9393364a541c31231028c75d1c81361229645531a4b5480c4b6d5e07b77f29c2657fa9a1f27855d3ac765d600d
 DIST kross-5.74.0.tar.xz 128440 BLAKE2B 33a8f033e9288b7980162a80dd0d6f3d3b011082847e1e2592a93898f508566511bd50d82595406198cc8d8bc6d2c44d62741526237efb36567d0ea73465f258 SHA512 0fd08d620d90f78ad0ce62aaea372dab4ad4df17533aa29fc1d86b718d0c7ca19a691298498b59a1d0d057eae902ec838f68f5238b482c91d568595543964456
-EBUILD kross-5.70.0.ebuild 859 BLAKE2B 30d45e17f0f3793fc2bb816bec665d294c9b1bef50c751525e2deddeaa312ae77e0cf65f1ec58b1811e135c6b397a86950b4a0b25b5b5eb121697d6086b45bf1 SHA512 31ed4551d0e8ac318f63bac33c2bad2b92cc4de6f6f6c59bf4de6f57a149163b4e54d9eee308c63b5da000ecf8b95112d5452ccaa6dd40df07565eb619005eef
+DIST kross-5.75.0.tar.xz 128444 BLAKE2B 75d314d7712649865407934e5977b007f37d4e4c377c04f7270cec02ddbe0e3be976be2462d7aea41947003c436d1502f38fce2e5dc2c3160d81a18d9d822e41 SHA512 0acd67a68420b17e6030f3f08098e71e37a8d1e826b15038ffbb844782061167ab66e976a7a577da1180e62b75ffcaa1b24dc65e65ea5cc89491ecbedb0550fc
 EBUILD kross-5.74.0.ebuild 859 BLAKE2B 38fc528deefbb9730ab01dce9642541a9ff2fc28f57500a6177a6b5bfae9ca18e20895ecfe8707d626e7837a57e5f2ea9194b6070fe1cd4255a8654a5d43dbd3 SHA512 6d9280167a65c91f9ccd4f4783144c90bee6c96288b6b127b0d5d9374aca6dfad3b04eac45ec5d711fc69fd3c4a0dfa7b3f4d83e616f99ec814e90964bdbe720
+EBUILD kross-5.75.0.ebuild 862 BLAKE2B fe159c37e209b8e76cfe95a14a40d787b7e2aa4cc12ff534a416f4c590c420b8a800d8908cd18e2429df2e96db1ef4e3a1d20befad1024aea16e874c7896fb07 SHA512 71f51810da2023efc45f2ae628506bc2fea403768d1dcaa62c6212686b7f7d2d1b0c8825a9f22fd9dbd4da47e313087421e148fa220007760e7433dd31490087
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.70.0.ebuild b/kde-frameworks/kross/kross-5.70.0.ebuild
deleted file mode 100644
index 55d0c9b44480..000000000000
--- a/kde-frameworks/kross/kross-5.70.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-"
diff --git a/kde-frameworks/kross/kross-5.75.0.ebuild b/kde-frameworks/kross/kross-5.75.0.ebuild
new file mode 100644
index 000000000000..606469c2f8f4
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.75.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index d1f927800295..3e816b989fd8 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
-DIST krunner-5.70.0.tar.xz 64184 BLAKE2B 97672bc5edb81231a9beaac67d3483ee6e76ed7a40b9dc95cbacfbd87a98fd62e939dadf639d0f17534daaee84ffedbca8693d8357bc46133be14ecaba0837da SHA512 861492f7106bc4f2f392e28f3ae7b61773d37d58d26b73a67c4410e2406c96e58183c584b18a24d7f9f41ec3165337d37e4616063365d65a635e07d64e18909c
 DIST krunner-5.74.0.tar.xz 67892 BLAKE2B a64ade87c1785781e1b73aa0c7c150bcca75eed66699111b23470764602675ed53753dbbf31f895789c9ba51113092b76bd0ef27ba786d6ebd9848addbbaea1b SHA512 504fb43acff3337920477a8f67e995a79bdc9e3816e8a92ff5f259a6e50201e4a4edb90cc483a7496daa87c26e39597ffec2b91fd9b315850ace4677f9ac0796
-EBUILD krunner-5.70.0.ebuild 896 BLAKE2B 2a1b6b431c2171de62184e68bd68d03cf653802a79b44c6f38d561d1ec6aa8f29646c50629460cf0d783e6eb1874596ef748e89759aa14d7695e5b9c7bfb4cb0 SHA512 fd81c205f42ffa8080b0413605d1c3aa635fe5acbda64ed22faf98c163af28c6ea9348d890716454908f03483ff9d6be2080fa58e665954ba8ca27bcab704851
+DIST krunner-5.75.0.tar.xz 69792 BLAKE2B f24e6ca6d53936ec4f764cbde4352b58d395e09036a93bbe6ec9cf7e0984b7e0e3f0594aaea616e3ba302286d5f8876ac60cc4ded04cec34da6f0f56f6bb7a3e SHA512 885577623a529aca79d4b6dae1224c3a4e47f3f88a80a2c9065603b8305a8eed1239feb413961f54b49d0cdf7cdddd74990f577e4a716cf8959a44c0269ed581
 EBUILD krunner-5.74.0.ebuild 896 BLAKE2B 4fd92d95415a49e23db6b43f7e9edad18a21c7e7ed9ff8359210a1c01fdc13b4900a57b40e0b23ee032a8b54687f4f1ba7b23d89d650d7a9d405ec1157a7a6c9 SHA512 7ff6e41ea14d3c27e829708c0abbee2e043f062386ae4586d7c1964e68465ed5a7ca7e4b0c173b867bbebd075e8c462f363b9ac8f385c075fae8a4e04980f97c
+EBUILD krunner-5.75.0.ebuild 899 BLAKE2B 188040a7dc4cef57685b5f97f23588f67d51994d8f5e8be8bfefbab34bd6d405601409a79af468b2e4344b25d8e7bb781e793c6bbb9140c79d77a005c4dc18ef SHA512 f270fe260bd4b39421bdc251c8d29b8f8d88fb1ce50a9cadeaa7ed14c1b1d7914aea752d50112eb913c8c53c44b7470a18800631d2e9d5261b2c16209268d089
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.70.0.ebuild b/kde-frameworks/krunner/krunner-5.70.0.ebuild
deleted file mode 100644
index 68033fecf66d..000000000000
--- a/kde-frameworks/krunner/krunner-5.70.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing different actions given a string query"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/plasma-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	=kde-frameworks/threadweaver-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# requires virtual dbus #630672
-	local myctestargs=(
-		-E "(dbusrunnertest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-5.75.0.ebuild b/kde-frameworks/krunner/krunner-5.75.0.ebuild
new file mode 100644
index 000000000000..5ffb238697ee
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.75.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/plasma-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	=kde-frameworks/threadweaver-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 5a831ee012e9..65b53b921749 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
-DIST kservice-5.70.0.tar.xz 259024 BLAKE2B c5613e1dcaa310459441f20e9f22b51d1b98b3a17cbab2da1e9f690ecc1bb8a663d1406ad254730e209021b5d9029da51691cc2e8c6056afaf6ef0760d1d9f77 SHA512 059827da605fcc29565e03f7b5f9f4130e039ee431d7b1f104da5c39fce69197136eca62f7036060b4bbc471aadbe43b062fa8315b8cd0021eeaf13b772f2f47
 DIST kservice-5.74.0.tar.xz 258552 BLAKE2B 16400aa4f21a093c66c21d7911f9082c094f27ac559ad66b94c68a43a0f1cff6627ae3ad32e75fbaac6c93c1c6cd6cb37bc9be4a6051b670c104785cd82aa9cc SHA512 7756047069ff22d1e78494770ec3fb56a07ce96459a759b8275188f75a9e9e5d334df0f7bc7c09fdf6f357c0e144cc115ba077a15079f8598bb042f37e5ce490
-EBUILD kservice-5.70.0.ebuild 1044 BLAKE2B e316a16dc75fd05977d45cca056deb8a5f9ffda3b992fddae9e54dcfdd6d721945ed413fd92c1b644498f56903d1e4c954eb23efa715652307a14894587d1b4b SHA512 4791f3707ec8645569b01f6e95111aa551f7bcd27588d67692453acf905ca91b8ff03b3f5fd8c1c9d37fb81e7e50b5a88272696945b75873bc27484d492fff71
+DIST kservice-5.75.0.tar.xz 258632 BLAKE2B e15e9f2b428f6c48652bf629b3a639327883471cdc743bb479e08561d6dbd5afbeda91945915d1c07a90d54bfef1d6342061c4a60e058f2485e9d422b296586a SHA512 13b99249ca88393eb9129a728ce718f33949711850ad3710ada9f5da2d0ea6f1f90dba609b8a8f0c741317e76c18a0fc39403205bfc3fb57bfe0680823a985e4
 EBUILD kservice-5.74.0.ebuild 1044 BLAKE2B 6bdab3b7b21d9d66ee66eee9b581b106df7880f7af236e93496d072ba88af5995f10f557badf820c0b89aace0e19ff1a3b0c34ab611a04b15ecc754379b5847b SHA512 5cae93fadc4801f532392a9c82dbb53738a642b2cc6610c3036dbc2ef690a98ffb90f4f50c28b2f4985d44c5da2be7971bc5aba3dd0b9dc31d1565b566c5a7b8
+EBUILD kservice-5.75.0.ebuild 1047 BLAKE2B d73b6492b61cb873eec5a99a0c074d15837db8e446de46ac1a62a564f86d9f4e885153814b1ab91c964550aef88ae77a3b7b5f5f54c12512880690992f491589 SHA512 b69e9eb33067eb1ca114061984a0bf40d419921f17082d1451f398864a0bc2c6a221038771e730341af9cd3ad1aa854e0ebdb4453eaf98715d98cdc72ad694fd
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.70.0.ebuild b/kde-frameworks/kservice/kservice-5.70.0.ebuild
deleted file mode 100644
index 3a21d2062a33..000000000000
--- a/kde-frameworks/kservice/kservice-5.70.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced plugin and service introspection"
-
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+man"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# bug 596316
-	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
-}
diff --git a/kde-frameworks/kservice/kservice-5.75.0.ebuild b/kde-frameworks/kservice/kservice-5.75.0.ebuild
new file mode 100644
index 000000000000..8649f8107e7c
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.75.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Advanced plugin and service introspection"
+
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# bug 596316
+	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 09982a845d9e..f652796b8cfa 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
-DIST ktexteditor-5.70.1.tar.xz 2345148 BLAKE2B 079985f3cf2f8c68185aa3c89ff18fb0cdc2b8ab38815de6feff83824b74f312d96ed110e41ee360b80d64191db1422f0f1e4a5b002a1457ecd320d20f25b98d SHA512 6bc47ed6d0c10c52bacb3f183a2a724dfa9d9b3fdb6545469bf8f3e0ec710eff611f657301805efaeb202dbce3ad0c2360a095d41546e7300aa6811dcd4ff193
 DIST ktexteditor-5.74.0.tar.xz 2380320 BLAKE2B f316776513996857b1e59540b9a7850ac4a810b734ccac2895cd7565e21cf69cdb0322ae8bfdbf972d3fa69c3b1b02bd55ee6115a4f9d2fbc237f716e5217245 SHA512 d37d8f132cd33d403f0c4dc3b8773661dc4e708ffea17a37344534f5370c9d41ce947f6a3045fa740bda7ca0021de0f4519be5a21e8cbd2038bca6ff4b9e8e3c
-EBUILD ktexteditor-5.70.1.ebuild 1588 BLAKE2B 3238ed045260b0fa7d73ea39fe7e28e5e5c7444071f849cd741127acfdd434b6aaac576a64d71fff1a6c4f284a724a632460f23deabb375778fb3a4939f137ed SHA512 bc53ef7fde178d0b6c11f2ecf0c4272dd6e710a30757449aefdb2b3984aaa5f38969097c8209ac9888162062c40df798819efaa46eae72fe5cfce8d516fc2d98
+DIST ktexteditor-5.75.0.tar.xz 2351624 BLAKE2B 18e521f776b705256372c8fb23095381774e34ed857021cb5d1dd466add1c943b39213a00513eebe8afa473f5c0756e909ee757b229522f0e87a2005d8d0f3ba SHA512 3cedd749a605ab4f6f4b1a5d71ee5b0ed3465d34903ba7d0b3ccff349612e682ae3e4e547674d4ef3ebaabd8c040a53920a42444116f7271e3b1d6f9d469a165
 EBUILD ktexteditor-5.74.0.ebuild 1589 BLAKE2B fee0635be8901222ebee496427278f1f61a43b2115554e5654ad0feebbdf20d0cb8f9d5ada9312e2219f0cbc646b81fb514bbb72705be386add14a7353b03e40 SHA512 ef4d148278045273b5ed5d2e03ac204c4363259ce6477cc4c9645563d6381d232b09606eff5023de439ee506eb70bb70fadb087d52e5d55d39f6efa1330b058c
+EBUILD ktexteditor-5.75.0.ebuild 1592 BLAKE2B 4dd41aabe7e3a4c55daf69761085230b686368c04bbfcc9e97974dcf45852b34e9f150aa98e201334f13ec5ea75834d157c42213eb15d7f148724d42c735766d SHA512 206c47029ac58b5e7c906653adc25226326dc2a1255cd85c448b7672bc67c343589fa570518f62f36253a7ce3a632c4712737f6d2497137db1958b40af5747cd
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.70.1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.70.1.ebuild
deleted file mode 100644
index abbd078aeba6..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.70.1.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing a full text editor component"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="editorconfig git"
-
-BDEPEND="
-	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kauth-${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/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package editorconfig EditorConfig)
-		$(cmake_use_find_package git LibGit2)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.75.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.75.0.ebuild
new file mode 100644
index 000000000000..ad0ae0415283
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.75.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+editorconfig git"
+
+BDEPEND="
+	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kauth-${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/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package editorconfig EditorConfig)
+		$(cmake_use_find_package git LibGit2)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 32e1442dffdf..85521e827848 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
-DIST ktextwidgets-5.70.0.tar.xz 321208 BLAKE2B e59ff4f70281a394420d60eb8c2fa10cc86ea986a4b4a2436d03f6fe1ae805d3732064316c18ec6201992264ef637a97e18661d2e723232e1c29f5d48a0f204c SHA512 97480c1bcab3e1a27b66fefe2103d1caa5e515699b0fe9adf4936ffaec4ffbafa32a6b84072de8181d914327aae5440dd4cb8ae99b1faec7e6fb070de308259e
 DIST ktextwidgets-5.74.0.tar.xz 324896 BLAKE2B f90a7426f6f76f3869738e6c86bd3b1951c096f69cecb582433df4cc5b100e70f4203d8b3cbe731cfc77739c541efb9a96fd85563817fda505ade6e98bba57f6 SHA512 f471ea1b09cb73f2e32d506139e45a3f928d834d559f6d25df5bf05e74dcee5b756ba3b87a38eb2de3fc69c9248a8982e1bfec8c9fc5cba6061e24f8ff62ce5c
-EBUILD ktextwidgets-5.70.0.ebuild 955 BLAKE2B f592f7288caac3f621b6c5412cbca16542b185c97c54c8560a51156b13b065ab6f7063970d4e7cb048714a96ef3f415609624c05fcb21e84684f79218c33f25d SHA512 b395ba831fd262a2e4c0ed397b720328ae0b4620341bdd36cdf370be4484f14d30ef424bb27a1c8345d956c1c8be0cb1d186c22cff88ff839eeaf5944508175a
+DIST ktextwidgets-5.75.0.tar.xz 324468 BLAKE2B 0df1b6a32a202fd0af395f1399c390d20b11b874297fb6632e7993258b4bca33cdad66235a416157dca2fc22490330ea495015c6f571cdc941ef0db10dabf60b SHA512 c85c226c25d74b562012ef6d80e55f301f374ceaf4e4a1e0880a4a67926bb150cb1b736c1ba87edf0a45932034c08b4160090794fe443df366383d019455f31c
 EBUILD ktextwidgets-5.74.0.ebuild 955 BLAKE2B d8203ecb262d1c99ca2f6d03700cbaf39f48f8d7baa0c05cccc318f06165935790e1f163249a3c8ed72015a1d0ac821b00fa9fcf49be5904f324bfe5935f43c4 SHA512 e5464baa66ab4a2327cdf955dd97bc4d33cc5de6ac3eaaf2d22e4804da5c7a600cfdc545bd7fba411adcdf05d2d99ebe0622399630cb0ee10c05acad8e0e38bc
+EBUILD ktextwidgets-5.75.0.ebuild 958 BLAKE2B 8611153e6e05a5de37a0a4fa7a0f32a5fd4a6baca7e0bdaee50f782e20a647b32bb00813346bb255f5488eab93027fd90b2ba78be9aaff20fbafd26a8587067f SHA512 dfc80b22020caf7c2006e056e38a45ab3fb0c4943becae972db192733172bc62086e4a7b2449e230ab8ab66b635bda2b9116724c0bbc8718c7deb019d054072e
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.70.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.70.0.ebuild
deleted file mode 100644
index f62ea84029e0..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.70.0.ebuild
+++ /dev/null
@@ -1,38 +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.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.75.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.75.0.ebuild
new file mode 100644
index 000000000000..65402c7ff5d6
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.75.0.ebuild
@@ -0,0 +1,38 @@
+# 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 providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index f8c72e03cc7c..0ca99591050f 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
-DIST kunitconversion-5.70.0.tar.xz 841228 BLAKE2B 8250af7d1c0e7c5f851b11b7958147b0face4fcdc7d13fb9556d79f993d39eecf3b63b54702f2fc3886c3fbf61b1dc3ec4074db25de88d87f2202e45817f2274 SHA512 73aa40ead1d31da3f6f24444cb8f67f8a1326c02afcd0456aa368b138f93a6ae2cd886e84f45f6a5c404ca793168ee4e9d715442e7951101e4c782ac03924ebd
 DIST kunitconversion-5.74.0.tar.xz 854944 BLAKE2B 4460a5c7a2aef3d007105785d69a5f2216860830e6eadcf0bbfda752721d4ddd905c3fae71145d052c7438614bacfe51eaa31300c6e5aeed055a1332f148ee78 SHA512 065e6f5e48e1c76996d46bddf030edfd7ff3a5d221d93599030874779492ee4d6df89cd736e565ef9a7b0ece1068ea5fcf3f59bdc6dc65ca9fcd94806955c598
-EBUILD kunitconversion-5.70.0.ebuild 524 BLAKE2B 7cbb7dd43b5f7d57021c55c2bbe66ba1c2915ad5c212ab2cf3facf29d2070f23bda6ba011156ae75db701e74c4fae9c4dd960c3f89e6b9a3b12d4b76a5220af0 SHA512 dcf5379b9fbd6e42d953ab3117dd11ab7fbf26f9c41f6ca2f2186be6f29563f4cbab933c65f720a89d55110081e5d862da211bb91e4116312de649f9a98c62a4
+DIST kunitconversion-5.75.0.tar.xz 855188 BLAKE2B 033e41eab6b00821d471c05f703cfe490c7c798be9e8b1577e596f4f8686942e9322b3945daa9d9261f8b0cf52f26502482a689f3e9ed417ba2dfaac15745e86 SHA512 a0f78ac5bddfddbecaef68e338640aeb6c5416c2db8d4c66b2fecb62c7ee11feed335fdf8b23fd7c98b19ac7dc78612e73f2d93c0223895ab192850984cb48d8
 EBUILD kunitconversion-5.74.0.ebuild 524 BLAKE2B da6414d9b5f70194047a46261c53ed8806c954f527bc01db97832eb7a557176b9ef82bf514547d518e6879db71979a62e0195ff9b64eee2db4b179ed0bd0d9a4 SHA512 ec44bfa25a8ed22798f9d2213af48eda872e3e6fb24db63bd708533d2d7e8e1fb3fa4478b5e2a2faa777bc91f52fba88e395070d1c42ebb6bba33f83c7ae3664
+EBUILD kunitconversion-5.75.0.ebuild 527 BLAKE2B 078d8568b839018ced7cda43365fa8def9b7aa83c48b8eaf1827d5cbe16b5f2c2d97ea9ecf70b3ff253375fb7850eea0f28038e1078fbd874188f69d8098b329 SHA512 95ad979f0cd282054aa05ed0b0acb9314488d1647cd51f3d3de20a67b14b11d18cf6d5a6b2064d658f1a7ea0b33b949ee632a0a0d36066f462fc643cd556788d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.70.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.70.0.ebuild
deleted file mode 100644
index f191e3e81f9f..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 623938 - needs internet connection
-	local myctestargs=(
-		-E "(convertertest)"
-	)
-
-	LC_NUMERIC="C" ecm_src_test # bug 694804
-}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.75.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.75.0.ebuild
new file mode 100644
index 000000000000..fb1f0eae43b0
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.75.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 623938 - needs internet connection
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 64810bf7e40a..5bb565ee6cb0 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
-DIST kwallet-5.70.0.tar.xz 295432 BLAKE2B 1732d0358ec8d27c4ba72f24ccb96bc6eb22b5914b63520a7daad41865dec236b524b9cbf4fa76579cdb8ecdfc35226fe10712f5707b9f6862a47085e2bb9a4e SHA512 44693f4661352a4aee17beae5b5b325261057768a876a1cf721041d977c5edbbd3b5edca76dd5c7f9d1a67355e3255fd29c9697cf1f3e9179f11c536c04386fb
 DIST kwallet-5.74.0.tar.xz 299812 BLAKE2B 8c38fc467440b241ce8a0c509ef75e3196303d6001bc74a2b347a3f6dcba6e80fc6d49068002a5317921d46fb60f0f033c79b99a5c583933ed39789e334fd770 SHA512 e18de73657c4b51c3150de88e2d764f710932527dc6e9fbfc8778e853b66e0776619fc5d8918cbf8fb6384f92d7b74836797c374d45a50223aa7d543cf743fa2
-EBUILD kwallet-5.70.0.ebuild 1427 BLAKE2B cb0d38259cfa7a6c57f8c5d0895df256067f3801301e495cf128df58297ccaedccea1c37cc0f1773de09430f4947e99116baf1e9ed8b3f6ee677f263b28b7eea SHA512 9827f83c9a109200adee399341b3d15629bee275bccd57ff8b5f8ebf7648ae2392cffaabb139aa9af391acd991d9278a5ec622ddd4f343978d48624e3a355dde
+DIST kwallet-5.75.0.tar.xz 299708 BLAKE2B ef9eabf569dc215a5a55e09901fc2e5910d6f7a53ecbf5b99de82e084404e479c48e78629d4751f488cf3033950e8a27a2ee271d0c4b897e931c27c00722a420 SHA512 51955dfb44f89c1793bba0478461efad00c93080a7168c9aa1d5ecdf427896419625d0ee1f68d7508dcdcb64ff5af4c7bd796c1bd571f3fd8f811a57811b5df7
 EBUILD kwallet-5.74.0.ebuild 1409 BLAKE2B 3708f5a45eabe73a35d00062a56c98fd8eb272a6fb84d9d3049a318d134a0bfb3bc655ec1b519c2649d497c4aa8b782418a7a8a48ef3644561a3f96f8b9de63e SHA512 da03d6ff4e0c3633f19e56bd7bf88c1281c7a04578e18a04cf5a1795fa931a9b55e0415e6fecba008f63d7f54ee439b015b553ee999cc1562265f75966e6d3ff
+EBUILD kwallet-5.75.0.ebuild 1412 BLAKE2B 59c4b55589a547da09bad209cefd1823271d899ce7fabdcb4c01ea8b69460451b72553f61ecd3337f92b0dc3632f8d7002d569af8cd1bbe2f0dca8a30cb72099 SHA512 bb5a24397758dc723636f35a98c98d876fb3ac8b944061ffa48f891fba7b00431fa46bf20bc89aea6081a96104cb62d40c82a1cf28b0eee7d5fef79641234fbc
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.70.0.ebuild b/kde-frameworks/kwallet/kwallet-5.70.0.ebuild
deleted file mode 100644
index 61d1bdd10250..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.70.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gpg +man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
-		elog
-		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
-		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
-		elog
-	fi
-	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
-}
diff --git a/kde-frameworks/kwallet/kwallet-5.75.0.ebuild b/kde-frameworks/kwallet/kwallet-5.75.0.ebuild
new file mode 100644
index 000000000000..d757b246fb96
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.75.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gpg +man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
+		optfeature "KWallet management" kde-apps/kwalletmanager:5
+		elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 00bed920fe5c..9cca6beeafd7 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
-DIST kwayland-5.70.0.tar.xz 347256 BLAKE2B 72cac86ea7b712f494465fdb8dd755f9a792848d4438838ee8113733da825c54363cee82dbbc11f082d74a304c546b08f8fa96d9f72eae3d906bb520d32966d6 SHA512 3ba6e090c8f94b7e49151807bbdc3525a3b6003273279ad4d29723da43e69885b30c5f6c10c3197fbd3e22695ae74368148d41cc4145a41b3e00c7fc359c23af
 DIST kwayland-5.74.0.tar.xz 344496 BLAKE2B 234b90876d45dc340b196e1416694af8b799fd88aa576e824a0e76f970691247d01e3bacb1be78aa5a5bf6f65b023ca2bb83ca7702da37a3a9120f6669b6e660 SHA512 347841dd5dabedd9de13e92275a2b6edb201a45c177c757b69af681e2f3b60c261087c5387c97305869c0a125a5f07de08113208a174ccb946f6ace310445ebd
-EBUILD kwayland-5.70.0.ebuild 674 BLAKE2B 1f2ea2c697cf828987231c3eb99214defe01cf91ec5db566bee2955ed08a9d0eea6323a036e7cd0913fbbb165277701873225d2dd2f5f5d1b25e84478c7fa322 SHA512 8548a06aea2a59a1ed9c5e19d77641d5873c5ee6fca87d5125a5f02dad353db0ef040dc242228cfa9cb2df537b124e5f5a69d7dbad2cf9f93ee0ba11929d4af4
+DIST kwayland-5.75.0.tar.xz 344572 BLAKE2B ef0e194787d1c874919b1ffb946453f05c2c3b1fdfaedccd365798f8e9093f93faf38a1a163f206c1fffd70cc3a2f7b84c428e6b476f5f4ffd06bb2828a5967a SHA512 8f77ccdf4f30bea2d6974d930734479c0f81f5309807b28f51bbcfda91977e27d5311b4718e4685609da0368c1e1bb060eaa765628a0ed9560f5774dcc357d8a
 EBUILD kwayland-5.74.0.ebuild 717 BLAKE2B 6e3fd86fb82bad1d4ceb8654fd2bc2d2b4ea662168c262e6a8424aeedfe6f57bb653f11fefec75eea90b302026b33b733bbfa254d4f293735f67ad4579e34344 SHA512 db72e7ee592062750297b4a3f4d7537eaae7edf6f63f2ff7180e846ee8d7f7aa676754a49efff0305ec05232efb1a06284482011309e022fb5c2e88d5961eb14
+EBUILD kwayland-5.75.0.ebuild 720 BLAKE2B 2b002d7df86001f67da0d803ea1e58e75248e351d581d91a9e20d5c1360f90a3be5741385258faa7675c52b45e2e2cea87f0d64733edbb968c0b6bb0a507d9b1 SHA512 121ba13614639c61cfb46cfefbc7e7dad6b566395f2745563c643e08a418e4fe16d9232627b9213e4d458eb285ab918cf490f64bea3bdb620941d3c3c2429d06
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.70.0.ebuild b/kde-frameworks/kwayland/kwayland-5.70.0.ebuild
deleted file mode 100644
index 588ce5e93d4f..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.70.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
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.15
-"
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
diff --git a/kde-frameworks/kwayland/kwayland-5.75.0.ebuild b/kde-frameworks/kwayland/kwayland-5.75.0.ebuild
new file mode 100644
index 000000000000..948871143002
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.75.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	media-libs/mesa[egl]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/wayland-protocols-1.15
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 556f06e488b8..fb55b0d1b20d 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
-DIST kwidgetsaddons-5.70.0.tar.xz 2341452 BLAKE2B 5a0b0f583bd50167bc4bb9039c64dfd91025284c492022e6576a3a2f4314206a9abb01fb5c195a92c321cb0b60bc2a83d63670b56ee0f675d43e4edb9e63b574 SHA512 4c11822f3acc2dad31346ba536d2daa2f1f2d357b99f9c181f336696f88a2e3d6b5dd0c82af1481e38662731bba64e7dc7c95e9a4ea588488e987b0e180d02ef
 DIST kwidgetsaddons-5.74.0.tar.xz 2363028 BLAKE2B 74645d26b8dc3aabe32fb591ad97b0c2e55acb76db5edcf36ba631c2a974652f926c7b986c160814fe818f3d32b803eab30f022edc0b408bbcebe062a4eb41dc SHA512 90e8d0806933b3735fd510e497b3ce7dae1c017265931799ec2c2012b9c4576a251739b7f7da69aa8dfae1b688322305fd95b94fa0baa49c254c5bc73caaf079
-EBUILD kwidgetsaddons-5.70.0.ebuild 674 BLAKE2B 20199cba83d2708c28d7c1decbe571dc2460bd56ae7f0915af7c01b427ebf69dd15984199d4f5314562c7ebf1ac37f1c4c98b9c686b88409e9d8c16038a3f47d SHA512 a92a27d648fc17b1a28a7f0d06109e051d72f02e713e4bcc1ff05c0940ba0ec6fb93c0a5f02e9e536b89b34980ff937039a6170a7edfc87e54ce3a609b56876d
-EBUILD kwidgetsaddons-5.74.0.ebuild 617 BLAKE2B 45ebc1ba00a2badb50a6778a5e1c5aafd0745b9ae2be5867a8683a9241eef0aee41e69fcc42f0d4fd4ea1689e9be3d5bdc0804d63c26f3e5050a7db219dc0bc8 SHA512 167fe725b2ca8640e25b683e7ae5e8acfdedf71ffb1fb27b956dca5ef01b7b289ff06ee0c247bea562675c1512a81f183fa1f251915a3c6551234c3572d5f6aa
+DIST kwidgetsaddons-5.75.0.tar.xz 2359680 BLAKE2B 663cc8af041c1e6692fc86af18f4694333854ff3cb0f135620fafa8b5192f3d884283c4078ba6b3b3107e56d0f6e4e2b212f2e093426ffb745ced22a8ce73c0a SHA512 ccbed24b53619826130498c1ac1933d923bd5a9d491e3320ded741a4825222abb6268f1e7a3d5117aa2515c83e658228a040dfb870ad2cf04db5f7bbc3913c4e
+EBUILD kwidgetsaddons-5.74.0.ebuild 751 BLAKE2B eb010b3d0aff6ef4cdc503b3cb562f8e000b90bfa07790c7cc8d21013675f592b8c5b98cd512b744063b0dec714a54b32ef64f8bc1be37490d52ac6b3791d3df SHA512 d2551bb3e6c26295c3cf685b8a9d935df63163d441387c90155117faada634ea90fa45ca94a8b44907e23f0ddb7783b9a13907470db9c527815bb91f4a896722
+EBUILD kwidgetsaddons-5.75.0.ebuild 754 BLAKE2B a2900a3f3a0cb17a2e678185f66f6f35293ed3928bb3bbab57b6b34afab61f352313542e04b6a2a2ae299da9f8dbe3afd2305ffd6b87e2e013e4a70e312163a7 SHA512 c43ffd494a5b446cc56b5ec79c42f2def1b0829e6b04fa7e4b5e38688c9e365fb7a7c18c0fc288b795917b9e03ed5710f6e04aad06252e93ce700dd48b707783
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.70.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.70.0.ebuild
deleted file mode 100644
index 6f4a52111423..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.70.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
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 650216, 653186, 697866
-	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
index 347978006bbc..7612c543903a 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
@@ -22,6 +22,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
+
 src_test() {
 	# bug 650216, 653186, 697866
 	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.75.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.75.0.ebuild
new file mode 100644
index 000000000000..2336505d895d
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.75.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 650216, 653186, 697866
+	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 13b785a46e87..7ede06528cb7 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
-DIST kwindowsystem-5.70.0.tar.xz 179304 BLAKE2B 379130c9f9a20fd7ba7bac472d6c77d57b3d1f0d11658c3dc893e4e9c8f061c12ce714189844cb9d93b23b3e0f5f5b906a753899665697e839241b87727c6e1f SHA512 1ada61fdef5e43c218f1904b6700d65bb729536ef3586b369f76ebe87e3ab418214a440435a3286a590d0df03bd064ce957bffaddf03a3bc972aa43bfbb417d0
 DIST kwindowsystem-5.74.0.tar.xz 177952 BLAKE2B a4db6407306dc8d4dd1abc56b79481b0ac9762925a241e971ab7e390226b9e2fb5a0044d18bc9a3d2b77a48e16e50ffaa8f02c5d30bc910adea9e706de6adf54 SHA512 f27c2676a2b21ed0cb8b876aa75c9beeebef0403288af8e354a444c63cb653bb8e9b9d349cd06352699a749488441b0a05344c876724f20fd86f06a40ec71fda
-EBUILD kwindowsystem-5.70.0.ebuild 809 BLAKE2B 16dc320ac200a2d2cca5dcd64346a72777814951cde50cc82e0e5f239d36423dd0dbd63aaca03d0b643e5da9c95b28a3f55101a047a9d21de7559c1938779455 SHA512 be5f44a2915b29072b8914568591178e4dc40b827e1213c16cadd90418fc9b1d195ff5b74435a6f95a8618ed393d8641f433410fa142c93335ee8eff9ef2ba56
+DIST kwindowsystem-5.75.0.tar.xz 176888 BLAKE2B 36c9fbcaa39c65a4f7e403286ac1b04ecad54a5804bcd6b00a7b3b39314538390df40ec62d5b2c428fb2622e2c01f16fe879d66f9d75cb1e9109bf491d116e22 SHA512 2867edd24bf8be325a890b3141e6f2c5ae2f1ff07db4eb8bb3d2fa0025ed4d2e01a25447f5abbec2f961dd092c5a2a34818008dfb5a3614c43864da7938546ef
 EBUILD kwindowsystem-5.74.0.ebuild 809 BLAKE2B b915eeddda22db8a1532830ac1334f1c5e4f4cf564bd3309d2e4308415f9ff89f3aae579fe574dce2ef99cc77db5965b268335913a7ad7e50dcf74ce9849dae6 SHA512 dca5af33a603f06543cf9bcf1f15df6e8848c55b0c04a2028af64ccd44a29f9fc45df66f1c18ea2b175cdd57d31211bfb480b6114019fc7b5a8aff0fc9921a50
+EBUILD kwindowsystem-5.75.0.ebuild 812 BLAKE2B 8163b3c85387e6ff4435e833e8f3039ea87cacc58b121e3e02009e52eaa20698c8329a17e1e05f496c12b7a26ab022300d64ab8717e2ad012bf54c92b9675adb SHA512 aea3e63ba1f41bf1c18ad08722b02fae9410604b8ab985ced611b12c5cf8249b8f2de9d3ae3ebe7dcb799fd92001b8f5fac4e6bd6df0dc7c26265068e6e8fad4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.70.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.70.0.ebuild
deleted file mode 100644
index 8ae1d5c826da..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.70.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
-
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-DOCS=( docs/README.kstartupinfo )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.75.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.75.0.ebuild
new file mode 100644
index 000000000000..b17a44b74c81
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.75.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+DOCS=( docs/README.kstartupinfo )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index b147a96dd97a..cc4d4c07d762 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,6 +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
+DIST kxmlgui-5.75.0.tar.xz 864232 BLAKE2B e249193c73c7cac626ff934e3fe6e7fe8cd0bfbafadf573d22216c87fb0648715afc92b232833269193db9ed9500c1b95910a572773c6dd394b8ec6c2e71ef0c SHA512 b286ee8d2b241e6bf407dcf89e1bed79bb9ae2f83a2c59ca41f61b3b2c80148b205f481641e57e41fdda8d70380af5496faf6f294800b5aeeeb66fbda95c2246
 EBUILD kxmlgui-5.74.0-r1.ebuild 1357 BLAKE2B 77c54b62eec91ebc8764d71dde07c0a39f85b8d37f55ffcf08672c6e1bfbf134a38ac0437ff42ffa8371e54d099c8371f91e6b9c0819b899b9ea8c07a0ef3266 SHA512 36a6588557e2a88935be6ddd5d158c896d4fe6d4461a7a925c9cf239083cae4baa8ed7ebff0bcdd5c65a397742ff531c44122da8c68ea7d47fa28f3ed280aa3c
+EBUILD kxmlgui-5.75.0.ebuild 1288 BLAKE2B 5e44c255d4fc9af7bffcd8111ae506b9ac0bc209d01b7aeec1d01a5e48646babcdc36aa954448b16fd5e24764cdd3a590ac9f59aeb470cac994db4691f52f7e9 SHA512 4ddbc5d9bf270f33a92bf52f1dbc05ae97ea1d18c6eab15fd08a1048eb3ed527e3733a8a594c9a7ac684a763b8750771a531ead695abc649bf4ff413ae102a5d
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.70.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.70.0.ebuild
deleted file mode 100644
index 2ede7f69d19e..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.70.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.12.3
-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/kxmlgui/kxmlgui-5.75.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.75.0.ebuild
new file mode 100644
index 000000000000..38761c0a0a10
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.75.0.ebuild
@@ -0,0 +1,53 @@
+# 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/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index fcfbcb479bcd..871a952499bf 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,5 @@
-DIST kxmlrpcclient-5.70.0.tar.xz 29740 BLAKE2B cb8b07f4809688a091e91e2103bbb800f362499368627b94c9c830a03ddba1b1f17bfd0b282edfb3a06d7e8e13e19b67e2550041b6720b8969f7e5dae55b501e SHA512 e15628128ec629b4c24ef953cee2b538097288ca606a065dcb0d665c0e73dd12a7cc4cc655dc42933c7e4fcf57ae1ef84d0e641b0b3f299bfe0fc0d184c98645
 DIST kxmlrpcclient-5.74.0.tar.xz 29296 BLAKE2B 0d983e66a41e8df356bb83d10d06106dab74c5c9f40148b131e4ae68403c212936e91fbddd9c92cca02271a9ea4ee45289cb208d35c00f72f3cfa46478ec5274 SHA512 87221fc5166312030af1c40d95ccbbdc68c791d0278d9ac181f98aa37328fa713e82bb178932a18d23f1bb1483c0571b4267ec0ae5970046e23426b3a93bf135
-EBUILD kxmlrpcclient-5.70.0.ebuild 494 BLAKE2B b01aa986801f6cddb224fc8efec9305ab1ce5de25dc9b26dffa6ecc25d6cd0ee7d8d994b33fc33c85175b7cc3db97ec3bcbc019fc57e8c360a57fb0309c17529 SHA512 a8358622c5a95429f79e329ec95c6093fc219563beca026d2e93fdeff9994ab4dd4d9a822d10e9cc0946945339b919eebb4a2518624949d19328ca326f5f9e08
+DIST kxmlrpcclient-5.75.0.tar.xz 29272 BLAKE2B d08f2c87dec959a19761f811823d23349a484c42b9389c2995098833f1351be8554ef18d58088944c14a3cd213a88bb2e0947e5490ed2212ee8eee10df1961c2 SHA512 1a221b143f50b312e26d0e3a8c00385e1de55af57c9023ec3e2d10447b34175db63200d16db48fd76172cb41c8245e16f19a10b3bc94ba10b77c3eb2a027fcfc
 EBUILD kxmlrpcclient-5.74.0.ebuild 494 BLAKE2B 28d28ca1574b37cf8df903e4145a5d02440cbb6e5d0f108800b175319b077435bb82e1f79e647d8677d86a00245a0e3ea25a16a2d9d10923387625ef581dfa35 SHA512 1f39e8097f231db8060bb1542fa91c096ce2e0ca50d1b76b7c9dae782832881fa5e0b604db5ccd266a50cc0d45578c0827fdc9c35fe188d5b33da8dd90377bf0
+EBUILD kxmlrpcclient-5.75.0.ebuild 497 BLAKE2B e766fb4a1f9a5716914b967f55aa5711be10fffe5afd247856b73d8fbc69a13a85acdf623277b70fc3b8aa42220aed690582053da2e0b8e61f03acbaff74c385 SHA512 647cc436bc7f2c60b54b2ff27db68636a62562c76d5b8af6c5f3e1c218fa6de1473239a71dddfa6193efc5bc8c18330a7810675f7435a7fdf42410a36c6c3748
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.70.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.70.0.ebuild
deleted file mode 100644
index fdea54d06155..000000000000
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.70.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
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.75.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.75.0.ebuild
new file mode 100644
index 000000000000..642e9de973ff
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.75.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index d2c4fb7bd119..68f0467684af 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
-DIST modemmanager-qt-5.70.0.tar.xz 113948 BLAKE2B 6c4c65dede0d8a77688bd58f2b9cf00c3b446e17e5ac495bd9e36bbed0b7e04b4c196a264991ad1654a660f3ad6ea4a16f68c374b03798aaeeb95886003866c8 SHA512 d3aaa75daf1b1374cf0791968b9d83e26e4ca9e0c7b0f11a18ecb690fd82de6de7ad44601f36fe1fc1359103917584a5bfea23264abddb8c7d66c59d0b1d0027
 DIST modemmanager-qt-5.74.0.tar.xz 112348 BLAKE2B 4a95ab9d303d3f2a43802938843f4130fa700101d91033d2d20a5158f95e9763483e8a40c889d6b4572c7ccb6051cf07ed61956e42f048de6857867e471312bd SHA512 c8dfaeca27a81b5a779f774b0edb4e4c670d1f92fc52f9e4863bacf725ae42f7d4b9dd813e47f56996a3427f0d813fb21162c609615e3523467e4fae0c4b6c1a
-EBUILD modemmanager-qt-5.70.0.ebuild 466 BLAKE2B bd9532fbb597108bc833cd68e9b025e269dc1cce2e103778d24118d6ff3573a78007d8e43fa41e8c2b4ebc0eb11df491001a7a6e575dd728fd5b1a9c8dae6b27 SHA512 db169830e5126773291f1f5d6f16d534e683b89a8154bdafd9bb1eb0d9a32a7fbc17b26ecb9a2608c9ff3a816e25a9ea8c8bcd3407753b73d2f4f811545560ac
+DIST modemmanager-qt-5.75.0.tar.xz 112312 BLAKE2B 4e4e89482f2f22e933c6228046075bfa80cd0561cfa4ba0e04a540904f090ede603383a6fe52a01f7256e95ceaae2c1d76f08346ff0a19b3baf4b1f681052fb1 SHA512 6b0da1652fdcd62d3fe4cd8fb57c15ad6afc73d6f7fe19cc1987e49d08260f782ad0e1a0e9c39e15e6c6ff635289b3d2db90f866c9953fea62a075892d8b7485
 EBUILD modemmanager-qt-5.74.0.ebuild 466 BLAKE2B 1e4ac6a0f85f28bedc1458fd61f47fd4d7594722f72d5365d397f126a566daf0594c1f1aa359bff599f5d7e1f03fe80cbf049b130b6146f6b2afcb722a3fe964 SHA512 c1fad4a9bb0161f774201c7ab363f56abfbb685499a850d00b2fced0284e0b4ee293fd3cf9dbc75bb75691fa54766d7910b3f9af2887c4120925135e3fb0b6ee
+EBUILD modemmanager-qt-5.75.0.ebuild 469 BLAKE2B b51b95f5de4dd4dded9fea81e92497551677cf7ebef942838193de568f36fd77d460f07152ab874446595ba3166b3266d58932630c2ddedbb550e581e4a7c999 SHA512 1c7276c8adb7654c2a12e2597337161a35ad2f982b4a5572ac1f2ed2441da4c212c833a443b1a56c5fb1ca6da42c08475b086436e35512ac7cfbd0527514c163
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.70.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.70.0.ebuild
deleted file mode 100644
index b49ee0bfe8ff..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.70.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	net-misc/modemmanager
-"
-RDEPEND="${DEPEND}"
-
-# requires running environment
-RESTRICT+=" test"
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.75.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.75.0.ebuild
new file mode 100644
index 000000000000..5d8026871f5f
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.75.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	net-misc/modemmanager
+"
+RDEPEND="${DEPEND}"
+
+# requires running environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index e7a7abca6b23..cc3345723a5f 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
-DIST networkmanager-qt-5.70.0.tar.xz 196556 BLAKE2B eb6ec223a896e2dcee9f349700e7c03b302feaf040eead954d2eedcf0b79b904cc1c25ff081a936ed65948aab2cbfa9d2cfe76662f4f2a28cbd34854a1e6c458 SHA512 e4cf7916b042b35d1e895a46973925659c2f8827c71cdc26c4e4a3b1a3ca2a2307cbca19e79b675e7ae41483618bfcaa93b635933bbc7e4ad7fa353077db01d6
 DIST networkmanager-qt-5.74.0.tar.xz 194888 BLAKE2B ae162e629235af4d87ec9b9f3df9629d5fe532d49f836980841c98bf2364c58c33672a0189d9447368e35bac016d47f10c271e098f519ddc454fc8c190cbdd9c SHA512 62953a2738cf15633733cd0ae9930c640abe90523495d1481893fc8bd3f2de7ace6f683e541c24f641731e014aff8b2f02520c2644dda4b25fa0460c57110cf3
-EBUILD networkmanager-qt-5.70.0.ebuild 700 BLAKE2B bed8a81645cc245382322f1a6ace186dc9687750e7ab286a2da451baa9be7fb1eae5ad2f27fb8446e52ac4889b64536ca4590c7cd1a8f39c9c266d5946347053 SHA512 39970d55dc82c955f034fa5128bebd3bbdb21f5f4dbefcb69794490aa21cd25063d8d18fdda41e8327e3732d444bd985f9e01e363c008e96728e21413660f759
+DIST networkmanager-qt-5.75.0.tar.xz 194960 BLAKE2B 80aa547c8479dfe812701452fbb5cea4b8fd14887db8d2e5119eb9548a0e6ea1b0a9edae56174f8d290c24f4acac746f6eefc37b365880fd348653df3c0cc075 SHA512 0948d6fa379166dbf64716d0175705074595ca7cc65fc90ab86880d14b7430162a9e20fb620f6bbed0d4c1d08e52698c67df3e4bb53116d32f757fe5d10000b5
 EBUILD networkmanager-qt-5.74.0.ebuild 651 BLAKE2B 77e904c48d4e40ead3e40f490a5ff38bd2da013506ca17775c746edf55eb951fe704b31f5c120567e537b41acbf1b8125097937e9957ea73ae89ee1e91037c48 SHA512 6ae397b6e4efb2ea75b7d2a9427b3c5e404c4454392f27d9b3e754bfc0c088fe3872fe3db20f33a72b4f51c2b2b5af4ad0f4d24b96d1b5ed2bd87aea8808b7c7
+EBUILD networkmanager-qt-5.75.0.ebuild 654 BLAKE2B b205f2ffde1049b321dfadae8ef8905a51f27e6c00478dd5d439f88374b9f7ea589cc65bb55ec7cfec4ead8130a6da25c79b0284db4c71f32bdfdddc67316c08 SHA512 9c1c5f46ef918a5cfd2585ccc7cfb6c98cd4c59c158c6d5c83e9fbd02a48a93b477d9abb11ab43268be164114dcb8e53df8e2ab5cfd3bfba09867258a85c784c
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.70.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.70.0.ebuild
deleted file mode 100644
index dd72f33dbb56..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.70.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
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="teamd"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=net-misc/networkmanager-1.4.0-r1[teamd=]
-"
-RDEPEND="${DEPEND}
-	|| (
-		>=net-misc/networkmanager-1.4.0-r1[consolekit]
-		>=net-misc/networkmanager-1.4.0-r1[elogind]
-		>=net-misc/networkmanager-1.4.0-r1[systemd]
-	)
-"
-
-src_test() {
-	# bug: 625276
-	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.75.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.75.0.ebuild
new file mode 100644
index 000000000000..f6390d4d2890
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.75.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="teamd"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=net-misc/networkmanager-1.4.0-r1[teamd=]
+"
+RDEPEND="${DEPEND}
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[elogind]
+		>=net-misc/networkmanager-1.4.0-r1[systemd]
+	)
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index c806691d227e..6bc26d9c3de4 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
-DIST oxygen-icons5-5.70.0.tar.xz 236039684 BLAKE2B 1bc0511d0ec1051ba3122b8b74fff8444421d1894b6222c73dde1304a94100297fd9992e9636a69620cc7bde24a4cd3cb3bb9f2b05c4560e75e83f7ec3969254 SHA512 67319b45a41b88d7f34ee37c5e52095c258e02f73ec51bff9621f2ef5b04f45ae366640d94aa8c395cee31bf5ba2bcf02c3ad2e79bcdc7402b7622c0ae6955bf
 DIST oxygen-icons5-5.74.0.tar.xz 236040524 BLAKE2B 67e5173affa60a18acd30203858514039f14d7d35824ef0354b7d4219d06ab45fd944504bc1f7f98b903974d455ccef3728309c1f61bd6173f9c83e6712f504d SHA512 bc00190778edd4b5b154f210ad3e3479f84d6f65b8114f0901966cebb4bfd0f6cabb7d68b1ac2759d7553360167fa620f258078c3c60437a04ef6fbe84243284
-EBUILD oxygen-icons-5.70.0.ebuild 688 BLAKE2B 7f6cbdecb6777343d59c59fe0a23539a3e8b16d30e6651974512708c42cc70e6c9cbf85ba68399eb6017acc988e9c9adfa54433ec75aa1cd33534927ac151f4a SHA512 130fd1dd298258d5d422d1164eb04fbe5e2570874d75e8532ec012b3315622050b6202cbc4bd987c04475dab531c086f8d703176f22484feadb10b63ee038769
+DIST oxygen-icons5-5.75.0.tar.xz 236041872 BLAKE2B 0cd4329ab9048b42f701986d9389a669228615d5515fff8e7c825685e0816c2b925944326e8e4ee37158afbb44bb97831ddc115957ea0e532da99294570fd0d6 SHA512 7f7fea283151d43342473392fbac0c345556f4780b9156e7ddf31b9ed072fe39133007d6032c4f7af7f2a09740a04dfe98a74901333c2c418f9163dfc570dd99
 EBUILD oxygen-icons-5.74.0.ebuild 688 BLAKE2B f31a0d9f28d2783c5b9dc1bb97403f540041abeee02b2a49b472f406ee24cbf9df02757b49f96b3ac1c0257332b3a2d35a2f01434b7121613561c16f0ec93de9 SHA512 a107f096b13a9b802992264b6a7edbd95196cf465b88e5d144bbc8efcc9ff301854fc86b5d02383869df3e202f20d3d99f41a14ac1aba16802795dd8a70e7cad
+EBUILD oxygen-icons-5.75.0.ebuild 691 BLAKE2B d932e8bcdd5b4c751e9e015dbeea75ed02a8f3fe31d527155bb91c69e7f6e13a93ed1cfab7f697114b8bb8544d9e6d71a5dc7f4f09a2b29cd6693b8e8b241a49 SHA512 bb1b4db824ac4de5984214f1570162e82a18095ef0391b9d123288db1e7fd8e224b1084875da136a5eff80904e1691fc85579b130b0d006416297ae27efe55cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.70.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.70.0.ebuild
deleted file mode 100644
index 5c03e77bfecd..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.70.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=7
-
-KDE_ORG_NAME="oxygen-icons5"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Oxygen SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-BDEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.75.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.75.0.ebuild
new file mode 100644
index 000000000000..e4cbd64523e3
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.75.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="oxygen-icons5"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Oxygen SVG icon theme"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 4dc52a30cf65..fe4e632f17ef 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,6 +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
+DIST plasma-framework-5.75.0.tar.xz 3146028 BLAKE2B cfce54f3cdd7dbe0efa16705d7d22b428342aea05a462bb87fad783f87c40af611080557b7e54387fb1507508a9db8bd2738d45912619b0056bf3d77b3c007f3 SHA512 951503ae1472f0713179d5f668451487d496c6b88c3266639451bfd869240cd065ef47889a36acb327a34ffe0a669385de347556a506f386ec8b3e3af892e045
 EBUILD plasma-5.74.0-r1.ebuild 1939 BLAKE2B 7d1e4fbf1808204a47427d9def5a0ce30818096e539107f61134883cf35c128d2474277c3b4ae0c5a6658fa66b3e4856fb081a3b190b4811bb98faa7c87ca310 SHA512 f0ff7c56fad5461f7cf4907bc68443c497013beca852fcfaa0b846862de797cabff7d71774473c00336375aac574d88ea77878f0b1ae98dc9c7c73dc65a01f17
+EBUILD plasma-5.75.0.ebuild 1873 BLAKE2B 2c0723714f1f7fc5874370eaa641effc20a3aba9af14883120dfc35aef7f7cb58d65578ad5a93e12b9692d06dd074dd5744203f903bd6145477afe867c1ca4bf SHA512 8f7e26d1259c5274f6aae10fea0ab26eddb739b29da59028f1e6ccdc1f4f9b2d2052bf57e2ae847704651aae6b829f8d6ed2e8b617f4716c6ddccbab03d35d89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/plasma-5.70.1.ebuild b/kde-frameworks/plasma/plasma-5.70.1.ebuild
deleted file mode 100644
index d6ab27d76353..000000000000
--- a/kde-frameworks/plasma/plasma-5.70.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
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only wayland X"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-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/plasma/plasma-5.75.0.ebuild b/kde-frameworks/plasma/plasma-5.75.0.ebuild
new file mode 100644
index 000000000000..4dd229e01593
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.75.0.ebuild
@@ -0,0 +1,74 @@
+# 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/prison/Manifest b/kde-frameworks/prison/Manifest
index 627948f6f4bd..1ae530e24b6f 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
-DIST prison-5.70.0.tar.xz 41004 BLAKE2B 949e7f5c6f185eb2ea07ac62d5cfaaa5b12089a88004f99996948d9a2cecfe5fd0126a6232c788035c1874c771e54c4f666d6767e0b43c4ffef7a9ca6dbd6cf4 SHA512 aa6275b7f45f10c1199efc375e990119505f1cb839871fbe4e642a01478daa62fd49ba6737dac73f8adfc67b77b43f99b9be7a4c557b12efa5e7c3fef813f16a
 DIST prison-5.74.0.tar.xz 40972 BLAKE2B 5e6b83d682ba7f64ccca649308899e03342f2a454e4e8e00c684dd34f8c0972b7ec5f5e5a77b7b0cca6a2682234be4403bb2f8ce6e9a36c6c01f31e537a46db8 SHA512 3d7ed0517a36e8cf3ff6956f61502ee02f9cf06876e842c3575e469701495b3ffaa05fb992d635573a43070ae6c7a5e7bad7c2073eb69c8d6bb6c2b5256c0b62
-EBUILD prison-5.70.0.ebuild 613 BLAKE2B 331b85de0dfa7d81d9d771802325d95764d5057924c143859976c4c58f7d3cbd72058bce4bee10dd3ac34c9d79bf0c41b6f0e9228f1e75566facd28f72c6ce13 SHA512 8aca7a81e716d8cf2f18ea2af96bc4bd1a8781ec584941923f3cd6b37e5016ac104a76fb428303e86c13290a837f6faff80fde2f9c2e3c87800b251ebc7bb5fc
+DIST prison-5.75.0.tar.xz 40948 BLAKE2B 994de4b1a284940f362b8f5cc91125bae906b1ce2678e80a599c3c4f9dad293f5aefe7bd4360d114a91c127be50f125e6126388206d117c44bdcf8e30e699f77 SHA512 948fd29006f6f38ac3a9a831a4b97b8b9e75b41f9ff092e13fef8633540dd34db6282213ef854f4ea4dc33f52d1d484e8f636e2e680261822fca15ef93ddbe0e
 EBUILD prison-5.74.0.ebuild 613 BLAKE2B f8fc02467671351a32e8c97ac4b205b31cf07bd9d02bbd4dc0ef411fa8a917895dfff5f8161671fdd61678770a85900958a0ffd6c3961751447b05a84c3528f6 SHA512 2a3c5ff55358a2916a4ebd78d718363fb14c60f270adf7896b482934f839f7f9141a6f1628bf51f9387de1dd5dd229b2f5ab7a9f011aeaf1a0c2ceb2e3ba801d
+EBUILD prison-5.75.0.ebuild 616 BLAKE2B 98fc4be86df732ed8b8a5f47ab0b0c8b0c68e518890d68203e6d22e56b90c55a81cf3f9621e2fa2f287b55755b555884e04559b624a9e4e627187224a7e181ea SHA512 085243ccfcc2fd3f25a7ba1f77bb113cc07fd693193331efe94048a83347eff2fd18dccaba1852a60eec9b4398c6459ebd3344ebeea697c45b4aae38d7b84598
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.70.0.ebuild b/kde-frameworks/prison/prison-5.70.0.ebuild
deleted file mode 100644
index 3f89040e96a4..000000000000
--- a/kde-frameworks/prison/prison-5.70.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
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://invent.kde.org/frameworks/prison"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="qml"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt5Quick)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/prison/prison-5.75.0.ebuild b/kde-frameworks/prison/prison-5.75.0.ebuild
new file mode 100644
index 000000000000..06a83caebd9f
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.75.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://invent.kde.org/frameworks/prison"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt5Quick)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 17d34e4bfd2f..d2d63a463d50 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
-DIST purpose-5.70.0.tar.xz 153468 BLAKE2B e918c824658b52829607ba9ddf727178d2689aa64f5caa075dbf0947ca53819f6b8a15d49df1d3c4a408a7017cfc63416a46af2466ca51e16c7383c45b799060 SHA512 932fc3a56c47a3a031f4acc32ae5ea04733c99f953ce3248e60bc47b836d26929e71bb10633c3859d642c8667e4b1dbb60f03f450da8b0c2bda703142cf80916
 DIST purpose-5.74.0.tar.xz 156216 BLAKE2B 7d810f2d3b1af7cd041b8e9449fc5934bca7b739b5edf7fe1f5da553f264f189cfac0dd715dddf66a6f46be0a9389dae5d9eb35558b0c41b89dd36e53d945ccd SHA512 dea52fd5d10cc0c34ecab742b691675076ddf1346e2b352cd5f74cd266576f85eb9d721bf68a29cea62f9879b826bf375b70580451c31bdd33509f57ae3cf23a
-EBUILD purpose-5.70.0.ebuild 1399 BLAKE2B f22391ffc04a00b1b72fa3db7fa1d320a6a19b0cf692115c02a7089bb4edc1449d60a6505275220f4e4220515277f2bff97a293b9452a51da5023cc2f65c448f SHA512 6e646a025baa3ab520823a5576044c78b00308f086e15225e177731114801006f8597faf978cff21bffbcc2cca0ca1fd31a9adefbe59cff8591763ae6e7a953b
+DIST purpose-5.75.0.tar.xz 156260 BLAKE2B 907722db174faeb48bb7513a5b0e7705a4685ec3dd8667cdfe40bff3a66929d235dd832b7c335a7d6ed66ebf18ee8763ff37ace2f24950bc43548a849e5a2cd6 SHA512 21e4b6649e953e910653eb045ed485823f857acb2fa48a864ff20a716ef34471fd1e8a5d3984f7c0b7d7516757943aa2ee965a1fc40390d5def3890ccda99a2e
 EBUILD purpose-5.74.0.ebuild 1634 BLAKE2B bc8b6b0543e15dde68c28919aab0edcae7ca93d1617cd433b453cc5190b8c9d224e8f50d0c6f4d173f9bd9538b419ad9338ee37630ba99bac953129aa78843cf SHA512 73fec80eaa5c014d2d902b63bb6a6d134e156287053a3324a4091e7bf5c49b14277a1618f883f42901176909fbecad0dc8b9eed6ea035f6d5ea2dfdc5036342b
+EBUILD purpose-5.75.0.ebuild 1637 BLAKE2B 542cd935ac6d87477c6eab22751a170421c665396fe1410d6ea0a5205dae20814bee1414a661c31cb1aae73c3c3aceaed2ab236e0620aad92849d14998295408 SHA512 5d6344213184431d904b386d01a5a8458f1d1b7d50147b0f7f8f0c7f34a31050d86618a6a9bbc3a6d375e1c0a0c8991b28432f8ba53c48333b08a564c8885a62
 MISC metadata.xml 441 BLAKE2B bedd6e101cd0b4233d383352c66125b30508c7bbb5f597bdd6854e02b89004e2e9aa968de63357f58fd5e196de40b7f1e4816572f828a7cc5307a657125bf21c SHA512 7d5fce42c371a15a6d05866d5d40436a05b8ec34538ce5fab7d4f47a9dd6ae4312ac4096e646df230ee611bddd040f58fa93f41688517b4205d3785f1ce56acc
diff --git a/kde-frameworks/purpose/purpose-5.70.0.ebuild b/kde-frameworks/purpose/purpose-5.70.0.ebuild
deleted file mode 100644
index 324153fa88e2..000000000000
--- a/kde-frameworks/purpose/purpose-5.70.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+dolphin +kaccounts"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	dolphin? ( =kde-frameworks/knotifications-${PVCUT}*:5 )
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-19.04.3:5
-		net-libs/accounts-qt
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${PVCUT}:5
-	kaccounts? ( net-libs/accounts-qml )
-"
-
-# requires running environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package dolphin KF5Notifications)
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst(){
-	ecm_pkg_postinst
-
-	if ! has_version "kde-misc/kdeconnect[app]" ; then
-		elog "Optional runtime dependency:"
-		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
-	fi
-}
diff --git a/kde-frameworks/purpose/purpose-5.75.0.ebuild b/kde-frameworks/purpose/purpose-5.75.0.ebuild
new file mode 100644
index 000000000000..bc4f598c495a
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.75.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth +dolphin +kaccounts"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	dolphin? ( =kde-frameworks/knotifications-${PVCUT}*:5 )
+	kaccounts? (
+		>=kde-apps/kaccounts-integration-19.04.3:5
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? ( net-libs/accounts-qml )
+"
+
+# requires running environment
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dolphin KF5Notifications)
+		$(cmake_use_find_package kaccounts KAccounts)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index dce2677d8970..a3bd4dd5b1d3 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,6 +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
+DIST qqc2-desktop-style-5.75.0.tar.xz 58704 BLAKE2B 7ef0e20c207804fe1293c8507a61c980a1efa516d4b31f2dfb9376d2c52df9a43b1dc51a49724a0b3c2c74a229324fb812a0dc1377bcb8f59973b93a7e3d907a SHA512 bcf9c41bf286ee5a8a533dd9ce392848c91f9ec797ac7c8851a1eb462739b9b114583cdce8485e8f5b91787d17327145d112f9ea429e383b798b98433c7651a6
 EBUILD qqc2-desktop-style-5.74.0-r1.ebuild 749 BLAKE2B 6073732afc60ec1149c349a85e15a92a2e6f64bb41e8edb240eed08f8fe1e32abeb9cca11bc9a1a1cbd28f0c2eb6038218c40edc71a8e53c15ea2100addb25d1 SHA512 ae62d92cbe9e57643ecb43c69209f080a05eddb4cb5f0b50296fc746190466dbf8f2447e09e2207e8ded4cd16f7afc3d26f6aad1f1cb7728ac9b5343e0c5134c
+EBUILD qqc2-desktop-style-5.75.0.ebuild 680 BLAKE2B cd170d232d5d8c7c2550c3ddaac3674728700af305ac79196e2cf86a61d412463011400713c2842245598504e6d990c5f08e640441aa34bf9855ccdf1430b655 SHA512 1b114049fd8d032355d6a66852f93283c959df0e3cb77a52d09c082dca6f92b2df05a23df475ace7c807320254d8301a9d4bd11d29bded97e60fc317a1671ea3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.70.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.70.0.ebuild
deleted file mode 100644
index bd17441123c0..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.70.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.12.3
-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="
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.75.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.75.0.ebuild
new file mode 100644
index 000000000000..2759de352b07
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.75.0.ebuild
@@ -0,0 +1,28 @@
+# 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
+"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 5a4701ddf6ec..96ea8ef1c28e 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
-DIST solid-5.70.0.tar.xz 267924 BLAKE2B 6c441e84923ec69c10a9cb72384fc0cc4f4c5d018e763fb6109c1d4ba4c0054270bf965a004c83d7bdb164efaa53c341dd15af20796a46425f25f4d816f598c0 SHA512 31e7de3cd726d07452d40d43c6280a95f54abcccc63858e7af198ec0a5f01754b721539e26feb5f5cb16c07e58b6029b0a660d55d1efb3887a658ed93c5fe33f
 DIST solid-5.74.0.tar.xz 268820 BLAKE2B 60bbbaebb2bbb5a983de2a92444902b7d7e16af2e7a2e3893b881d4b03219077088acd4298f55802ae866f9c909c4fc82dfe04c7b7209306c9328e97b9aaf022 SHA512 cc0190327552c63bca8627b96d9f59ec9fb4e4c1842d36c42455e8a458f97f972274765a94b70f311a4105d33f0abbd921b10a2db2b1e7f4c492e92268ca68b1
-EBUILD solid-5.70.0.ebuild 861 BLAKE2B b88f445976d2accb94d0245aed6a32c2dc91575c53ce7d01bb14afda9cac70ab6776028d0e26acdfd46ac34ea7f6330cd3b7bb650d5c089cb4ba61b92f8bc4fa SHA512 fd98ad0aad610c30c9be22d9c7e3c1a8de9feee0f532bf041173ca6a0bba3a40e5703b87a92bea77c62b26f0bf8a85f10d3fb0a065f6b90fdda61e735ba25572
+DIST solid-5.75.0.tar.xz 268856 BLAKE2B 3f33ad93088d400f0ea526d163fe0251233b3d3b5bb4da6c52a0976e537f09c122b06b8d56e581fb9ace404744e635ff43b99e50a2353e137bde8c17e2db7dc9 SHA512 6fffe1f52e68499d4f6b40b235ebd0f3597c88c918db4bb90fd5e75f057571fe60ea37dca5f1fbfc5bf82f60a3b3c16b4a1e91b1f2a6b64f228ab31539c1d24c
 EBUILD solid-5.74.0.ebuild 857 BLAKE2B aa1657754a3cab5864f9a6272c5d028a34ba36dfc25abf5727ae6b573bf1ecabaac669e960c9829d7851eb961179c27419b2fe5a2f4f71c3662041204eeeff1a SHA512 e99551fcfacf2fa62a5c71bacd6ed34bf71e263fa3c8288928c555e81fce41e4bc4411bc473bbc5ef3f2637b96609e0f735bab43fa6340c3fce3b8a45280dfc5
+EBUILD solid-5.75.0.ebuild 860 BLAKE2B e3663622f99781a256166299a0e4afe3d77dba0a73825587d27c2c66c527222d5521a33c60cd8a17da3c8cc2a4418fd5f1edc76de30b3b45054d264d4ec98313 SHA512 e6ab0f1f58216258220edeeae68268b4faf143bd61b9dc3044fef593e074fa334d1cfde74e89f3fc0b406bf7431a703a5606e5a6a1beda89232d48026583e66c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.70.0.ebuild b/kde-frameworks/solid/solid-5.70.0.ebuild
deleted file mode 100644
index e1d18f987c73..000000000000
--- a/kde-frameworks/solid/solid-5.70.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-fs/udisks:2
-	virtual/libudev:=
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then
-		elog "For media player support, install app-misc/media-player-info"
-	fi
-}
diff --git a/kde-frameworks/solid/solid-5.75.0.ebuild b/kde-frameworks/solid/solid-5.75.0.ebuild
new file mode 100644
index 000000000000..e40ec75b7bbc
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.75.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-fs/udisks:2
+	virtual/libudev:=
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Media player devices support" app-misc/media-player-info
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 6049b4d9918c..e1661b6495da 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
-DIST sonnet-5.70.0.tar.xz 292380 BLAKE2B 53047e83e276fd016a674067d0ec0655ec855b071761ee1347fdac047db1a3049d965aba2e49b6c3385ea77e49b0666b140d960bfd04af752f6cebdb731ecaf6 SHA512 de93c1396262215407324795ea0ebc7d45752fb33873f0f6552821b9fa97dafd9972e274784f9f70c63f220aba9db261dccd55cf169cf62e629f398dc2db7fe9
 DIST sonnet-5.74.0.tar.xz 293316 BLAKE2B 55f73f617b98c85a4f63abea6eb327ee2f017ee2d63f3c739269afb5311e392b153d8c6a7f29dc9be095450c48d7a220cc387d6d842175a345044c084bc868bb SHA512 80f19d6f7c168f6daed208769c5abe1c664b48cd5d8f3ddd75f3992f917859d14281ed12b819b5bc9f501849243de639388a8e47dc60e0d3bda0e5b8426a54e6
-EBUILD sonnet-5.70.0.ebuild 880 BLAKE2B 94c1ec6071cfa44ab2d4379018bf73e15c7d9176aa966431bdf6e2c44e6eb98ecbaf505522143e2c6dddb418a76b46b8dffe7b5ace631b16b1167a702311b876 SHA512 6df0c67073952ac962f3260509584ece06cf88196bfaed22181465f80fe7a7b48b4726cb27dc85ee15d674c6baf1c8c36e8616e09726ca3cdf4b3e8389751e36
+DIST sonnet-5.75.0.tar.xz 293896 BLAKE2B 95a6532cc3c68f97b1bf4c97196320f73c46bc35ed0b422add51d6b75de7629c18405d7f841b88fd69c1af44fe2de623a24ed1f60297e2039dbe89d9f03e9432 SHA512 8ce91c819142f7546d37ffccbcce13a56109ec23767f2af14713a84102b04889ea0bfd4bd3d3b332df8946e0a161d2af8b8f11799afa893dfd9fc2839e013142
 EBUILD sonnet-5.74.0.ebuild 880 BLAKE2B 42891a09d37fc2fa05ffd600992a41e583e271a755f68c3fe1118e54f2d6984733c7e7ae177afdc58533d7c53f20ec97f365672eac8ec2b72ded05aaf2ec45f0 SHA512 ed19429b429423fd925d751fafd816ab5b12a90022e3d05e5e4488c4e787c337062ef7b724e961616327cce026356f49d1ac6c67d9f9dca814cc855659b2bdac
+EBUILD sonnet-5.75.0.ebuild 883 BLAKE2B 378b61065d365b6007a21939d114c81b88c97bba583084ba53472c4d19ecc6b8ebd108d848f7607a896cd16e69b5dd51aba2b9ca12134553c3b2ad15c36eeed2 SHA512 8e5211edd6cd1b5f8f2fea25f64034d967d95c9c0a53629bfdb9887d99c9075862b622b9565da14a4c454c6f561d1e5c48b92a5b9bafee58ef0efacb53bab9fd
 MISC metadata.xml 502 BLAKE2B d76f720d075b51e7bfba2fbf3edf8715f158ff62585596233be3b6d3afb52212e15be4d3cfc4e83e68a52dfe3ac233af1cf82894ce3197016d163f3d2688e673 SHA512 5ffd2a07ba9206a3d6a88970687c3baa068af228e6025cbc662a466eafc0afb3598e390f907b8c334a418394e60f58db07431cd0a85440148f9959be6ea6e0af
diff --git a/kde-frameworks/sonnet/sonnet-5.70.0.ebuild b/kde-frameworks/sonnet/sonnet-5.70.0.ebuild
deleted file mode 100644
index 06103876321b..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.70.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
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="aspell +hunspell nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package aspell ASPELL)
-		$(cmake_use_find_package hunspell HUNSPELL)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs: 680032
-	local myctestargs=(
-		-E "(sonnet-test_settings|sonnet-test_highlighter)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/sonnet/sonnet-5.75.0.ebuild b/kde-frameworks/sonnet/sonnet-5.75.0.ebuild
new file mode 100644
index 000000000000..f5798c21f8c1
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.75.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="aspell +hunspell nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs: 680032
+	local myctestargs=(
+		-E "(sonnet-test_settings|sonnet-test_highlighter)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 6d3287733558..293ea8837bf8 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
-DIST syndication-5.70.0.tar.xz 508892 BLAKE2B d2a134996aa45dbaf75d6830d85d9e2f16967e8177d15c434abd1951dbcbdd816d141a0e104ff17f82d5bd452673282dcc9f3185dcba716fc5675ae647428cdd SHA512 014226e19cf2e97f4f2c60a5a7b0aa2ae3696ccdd6d28bee5b49ccf234e3404d4784d254016f74b9c53f39fb20780a15eabe05722161460cfc393036c8d5552f
 DIST syndication-5.74.0.tar.xz 508876 BLAKE2B 231a86a83735fe295a61fa605070e5672142e3842e335cb6b1fccdd908d58a113bfbb42ef41aa1f9066dc738ce329a3411d5015c0e0eb79682737f350bf18c10 SHA512 c524ea90c4fbe80040a772e967dc024707ed32c124b0efcf4324e5bc60093472762f7b48fcadd1f288747464defd16abe185fdff00c8e414db37a00bc1e6fe53
-EBUILD syndication-5.70.0.ebuild 534 BLAKE2B 872137d0ddf95f5fd67868029cc7259ca3d2ca5e3fbb0389827a0b25aaa6227d95fe85ca8ac62a87a363dc08dbed02bd8f2320f0c2b46292d862d1a72dab8ac8 SHA512 d4cd2a5a200306c3ba8a2c5463e92928765ecf90b58e896e705fc12e424070d43e7217135089fc73b866bfbe78fa7038554f1d97b826483b8cbabc02a776f7a3
+DIST syndication-5.75.0.tar.xz 508832 BLAKE2B 43a4165563d6e49430b50b9b73c9e68e6fed7f85921f29ca87220e5bf259e7535205a68389ccb6ade741e097107cdac8e5cf26974d3f423817d6ecc27118eaa8 SHA512 1f16527c456803048a5ea37efcac23c1cd756d22db657d5d0e8483d61e49b4ce6aaa2d4d1907137b2a5fbc97425bb59a92c9b1ea679319786129e89269711408
 EBUILD syndication-5.74.0.ebuild 534 BLAKE2B e0c4ff6f15bfba8bc70bc31506a204841560c0615e29a3c11e354c367a8ee17f16e8c214a993891e423d4cb501194e4624160220b2817be743dc595a3ef3f7ed SHA512 b6c985f8e8581a79e8381e3b1e523bbb88ead834d0d409f9143dd4fd733696bf62612ee7717cf580bcc6ac34b8ab99ab8151c1cce7f436ef176fe861683c3975
+EBUILD syndication-5.75.0.ebuild 537 BLAKE2B 810acc693d626081c409351bebb55fc2d222672cc6444313ea909ac4c8e27460722a01de1d969d988ec6d0b08cea9fb1c3a915d19020d42dfc669a08c456fb0a SHA512 4c805155c8779bcb2d8cc36e48b60179576135c0936655266b4f6ebf3fb22ae31fd5ec22267105fb419304b03bef5f209cde8a13617dff22deb4aea30859e52d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.70.0.ebuild b/kde-frameworks/syndication/syndication-5.70.0.ebuild
deleted file mode 100644
index a2b28cd40f25..000000000000
--- a/kde-frameworks/syndication/syndication-5.70.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
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=dev-qt/qtnetwork-${QTMIN}:5
-		>=dev-qt/qtwidgets-${QTMIN}:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/syndication
-"
diff --git a/kde-frameworks/syndication/syndication-5.75.0.ebuild b/kde-frameworks/syndication/syndication-5.75.0.ebuild
new file mode 100644
index 000000000000..f57800bca198
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-5.75.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=dev-qt/qtnetwork-${QTMIN}:5
+		>=dev-qt/qtwidgets-${QTMIN}:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/syndication
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index a572d96ae62d..51ef1c8fb3a7 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,5 @@
-DIST syntax-highlighting-5.70.0.tar.xz 1606544 BLAKE2B 573a16979e9d2adff8562312c7681acbfbfaac906cf5eef2b1c8ae4131a555b89e4900d0d0e63b1a2fab3ac535e7c2daf0d847637d16d9eed9f4a07b30554c53 SHA512 59a05fd274cb11b893351cc10747600e03ced88cdc738eee26689e9a2a97b07db05805c0b0dcadbf02809254bd170b04f27b8372abb26b769bc6e962c615b9e0
 DIST syntax-highlighting-5.74.0.tar.xz 2028848 BLAKE2B b4641cd116b851564650a59a1354590b1fcca551a28fd0ea4034b5c95369a39084d0de83370416f10e2f4e51f724ab4bce5f22e97259013358aab54b980ca5b1 SHA512 6dfc9540ca4ec2c76c9b96a864a24bba6923529d72605dcd36136809250be12c366f52bf3dda02564169744729172eec2f0d3f69137d374d81af826ec97bc3b7
-EBUILD syntax-highlighting-5.70.0.ebuild 567 BLAKE2B 6f5bdba5013444f0399ebe811837b0d39063a6523500d4f293c0bef285baf47f12908fcb10af63ee0274e287ad698e33f0424a89f06db5e5e18cdf94a7bef93e SHA512 0cd9691816351924347d9621e5b61799b0499267410ed6910162694ff7354bd35150f9335ee204297c982475eac0a4b16a4923fde4daf3f5d6b263971869f2c6
+DIST syntax-highlighting-5.75.0.tar.xz 2054716 BLAKE2B d2c01653fdb11dce93ebde022677b5f83eee9bad012a9c7ed2f4b7f94440cdb5eeadbff56ec963b9983cb958547e680b36b4f97ebceb2821108527d2ad899e4f SHA512 723d41954a6eb7b7f00c378c52f8bd52dc13389d1bfd5c099320d6591c3337d6b3fb2c375eb917779ebb22c7bd2f8df2370cd05291c7cf11b92434b353229aa5
 EBUILD syntax-highlighting-5.74.0.ebuild 567 BLAKE2B c529a4a46062c8683fc8346f9d6466302d2d059208a2b5ffb654ce9a65ff5266f161d09b0d07d62471a0444b70e0de47e13e702d614cfb14800fe28fa9f6ec1c SHA512 071898b312f43b4f5e7f5b622cc74a2cba90cc799070f74ac900240b27ba017a29549b12e491c51cfc03b5d6e94bf3a71558d8e9ef98581cdb76101f84f5d56e
+EBUILD syntax-highlighting-5.75.0.ebuild 570 BLAKE2B 773b45ce46bc524013131e20a4a9b18daae37292231bbcd6165ccb1071af9aca9fc56eecfea500f641182e002105796a12d4ef8b2886915af4e483391be3944b SHA512 4b726047e49885ba6472aada6d6e5646f424a3bf9aeadec181c84c6387991541670f4998e003603146ac3433bca1fdfe62a922ceb8414629d0c408e7c37c02c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.70.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.70.0.ebuild
deleted file mode 100644
index bedd9b8536f0..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.70.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
-
-ECM_TEST="forceoptional"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.75.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.75.0.ebuild
new file mode 100644
index 000000000000..352f17f8e6fa
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.75.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-lang/perl
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 89f5a3662ced..09b9ce31a141 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
-DIST threadweaver-5.70.0.tar.xz 1410864 BLAKE2B 8f0c91648be122015692133ee0fa88357aef574d31129921f681d26caeb267c6882dd11550afb8b9d65331c937d030f617391d754f9ee9db2599f8bd2e4ed659 SHA512 1d9b7bb685afce96ee49bbc79ea2b9e9916ace2e8598b638a1069ac14403d302f811417ba96a2621e216acfa7bdfe55e8b013515cc25a3d25b1d506461147291
 DIST threadweaver-5.74.0.tar.xz 1410804 BLAKE2B d54888a01ca70354445be7bc3f2fea9c2afbe204fde614afc6f5fd28678b2a796fad585a46ee041253a61d7a456f6ec49f6c6b543509b6c87862c16324845479 SHA512 b419a80eb13366d3a71cd2d894a57f7834a9afb8472f88603fb9b24d678fa546da9fc96ff3a0af5e4db14f5bbbb52e2eb00f7ef2429a94b3b413a0026b69d899
-EBUILD threadweaver-5.70.0.ebuild 360 BLAKE2B 11f4d5bbf348cba699335c3046c139bf72745fa89ef6aea03e4e97de706c570c2a8a6963d992a1c21fb2b56505b6bf4ecde26eebf10ba02a8d620457087b569f SHA512 5354daa5d4db43aebb742a6e4eb2286a05c759c9a3e4dc36f464197568736db746aaacfee8ebc15cd0043eb5cd90fa30447fb493a1b4300ad9e2117c7806a045
+DIST threadweaver-5.75.0.tar.xz 1410792 BLAKE2B bc080f5115416cfeff634be1f3e2532d4d5472a5b3e403cdb59226f251bf7ee681c5e3293bbe5f1eb1afa2ff714d8e5ce92b15518fea4b75d83f392fac5250cc SHA512 901bec9d7befa8dd96076abe4ebe9863d97dab49477562679ae652073710e4fa8bc83bd5f787d08ab065265338a985448ffa42de0a2dad3e3c6386545b7b0e5a
 EBUILD threadweaver-5.74.0.ebuild 360 BLAKE2B 11f4d5bbf348cba699335c3046c139bf72745fa89ef6aea03e4e97de706c570c2a8a6963d992a1c21fb2b56505b6bf4ecde26eebf10ba02a8d620457087b569f SHA512 5354daa5d4db43aebb742a6e4eb2286a05c759c9a3e4dc36f464197568736db746aaacfee8ebc15cd0043eb5cd90fa30447fb493a1b4300ad9e2117c7806a045
+EBUILD threadweaver-5.75.0.ebuild 363 BLAKE2B e9cba8a7292e3ada9261047e25e4e36b8b439ae0baba28d77df7f7472eb8a78b9422ce69e1b5d01aacb29c9738499d0d1de857a693415b563e8e72f2e472463f SHA512 e47b53c7b6a615584deafac09d2ac2912f2f540287fdc2b9ff9a76c5a40aa83dffc723ac1419fa2076c923159b35a95a221cdd48778e285e17a77d18e44bcfa6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.70.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.70.0.ebuild
deleted file mode 100644
index 91cd03721b6e..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.70.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_prepare() {
-	cmake_comment_add_subdirectory benchmarks
-	ecm_src_prepare
-}
diff --git a/kde-frameworks/threadweaver/threadweaver-5.75.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.75.0.ebuild
new file mode 100644
index 000000000000..62f7250b169a
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.75.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	ecm_src_prepare
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index ae173d24f18f..8db7ceaac397 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 5974620b6e10..89db505e0633 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -9,7 +9,7 @@ AUX kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.p
 AUX kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch 1197 BLAKE2B 4cf50f0d883b194c92f16961df4d7158e19644c8f6756afa27bbfe8438da0ae44fe96d29184060c242ffc0870536d35b9871f4dbde042a2fe176abb8cf0a2180 SHA512 ff3b227bd15612201a0510a5ea0f330372e712b05b170b34d671b68e7ac3d1f561a65fcc1ea55d239bc64065186b70a17530061ddfadf6ce4f0a13a9a8d100e9
 AUX kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch 2261 BLAKE2B 531b3a81f9ed7c50794191140bd510f0ee5968c4deb67056f0f37649f19caa96fc0a2cfd9bd29086b6c9c59cd591d41a2db52627c5006deef41dd74f86b36ed6 SHA512 20e856aba62f5528b6772d8693c435ef7070065377d5dbee9e695a11f6d782082fdcc8b5d40804137a93db4f12f16a41a2b8af4212179cd1a0f43e1f30e71453
 DIST kdeconnect-kde-20.04.3.tar.xz 431092 BLAKE2B 8da7439f6d3ef17c1a80b6a47411200e5bb2e622c9072b386cb2aaf6730fde80a6c6d8564aaaad42ad97f471259e651ccc9e78d5067619e7f150b61aecec645b SHA512 148526e1c216725fa92b96682ea2a78f4bbb94d56066bc545fee875b321eda2b41f75f840366d1a69e74ea3e40832ac70dce912226427df019fed4387c68ec43
-DIST kdeconnect-kde-20.08.1.tar.xz 407996 BLAKE2B c0f9975146aa459caefe34a8adb315390669d27739ac82d5b0b06a9f7721cac32aece91c54aea961210f4f66ac061550b1e71927b35f65bab56a7fb1fcf5b16b SHA512 c6322b1a77323a814f9a501d871f03c70530f9ba63dcede4228005f528da577078c1fc56760ee4181e0cc90ffa97ced59451c6d2546e3c9424afa21ff2d76f8c
+DIST kdeconnect-kde-20.08.2.tar.xz 416080 BLAKE2B e3643a1beb81fa9de98564c4a88b004dc8f03abe569de69405c143f4aff88c01e502198dd3e47165f7c1172bcba863bc49de394c36b66a7a320ae7c451eef3de SHA512 1b305efd2075d9784510d97f9124e4361a787fd51e05a9c52e9fc556b1a2c8271b3711291133c12901faae193146a157668c3796bebc62c5780b225b24f66087
 EBUILD kdeconnect-20.04.3-r1.ebuild 3058 BLAKE2B 5f8256cfd5918fb9bdfebbb424522b93b6cb8926cc3181f84cd335613c854a34a3a6372e5656c2618aa56ff65f1aa9e773c490a2ced801e580b7e385c967a10c SHA512 77e66d7976cf0eba7fbe88f8e6fb42fcb33c826d660aade9f86e94df8076c9e340941399d7ea38984203dac1f516d5487135deafb205e37004ede9ebde9cfd3e
-EBUILD kdeconnect-20.08.1-r1.ebuild 3186 BLAKE2B 713814db1e29d9777ed863a131613359e0ca165a27696309675ec03e3d49feaca15c8d2de97f497244e2a3a73009ee76af38e0736e39a2a91e16693e02a5ce78 SHA512 40800fa53d52393c5f9de308b957f6f2c8d0aae55098cb001c949c92fd86fecdad517cfb2f9f28e2d8ee8fc79bc8c722767faffb0f57fb727ba0e206994eeea1
+EBUILD kdeconnect-20.08.2.ebuild 2280 BLAKE2B 5d551c87db71eb8fcdda67580602ac820856a4ed32f2d434dd7d3827dc49baf60b482b330f8b4ee564573df3cdabf321c895d5330601e489577f0a24d59e7cca SHA512 56dfca4ef6b7aa221ab2448a81802f24afcb3e55919263d55f918be02c63ae81878c7b42db2fa81197fd076d679ea74a149a6f720b91ee3836741fe5d5bb35ca
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/kdeconnect-20.08.1-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-20.08.1-r1.ebuild
deleted file mode 100644
index a43c4f2bd59f..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-20.08.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=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}-kde"
-KDE_RELEASE_SERVICE="true"
-KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kdeconnect.kde.org/
-https://kde.org/applications/en/kdeconnect.kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="bluetooth pulseaudio wayland X"
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	pulseaudio? ( media-libs/pulseaudio-qt )
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	dev-libs/kpeoplevcard
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	net-fs/sshfs
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	# CVE-2020-26164, bug 746401
-	"${FILESDIR}"/${PN}-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
-	"${FILESDIR}"/${PN}-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
-	"${FILESDIR}"/${PN}-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch
-	"${FILESDIR}"/${PN}-20.04.3-04-Limit-identity-packets-to-8KiB.patch
-	"${FILESDIR}"/${PN}-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
-	"${FILESDIR}"/${PN}-20.04.3-06-Don-t-brute-force-reading-the-socket.patch
-	"${FILESDIR}"/${PN}-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch
-	"${FILESDIR}"/${PN}-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch
-	"${FILESDIR}"/${PN}-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
-	"${FILESDIR}"/${PN}-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X LibFakeKey)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst(){
-	ecm_pkg_postinst
-
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-20.08.2.ebuild b/kde-misc/kdeconnect/kdeconnect-20.08.2.ebuild
new file mode 100644
index 000000000000..40ad8d5ccd2d
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-20.08.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}-kde"
+KDE_RELEASE_SERVICE="true"
+KDE_SELINUX_MODULE="${PN}"
+KFMIN=5.72.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
+HOMEPAGE="https://kdeconnect.kde.org/
+https://kde.org/applications/en/kdeconnect.kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="bluetooth pulseaudio wayland X"
+
+DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libfakekey
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	pulseaudio? ( media-libs/pulseaudio-qt )
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	dev-libs/kpeoplevcard
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	net-fs/sshfs
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBLUETOOTH_ENABLED=$(usex bluetooth)
+		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X LibFakeKey)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst(){
+	ecm_pkg_postinst
+
+	elog "The Android .apk file is available via"
+	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
+	elog "or via"
+	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
+}
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 0a96f4c2edd7..7b7d956aa62b 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,5 +1,5 @@
 DIST kio-gdrive-1.3.0.tar.xz 51668 BLAKE2B a5c9bc347e5b40998449b613e8ad73c362d82d2486a1e91527f84acc5473d603b3cca422bd7c67cff28e49b08803904fdf752bec742bae752e868b8a84321684 SHA512 b0a6be2b59512d3faf6c677c6f3ffdcc9a38fff3a41d0bc6a29566008d7da3ab524fb189ddd219308a8ac8244fbed67c01da480e8193ed0aeb815fe64d72988a
-DIST kio-gdrive-20.08.1.tar.xz 57056 BLAKE2B e5804b035c8db7eef0e8e0f1809cb62e5f0f5fd07aa7a35f62384ff0e18ade24bf4acdc088611b6ee5b7822480b51227d0a3421f79b1f2966e3c079a2cf3ec32 SHA512 3b1b0ca114b72182e36dbfcd166f32bc2e1a128d031d4d95825ffa088b25fe7266dbafb812f64e89c033d4d56f20dcca8da19ae0861e97fc4e08512880f77274
+DIST kio-gdrive-20.08.2.tar.xz 57900 BLAKE2B ef59453f4de2fff9e2de86172898c6eb343a13743fd11bbcd8d9a0bac276d1f753e5379ef69ce3bfd3cffbe2950ffd588216ad378848d06cdf21217214ed4cc2 SHA512 f351f4d7e54dab80074080ec2c5a6348a2c88fe2067cf8d4d3e4978323ba342ec32109063889b69559eae0a353906b02114c86dd32f6f1af1782f0bc969b68b6
 EBUILD kio-gdrive-1.3.0.ebuild 1069 BLAKE2B 258a60d0c4a8cb207b1799a4e8bbe05c0d75f616377d4eccfeb02b317c8cc4a06c6cd03b4f4c217e7fde0b822feb4a5e18044365c66f23b4385f6548fdc76622 SHA512 8900f71af6c32a24cbd232cb1c9bfc3189919ac4a0f682fd057480e4296dae6891ea97a26ea376e50d9cfc8a1ce342a53d338ba8a329ca62498399fd64fca9f1
-EBUILD kio-gdrive-20.08.1.ebuild 1050 BLAKE2B db4a9e73a22fb1dcf249c8b29dd700bc2209c49e6fa15f8667e6992313563b1d4922947919e31d58a30d5dc0ed7cb2e26a2c5f906d1fea40860d1ecfc8610656 SHA512 8b3cca5eaa2f2e7879abeea2201542b25565e867d11fbb2bed31f7bf1678115327e6842b6297e9e6966475ce0d197195da10ac8bb5ec3a6acfacc66d43c8c556
+EBUILD kio-gdrive-20.08.2.ebuild 1050 BLAKE2B db4a9e73a22fb1dcf249c8b29dd700bc2209c49e6fa15f8667e6992313563b1d4922947919e31d58a30d5dc0ed7cb2e26a2c5f906d1fea40860d1ecfc8610656 SHA512 8b3cca5eaa2f2e7879abeea2201542b25565e867d11fbb2bed31f7bf1678115327e6842b6297e9e6966475ce0d197195da10ac8bb5ec3a6acfacc66d43c8c556
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-20.08.2.ebuild
similarity index 100%
rename from kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild
rename to kde-misc/kio-gdrive/kio-gdrive-20.08.2.ebuild
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index d63884088918..f715b112eb60 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index b2aa2229a968..93b1ddf9d79f 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,6 +1,4 @@
 AUX bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 2204 BLAKE2B ec7b389b3bd663f7c4da29c6d4afbc770e6ed2e96c1c6335e1f92b13d05dd77fbcafa508676c27e9759684eaac8087606e8965e8106d55d23427cb63aef1b786 SHA512 a678b1c40cf40659caf3387b028f605d396a03ac08d04b4d74900ce0795208b344942acc1541d3fcd3ef102adc2ded9440f391d4bec501bac5955e108b7fd1e4
-DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323
 DIST bluedevil-5.19.5.tar.xz 168480 BLAKE2B 2fd4447dde007540e3cbfc0994cc257cf777088582c27bb3af123df3085138496f33ce4cf9c403944de1f012cfbae6e7d72058d9536c00ef735c071da7d20fe6 SHA512 152702f37e46b3b359ff23705dcf347588691d87e1a0cbce940ef557f29e92fd9e129724ab37158b4daa00fdd38d31ad5197318dc09b33d7c834e562b6aff5dd
-EBUILD bluedevil-5.18.5.ebuild 1068 BLAKE2B f17fc8d025089aac350637564beaae3469673c38b538ffc97af05d20b458cc6a571973bcffd5220c8aeacaf672a8c80eda649f039813a5e0b401a1a6f08f473d SHA512 255d07652fc437a7d1c1569c69d4b27a38162481cde4518694e5768df90bd9dd50e2136ed3769ff0e8a923ae38f20ad1387dcec05e3270ceaceef8471c3e7486
 EBUILD bluedevil-5.19.5.ebuild 1245 BLAKE2B 443419ed1215b968d0382eb690c3255276b08d876569fb1a2556b1bd26745c2937fad9b1bcce9f34a6fd06b79f04fadb02d3233392f798403e9beab41144022b SHA512 090b68d1357195c6ccf3f0cc4ad1ef8cd8ffd23f7e8ae4499c1ce032fbd316b5b1d0b62ea3b06f09c444cf75ade6fce0966f7d6bf3209a0109fc3f09f5043233
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
deleted file mode 100644
index 77b72cd6649c..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 3a5f1bca59d5..3c09cfcb63ef 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-grub-5.18.5.tar.xz 3138804 BLAKE2B 236f590f19df0a8faf28bef3dfc0a555434902ff284a978576d67e0f7f2076f42d3cca8283d3b979cc3d7afddd1b50a2cde09dd3a23056798d7a6ad7c6db9635 SHA512 969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69
 DIST breeze-grub-5.19.5.tar.xz 3145156 BLAKE2B 5d18ed9699fe1fd5e0d3a94263c25692f4f933066de9b43098f70051dddb11fbead60032c9d28b3fb5960b7f05dc1a2d4aaf6ffe80fb203394d568f09d421772 SHA512 db589b3f8daf4518b517b74110b925319b610251e002c3e28fdd2e0a88d99c2d3108dbbe02257a60bb4b6a3e4b594febf26f7d2448ec1caeaf341d95cd02c0e3
-EBUILD breeze-grub-5.18.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
 EBUILD breeze-grub-5.19.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
deleted file mode 100644
index 4c4e78b0a1a6..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.18.5.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
-
-PVCUT=$(ver_cut 1-3)
-inherit kde.org
-
-DESCRIPTION="Breeze theme for GRUB"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_prepare() { default; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index dede4c1f9055..07decf974c60 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,4 @@
 AUX breeze-gtk-5.16.5-cmake-pre-3.16.patch 542 BLAKE2B 58af50232fc314cbab7f6d47a54bf87b2be75757354f0ad7fbf65e36822774dc96a3d7928360b1c27c7819e7d55253db73f5f883cddbdaf89ca62e94cf1732c1 SHA512 9065680b040447fa84d4f100bf5ed7fdde2631c53ab777abac238d9a319c33d40ac1f111ec942c9f32721363fd80e71514e405cb0dc429e07b80dbbb4233c0fe
-DIST breeze-gtk-5.18.5.tar.xz 42396 BLAKE2B bbfe9cd57c438ad1b1cb144b0393ee45d0ed0aeebb34b38e557e2950d7e0d8ec950c1404eb2e17fad7421becf6486cbd6d2c44b414fde62f27076f4fa2419791 SHA512 3dea9af26cd18dc0388c76c070c5a375054b6a03ffa97e298341924fd909e2dcc49a7c7b431b36a158c1012ce6f9d48f98ef84fc6cda0965d9a24ab18c7c0951
 DIST breeze-gtk-5.19.5.tar.xz 42576 BLAKE2B 8874a468666d17318a2fc06ab6dad66e4a6e648bc46479b019e7ead84b29185f8dd334801231b2890c6aec3821172871ce4d9859daf6fd6e83bde23fc7ebc4df SHA512 cb201730ba20745cdf04e8889830e1a5f6ac530435783ca1c01c52d456c650a88f459c871fb6e6b4ef36bc771dbaa4e2d03d7ad08906c910b7b9849678bf9f2f
-EBUILD breeze-gtk-5.18.5.ebuild 1016 BLAKE2B ac9c25e163e1200f10fe3aa526e25acdd9ed5e71e933cffde1ce5a62201316e73a750d9376634dc4953e117fce62ca945c7b16a66f31dc18324e2c44af236d20 SHA512 64ab23938f10d4b5136412b58f2f6ef532d4bb36dac4081222eb852c149de9c38253e8a42e50ac0e8a6edcfd546f25b1e15409db628c8197c9ee836253e9feee
 EBUILD breeze-gtk-5.19.5.ebuild 1016 BLAKE2B 5faa84f7e21350dd618cff01c6d230d7a09cab602f885072059e60703eab11f9542c8c238902160e0db45dff81430fcf140bd96313d29689255b74c2be30946a SHA512 36efa28342658411b75d2abfc734979c06498009b7fe8b2c5d2178c1bcf4879fd17f20baa7c54d6743ef29b72bb77f3d13d017d6f1bc6cb2e39ec6472ec60774
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
deleted file mode 100644
index 6e585bb20700..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.18.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/sassc
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	>=kde-plasma/breeze-${PVCUT}:5
-"
-
-python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	fi
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 0539d7922690..75e703513ff9 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-plymouth-5.18.5.tar.xz 105672 BLAKE2B 6aceead2db0c977951cdd8e6d93314276fd920846e77a0ac5a9e195937b5ec116f3c2be371096d77dfaa9546bd2b44516ef8ae42ddd2aa6760684cc693418b3f SHA512 45206a6c99047b8b68fd5806dce608ddc09c4208c7966ef276bd7096949ad05138ffea2d6272e5c5ed5985ebbde9bfb7ce8b8a1074f56286dd3e1b840937b98d
 DIST breeze-plymouth-5.19.5.tar.xz 105732 BLAKE2B a9d0cb4e34f3d5f9bb7229c3b29074765fadcf54424562d7c91b4f56233d130efebfbd263e65b4013da2a3da1b59b7da6d77e728661d1ea5d965c413cb558e10 SHA512 8f0739379c2ddb62b612acf65c41bee57e36d98a120289a1db3245467d118e18f3c0fe67905d990c586dfbe333c47f8671893726ad5ee9c28883d938e309963d
-EBUILD breeze-plymouth-5.18.5.ebuild 515 BLAKE2B f41afede696bf0558e5a4a3b68e754031be382d6e0cbe0a483cb5da96741f87559dd1a4bbe91d7e2c85ef6be781c1f52ae236473de3288ba6ed34d2b02baa896 SHA512 a546c2747432ad3612603933b9142a001f7acbf7c6d4a45b9670b69bf9be342fbb98207ba451c478ac70570c0512ed4634e364c5bae51432e14b91e9e7476c0e
 EBUILD breeze-plymouth-5.19.5.ebuild 515 BLAKE2B 77e594cf5b75f0cd93105bb43dc9322dfadf3c7bdebe11754424160bc2f4b14037b6e1fb45ef295bfb8a399014911e7b920deb72cc1d41f48f5dde10ac094416 SHA512 db06ff20f3c67c964491cda6050c8c0b8d395c761019e003cd5f6e1492ff5689d9f40d7a4e1f809acea890ab26148205638274a2cc116451bed54a83df9d3c09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
deleted file mode 100644
index 38f5b1cecc42..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.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=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze theme for Plymouth"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
-DEPEND="sys-boot/plymouth"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 66057763931e..9da500a9a085 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-5.18.5.tar.xz 21583276 BLAKE2B abd1afc0fcfde8a7b72923824908cdc18124ae2e544446a7923e1a6a88ed89876bdac127867a8c33473d0e0c83b360450fafa1c3f72fa938837de03b157de055 SHA512 d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5
 DIST breeze-5.19.5.tar.xz 22761136 BLAKE2B 379a26d103acc718281f7ccdc6d66539c78d77ca9bcbbb0d3c9d86625a4d053f1772b49584a179d38d1c00e14441695b717405898ca6ed9ce0c6e947e93ac172 SHA512 6b67b147c34e3b143e0c4c400eb3133ab15b826f9046ad2e701114f3ceaa1e2d085d864f04c28f2bdc37464a2313c6d8b5983fab5ca9f22ccae90ef1528eb8c4
-EBUILD breeze-5.18.5.ebuild 1415 BLAKE2B acd856b73e24e7f705e4fb74bc9cdd68425d1954c8c318d71549558c145442428d86878526295f16dde5fe7dc57ae73d6c24e73fff32783cb14fdfb39627d157 SHA512 c08c90f4da1e1a49f18379111592ab9456827e5231e7c07e4695927b676c0f77e72a21482ea2a5879a6c2a5a87a55db5292a6e68bfc41c57390891f3e1292e22
 EBUILD breeze-5.19.5-r1.ebuild 1334 BLAKE2B 1b670cb195c476531b5af8c78615b00b48b642c6361d022a9d4763147ddee5b30e73b3cfcd23582bc97eb062a061ee097284bc4aeec54f498aef24d226689959 SHA512 76b8a6bbc9c2f6e70ddcdbb980e284c07a2a45bd985d1a693ac7b44fa1af1162677ea88eb845781298dff97129737ca970f9454bdbc467c0f03aaa9eb96ea518
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.18.5.ebuild b/kde-plasma/breeze/breeze-5.18.5.ebuild
deleted file mode 100644
index cff25bbce754..000000000000
--- a/kde-plasma/breeze/breeze-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland X"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
-RDEPEND="
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	sci-libs/fftw:3.0=
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 95cb45c9b031..6be9c11f8c4c 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,3 @@
-DIST discover-5.18.5.tar.xz 10475624 BLAKE2B 0085fbc4bc0225863fed7d0a01d21d512d283ba5d3289840a3ea6c423ca876121a90065220918e088b7652580cfb79d30a5f01e445374931f3a1279e27485417 SHA512 6ae578815d54ccb770d4d113ec04f0e75c4b93cb1b4a1d636009072da83721e440a4fe817613f1b676c852cf2fb3ee1bb7192c60b174753578449e0bdfee7195
 DIST discover-5.19.5.tar.xz 10296324 BLAKE2B d19662ea90f8be4e090e62587ae79b19c072dfac28d90c2bc1476ff4e375498e938e0b76d02487e8cdc64e297193dc62bce34484f81122d827ae0fcc5070fc3f SHA512 524fc45331631a305620f05fe67f780aee2dba7714978f32d9baa0d488185da801ee7a4d11592f2e07dfe395726b0c34d4ae7dfe3abf2b0e7632bdea27a714fd
-EBUILD discover-5.18.5.ebuild 1994 BLAKE2B 40ea5ec9b64f4ee9055f5db4140b0c0062dd1d206433914b0d7ed892d6694e5b9b296ef733362f6efe21ea38c9ec982fe3a55941db6c8f315a2e856fb943bea1 SHA512 13460232c4219a5e52f0fa97a47bb461fdaeb26e09addaef3ab4dd5ddd599afa87edaafdeae938659adad4770e929cb473220c1a09cd234a063deef8cbf012a8
 EBUILD discover-5.19.5.ebuild 2032 BLAKE2B 885e08114d9fa1440380f6fad21f64a816d39776242a2aa53b14d253e17053693e069dae7e5ed62fec03772474c2ce3e690f4692f57abc7be96f5041626f0ca0 SHA512 55bd727d282f46296930d399dec6299be3dd686b3a2cc1c8e87d7816ccae73dd2cdfce5dd200ed55f9aeeff63fbe6cbc7c3fe10986f2838cb3d7a9df76921ec9
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.18.5.ebuild b/kde-plasma/discover/discover-5.18.5.ebuild
deleted file mode 100644
index d5c4806e78ef..000000000000
--- a/kde-plasma/discover/discover-5.18.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+firmware telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=kde-frameworks/attica-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=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/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	firmware? ( sys-apps/fwupd )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 7c93d3a6a29a..7cd79a898386 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,3 @@
-AUX drkonqi-5.18.5-init-bools-w-false.patch 1702 BLAKE2B fb60d49278011acdd8ffc4eacc5cfa07afc34f3dbe240945bf87c2ed23f4f94bd4284fe3df25e53e28467a2d4ced54b47461a440cd70be41e17412ed9c2d9c52 SHA512 87d3ec1db263b1cb1eb27684da40815eafcfc8bf512ec771eebd3481bc032a6653686aa22f71313b46dfda7e1dcbdfd5b2bde9930d69f0939ed2ddf7b25529c9
-DIST drkonqi-5.18.5.tar.xz 747984 BLAKE2B b94f808c7edf8e02628badd63ecb5edc9dd80d3e157f46c72fb884d5c35a2a5c70e9080235a7be84150dc973765f42572fcd6e907bcf6a58c100d80b7188bbc6 SHA512 b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9
 DIST drkonqi-5.19.5.tar.xz 744412 BLAKE2B 54840e9fab41f09c6184eb29e3e7bfb17d08a76966b7bb9776f1f044671c61073bd38ca4b8f96c6c3eb4a534871550363941cf2fd94a177f770caccec9a3339f SHA512 0dcfcb5018f1024ad751c234f7e67b865f06c8e8bf5a1a95a160df2af97730ca111f4cc8614da646c8dbe042a206d3d4be214790abcf617ca454582161f0aa24
-EBUILD drkonqi-5.18.5-r2.ebuild 1683 BLAKE2B f0edb1519a89f54fcae1960d4bdb68beb1a02a708a3f1608204179711e33644a656ab353b1e8901b9947c8124852fa5a1bc9d70fdd510cc87daef86c489c6807 SHA512 4027d7640d8706c79acb24245425dfb9542ca0814bf5462edfee89f9ed91586fe99c5dd6d58fafbd490d17851c4bf9b824e1442cdcad60a2188810dccc41147d
 EBUILD drkonqi-5.19.5.ebuild 1641 BLAKE2B 1277c750214b86b6419ef30f07c07d88f014dbdd7613707f280dfdbead0c6dcfa613f35f794c6345ddf52035fe67c58385bff763e3ced75b21a58611042ecee8 SHA512 8c0056c6b8ca5091d8ce4edf71a0f3506d740f7629c3dae4c4dd996e3a48d136a54ff3c79b8626da0312ec9bf4133b69a2ef6553b14b621f19683f84907e815c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild b/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
deleted file mode 100644
index 03342eff8d10..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-init-bools-w-false.patch" # in Plasma/5.18, KDE-bug 421187
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch b/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
deleted file mode 100644
index 6ce33a7198ab..000000000000
--- a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c517b795936fdab641849ca83ec8c3e253e32de8 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 12 May 2020 12:25:52 +0200
-Subject: initialize bools to false by default
-
-Summary:
-This should fix random 113 errors (user_not_insider) coming out of the api
-
-I can't really reproduce the problem other than by setting the bools
-explicitly to true. Seeing as they were previously not set explicitly
-they could very well end up true accidentally.
-To fix this let's set them explicitly false.
-
-BUG: 421187
-FIXED-IN: 5.18.6
-
-Test Plan:
-hoping for the best!
-tests still pass tho
-
-Reviewers: davidedmundson, apol
-
-Reviewed By: apol
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29675
----
- src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-index d30f379..8b4e4bb 100644
---- a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-+++ b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-@@ -34,8 +34,8 @@ class NewAttachment : public JsonCommand
-     BUGZILLA_MEMBER_PROPERTY(QString, summary);
-     BUGZILLA_MEMBER_PROPERTY(QString, content_type);
-     BUGZILLA_MEMBER_PROPERTY(QString, comment);
--    BUGZILLA_MEMBER_PROPERTY(bool, is_patch);
--    BUGZILLA_MEMBER_PROPERTY(bool, is_private);
-+    BUGZILLA_MEMBER_PROPERTY(bool, is_patch) = false;
-+    BUGZILLA_MEMBER_PROPERTY(bool, is_private) = false;
- 
-     // flags property is not supported at this time
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 259196972fa6..0160e1064ab9 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,3 @@
-DIST kactivitymanagerd-5.18.5.tar.xz 86988 BLAKE2B b87b6f96d60d1d5f77d052c79f45559c5826f83a35f4a64b98b486bdd90daf4b31d05ac9f1f84d628d7651b1a76fb9bebaddea09f15d055b6924a80c44e9a334 SHA512 2ee59f78cc948fe11577373ea69f895efcaa7d4f239362d3e060382c3be0f67511a0baa64a404c1e0e53d5777775afba60f49e58476c70dcdef6c63358ca4dbc
 DIST kactivitymanagerd-5.19.5.tar.xz 84996 BLAKE2B c5dd47d35fc1bcb5a1f64ed0a60d96f85398372d481927511269abe98512ba38c1128fde760dacbdf044dfca1b52eda68aa3558cab2b9238a0c957bb0edac009 SHA512 884f839c68b94da264042262b730baf81ca4b65320daa2b4de2ecba0698728600f25de77feeb6ef69bc9d98b06e827d8ce467fb9d7b54807442d7d9cf2b9b9a7
-EBUILD kactivitymanagerd-5.18.5.ebuild 909 BLAKE2B 186668843d8dd45c3e02ff06babde90bbf84b790703232bdbe71bee67232f8bb04bac8d66e18911385f8d438afb7a453e2a74588dbc3c295486404394cbb6741 SHA512 c401c84644ef4b046a71715e1c9f55ea6fc58137258b6cb8b8c63211d79e720faa988ee26bf9dc14e2db38d0e5600b878f3a7f3ae46555af747dca7d3ce9fe13
 EBUILD kactivitymanagerd-5.19.5.ebuild 909 BLAKE2B 0ffe727777c14ef0e5b0c7a5b039d49dd87a32f0d2468741f3bf7d4fa29cd96e9c067745043c8451ae536a1a6aab7486e4694428edbda97bf9a41c64d2074d46 SHA512 c0810c97c98f1cef8351494c3790a9f7484f0242d8f48d1630f76cf6f05b61f9ebabca3e414e3441c637bd01734fb0a5da63cafb9e4a3c2f467e42d9447808c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
deleted file mode 100644
index 74f742a83866..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 35214027ac8c..d4506447dcdd 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,4 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.18.5.tar.xz 592020 BLAKE2B 6a35db9d2e68d6ceeaad72553e5d295e54d053b624b1803080dc123451b804250ca0881d6c70b626dddb75ae48b6db398cec5b9c48a25cdd87d18e03873ff612 SHA512 c73695a1ecb81b9222e213f0e98c37354560e32dc56fe8e5ebe1665f7f86a88326bd7a32f4b66d2a73826c9d684f5410306ef5e6660751601c77eae0c6f16d4c
 DIST kde-cli-tools-5.19.5.tar.xz 600580 BLAKE2B bfe77d7d5d9528b3b7d089341afa1cf48bd05d2b82c596a85eddaa197ec9ddce4c83f223e6698979b10e764f4468b3a5bfc94777400d8aa927227cbd0508c975 SHA512 9e8de408643caad7c0de52cd348c35678c92b478587a2e7fd6b0cfd1d93dd578d9060c58b1dacf4b0143840d61860b51f41b53b7c2349112b855c9bad3c9b897
-EBUILD kde-cli-tools-5.18.5.ebuild 1723 BLAKE2B 6024fb092f668527899e80160ff9072ac44d417f4243ff9d0e6c42928c3a97a4120e3bd44a5b203825bf69b7fb925d19d06104142664cd03b71343bad4935fbf SHA512 629c9d412e063ff0783b9b931c49b15b9c18b54478ce38d8404c1aad478c2e067d1d102b50048e2a5019b370b2a902ede2e791ae4adae52b48859011f963b82f
 EBUILD kde-cli-tools-5.19.5.ebuild 1723 BLAKE2B 9477d1d27efd6aed0ba74fe6847d8cc1caa543b7cf02b0425dac1ba3c3c308303cf7e2d5ecbc969f2a0a08d2acfa8127f4cc3e4b4a1a3ef0b1743b1691941aa4 SHA512 281271bdb6ba3f1da7bbdc25ec620442941058e0650ca47817a8076d41e5de9780999448a465ae37002eb542d61a3fd9c158ea939764c450d1969a5509128c15
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
deleted file mode 100644
index 30926bcc804a..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF5Su)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index dc993df5d265..0be895ed972d 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,3 @@
-DIST kde-gtk-config-5.18.5.tar.xz 24688 BLAKE2B 3c51e37b1df8c9a48d766158b166b5177727b51c3a5c59435a8b280383af5de74574396272c2900b7a801d8ff0c97dee39e84737f032dde11fd0b2ba2d89f5dd SHA512 2ef81b454789136692fead9af2b8d7383805ed5cf91f9f781e637f65cbc293b9ac03be7583f5b5848c4db956da4212027c5b54a878c3796ff975292deef9aa84
 DIST kde-gtk-config-5.19.5.tar.xz 26224 BLAKE2B c55e69d3447179817b0a152b837843f97eb3fdf7e337b1cdabcce4089532a23609777fb57aab1615aad70369d5a22b2707c5eaa10783500e3ae33d57cd868e2f SHA512 d9875fc1af767b7f318520f386a62404779c33312eb5bad1eebc924a36ca05d822cf219b56548cd050e0965b0dfd581b5fee533a77fb5d745e51f63b350ff79c
-EBUILD kde-gtk-config-5.18.5.ebuild 1107 BLAKE2B 060f075b7c0a977800f69d8a03fde17eac20393675f41823639c415f9cdf6372b4712485600845b6769d9a8fd716de638118416af68d227bff12c50eca8dd6b0 SHA512 01d0f342aa3940290b552a06558c06ecc358463e4f498ef4fc07fc7cb0d8ccd27d79f8b7cbb88413a6f5df9d57386b2ae83c9742731b2e71571e8c663de6dd8e
 EBUILD kde-gtk-config-5.19.5.ebuild 1189 BLAKE2B 5dd189ee2135920e6bd5133139a27819959c9b0e4840e48839968e218a428e6a026d713a234b71fa8b9de7526a52e8c56f4f5b0413e9ca3d9b0d4b85ade4d57d SHA512 9da0e6205029ad1d0ab8a4dbe8d8a2b448f88890adecd7ab43e98b15528f5edb128d3af7f0d01b95b7e8f8bf3d1b463c7ebf0397544ff62212de8c53b0eb492d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
deleted file mode 100644
index 584df58ceeb5..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.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=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	gnome-base/gsettings-desktop-schemas
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index bb7a062be7b5..efd33446e247 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,3 @@
-DIST kdecoration-5.18.5.tar.xz 43884 BLAKE2B fb1ed23440ac6e1813bb02e9d714e4a6d85587c92f7d379d9c05c981469fee8d73351d38b9fedee84b8b016b5e0aa44074dcd666adf7e8fe511870f264b01131 SHA512 ecbeeea7e2239999995facee481794bb35da359b3e64c0b4e10dd7b0d18d8cd43a6a13ff216ed963cd7f59a78b0b190ab994e6d30f7b84572a8cf69a74abb164
 DIST kdecoration-5.19.5.tar.xz 43832 BLAKE2B 7d72c6014e6893f194c3c1faa2cab0cde122ed51e39006c95eda2bff247601e54d973cb2ad7ce6a92bc410db288396e279efb5b15c911d7008d47d566e9b504d SHA512 74ce5ed6a071ebc484103a2efbfbf3f2f624852dc00e141ced85813571bffb351f832dd6162c1c672274006c7bf2c7b64d59e5224f5eca6d17cd3e3a2e35151b
-EBUILD kdecoration-5.18.5.ebuild 479 BLAKE2B 4f8ea237078478db8e5e2e20e0db3c21adc7711a81d71e893c37cb01257c9089e0f1dd91a9891ea441ec32fb37b7da194cd3ea29dd6a22137d6b73c7d9ae6c24 SHA512 65dd0c311fb15f02cc0bc6f419a37cf9c0be4aca2f285083a9d0b27df820a65c848bf5ffba6df2519a4b9d7bd999e4ab48f4e9e5b4e9d86424a5eae2ba08ff0c
 EBUILD kdecoration-5.19.5.ebuild 479 BLAKE2B 384f16ab8b0c5570039e645d020c66f7dd1888dc3c85a729f6502cc6f4fb29cc25b6af3de43cd32aa1833e606d4474cacc9f769768c3beef41c5f850f8b10003 SHA512 2fe4ee5c8c65275957344333c4186bbbb7ad5257b94b1438bf2414b551caeea0cb3adbc2f5f48b2f04687bbe00d7b6fbd9eefb086ce065dc13f4a1f3b84d5ccd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
deleted file mode 100644
index 180cd3e093e2..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.18.5.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
-
-ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin based library to create window decorations"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 898c2716d973..95a8da77f278 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,5 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08e3358083b02d27038b6e46a345881f2ae4b38c7af3f0012ca300fbe9697bcc15165d09bd0596f91f743dc6cc6bc7f4b286a85951 SHA512 5ef0b40c381bdda5a701240e4622df2044ccb68093b2d0853671db9d6de7274f28723b799d4552e2a99d35e67c232d26a0e1a24939bf02c155366c050a0bce6f
-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 2182 BLAKE2B ad22125c6d0d678ca69b404131c9472057f35f13867a0268ee2f4c0139a12841b37b1fbdca11dad1f575436a26769fd4d24b416cdbeb023ebfb89c4c58bfa186 SHA512 0e9e5d29a0a6dbadfb4adaad2ac6f7776b441463236680e7ce6e8982eb3c315b1520df3a78852534d1c62a78ce17bab8dd55307ea6960e60acffedd905309e32
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
deleted file mode 100644
index e17cb42f9487..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="share webengine"
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 48807a688edd..0a4a4bc617f7 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,3 @@
-DIST kgamma5-5.18.5.tar.xz 80720 BLAKE2B 7dfc4f96389aa0004b6db92b03eed051a2c2651210069f9f86f6c430ad3d095b16296083c4d57524de092afb2306b841fdfd7166c6805f70761f9af55cf8bdb1 SHA512 a6d242293468eb702600334361bc1299823235b059df64ecc6b2a6219f7801a1fb7ac7f13e71475d877ac03623d72043a6c35c31531fda97af883265deca735c
 DIST kgamma5-5.19.5.tar.xz 80752 BLAKE2B 33280fb2b7856d7b6029e7c05323897a393ca2a1d86f8951327e237cdd29b22f07b64a46ffcaa78093866036c09324605b485fcc103e144b5aa9ee4116e1a338 SHA512 bb758ac5a4ed21563bcdad3eca07a822a8bdebe5d5cf4862f92f2b38dc9a8fc4b15b8cf0e96d6a329b969eb36064c8723ec432a044cecf1c25fe43853cb8f567
-EBUILD kgamma-5.18.5.ebuild 677 BLAKE2B d7dbd83318e6dc2d34d74b8389d41aaddaac1867ea15e84c2d7c677c6cfe7b3cc9c36c4d36b09ab77afc1f27b05cbaa419759ba37b7c8b7de59603767851e936 SHA512 96da9c6f596b496a9bd957fc74a34bb2f3daec9e7bd9ad307c748c4482e44a99df081bacda1044df36ba46b7084fad949063569259dac0f3a6e8be008eaf53cf
 EBUILD kgamma-5.19.5.ebuild 677 BLAKE2B 2c3b13deef596a3f1b9b7b4a211e0903d7ac7aae05bfdf8f301f08955e95eb7b2d10827f309e10007f29846eae9abf803c2b3eac3eded9c3a12ae3eab4be9557 SHA512 6016baa4a43307b102666c57f12a8329541578bba5609c8baf7a3d7d1a564ebacefa0cef2bcdc6658cb981916c71b8b287a2e4d04148a3048f35683bcdb71f95
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.18.5.ebuild b/kde-plasma/kgamma/kgamma-5.18.5.ebuild
deleted file mode 100644
index 4e47514a459c..000000000000
--- a/kde-plasma/kgamma/kgamma-5.18.5.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
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 644bb373ca72..fd26581f43a9 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,3 @@
-DIST khotkeys-5.18.5.tar.xz 1854812 BLAKE2B cec0db1fa589ddca9515e19fcff6dba580c7567ec381c2961e5211fc830398f4f3a29f9e67f8e7821096d5052f710357ffcec3517b8893930629c356590757b3 SHA512 67e5d904127764e89d4a5c5d1c5fcc6ff0070d2a298f1032189dd3e9e17246482431ae651869d157625fc81caedee2a897947a6cb0bbe7508b5d76c61f5fca85
 DIST khotkeys-5.19.5.tar.xz 1855968 BLAKE2B 464797fce42a50313c187743a7213b870af805aea2f75e0e3564e81fec49c334f9574515b267a1acd57dae1f7e8b6e62849ce6e554db52bd452bcac05374660b SHA512 c7832ea7cb2890cbdf9d160b1658a393e105903e54b87cd10cf00f5bffa1b240e70685a201e2b4d580b4083e903770a2b26fd65f68f05302798320e7f20103be
-EBUILD khotkeys-5.18.5.ebuild 1346 BLAKE2B a48049323571b5962e3478b014d90e7e90d5df0d151a33c66839cbe98cb6a081e5b51fae3ae1d376c30af659210e3e159c35b429daf5a161766f3278ba82b8e2 SHA512 8e6e833dde654a7516f3c81e1c059835e99868ece482c7c992eb17275a57896b23636dbfb7ccb97025a29ea4311acb4a6ab0ab3336c3b8d38c805aa9f7c55667
 EBUILD khotkeys-5.19.5.ebuild 1430 BLAKE2B 91463c3d1a6378a0d89685cbaf7aa99b9b3eb3d32e22c10f3179bd5fc546118f187b5e75dd7af00d54571cc8cb4d5521c2e7b011b6525220d1d11bb68aae6e33 SHA512 5da2a34138e88fa67ab3a6d6557e373ef610681aaf4358900f790172c7fbd59e7589ef016a2f9bbfef21ac7b802c2a057b853630bb5c738d423caa45ea215950
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
deleted file mode 100644
index 8eb1ab7b9a1a..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.18.5.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
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 62fc6763a748..66c30d84cf36 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-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 2760 BLAKE2B 4bb04ceca0ade7cf3636d3400c421d8f1ec2afdc874c6756f771f9fbeb1812776a051a709d36e170b18080240e9ff420975beb1cc8b2a46f8cf5f95d6b879057 SHA512 2b5f78e9aed13a248ed1f82d6db44fe262ee0737de76929f1236b90b25c486c1553a6197f06ac478aba1a44620d5526bb5623bdade1a44ded68897007310e810
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
deleted file mode 100644
index 12f0d193f407..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.18.5.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
-
-BDEPEND=">=dev-util/cmake-3.14.3"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}: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-${KFMIN}:5
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ieee1394 RAW1394)
-		$(cmake_use_find_package pci PCIUTILS)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
-	fi
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "net-fs/nfs-utils" || \
-			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-
-		has_version "net-fs/samba" || \
-			elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index cab8bcfd937f..e1d10214d24b 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,3 @@
-DIST kmenuedit-5.18.5.tar.xz 813952 BLAKE2B d5c58ffa7cf3813955f9f87f119c11333215fcffb3b3dcdfc7e601839233d4611b3e0359c3313b4035d957d5890229d57109ab7b4929fe860b7b9c997d1f9d72 SHA512 647aed82a3190e2c27bac4e50eec681684dac08c6f3f7e8e0d2d02b8667e58b367a35a66b830083037570999655652a94f26ae063e253ceedd0db1df00ef834f
 DIST kmenuedit-5.19.5.tar.xz 896836 BLAKE2B 35e921a58856a3ed63f5ef912b06d3db1670e6e7e278d2120aaad69964a2fa60f536634d3b0dc3781a6b487df5aa948eec4ff943a7413f88dc1f9f40010a36d3 SHA512 332fa310a8a4d0c792e05db5427d16b3290998f0da5c7184d674d8104e8079bff51065575a98f61b83899df6cdd7f4be6daf0a5dc014f30bf1ced49c896e1241
-EBUILD kmenuedit-5.18.5.ebuild 1096 BLAKE2B 896a8ad423a24adedc31aec1a314f4c0bc14634689704f7a19e412e918564397aab2310d77249d9231a8ee93ba9fa738f48d648259ccd300f174e2791325091a SHA512 a1584982a98dba6ecbdd3a3b447e900fd658ca3731846ddf0f9da36f8abb4825cc6a5fbc2487ee33bfb0641b5cbfc88ee5b8533580615e6c3ce129406bd24e34
 EBUILD kmenuedit-5.19.5.ebuild 1096 BLAKE2B e373c8f1d299065e26dea7068505fb6bd3b15a126faa71cf677c3e2636bfdac8ade7348bbac549f13a6bccbbea9bd6625400d1eac37a669f471fadd928f8d642 SHA512 9c7cfe3711745595e76142084903932b1ada8d43c2bc14a8e93cda4afffe3e29251068a216ea89f46f4f65cb30730d5e9d0a2bc7fabfbcd3d256fe56f7e83c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
deleted file mode 100644
index 29af3fe52040..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.18.5.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 1eb274055911..1ee3355a0f5b 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,3 @@
-DIST kscreen-5.18.5.tar.xz 113256 BLAKE2B c4cde78164cf3b344fa2ff7905a37cbbf0f32bf3cb527a1e54493cd6f831e617ab85d80d15a489690c503e7f4fd35bb8350f4d1edd6149b3c3e21f52df0286de SHA512 310e9f1b2a46d4d81b78a2567e4b183847e22eeb08d1912748968c7cbd77bce7622aa51b1931144e732c1fac6bc3e7827c2db0d9d539e31e642b9d7c0827b36e
 DIST kscreen-5.19.5.tar.xz 113748 BLAKE2B 91dda071d5b70706f8a5735905c22333eb68c8bab32fe138e77e12764bbfc8d19481b285548caefafea91f666b2c98e5b058f15f481862903fb1cc109be96d3a SHA512 ce47e5b0e16f985811d0e71d4c97d2d25d2a4258732c5b7b8706cdfd176c4883c431ea946833abcbc87fdd81ed6d546da6e23640b4586b8013591ee5917c20f0
-EBUILD kscreen-5.18.5.ebuild 1225 BLAKE2B e45dc9247578442c7fe08721baaddc265f0de50e93183d71eb3511d149830f333f8173a13e70927ebf69850896847e397c07313dbe8b2e852ed020a17e5003dc SHA512 353a602e69e79f14527ab39257988de7c47bf85fa38052564677528accbd1c042e9a1680f59afa8e3f8afdfaa83e5b2aa897f028dae1e05ad611c0edf2f525d6
 EBUILD kscreen-5.19.5.ebuild 1225 BLAKE2B c27d88d1278cbe91d87de7791a0a124a0414663906b4ec7f91f4b6ef2619f3a253dc8ba1bbced1435606cfa634e0172fe032a70fa4c681956b2acdb0db68ad61 SHA512 7d07427c0f9d9681b70af8907e2485baa178c317265b76f66190d8842f2ceedfd373f856ec6c49e21c63b5e3674bae95b47c4c5abfd1e362a8dde4ff0023c685
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.18.5.ebuild b/kde-plasma/kscreen/kscreen-5.18.5.ebuild
deleted file mode 100644
index a425a4922273..000000000000
--- a/kde-plasma/kscreen/kscreen-5.18.5.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_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://invent.kde.org/plasma/kscreen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index d60ecaf112bd..921dc5ea80be 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
 DIST kscreenlocker-5.19.5.tar.xz 126420 BLAKE2B bef083f6ffaa7930446a234c35d628ffe81c187718be48ee3158b50d5eaf7b5989abda1d3f23a275cff5b949d101cc43e4819bc44b300674681b4233bcbf1f1b SHA512 aa112b28374e2ccfa257d161d47de96ba8a884dbf6cdc59be9dac3624e49472aad7ee0f413e63c9a001969b7e0413d2571e19f39e232e46cefe112fb7f880eda
-EBUILD kscreenlocker-5.18.5.ebuild 2299 BLAKE2B fda70dfe9d133265a8c1066ab3e90a91d3227340b1305f0f25cb926698d84259f2c4b4b9e810b2c2dbe379d957d2825d3ae78d4af5720c97c4f62936e6620f35 SHA512 03a704ef613e76a3e67b57c82c5ff7e99dd47354a5a88718b02fb7ed6b6bf1c774b31ec0e962f52e13f334a8b815652772b841402b2db54347e52bb7cc2e011e
 EBUILD kscreenlocker-5.19.5.ebuild 2238 BLAKE2B 7368868e7337088729cf8fcc9d4bd6f68f43b123bd62d646b0326d5bb719e9185b34621e373ecc6f9948f597a05dce51ad2bcdff7d0b9f12536866e8a593f563 SHA512 a50bb08b695832eb913f74cd43214a5c2ab777917fea82bb5838845f45075f30ec4f4922e5b9a575599a7a6a153f218c115eb39483f3b9f77a983aba60b13341
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
deleted file mode 100644
index 417421f3b1dd..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.18.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=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_loginctl=ON
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 46f305ea3aab..ed1663a95434 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.18.5.tar.xz 22148 BLAKE2B 31521b28a840bfbb14cdef2484dde8908a0ffbeda5d54663243bd93a070d77d72019b5436f0a4f838e7c8b9f60992b06636e181b6ced51d17a13ba4f7c3918b6 SHA512 8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf
 DIST ksshaskpass-5.19.5.tar.xz 23572 BLAKE2B c399be04e33a51968c7c3d962039f7aaff176c7a14bb5d8d2da36e999908aba1f3fa07337412390470cab1342a70bd37b2241b750e7bf852980c77810f311873 SHA512 7bd70985cb4a133e49d58b27c9266222913097154b78f60fc55b7ea3e684723b3ae55cdd0b44f58dd7c2cb54cc2f6046907b7881355b437689d9e470c2aafdd4
-EBUILD ksshaskpass-5.18.5.ebuild 2200 BLAKE2B d61278bda981d6764b8472b12884bf4c6685d788eddbeab0acb76d1d7da7460040abbb73a88c092947b14ef303d730e27ccffadccba946676ac36476474692b9 SHA512 411797a3eaaf443b8236fa3f87124224baf03b91ab806bb56b238660529b0ea14e772afc4cdda82b9d5e13fddb7ba4e116ad97fbb97e64f922d62617fe5d90a9
 EBUILD ksshaskpass-5.19.5-r1.ebuild 2256 BLAKE2B 5f2dc91ac1d7282916293f3688a02097d356b253d3c3a490e7b9aafb7e7229ddc9ccf41bcd49a5cf6b3d598e44bcfad3a844ecc2a0ea4e2fb926cd7456e8956c SHA512 1c9f0696fe8a7f109eea8508ab1888023eff5b3c5ef1c90706b78952c65a76a4d43ee5160f96de01d626591fd0546254ee3f0ad3d7bb7a4b95829341d18e76e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
deleted file mode 100644
index 7555b875998c..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
-src_install() {
-	ecm_src_install
-
-	insinto /etc/xdg/plasma-workspace/env/
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "In order to have ssh-agent start with Plasma 5,"
-	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and uncomment the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-	elog "to properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
-}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 527042270fb0..c4c85a81e85e 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,3 @@
-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 1412 BLAKE2B ed15bd5f6f51235bcc2a2d3d105feaf3c531ccbb511f97387162364deb2cc2108a133c9293128ac6a6458d1a3ff1ceffaddb585c73cd07e3877b9c1376cc81d3 SHA512 2cdd16db81febd6ba22b342bef89179c702b17adcafc35223cccc1db404f062847ecfbabd174dfdb95f27be5e5dbf067299c0e8e4e06fa0d5fd72478c25bffdd
 MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
diff --git a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
deleted file mode 100644
index 66cea4f4b33c..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.18.5.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="lm-sensors pcap"
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	pcap? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pcap libpcap)
-		$(cmake_use_find_package lm-sensors Sensors)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 0a235876ff97..755f68fa126a 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,3 @@
-DIST kwallet-pam-5.18.5.tar.xz 19800 BLAKE2B 695fb89d1a54bfc44b06bee4881ae357a42c82b6506a6ed7966c30bb28137ee379ac1beb9391982c15ac63e95c0a1bbba2e0950ee89e050a2ceaf296b98958d4 SHA512 050b3ca66f3b078bb7bccb4a3b7750787bf22d18af60972969f83141b99eac4441fa08d48022278cfe28c8f96f7a1d9ca346f155d8ddbdb60b17bc9c142521cc
 DIST kwallet-pam-5.19.5.tar.xz 19932 BLAKE2B 28d8419f500c163ba15a79cc994af70b723dff24fa8c32e899bd856766290f20d09e3ee98e164d55596d1b97137e92096f9c2c3cf2386bb700aa0b7bcfed1c39 SHA512 3fe30f979f6ee838b073b7afdb406068f90529fbbac3513d65145f6a46ab8ba0b61ba11a3e9192c60b1ddd50e9af448c1298725fc01dca483b40a8030053095d
-EBUILD kwallet-pam-5.18.5.ebuild 731 BLAKE2B e538e72a2a41b9af859f889eb338b22b2655dcba2243b4af5db9a91f0558856ab4a8166116acf0b119593fa3ddf307cb07bb55477cb0c73bd5b8bfa5d766ae19 SHA512 e142c7fa4b65c1540180371e4644bba6a6d49e214bc02336e1edf44c9ae7a0a1571ed3b9f4f69e788205893c60c306bf3f096750904842a33087fa9e61d0b4fe
 EBUILD kwallet-pam-5.19.5.ebuild 731 BLAKE2B d950afa45dbb80cbf33a5fba88d382962b9a0c6c53bd65ff445ffbcd5b062578e7909768d8102a6faae954b38853d2dbcf16e0379e80f1408399cc0f3ce2697c SHA512 87942ac14c168a76d23669b2b2ece8f828684a07125fc9a29d8b10367586d2e5039abf192cc30f3cb311e4cdbb7e3a0404b0c2d2986b3680b82d922b87fb0e1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
deleted file mode 100644
index 78a943d40ffe..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.18.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=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="PAM module to not enter KWallet password again after login"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	dev-libs/libgcrypt:0=
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 8c0248a0c7f9..7f037bb150ed 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-integration-5.18.5.tar.xz 20496 BLAKE2B 74d2396b475a462710fe28f1ee710935a927579e852bd7105785159309ba745acddf527b4ee335ef0e233fd4a43404778af88cbc50e0413d393896d9eed2d299 SHA512 65d87f1e9e9c957e9e9e73dc04da65e23d0c12cb93eb52c86912f4b15a360d6848cc26edbb97be3444c9a5d7a16ade1aebf2d241d4d1a1530aaa5523d1e9f9b1
 DIST kwayland-integration-5.19.5.tar.xz 21276 BLAKE2B 0d2a243b665efa9a1be2464dc04a4d01e71be65cff143fddd60e49c4d4d1377ae4982087711b1c5706a1c95434aa8e751e2ea35c2e50e3a0de8ff3a36abbab5b SHA512 db5f05ac9d942650b0933d723ba7138d35d262757b229f5f79b07a621543fdd87679da28d9fa059dc48064db39b69ce34f5296decdfc126442ac3f9f4bbbb2b6
-EBUILD kwayland-integration-5.18.5.ebuild 699 BLAKE2B fc20b6e47204ce57593ae3ec743ed702ea0bbdc0e29ec265d3b6102f65f539e5834ad2ea36fd1ebba581c7e6a9ed93ff29c00f59c894ec899f52767263a10763 SHA512 8974af9f97437d0249fde1b2ad429032e787c13a76f68b18f29e395d299f2742c86ddd600f9a43d33b843222f32a28b56e555cb3ab4da6a4fa3ac85212304fce
 EBUILD kwayland-integration-5.19.5.ebuild 699 BLAKE2B a30fefc4ac1419b0fc461154fe5e08aa1d7cfb2a6b0b814732475ea86c570fefec39fb078a9841281d81eff051753174616adf1c81884d7a127c7fe295fc30e5 SHA512 d5ee26c40bfeb3c715999237928592cca13f5366fb0cba850949a57d3e8db620037878f8e71b3de837ac961f60c4473d5d7980ca93a6a61c9943b7af4c24357f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
deleted file mode 100644
index a3aeee586daa..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.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
-
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index e95e2925b1ac..6dfa6024d556 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,12 +1,5 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
-AUX kwin-5.18.5-dont-exec-QDialog.patch 5916 BLAKE2B a8506ca70519c5f4a0d57ee26b76897f292d2d62cfe72b04084a8f098c543db7c431cd0d7c86a5689a064b86bda3223ea200aa803605aa6708a3bc037498ecd3 SHA512 ea9b4715ae677f22f46d0ef8661b9f8c75b27eadab928307dad0093e9f60592f9866dcb38d84794e621b3304690d5226a139d172411dd75155088701090eeba9
-AUX kwin-5.18.5-mesa-21.patch 8683 BLAKE2B 87f8ffe26103586cc9514bac2e2723b26a53296e4583ed6c38ff79cbc08ee9b51764db6ac907885498cc0f3ecc501ca96e22131955302a7e284bde8ea780df67 SHA512 5ecdf8124126cd8853b8ff13e88fabf74b2a890ee2540ba22365bb41fcc9201392b72b13b2aaf4c3b67cb54403d8a5fb0cd894ea33a7bea90a9226e40145eba0
-AUX kwin-5.18.5-qt-5.15.patch 1718 BLAKE2B 8c1f51bfe1c91c588fb44bed8840ef216c0473fc41e7c5acaf0ad6e46280f1f5c843760351bf262638732b22aefdfa78c220acd65de389a79a948f39818755d1 SHA512 1995b8ec0de12576972c6a28db32dc108bf0d2f7a5a49eff007326fcea4fb070f4cbcca0783c2bb80389f92b64d3ad295107697a9363cf19f32f70e7202c507d
-AUX kwin-5.18.5-wayland-lockscreen-greeter.patch 2254 BLAKE2B ce05dd3389e5de51ffa960215c963765170b72a439e1b9440f3614bc64fdb7949c040f686ff935b357f6a96d88aced49f5aa23a0e36b6065555bea59b3e58547 SHA512 5b72401deb460d3d09f444f1a120d5bf75c0c3ed7e75c609b57a5a46a84159ba80be8e9277b50a9c1796e46ce34712fc5bce8bb7021b9e4199d7b5a798e42efa
 AUX kwin-5.19.5-safe-removal-of-X11-event-filters.patch 5327 BLAKE2B fd2982a92f2a2bdbdb2e718fcb4e3293245470877aa3021eb0b8da66a5018e79a68bf34034689919a156e8c8de1f1686797c3e355cb96330dfcd559ab27d2e43 SHA512 ffeb77e0f718e06a605ffd82708228ab63161d449ec21067eafc9d34b119bfcb80d9bb608c1e7cacd1bda0786618c475a2cf7977b94e7475482caa281000debe
-DIST kwin-5.18.5.tar.xz 6274772 BLAKE2B 1614515df60667fb6e8f45302db13dc43ca896c7266c2e2846fd1a1da75b4054cbe14a27b8b3f7d71ae6398e2cf4d9e8e2a68af1c1fa6809a271c5b29574a023 SHA512 b703891824ec31e8ae29df27a11499579ab95789a838e893d5904e40aeba27b0ddc04836038d5b4c062d75ceed277d07e67eeb1b4e957ccf414f03786037d562
 DIST kwin-5.19.5.tar.xz 6260188 BLAKE2B bcf3c8afc00af0df8cddeb49396bd23df6178e379ac4c3ba3c547a2c602d309202a72136b69b83f729434fc5691ba24699cf3f44d47b2c033623bca5d551bdb1 SHA512 97ad0096066d99b4bba3089416a6d3744b6f83d82a004caa8762b420cad34cac4221b3535678d4c6f1bcb43c4d97db56be5ac68c4ac501dc168f4472a6c0dad5
-EBUILD kwin-5.18.5-r1.ebuild 3171 BLAKE2B abf91e2d96656acb472fde3ce1ae1247d72a4720427e2faae702a41a669d0cb2dd7db9b1b12ec0b5cf34edd27b3d494c700d9faa566435f0fb9b6ee75b08e133 SHA512 ebef4cfc82c7a4318739b9eff76c5ce32f526b451a67b5e2b0f44448dc4d3dfe837d069dfcafc3ad6cc31251071a41ef4e3e3ac89d330eea04d748fb9bd7ad8c
-EBUILD kwin-5.18.5-r3.ebuild 3280 BLAKE2B 8da770a19c7b40d1899c53a25e679d24037432fe7fb193bf99dc5eab2290f198462454f154120df9cbc2f89b1e60deff6bc106b1c006e4aa8ebe1e3f344847a6 SHA512 ce9379690dd33560d7dbdc2ee7a160781330fb1724b4f9a68eacbf1d32cdbd972e7e28cb4d1f608e96a75437a2568056ed213cf30e81a11bba8199dd248983f1
 EBUILD kwin-5.19.5-r1.ebuild 3116 BLAKE2B 705a3a61df8bf2b0c1e334b7aba8690ad5478f64f2956b1e3c8a863b8ac0773b95d69b75c94d23f91af0e6562f071d2a3a642257f07f041c9bf59fb58d3b8072 SHA512 ef47a3b4851d18f6dcc4615f290b98c87ce16a9655f08efc42f1f993878229f04ad7e591741baac5fb17efeceff7dae33a918115f144319b1818819db96ea67b
 MISC metadata.xml 347 BLAKE2B 9288920f1da9d97be4ba082678abbd6c404efdd6d7c6b997015e38e7d1f36f2b6201bda92799af0ac02287e86d2525c0a7e783e7efd305ed67ff8b96715ffe59 SHA512 e9e82ec176a53e1bea1eb323c1d1daffdcf900f1787ae76fd3de0434ffb8ac77429131ebbfc11080a1771ed03195e7d98c98be2ebf6a444de95d6cd0eb539824
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch b/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch
deleted file mode 100644
index df65c32fb13a..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 5ea54eda5d1f91428933d338ea8b950aea86d43a Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 6 May 2020 15:15:03 +0200
-Subject: [kcmkwin/kwindecoration] Don't exec() QDialog
-
-Using nested event loops with QML is always troublesome.
-
-BUG: 421053
-FIXED-IN: 5.18.6
-
-Differential Revision: https://phabricator.kde.org/D29473
----
- .../declarative-plugin/previewbridge.cpp           | 32 +++++++++++++++-------
- .../declarative-plugin/previewbridge.h             |  4 ++-
- .../kwindecoration/package/contents/ui/Themes.qml  |  3 +-
- 3 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
-index bad4cc1..83a9bd9 100644
---- a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
-+++ b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
-@@ -36,7 +36,11 @@
- #include <QDialog>
- #include <QDialogButtonBox>
- #include <QPushButton>
-+#include <QQuickItem>
-+#include <QQuickRenderControl>
-+#include <QQuickWindow>
- #include <QVBoxLayout>
-+#include <QWindow>
- 
- namespace KDecoration2
- {
-@@ -173,15 +177,16 @@ DecorationButton *PreviewBridge::createButton(KDecoration2::Decoration *decorati
-     return m_factory->create<KDecoration2::DecorationButton>(QStringLiteral("button"), parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)}));
- }
- 
--void PreviewBridge::configure()
-+void PreviewBridge::configure(QQuickItem *ctx)
- {
-     if (!m_valid) {
-         return;
-     }
-     //setup the UI
--    QDialog dialog;
-+    QDialog *dialog = new QDialog();
-+    dialog->setAttribute(Qt::WA_DeleteOnClose);
-     if (m_lastCreatedClient) {
--        dialog.setWindowTitle(m_lastCreatedClient->caption());
-+        dialog->setWindowTitle(m_lastCreatedClient->caption());
-     }
- 
-     // create the KCModule through the plugintrader
-@@ -189,7 +194,7 @@ void PreviewBridge::configure()
-     if (!m_theme.isNull()) {
-         args.insert(QStringLiteral("theme"), m_theme);
-     }
--    KCModule *kcm = m_factory->create<KCModule>(QStringLiteral("kcmodule"), &dialog, QVariantList({args}));
-+    KCModule *kcm = m_factory->create<KCModule>(QStringLiteral("kcmodule"), dialog, QVariantList({args}));
-     if (!kcm) {
-         return;
-     }
-@@ -205,28 +210,35 @@ void PreviewBridge::configure()
-                                                           QStringLiteral("reloadConfig"));
-         QDBusConnection::sessionBus().send(message);
-     };
--    connect(&dialog, &QDialog::accepted, this, save);
-+    connect(dialog, &QDialog::accepted, this, save);
- 
-     QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok |
-                                                      QDialogButtonBox::Cancel |
-                                                      QDialogButtonBox::RestoreDefaults |
-                                                      QDialogButtonBox::Reset,
--                                                     &dialog);
-+                                                     dialog);
- 
-     QPushButton *reset = buttons->button(QDialogButtonBox::Reset);
-     reset->setEnabled(false);
-     // Here we connect our buttons with the dialog
--    connect(buttons, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
--    connect(buttons, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
-+    connect(buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
-+    connect(buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
-     connect(reset, &QPushButton::clicked, kcm, &KCModule::load);
-     auto changedSignal = static_cast<void(KCModule::*)(bool)>(&KCModule::changed);
-     connect(kcm, changedSignal, reset, &QPushButton::setEnabled);
-     connect(buttons->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, kcm, &KCModule::defaults);
- 
--    QVBoxLayout *layout = new QVBoxLayout(&dialog);
-+    QVBoxLayout *layout = new QVBoxLayout(dialog);
-     layout->addWidget(kcm);
-     layout->addWidget(buttons);
--    dialog.exec();
-+
-+    if (ctx->window()) {
-+        dialog->winId(); // so it creates windowHandle
-+        dialog->windowHandle()->setTransientParent(QQuickRenderControl::renderWindowFor(ctx->window()));
-+        dialog->setModal(true);
-+    }
-+
-+    dialog->show();
- }
- 
- BridgeItem::BridgeItem(QObject *parent)
-diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
-index 7e1d8f3..85fccbe 100644
---- a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
-+++ b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
-@@ -26,6 +26,8 @@
- #include <QList>
- #include <QPointer>
- 
-+class QQuickItem;
-+
- class KPluginFactory;
- 
- namespace KDecoration2
-@@ -70,7 +72,7 @@ public:
-     KDecoration2::DecorationButton *createButton(KDecoration2::Decoration *decoration, KDecoration2::DecorationButtonType type, QObject *parent = nullptr);
- 
- public Q_SLOTS:
--    void configure();
-+    void configure(QQuickItem *ctx);
- 
- Q_SIGNALS:
-     void pluginChanged();
-diff --git a/kcmkwin/kwindecoration/package/contents/ui/Themes.qml b/kcmkwin/kwindecoration/package/contents/ui/Themes.qml
-index 28e5899..1eeb4cd 100644
---- a/kcmkwin/kwindecoration/package/contents/ui/Themes.qml
-+++ b/kcmkwin/kwindecoration/package/contents/ui/Themes.qml
-@@ -40,6 +40,7 @@ KCM.GridView {
-     view.implicitCellWidth: Kirigami.Units.gridUnit * 18
- 
-     view.delegate: KCM.GridDelegate {
-+        id: delegate
-         text: model.display
- 
-         thumbnailAvailable: true
-@@ -101,7 +102,7 @@ KCM.GridView {
-                 onTriggered: {
-                     kcm.theme = index
-                     view.currentIndex = index
--                    bridgeItem.bridge.configure()
-+                    bridgeItem.bridge.configure(delegate)
-                 }
-             }
-         ]
--- 
-cgit v1.1
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-mesa-21.patch b/kde-plasma/kwin/files/kwin-5.18.5-mesa-21.patch
deleted file mode 100644
index dc87b4045483..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-mesa-21.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 2c76cc4784382b3df9b5413860d0793ea26cea31 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 29 May 2020 16:01:27 +0300
-Subject: [wayland] Fix misuse of EGL/eglmesaext.h
-
-The recommended way to get all EGL extension defines is to include
-EGL/eglext.h. EGL/eglmesaext.h is a private header that compositors
-should not use.
-
-BUG: 422131
----
- .../scenes/opengl/abstract_egl_backend.cpp         | 11 +---
- platformsupport/scenes/opengl/egl_dmabuf.cpp       | 41 +-----------
- platformsupport/scenes/opengl/kwineglext.h         | 76 ++++++++++++++++++++++
- 3 files changed, 78 insertions(+), 50 deletions(-)
- create mode 100644 platformsupport/scenes/opengl/kwineglext.h
-
-diff --git a/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/platformsupport/scenes/opengl/abstract_egl_backend.cpp
-index 532ec27..e160ef3 100644
---- a/platformsupport/scenes/opengl/abstract_egl_backend.cpp
-+++ b/platformsupport/scenes/opengl/abstract_egl_backend.cpp
-@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
- #include "abstract_egl_backend.h"
- #include "egl_dmabuf.h"
-+#include "kwineglext.h"
- #include "texture.h"
- #include "composite.h"
- #include "egl_context_attribute_builder.h"
-@@ -49,16 +50,6 @@ eglBindWaylandDisplayWL_func eglBindWaylandDisplayWL = nullptr;
- eglUnbindWaylandDisplayWL_func eglUnbindWaylandDisplayWL = nullptr;
- eglQueryWaylandBufferWL_func eglQueryWaylandBufferWL = nullptr;
- 
--#ifndef EGL_WAYLAND_BUFFER_WL
--#define EGL_WAYLAND_BUFFER_WL                   0x31D5
--#endif
--#ifndef EGL_WAYLAND_PLANE_WL
--#define EGL_WAYLAND_PLANE_WL                    0x31D6
--#endif
--#ifndef EGL_WAYLAND_Y_INVERTED_WL
--#define EGL_WAYLAND_Y_INVERTED_WL               0x31DB
--#endif
--
- AbstractEglBackend::AbstractEglBackend()
-     : QObject(nullptr)
-     , OpenGLBackend()
-diff --git a/platformsupport/scenes/opengl/egl_dmabuf.cpp b/platformsupport/scenes/opengl/egl_dmabuf.cpp
-index 3f75bc7..753f15e 100644
---- a/platformsupport/scenes/opengl/egl_dmabuf.cpp
-+++ b/platformsupport/scenes/opengl/egl_dmabuf.cpp
-@@ -21,10 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include "egl_dmabuf.h"
- 
- #include "drm_fourcc.h"
-+#include "kwineglext.h"
- #include "../../../wayland_server.h"
- 
- #include <unistd.h>
--#include <EGL/eglmesaext.h>
- 
- namespace KWin
- {
-@@ -34,45 +34,6 @@ typedef EGLBoolean (*eglQueryDmaBufModifiersEXT_func) (EGLDisplay dpy, EGLint fo
- eglQueryDmaBufFormatsEXT_func eglQueryDmaBufFormatsEXT = nullptr;
- eglQueryDmaBufModifiersEXT_func eglQueryDmaBufModifiersEXT = nullptr;
- 
--#ifndef EGL_EXT_image_dma_buf_import
--#define EGL_LINUX_DMA_BUF_EXT                     0x3270
--#define EGL_LINUX_DRM_FOURCC_EXT                  0x3271
--#define EGL_DMA_BUF_PLANE0_FD_EXT                 0x3272
--#define EGL_DMA_BUF_PLANE0_OFFSET_EXT             0x3273
--#define EGL_DMA_BUF_PLANE0_PITCH_EXT              0x3274
--#define EGL_DMA_BUF_PLANE1_FD_EXT                 0x3275
--#define EGL_DMA_BUF_PLANE1_OFFSET_EXT             0x3276
--#define EGL_DMA_BUF_PLANE1_PITCH_EXT              0x3277
--#define EGL_DMA_BUF_PLANE2_FD_EXT                 0x3278
--#define EGL_DMA_BUF_PLANE2_OFFSET_EXT             0x3279
--#define EGL_DMA_BUF_PLANE2_PITCH_EXT              0x327A
--#define EGL_YUV_COLOR_SPACE_HINT_EXT              0x327B
--#define EGL_SAMPLE_RANGE_HINT_EXT                 0x327C
--#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
--#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT   0x327E
--#define EGL_ITU_REC601_EXT                        0x327F
--#define EGL_ITU_REC709_EXT                        0x3280
--#define EGL_ITU_REC2020_EXT                       0x3281
--#define EGL_YUV_FULL_RANGE_EXT                    0x3282
--#define EGL_YUV_NARROW_RANGE_EXT                  0x3283
--#define EGL_YUV_CHROMA_SITING_0_EXT               0x3284
--#define EGL_YUV_CHROMA_SITING_0_5_EXT             0x3285
--#endif // EGL_EXT_image_dma_buf_import
--
--#ifndef EGL_EXT_image_dma_buf_import_modifiers
--#define EGL_DMA_BUF_PLANE3_FD_EXT                 0x3440
--#define EGL_DMA_BUF_PLANE3_OFFSET_EXT             0x3441
--#define EGL_DMA_BUF_PLANE3_PITCH_EXT              0x3442
--#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT        0x3443
--#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT        0x3444
--#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT        0x3445
--#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT        0x3446
--#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT        0x3447
--#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT        0x3448
--#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT        0x3449
--#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT        0x344A
--#endif // EGL_EXT_image_dma_buf_import_modifiers
--
- struct YuvPlane
- {
-     int widthDivisor;
-diff --git a/platformsupport/scenes/opengl/kwineglext.h b/platformsupport/scenes/opengl/kwineglext.h
-new file mode 100644
-index 0000000..834701b
---- /dev/null
-+++ b/platformsupport/scenes/opengl/kwineglext.h
-@@ -0,0 +1,76 @@
-+/********************************************************************
-+ KWin - the KDE window manager
-+ This file is part of the KDE project.
-+
-+Copyright (C) 2018 Fredrik Höglund <fredrik@kde.org>
-+Copyright (C) 2020 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-+
-+This program 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; either version 2 of the License, or
-+(at your option) any later version.
-+
-+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, see <http://www.gnu.org/licenses/>.
-+*********************************************************************/
-+
-+#ifndef KWINEGLEXT_H
-+#define KWINEGLEXT_H
-+
-+#include <EGL/eglext.h>
-+
-+#ifndef EGL_WL_bind_wayland_display
-+#define EGL_WAYLAND_BUFFER_WL                     0x31D5
-+#define EGL_WAYLAND_PLANE_WL                      0x31D6
-+#define EGL_TEXTURE_Y_U_V_WL                      0x31D7
-+#define EGL_TEXTURE_Y_UV_WL                       0x31D8
-+#define EGL_TEXTURE_Y_XUXV_WL                     0x31D9
-+#define EGL_TEXTURE_EXTERNAL_WL                   0x31DA
-+#define EGL_WAYLAND_Y_INVERTED_WL                 0x31DB
-+#endif // EGL_WL_bind_wayland_display
-+
-+#ifndef EGL_EXT_image_dma_buf_import
-+#define EGL_LINUX_DMA_BUF_EXT                     0x3270
-+#define EGL_LINUX_DRM_FOURCC_EXT                  0x3271
-+#define EGL_DMA_BUF_PLANE0_FD_EXT                 0x3272
-+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT             0x3273
-+#define EGL_DMA_BUF_PLANE0_PITCH_EXT              0x3274
-+#define EGL_DMA_BUF_PLANE1_FD_EXT                 0x3275
-+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT             0x3276
-+#define EGL_DMA_BUF_PLANE1_PITCH_EXT              0x3277
-+#define EGL_DMA_BUF_PLANE2_FD_EXT                 0x3278
-+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT             0x3279
-+#define EGL_DMA_BUF_PLANE2_PITCH_EXT              0x327A
-+#define EGL_YUV_COLOR_SPACE_HINT_EXT              0x327B
-+#define EGL_SAMPLE_RANGE_HINT_EXT                 0x327C
-+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
-+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT   0x327E
-+#define EGL_ITU_REC601_EXT                        0x327F
-+#define EGL_ITU_REC709_EXT                        0x3280
-+#define EGL_ITU_REC2020_EXT                       0x3281
-+#define EGL_YUV_FULL_RANGE_EXT                    0x3282
-+#define EGL_YUV_NARROW_RANGE_EXT                  0x3283
-+#define EGL_YUV_CHROMA_SITING_0_EXT               0x3284
-+#define EGL_YUV_CHROMA_SITING_0_5_EXT             0x3285
-+#endif // EGL_EXT_image_dma_buf_import
-+
-+#ifndef EGL_EXT_image_dma_buf_import_modifiers
-+#define EGL_DMA_BUF_PLANE3_FD_EXT                 0x3440
-+#define EGL_DMA_BUF_PLANE3_OFFSET_EXT             0x3441
-+#define EGL_DMA_BUF_PLANE3_PITCH_EXT              0x3442
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT        0x3443
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT        0x3444
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT        0x3445
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT        0x3446
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT        0x3447
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT        0x3448
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT        0x3449
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT        0x344A
-+#endif // EGL_EXT_image_dma_buf_import_modifiers
-+
-+#endif // KWINEGLEXT_H
--- 
-cgit v1.1
-
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch b/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch
deleted file mode 100644
index eb8f6617026c..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sun, 7 Jun 2020 18:05:21 +0200
-Subject: [PATCH] Fix the Plastik decoration with Qt 5.15
-
-The trick in qmldir no longer works with Qt 5.15, so use a more reliable
-approach. This way works with Qt 5.15 and also on previous versions of Qt.
----
- .../kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp | 3 ++-
- plugins/kdecorations/aurorae/themes/plastik/code/qmldir        | 3 ---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-index 25d11251f..4304dcdc1 100644
---- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-+++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- void PlastikPlugin::registerTypes(const char *uri)
- {
--    Q_UNUSED(uri)
-+    // Need to register something to tell Qt that it loaded (QTBUG-84571)
-+    qmlRegisterModule(uri, 1, 0);
- }
- 
- void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-index 49a4b402d..aa7bf16b3 100644
---- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-+++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-@@ -1,5 +1,2 @@
- module org.kde.kwin.decorations.plastik
- plugin plastikplugin
--
--# we need to have at least one element of Qt is not able to find the plugin *shrug*
--Foo 1.0 Foo.qml
--- 
-2.27.0
-
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch b/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch
deleted file mode 100644
index ac4b9d24c8e1..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 6f8b8efb338117ee197092e46b25b489b612257d Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 8 May 2020 11:26:27 +0300
-Subject: [wayland] Place lockscreen greeter above other windows
-
-Summary: BUG: 420802
-
-Reviewers: #kwin, davidedmundson
-
-Reviewed By: #kwin, davidedmundson
-
-Subscribers: apol, kwin
-
-Tags: #kwin
-
-Differential Revision: https://phabricator.kde.org/D29523
----
- abstract_client.cpp                  |  2 ++
- autotests/integration/lockscreen.cpp | 19 +++++++++++++++++++
- 2 files changed, 21 insertions(+)
-
-diff --git a/abstract_client.cpp b/abstract_client.cpp
-index ca6c422..48918e7 100644
---- a/abstract_client.cpp
-+++ b/abstract_client.cpp
-@@ -275,6 +275,8 @@ Layer AbstractClient::belongsToLayer() const
-     // Since the desktop is also activated, nothing should be in the ActiveLayer, though
-     if (isInternal())
-         return UnmanagedLayer;
-+    if (isLockScreen())
-+        return UnmanagedLayer;
-     if (isDesktop())
-         return workspace()->showingDesktop() ? AboveLayer : DesktopLayer;
-     if (isSplash())          // no damn annoying splashscreens
-diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp
-index e258540..82cac09 100644
---- a/autotests/integration/lockscreen.cpp
-+++ b/autotests/integration/lockscreen.cpp
-@@ -62,6 +62,7 @@ private Q_SLOTS:
-     void initTestCase();
-     void init();
-     void cleanup();
-+    void testStackingOrder();
-     void testPointer();
-     void testPointerButton();
-     void testPointerAxis();
-@@ -223,6 +224,24 @@ void LockScreenTest::cleanup()
-     Test::destroyWaylandConnection();
- }
- 
-+void LockScreenTest::testStackingOrder()
-+{
-+    // This test verifies that the lockscreen greeter is placed above other windows.
-+
-+    QSignalSpy clientAddedSpy(waylandServer(), &WaylandServer::shellClientAdded);
-+    QVERIFY(clientAddedSpy.isValid());
-+
-+    LOCK
-+    QVERIFY(clientAddedSpy.wait());
-+
-+    AbstractClient *client = clientAddedSpy.first().first().value<AbstractClient *>();
-+    QVERIFY(client);
-+    QVERIFY(client->isLockScreen());
-+    QCOMPARE(client->layer(), UnmanagedLayer);
-+
-+    UNLOCK
-+}
-+
- void LockScreenTest::testPointer()
- {
-     using namespace KWayland::Client;
--- 
-cgit v1.1
diff --git a/kde-plasma/kwin/kwin-5.18.5-r1.ebuild b/kde-plasma/kwin/kwin-5.18.5-r1.ebuild
deleted file mode 100644
index 33ac47b0ae2a..000000000000
--- a/kde-plasma/kwin/kwin-5.18.5-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="caps gles2-only multimedia"
-
-COMMON_DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-libs/libinput-1.9
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	# in Plasma/5.18
-	"${FILESDIR}/${P}-dont-exec-QDialog.patch" # KDE-bug 421053
-	"${FILESDIR}/${P}-wayland-lockscreen-greeter.patch" # KDE-bug 420802
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.18.5-r3.ebuild b/kde-plasma/kwin/kwin-5.18.5-r3.ebuild
deleted file mode 100644
index ed5d1d1f83c3..000000000000
--- a/kde-plasma/kwin/kwin-5.18.5-r3.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="caps gles2-only multimedia"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.9
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	# in Plasma/5.18
-	"${FILESDIR}/${P}-dont-exec-QDialog.patch" # KDE-bug 421053
-	"${FILESDIR}/${P}-wayland-lockscreen-greeter.patch" # KDE-bug 420802
-	"${FILESDIR}/${P}-mesa-21.patch" # KDE-bug 422131
-	"${FILESDIR}/${P}-qt-5.15.patch" # Plastik deco issue
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 431ed469cc85..23121bd2bcad 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,3 @@
-DIST kwrited-5.18.5.tar.xz 20236 BLAKE2B 3dad52dd60ad24dda97165332bd2a6182ac3fd9aef57b2f3e90ece0cc899617d99e84d696d3647c84197d088f383eaa9c96e88367abc310e1bdff81e0c57f842 SHA512 2c28ba26228394989524b46e68cd2783eff5c412ccfdaf12947976bde6a2ba732e696c3d8af666f87cf67062c75485fb0ed01f58ff3d727fedf8d440ddfd4f84
 DIST kwrited-5.19.5.tar.xz 20208 BLAKE2B 76a5ddb2c9e4e3e47f1deb65c077634715dd1853a879573ce6be259d5cfcfb9ce7bd68b5967fa006e84f34dafdaf82ee18c9154ab28bcf49d152edc6816e7b10 SHA512 c5beb32da7ea08d944d603db9f5af6356b7742be9408f8d5e540d2e782c54d0642f93a784420a931ce807f980fc6aed0135d54e8cb03f88831ac7c0404dc7136
-EBUILD kwrited-5.18.5.ebuild 623 BLAKE2B 00ae1b0954de469354d8d4b73a5e29b73faa93811021d8269b3d599274ce632c6fd52d2b82bd7dd2f810b040e9d57fe2c6536d801a190072b78f7aca811d5830 SHA512 98da6e9ef2033c63328eac9b52033cbab5018f164b80c3921b9701a0e41b738e8aec2092be6a467f576431c9ac8f3ed102c1e3404d2ab604da1d9ff5d3022a99
 EBUILD kwrited-5.19.5.ebuild 623 BLAKE2B bcc2a84195ee3c1bc321b9a4ddb0815812fcde9713ddbd5ca74579316232039099099b7e25c7a052ea7b5b7d3f50c236eb8c5ef63cd4081ec0b3449ab7dfb364 SHA512 40f2fcfaf5a4dac3327142348c4373636d1f0f920a1b975a4e924f070284d73ba52539d7e74d468b1d2aeff197a688aaba9f84685d9db08aeb0a483e823b2449
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.18.5.ebuild b/kde-plasma/kwrited/kwrited-5.18.5.ebuild
deleted file mode 100644
index 659686c1f1f5..000000000000
--- a/kde-plasma/kwrited/kwrited-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index b7a82630d822..32a23ee135ef 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,3 @@
-DIST libkscreen-5.18.5.tar.xz 85532 BLAKE2B eb9c85c88888dc82486cce8cd55c06cc9c180ac84a9ebd005cbbeb26233bccd3a48daadbff42cff33c92bf871c89bd84c5f291210bbf7768c7ad7b45641d7a0a SHA512 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
 DIST libkscreen-5.19.5.tar.xz 85468 BLAKE2B be5d055092395e53e252e879d4bfb5177e45e1b5df96cd53bff81a0cf88b10f84dd1a0b7445bc1073357c98040afc62334aa433e20d5afe3f21f73b3e3ea5cae SHA512 5bc462ee9e322bbdbd375003b962b868a6c6dfff6344e61d39e04644fbb7f409a337116df1c274a664f633b176dfd69af992d3e0e290fa85dbe529cbe1a1e87f
-EBUILD libkscreen-5.18.5.ebuild 606 BLAKE2B d4d29ae7fe2ace3772cfc632ca430cd06cd14cbe1a5407be22ef0992c4daa8b589714166863ce59506bf5503e05ed902e539e3e579c31aabfb78e2322974e215 SHA512 22931f06aa1ae659ef952558df3b2bce5a33fecbf2992fc19023ed379627c899c1e29768c2eec9656ac743cb3232c0b644691e50fc860b05c737948645fbdf79
 EBUILD libkscreen-5.19.5.ebuild 647 BLAKE2B f3aceb4ea5508d25b411deb683820f455f278efabb70b8d800a1cb10f457aa51b979f99cf55db6527be3c8356788eef78e5c35df9994dcff3cf7bacb8d9e0e49 SHA512 596a327c444c5cbf52b0860ed63d1b54a00133d52006b83bd79feccba4f3690a0a92b12be9430b9415d6ac77ea76adc249dfec822b557e8baca152cc3a8c8776
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild
deleted file mode 100644
index 49b247ec7ab8..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.18.5.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
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 4113f3ee8ad8..de6a89d239ed 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,5 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 AUX libksysguard-5.18.90-unused-dep.patch 3054 BLAKE2B 9d48130d6754fd02a570ea91a17cc35fdb20a14b89e8408d041c983a4893dcf1fe3d35751ccacba845bcb4a8a5a230e0a78b722ba0a7cf720d2123abfdb6b78e SHA512 caf4a646361f3011a5926ae0ba7b10ab6b31bb01d8a5bead676735021096117492f531e8cd9d09dbfbfcfdc83b1d4d94d327c1766928fa6a7684989b967ba354
-DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3
 DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
-EBUILD libksysguard-5.18.5.ebuild 1532 BLAKE2B bd23ce39743bd0d5f085771371fbe3bf352f0ca0b25191fdce0f3a4b3e638cfc9f3a757d3d5206ba528637bcda4a71f938fa0e5127d847328acfc8636d2d7ad8 SHA512 0987e280ae69e5ba924eb0de04d7163e652122d7e5d59dfa14ce0d5bbb1f09e761126a6f8f2b7c4eda99bae2640c0919ae7f3be9930cdae038758f0883f65772
 EBUILD libksysguard-5.19.5.ebuild 1710 BLAKE2B a0671e4ba5b7e5c6db8b933a7a48b3b5330fd2e6810b43135e90712577f2f265bef1be40bccce65f856e0fe40d9174cb26695a7cab10e3f25a9e09e176abba09 SHA512 9a4c63e759fae3557a467fa9222b0dcb6c12f39399c842a50d75134fe3482c0bd9f4f33cbcd684f55940dc36a8322620cc5085c177d832115b4976234d5f35eb
 MISC metadata.xml 466 BLAKE2B 4d12ced01f42a13382548c25539307e9293aeb4ee00653b4fd0405b439a883c36b3e0cfc336610618a57b53ba4ecf318466c51c4fcf16f3ae7f53776c7b7eacf SHA512 2c31b0f8ba65eb8ef8656f6f687a51ad6d5b406ae17ca1fddb5751f49553b7a804223237aa379b84a867ebc59f7c22893037ccf3b059dddbc7f80bb26b3d2b82
diff --git a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
deleted file mode 100644
index a4a569627298..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-SLOT="5/8"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="minimal webengine X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}: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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	!minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !minimal KF5Plasma)
-		$(cmake_use_find_package webengine Qt5WebChannel)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 13abbede1a74..b61aae38140b 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,4 @@
-AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5
 AUX libkworkspace-5.18.80-standalone.patch 5188 BLAKE2B 5635ef59e36581aee87689dcc3b2b9acc66eb37de12b084f249c6f80ae18d727b830cdf7b2e9795ad4ecb956cce431ed25b4ff0b9b3be02a09c835f182f49fdb SHA512 02b36fc91b10b0dc38cd57f3e138cfab51994a31edf73727762ec92a6e8fd1d786724cc3591956d337f6cc46b87596004909503e0a21a52115828b594bb0cca4
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD libkworkspace-5.18.5.ebuild 1454 BLAKE2B a885654deeaf4d2fec1735b188f42d48f5660df726f69e27ab721fba9f4abc01b5f01e18dca2ba68e2632cfcc2916a177940dc8190420ed6646b2bb685de8a44 SHA512 544539081c4274d1c58728a8c35ee312915ba61f3687c757c4acdc71d80ef52e1517e6f80a3862a2eeae7af69ec95f3ea89e425022e0f36c9f1f5af5e34bb23f
 EBUILD libkworkspace-5.19.5.ebuild 1489 BLAKE2B 53d3846cd030eea66ecc98dd65d644e5ea5898e985ed9f16e33f1de96be534d0c8f917ba62e84e284be001766acfcb2505988bd0c2f30cc13c2afef186c5904d SHA512 989aeacfcb48f10857cefe15a0959077a41f415a2bae4936f0e01bb219b3b3350cf70a16dccc28b405372992eb1b1c996f20600631af9a4cc5c54e20854b3a1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
deleted file mode 100644
index ed0d29d759f9..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 10 Jul 2019 11:38:44 +0200
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++---
- 1 file changed, 66 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c4c47870..53bc780b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,56 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.0)
-+
-+    set(QT_MIN_VERSION "5.12.0")
-+    set(KF5_MIN_VERSION "5.58.0")
-+    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
-+    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+    include(KDEInstallDirs)
-+    include(KDECMakeSettings)
-+    include(KDECompilerSettings NO_POLICY_SCOPE)
-+    include(ECMMarkNonGuiExecutable)
-+    include(CMakePackageConfigHelpers)
-+    include(WriteBasicConfigVersionFile)
-+    include(CheckIncludeFiles)
-+    include(FeatureSummary)
-+    include(ECMQtDeclareLoggingCategory)
-+    include(KDEPackageAppTemplates)
-+    include(ECMMarkAsTest)
-+    include(GenerateExportHeader)
-+
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem)
-+
-+    find_package(KWinDBusInterface CONFIG REQUIRED)
-+    find_package(KScreenLocker 5.13.80 REQUIRED)
-+    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
-+
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                URL "http://www.x.org"
-+                TYPE OPTIONAL
-+                PURPOSE "Required for X11 support")
-+
-+    if(X11_FOUND)
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
-+        set(HAVE_X11 1)
-+    endif()
-+
-+    if(BUILD_TESTING)
-+        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+    endif()
-+
-+    check_include_files(unistd.h HAVE_UNISTD_H)
-+
-+    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-+    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+endif()
- 
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                         kworkspace.cpp
-@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
-+endif()
- 
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
-                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
- 
--set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
--
--set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
--
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
- 
- 
-@@ -101,3 +158,8 @@ if(BUILD_TESTING)
-     add_subdirectory(autotests)
-     add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.22.0
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
deleted file mode 100644
index cce15eca35b2..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.18.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=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 490041c7ec0d..6df9a20822c4 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,6 +1,4 @@
 AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
-DIST milou-5.18.5.tar.xz 64264 BLAKE2B e4dba1cded6c5b833f35086b3cc943e4bfa4a0a6df530eb43aba7efbc40ea48aad8c88a2221546e7fdcc411c136232af84b7ab6a45d99233369c4a2c628f56d4 SHA512 3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d
 DIST milou-5.19.5.tar.xz 64612 BLAKE2B 588e5b98d5a1aa061dfe09d9566c68904c882a7a4120e3fadaed60fa1f372013d966511693ee44bb67d6b554e44d287374784ed02b25c04a0b7b06fd34240fa1 SHA512 c480d22ec7f6be8031af13b23914add05d331b017c1d4d2a193a47f31cad1ede0bfa833a9368d0ba9c35cf5b0f97e23d15307ae45569d8bd9d7fde305d17b913
-EBUILD milou-5.18.5.ebuild 842 BLAKE2B db01ebcc996229b0918aeaebb5b58b798fc342f50eb5b4dc4d5c1e2d906a7171fd40ce1faf228ae04aed8611888086674d83f9ee3a4c48de2be24bf6bad09565 SHA512 965bdebf6546e32453e842dffef2b8b2f2ffd47d6eb314051a7f94f401542a1eed8b1e6eddfc26934607068eefca3c22768396aab649618b422da378193c9081
 EBUILD milou-5.19.5.ebuild 913 BLAKE2B e69c781c56921e660e6c1d730405646ac7ef0c97a1ab6b58b296bd3cfac21ea9f5052d2ea832e248d38bb71117b3b16f76738996d34a5729f8ca9ed8c0281e3b SHA512 0c4aa58903ea695871d3f2b755a339fca2f549f92c9417f4817ae49a0760b3b24b4c8404a991fc6670bdb05da45b9f4e9819a7df45ddc5b9e4fd75b8d084d916
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.18.5.ebuild b/kde-plasma/milou/milou-5.18.5.ebuild
deleted file mode 100644
index e11a7e39587b..000000000000
--- a/kde-plasma/milou/milou-5.18.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
-
-ECM_TEST="forceoptional-recursive"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://invent.kde.org/plasma/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index c9e7a2ccf554..e68706d88a62 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.18.5.tar.xz 4471212 BLAKE2B 72839684b00bd9382475c26dec2d4ff73b8f84318a326c12e4fc25f4452b731c23f853b1eace2d2257df5e82ddfb104fcd70231b7431546902384288438147dd SHA512 e965e8edbf94d2bd2241202030960615286c454c02bedfbca29670c9dacf55b5f34a8dda1ec3ef9f18f4bb864ff8721acaf559f14cfc1c22e7b5385865cec579
 DIST oxygen-5.19.5.tar.xz 4462408 BLAKE2B 94a284ed12f6f1d2b04518c9dd6e891ee78c3959c39a82a339e58dddfde442e9bf2ad0a1296dea2f511a3e099fe61deea570f0f0a9b01ccff50e3ff8cd2d45be SHA512 53eec62c875dfb94d6b757e2b37b0ac23756d16ad4841cc6d7d9992cd2feaf8d7fba35987cd75f265563783dac013df509f7261033d169b8dca5e545e0eb03f4
-EBUILD oxygen-5.18.5.ebuild 1363 BLAKE2B c5fed27ea231e1a9bacd0cbaf9e14df7b5af1ab99e800b673804d05388ad62dbc24e6519fc2e14d00ab5357172861a98bf0ce19fc1082c2d54ae94706cced55d SHA512 851cd0fe3d8377280fd78f5c9a20a777ba13ad5afed901aa81f2b201f41b1276237256d3837fafc64ac5889e6e13fe5df4007159738ebdde6f23ba1a32b88dbc
 EBUILD oxygen-5.19.5.ebuild 1363 BLAKE2B 4d06fb8b263bbee235363ce1f1f7daf24565395eb15843e8ea70782425fc25edfc41ea3c7c68b2d59fc56ff4ca6d15114f39973e9b73a31fd72b5d99c606dfc8 SHA512 e1675ceb9f884c4efffe6f2e759901c6c03ec0d31e93b90547163ffd8297fca278d5bc855dd61146d2772949a39abccc4cefac9e34cb8315e450537b10126b9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.18.5.ebuild b/kde-plasma/oxygen/oxygen-5.18.5.ebuild
deleted file mode 100644
index b446528ecc51..000000000000
--- a/kde-plasma/oxygen/oxygen-5.18.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/oxygen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 390b33e695f8..26a956e7ed68 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-browser-integration-5.18.5.tar.xz 156428 BLAKE2B 9f83e33c871ea59fc73ed6dbf26e137f5dabfa4bb2403d71a0621cc0c41b1a15b461631b6ab864649780fe50c54f9428394716d8d5055453b51616c393daea96 SHA512 096bfc0940fa3a40fe5145078fe801e2436779ac3333e953a68f7a68d3d592e3978606b70f1678c83a0748221e4d992ce14e0cb72c671f242d13db41390e8730
 DIST plasma-browser-integration-5.19.5.tar.xz 176780 BLAKE2B f46d8434a957d52ecf3b475c08b106705df2c4486b85b7365b7ddf7144d2cae993787c53397ed0e91c0cd3210f9f746a22d61df08a5bd4d1d5eb58605572b452 SHA512 c7334c4ab4ab3e0e1e93715257995fa7b16103a61eb40877b3e859f75b781e27456f96d5fef409284d0f584335f723b30a5a0bee0a06ffb9cea9012cb158b9e1
-EBUILD plasma-browser-integration-5.18.5.ebuild 967 BLAKE2B 9cd19e00f7845e16fd4dbcac7752f182210a1986d02f3796bd26488319848c724267783538b6ea0636629e12e18cfcf8bdbea1347376b99d3286bb7195508388 SHA512 bc98bfc39553fbd53c65c8ef5f419e779cd5029d536a8494efdb27a177a522aac224e3a351d27a5392cc466e31398d7651916696df860a802a7cbb524e050746
 EBUILD plasma-browser-integration-5.19.5.ebuild 967 BLAKE2B 30c98708554e9764c6cb5b6b9b5c4c510faf386ae7b419e15a0035d42a22f7df51ca9008467312a0b4fd30029ae979d081060b5e86ad6697c85425e27b4a7c20 SHA512 f2fc528476cb303fb288dc59d9edc5a7c65b8795d6c1ef1a7ff5f0c3dd8ecfc9009460ddc6c3830c147bd16a2478c50dec669b2a6f4fd81b58eca9eb57b67734
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
deleted file mode 100644
index bc8d467ed23c..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 4d8da113e52c..a923e6d35ee4 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,15 +1,5 @@
-AUX plasma-desktop-5.18.4.1-synaptics-header.patch 821 BLAKE2B 96cbad72391a1d361b009b25362980c8b0ec3e583368ffc4d599b73289e6e6228afc65d08236d704af8878c6b21a9bd1a15f3fad952855d88bc660f73feb9bf4 SHA512 02cf404a9bce33e689f40597d35afb1ca3625e7caaf775a50ed70217bd8034f842001a16e1084bf81bba9dff0361a4e57a6e08853beb7d90216bf1519d305516
-AUX plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch 1058 BLAKE2B 668605a0994577bef4eb2308846d8f2e403b6546f22f9d5c05f83717abd5e27e137b199376927367227d0cad593b3d7bef859ec3791a3013bca46c930a27d459 SHA512 386c35e1f77f68ce81013d7fa7ecbe8f240ffd16507dd501eb4f9950902d21cfcc7d239b4210ac5b700a9ed59fa45799daf3ac2a5d53251a02b940df53841b28
-AUX plasma-desktop-5.18.5-animate-column-moves.patch 1133 BLAKE2B 20ae4b0e2188483a8a391ef58865b25c0d6d45019c3a3cfd9f93264b8713a9165a1316f4634909964c7348e1fe6c22ace385a7a74d33aa455fe61209d9276959 SHA512 dcedab90dd0e6cebef4a87a8a8aab3163ed268dd3d5c3223b2bba09edafc184ea8dfd04de202458c1f9789f78580b949976a51fd75e37bfb2e4097968be26703
-AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b
-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 4714 BLAKE2B 907055b17edd13e279b51463352301b5397b34b189d060f53df1f1394004a726a3127923736df58bc134833aff3cd157fbc95ccca73a4b5b12b0dbaf0728d10d SHA512 66229eab5329c3fdc40018d036dc8bd2d7882a087729c4ea81be2288a1dfe0235a70aad78bbf29ec81fb34ff4d0d5b19f7ba7c2527df62fbd4beb5ee2a0eeb95
 MISC metadata.xml 540 BLAKE2B 3953467f0fea68209d7b5cbb5f5d23bc1b1aadf0e88ec5dfc28d688f7d68e560fda165330da32940bbf43d82f6f7bc178451977870cf3e2e69f4159e4c2018d8 SHA512 5d48a9f5bd4e990a52eaa894e3572bfa66d966a0665b495a5539484cb29f6a2a4f81193c80556cf712a76e3661ac575bc582276be22acc3817e7758e727065a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
deleted file mode 100644
index 181e89e7db38..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 24 Apr 2020 18:55:30 +0200
-Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
- dir from include
-
----
- kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-index d2f41d70b..3eb3171ee 100644
---- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-@@ -53,7 +53,7 @@
- 
- #include <stddef.h>
- #include <limits.h>
--#include <xorg/synaptics-properties.h>
-+#include <synaptics-properties.h>
- 
- #define SYN_MAX_BUTTONS 12
- 
--- 
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
deleted file mode 100644
index 17db7fc5b516..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c46f28170c785f04fa396803037a608c8077025 Mon Sep 17 00:00:00 2001
-From: Matej Mrenica <matejm98mthw@gmail.com>
-Date: Wed, 6 May 2020 07:50:01 -0600
-Subject: Fix blurry icons in KColorSchemeEditor
-
-Summary:
-When using fractional scaling, bottom icons are blurred. This patch fixes the issue.
-
-BUG: 418165
-
-Test Plan:
-No side effects.
-
-Before:
-{F8289358}
-After:
-{F8289369}
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29481
----
- kcms/colors/editor/kcolorschemeeditor.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kcms/colors/editor/kcolorschemeeditor.cpp b/kcms/colors/editor/kcolorschemeeditor.cpp
-index 774d66e..03caa51 100644
---- a/kcms/colors/editor/kcolorschemeeditor.cpp
-+++ b/kcms/colors/editor/kcolorschemeeditor.cpp
-@@ -28,6 +28,8 @@
- 
- int main(int argc, char* argv[])
- {
-+    // Fixes blurry icons with fractional scaling
-+    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv);
- 
-     KAboutData aboutData(
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
deleted file mode 100644
index d7603e434a69..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3a6795548fd755121084b6a77f9de23bece8f534 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 17 Jan 2020 14:41:47 +0000
-Subject: [widgetexplorer] Animate column moves
-
-Test Plan:
-Search for something in the second column
-Now it doesn't jump
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26699
----
- desktoppackage/contents/explorer/WidgetExplorer.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index 1d98e59..56a0c22 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -326,7 +326,7 @@ Item {
-             //moved due to filtering
-             displaced: Transition {
-                 NumberAnimation {
--                    properties: "y"
-+                    properties: "x,y"
-                     duration: units.shortDuration * 3
-                 }
-             }
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
deleted file mode 100644
index 115d52423fbf..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 7 May 2020 16:18:13 +0200
-Subject: [PATCH] Add FindXorgServer.cmake and use it for touchpad KCM
-
-Summary:
-x11 backend of the touchpad KCM uses xserver-properties.h that is part of
-xorg-server package. As XORG_INCLUDE_DIRS seems to be empty, so far, it was
-relying on Synaptics_INCLUDE_DIRS implicitly and worked only if the header
-happened to be in the same directory as Synaptics' which is the case most of
-the time.
-
-FindXorgServer.cmake is just a copy of FindXorgLibinput, adapted accordingly.
-
-Test Plan:
-Pointed Synaptics_INCLUDE_DIRS somewhere else than /usr/include/xorg and build
-succeeded.
-
-Reviewers: #plasma, zzag
-
-Reviewed By: #plasma, zzag
-
-Subscribers: broulik, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29514
----
- CMakeLists.txt                     |  4 +++
- cmake/modules/FindXorgServer.cmake | 45 ++++++++++++++++++++++++++++++
- kcms/CMakeLists.txt                |  2 +-
- kcms/touchpad/src/backends/x11.cmake   |  2 +-
- 4 files changed, 51 insertions(+), 2 deletions(-)
- create mode 100644 cmake/modules/FindXorgServer.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbdd95433..64e8bbd60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,6 +133,10 @@ find_package(Synaptics)
- set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
- add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries needed for touchpad KCM")
- 
-+find_package(XorgServer)
-+set_package_properties(XorgServer PROPERTIES TYPE OPTIONAL)
-+add_feature_info("XorgServer" XORGSERVER_FOUND "XServer header needed for touchpad KCM (X11 backend)")
-+
- find_package(XorgLibinput)
- set_package_properties(XorgLibinput PROPERTIES TYPE OPTIONAL)
- add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for mouse and touchpad KCM")
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-new file mode 100644
-index 000000000..5248c6d25
---- /dev/null
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -0,0 +1,45 @@
-+# - Find xorg-server's headers.
-+# This module defines the following variables:
-+#
-+#  XORGSERVER_FOUND        - true if xserver was found
-+#  XORGSERVER_INCLUDE_DIRS - include path for xserver
-+#  There are no libraries, just a header file
-+#
-+# Copyright (c) 2020 Andreas Sturmlechner <asturm@gentoo.org>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. Neither the name of the University nor the names of its contributors
-+#    may be used to endorse or promote products derived from this software
-+#    without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_XORGSERVER xorg-server)
-+
-+find_path(XORGSERVER_INCLUDE_DIRS
-+    NAMES xserver-properties.h
-+    HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
-+
-+mark_as_advanced(XORGSERVER_INCLUDE_DIRS)
-diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
-index 7ab966e8e..ce730f537 100644
---- a/kcms/CMakeLists.txt
-+++ b/kcms/CMakeLists.txt
-@@ -58,7 +58,7 @@ if(X11_Xcursor_FOUND)
-     add_subdirectory(cursortheme)
- endif()
- 
--if (SYNAPTICS_FOUND AND X11_Xinput_FOUND)
-+if (XORGSERVER_FOUND AND SYNAPTICS_FOUND AND X11_Xinput_FOUND)
-     add_subdirectory(touchpad)
- endif()
- 
-diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/src/backends/x11.cmake
-index 9248eff7c..8a584e939 100644
---- a/kcms/touchpad/src/backends/x11.cmake
-+++ b/kcms/touchpad/src/backends/x11.cmake
-@@ -11,7 +11,7 @@ endif()
- include_directories(${X11_Xinput_INCLUDE_PATH}
-                     ${X11_X11_INCLUDE_PATH}
-                     ${Synaptics_INCLUDE_DIRS}
--                    ${XORG_INCLUDE_DIRS}
-+                    ${XORGSERVER_INCLUDE_DIRS}
- )
- 
- SET(backend_SRCS
--- 
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
deleted file mode 100644
index cc39c1e46488..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 977665254990892411c74e8a04a8fdb10ef68547 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 17 Jan 2020 14:41:42 +0000
-Subject: [widgetexplorer] Fix animate in animation
-
-Summary:
-The animation in comes in from offscreen on the left.
-
-"to: 0" was correct when we had one column. With the 2 column view it
-means we animate two items on top of each other and jump when the
-animation completes. We want to animate to the final position the item
-will end up in.
-
-It bugs me more than it probably should.
-
-Test Plan:
-Search for "asdfasdfsadfsadf"
-Remove search
-Animation now looks ok, instead of horrific
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26698
----
- desktoppackage/contents/explorer/WidgetExplorer.qml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index b7bbce8..1d98e59 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -305,9 +305,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     from: -list.width
--                    to: 0
-                     duration: units.shortDuration * 3
--
-                 }
-             }
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
deleted file mode 100644
index bae49609e52f..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From e5e5f5ed51aadfac99bfbdf3d2db5be16a12443b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Mon, 10 Aug 2020 13:50:36 +0200
-Subject: [PATCH] kcm_fonts: Make the font selection dialog select the correct
- "Regular"-like style
-
-Due to KConfig dropping QFont styleName property (for "Regular"-like font
-styles, see [1] for more details), the font selection dialog invoked by the
-KCM could end up selecting the wrong style; this change sets the appropriate
-"Regular" style on the QFont object before invoking the font selection dialog
-to fix/workaround the issue.
-
-Note that in Plasma master branch the issue is handled differently, since
-we switched from QFontDialog to KFontChooserDialog (the latter has that
-logic built-in).
-
-[1] https://phabricator.kde.org/D27735
-
-CCBUG: 420287
----
- kcms/fonts/fonts.cpp                          | 61 +++++++++++++++++--
- kcms/fonts/fonts.h                            |  1 +
- kcms/fonts/package/contents/ui/FontWidget.qml |  7 +--
- kcms/fonts/package/contents/ui/main.qml       |  4 +-
- 4 files changed, 61 insertions(+), 12 deletions(-)
-
-diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index f771f6e51..c2ccdf777 100644
---- a/kcms/fonts/fonts.cpp
-+++ b/kcms/fonts/fonts.cpp
-@@ -53,23 +53,50 @@
- /**** DLL Interface ****/
- K_PLUGIN_FACTORY_WITH_JSON(KFontsFactory, "kcm_fonts.json", registerPlugin<KFonts>();)
- 
-+// If the styleName property is empty, then we want to set it to
-+// the "Regular"-like style provided by the font, so that the font
-+// selection dialog selects the correct style from the available styles
-+// list; for more details see:
-+// https://phabricator.kde.org/D27735 and https://phabricator.kde.org/D27785
-+static QFont setRegularFontStyle(const QFont &font)
-+{
-+    if (!(font.styleName().isEmpty() && font.weight() == QFont::Normal)) {
-+        return font;
-+    }
-+
-+    QFont f(font);
-+    QFontDatabase fdb;
-+    const QStringList styles = fdb.styles(f.family());
-+    for (const QString &s : styles) {
-+        if (s == QLatin1String("Regular")
-+            || s == QLatin1String("Normal")
-+            || s == QLatin1String("Book")
-+            || s == QLatin1String("Roman")) {
-+            f.setStyleName(s);
-+            return f;
-+        }
-+    }
-+    return font;
-+}
-+
- //from KFontRequester
- // Determine if the font with given properties is available on the system,
- // otherwise find and return the best fitting combination.
- static QFont nearestExistingFont(const QFont &font)
- {
--    QFontDatabase dbase;
-+    QFont _font = setRegularFontStyle(font);
- 
-+    QFontDatabase dbase;
-     // Initialize font data according to given font object.
--    QString family = font.family();
--    QString style = dbase.styleString(font);
--    qreal size = font.pointSizeF();
-+    QString family = _font.family();
-+    QString style = dbase.styleString(_font);
-+    qreal size = _font.pointSizeF();
- 
-     // Check if the family exists.
-     const QStringList families = dbase.families();
-     if (!families.contains(family)) {
-         // Chose another family.
--        family = QFontInfo(font).family(); // the nearest match
-+        family = QFontInfo(_font).family(); // the nearest match
-         if (!families.contains(family)) {
-             family = families.count() ? families.at(0) : QStringLiteral("fixed");
-         }
-@@ -614,6 +641,30 @@ bool KFonts::isDefaults() const
-     return m_fontAASettings->isDefaults();
- }
- 
-+void KFonts::adjustFont(const QFont &font, const QString &category)
-+{
-+    QFont _font = setRegularFontStyle(font);
-+
-+    bool ok = false;
-+    QFont selFont = QFontDialog::getFont(&ok, _font, nullptr, i18n("Select Font"));
-+
-+    if (ok && !m_settings->isImmutable(category)) {
-+        if (category == QLatin1String("font")) {
-+            m_settings->setFont(selFont);
-+        } else if (category == QLatin1String("menuFont")) {
-+            m_settings->setMenuFont(selFont);
-+        } else if (category == QLatin1String("toolBarFont")) {
-+            m_settings->setToolBarFont(selFont);
-+        } else if (category == QLatin1String("activeFont")) {
-+            m_settings->setActiveFont(selFont);
-+        } else if (category == QLatin1String("smallestReadableFont")) {
-+            m_settings->setSmallestReadableFont(selFont);
-+        } else if (category == QLatin1String("fixed")) {
-+            m_settings->setFixed(selFont);
-+        }
-+    }
-+}
-+
- void KFonts::adjustAllFonts()
- {
-     QFont font = m_settings->font();
-diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h
-index 51ed2ab60..5959e1995 100644
---- a/kcms/fonts/fonts.h
-+++ b/kcms/fonts/fonts.h
-@@ -153,6 +153,7 @@ public Q_SLOTS:
-     void save() override;
-     void defaults() override;
-     Q_INVOKABLE void adjustAllFonts();
-+    Q_INVOKABLE void adjustFont(const QFont &font, const QString &category);
- 
- Q_SIGNALS:
-     void fontsHaveChanged();
-diff --git a/kcms/fonts/package/contents/ui/FontWidget.qml b/kcms/fonts/package/contents/ui/FontWidget.qml
-index b62dd3bf4..5a6be5128 100644
---- a/kcms/fonts/package/contents/ui/FontWidget.qml
-+++ b/kcms/fonts/package/contents/ui/FontWidget.qml
-@@ -57,11 +57,8 @@ FocusScope {
-             Kirigami.MnemonicData.enabled: false
-             focus: true
-             onClicked: {
--                fontDialog.adjustAllFonts = false;
--                fontDialog.currentCategory = root.category
--                fontDialog.font = root.font;
--                fontDialog.currentFont = root.font;
--                fontDialog.open()
-+                fontDialog.adjustAllFonts = false
-+                kcm.adjustFont(root.font, root.category)
-             }
-             QtControls.ToolTip {
-                 visible: parent.hovered
-diff --git a/kcms/fonts/package/contents/ui/main.qml b/kcms/fonts/package/contents/ui/main.qml
-index 4a99c043a..e51fb21ba 100644
---- a/kcms/fonts/package/contents/ui/main.qml
-+++ b/kcms/fonts/package/contents/ui/main.qml
-@@ -264,9 +264,9 @@ KCM.SimpleKCM {
-                 property bool adjustAllFonts: false
-                 onAccepted: {
-                     if (adjustAllFonts) {
--                        kcm.adjustAllFonts(font);
-+                        kcm.adjustAllFonts()
-                     } else {
--                        kcm.fontsSettings[currentCategory] = font;
-+                        kcm.adjustFont(font, currentCategory)
-                     }
-                 }
-             }
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
deleted file mode 100644
index 593665a53c58..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From f3bbc0ba0e34ea1b34b106228c02d85865ed904a Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 24 Mar 2020 08:15:12 -0600
-Subject: Stop multiplying duration values
-
-Summary:
-After D28144, some animations are now too long because they were inappropriately
-multiplying a duration value. That's no longer necessary, so let's remove the
-multiplication.
-
-Depends on D28144
-
-Test Plan: Various things that were a bit too slow before feel just right now
-
-Reviewers: #vdg, #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D28239
----
- applets/taskmanager/package/contents/ui/Task.qml             | 2 +-
- applets/taskmanager/package/contents/ui/TaskList.qml         | 2 +-
- desktoppackage/contents/configuration/PanelConfiguration.qml | 4 ++--
- desktoppackage/contents/explorer/WidgetExplorer.qml          | 6 +++---
- toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml       | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
-index 2bf8b88..9683fab 100644
---- a/applets/taskmanager/package/contents/ui/Task.qml
-+++ b/applets/taskmanager/package/contents/ui/Task.qml
-@@ -293,7 +293,7 @@ MouseArea {
-         Timer {
-             id: timer
- 
--            interval: units.longDuration * 2
-+            interval: units.longDuration
-             repeat: false
- 
-             onTriggered: {
-diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/taskmanager/package/contents/ui/TaskList.qml
-index 594420b..6d6bc45 100644
---- a/applets/taskmanager/package/contents/ui/TaskList.qml
-+++ b/applets/taskmanager/package/contents/ui/TaskList.qml
-@@ -34,7 +34,7 @@ Flow {
-             NumberAnimation {
-                 properties: "x, y"
-                 easing.type: Easing.OutQuad
--                duration: units.longDuration * 2
-+                duration: units.longDuration
-             }
- 
-             PropertyAction { target: taskList; property: "animating"; value: false }
-diff --git a/desktoppackage/contents/configuration/PanelConfiguration.qml b/desktoppackage/contents/configuration/PanelConfiguration.qml
-index 0e11a96..33e3fbc 100644
---- a/desktoppackage/contents/configuration/PanelConfiguration.qml
-+++ b/desktoppackage/contents/configuration/PanelConfiguration.qml
-@@ -103,7 +103,7 @@ PlasmaCore.FrameSvgItem {
-                     return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - panel.distance
-                 }
-             }
--            duration: units.shortDuration * 3
-+            duration: units.shortDuration
-         }
- 
-         NumberAnimation {
-@@ -122,7 +122,7 @@ PlasmaCore.FrameSvgItem {
-                     return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height - panel.distance
-                 }
-             }
--            duration: units.shortDuration * 3
-+            duration: units.shortDuration
-         }
-     }
- //END Animations
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index 1648708..e26cc40 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -306,7 +306,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     from: -list.width
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-@@ -315,7 +315,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     to: list.width
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-@@ -328,7 +328,7 @@ Item {
-             displaced: Transition {
-                 NumberAnimation {
-                     properties: "x,y"
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-index 06524c3..eb6b190 100644
---- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-@@ -54,14 +54,14 @@ Item {
-     }
-     Behavior on rotation {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
-     }
-     Behavior on x {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
-@@ -69,7 +69,7 @@ Item {
-     }
-     Behavior on y {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
deleted file mode 100644
index 9e8cddfd2285..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-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"
-
-COMMON_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/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	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-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
-
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
-	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
-	"${FILESDIR}/${P}-fix-animate-in-animation.patch"
-	"${FILESDIR}/${P}-animate-column-moves.patch"
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package ibus IBus)
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
deleted file mode 100644
index 5fa672f9e019..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-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"
-
-COMMON_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/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	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-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
-	"${FILESDIR}/${P}-fix-fonts-kcm-w-kf-5.68.patch" # in Plasma/5.18
-
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
-	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
-	"${FILESDIR}/${P}-fix-animate-in-animation.patch"
-	"${FILESDIR}/${P}-animate-column-moves.patch"
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package ibus IBus)
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 3296f54d46a2..cbcf32494cc4 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,6 +1,4 @@
 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-r1.ebuild 1317 BLAKE2B 36dd356ae7cff604d68f8199171dcf88382b391f64f688b19468230b69769e92d59347f4eda807cafc0feb51bf976b09198715a7b679bad1b0a99587e8a23b0b SHA512 faf6475f6332ab198978c91c6348f64eb2b7af87584aa3b48c4db2ef341145e11215e8a9b588e05c5ebc9d8d16bf8d7f16699f1debd07ef3a2655b6c86c80860
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
deleted file mode 100644
index f7f300f1c4a7..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.18.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.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-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="
-	>=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
-	>=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
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 6ed2497d5cf3..c1970f05f2d3 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.18.5.ebuild 3591 BLAKE2B 8a189ae651e7eb5d2125c92697f61ed6bd150b482b4d288d31d8be2446743c6d7e5b0dd141bb38d261f03ebf623c0cbde3b8da6906f8cdf9291220c2ff07057d SHA512 7868fc98b37b36b51c855d9a97873b1221527fcc75232892c3414ea2304812be60f1d880970cc8cc10e96d151127f06a6dfd223f070be4b1a7715461c3077782
 EBUILD plasma-meta-5.19.5.ebuild 3628 BLAKE2B 7e7eac543cb2e77d257927652c969e78e289897377e56b6524d247153145a16fe5c7bf8e339c9e40c26017e44fe102b7f2ab381c6cbb93062b94daec682de5fd SHA512 1e044042c5a6dfad973c4fc2d52038545f1b00dcc2d3a27b4dfd2b79f3e518e4c2ceb3ab231dafecc77a8329fa2e503a122dbf94b85890360701995b9494a8c5
 MISC metadata.xml 1963 BLAKE2B 0273adb85723495addae8367af9da0ceb907cf86aa0bf4fbf6289aa291b1b19ecd66f191ee12d62427a5316f0f75d831ee2c0ac0d2b246812a52c476aa95fbb2 SHA512 18f5c9bd29f79478e7c976ff4ab4194de3256e4d7da75cf83fd7c8b4af02d39a4ccc1d85cf672529e17f3cb84fb7ab1226d452d5b669d055e88764d2f8b6e6c9
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
deleted file mode 100644
index 6cec1857bb3b..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.18.5.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
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +browser-integration crypt +desktop-portal discover
-+display-manager elogind grub gtk +handbook +kwallet +legacy-systray
-+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/drkonqi-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksysguard-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/user-manager-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			x11-misc/sddm[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-		qrcode? ( kde-frameworks/prison[qml] )
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	use elogind || use systemd || return
-	ewarn "An existing installation of sys-auth/consolekit was detected even though"
-	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
-	ewarn "There can only be one session manager at runtime, otherwise random issues"
-	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
-	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
-	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index c33076838a80..eaf99f7dade6 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,7 +1,4 @@
-AUX plasma-nm-5.18.5-missing-wireguard-icon.patch 1698 BLAKE2B 37bb63676905746999df50b87e5575d4ec1207dec37848e18216123760d84b577327c20346ede1dba263975253db6bcccfbf4b91167f59aa173b08baffb7e542 SHA512 485e56c592da9f30e5acc94f9f2e8af66989e70aa74ae0b4756dd4e7008729fa1eb1d43dd329983565366937eb7a057a74741b8b456db462cf7f7af00ed1b841
 AUX plasma-nm-5.19.2-fix-inline-password-field.patch 1458 BLAKE2B b169f54b842e38fb077a793778c9a923e2a5df906abd0c29edee7d5279cd81555617b0b70d50953724737d0aa068618bbff9eb341eb3d9fc542cbdcd982db3a5 SHA512 90be93b2a95cd2a69e7d8083d33b7c0ea11a4b09e4396e853f6147b304dc60635274a21ec91e23637c6045813586b6ef52b670d273c1bf29b5abe3a48ed65b39
-DIST plasma-nm-5.18.5.tar.xz 828008 BLAKE2B 557a31d5a0e7886be90e62be3f5328baf4a8bbfeb3e9decf1f2f106f33bef7e64fb886b94691faab57119f231b6bbcff58514d795df75f858ca9c8ea8c1af9a7 SHA512 8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a
 DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7
-EBUILD plasma-nm-5.18.5-r1.ebuild 2368 BLAKE2B 6bb2e5feb6f4182e620ae1f410639b9794ba2e175bf053dc74d5efde0db63cfcf13e5b4595c387acacb68c4675c296e74c8de2d9c28c078bb7e263cd33fa4861 SHA512 1825154c7bd0d60f70cc4fe02ef3b1f5b82a9533c56f9bd19ae53d31b2a1c3576e098fffe83b5d8a778765c27b19065643327ba71823e129285d2eb40d6ec078
 EBUILD plasma-nm-5.19.5.ebuild 2411 BLAKE2B face78008487cde60f4c07d53389a3fd99e83e4bfe79ae04bb1c2bffb76c4ae22cbbb08fde8738d1b758551477e325604025515640c01b260b4351c0321c3e81 SHA512 2a79e85fa7901df76e16761bbc63bb9f4183df4940a765196a4e7ba793d3e1f8c43de960ba3061e470f13fefc7817de2139a1ade6b7834344f3885fb3d3b9364
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch
deleted file mode 100644
index 85902e504096..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From da52d01788f5f07aa60ed7a6f21d7943a2e0c8d3 Mon Sep 17 00:00:00 2001
-From: Bruce Anderson <banderson19com@san.rr.com>
-Date: Wed, 6 May 2020 08:03:11 +0200
-Subject: Icon in system tray missing when WireGuard connection active on
- startup
-
-Summary:
-If a WireGuard connection is made prior to start of the
-plasma-nm applet, no icon is displayed in the system tray.
-
-BUG: 420983
-
-Test Plan:
-1. Setup a Wired connection to autostart
-2. Setup a WireGuard connection which uses the Wired
-   connection and set to autostart
-3. Logout and login to start a new Plasma session
-4. Verify that the standard Wired connection icon with a
-   padlock symbol on it is shown in the system tray
-
-Reviewers: jgrulich
-
-Reviewed By: jgrulich
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29469
----
- libs/declarative/connectionicon.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp
-index cefe6df..58c0cce 100644
---- a/libs/declarative/connectionicon.cpp
-+++ b/libs/declarative/connectionicon.cpp
-@@ -317,7 +317,9 @@ void ConnectionIcon::setIcons()
- 
-     // Set icon based on the current primary connection if the activating connection is virtual
-     // since we're not setting icons for virtual connections
--    if (!connection || (connection && UiUtils::isConnectionTypeVirtual(connection->type()))) {
-+    if (!connection
-+        || (connection && UiUtils::isConnectionTypeVirtual(connection->type()))
-+        || connection->type() == NetworkManager::ConnectionSettings::WireGuard) {
-         connection = NetworkManager::primaryConnection();
-     }
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild
deleted file mode 100644
index fd1c44fe031f..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.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
-
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-wireguard-icon.patch" ) # in Plasma/5.18
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake_use_find_package openconnect OpenConnect)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index e05590c6aedd..2677950d98b3 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-pa-5.18.5.tar.xz 105148 BLAKE2B 19b79ead20bc54d6f1e8f515980590f402c00a3c3e82841c66e8cece4f9bb90e87a7a5bf0c02afaf5e7bbfa3715c418301926120d4cd69d94d4c3dc54b8de0cd SHA512 fff3049d4879e4f6fe428985dd14f91fa6bac8fe2e7c696ee1424d610038f61fd7eda2621bfd2c2643529956f7986b59c9eead1ceb79e1cfb1397fa52b470376
 DIST plasma-pa-5.19.5.tar.xz 108156 BLAKE2B cbbb50c102d77b4eddb865daddb432e4ec1e7b27d033ecbd87c0bb8d64b565eebc206d4c13b197ea4f5bff4693e4ef9c9e3570e21fc177adc58f478683269603 SHA512 90d9faf8ab2f4fc7ecdc3e4fa84276ef6c7fc3abc2b2b7a0407e9f001c10330aa98a89ee68602c5378e4e46eec89a88c55e1e01dc2d755e613e4f584234331b6
-EBUILD plasma-pa-5.18.5.ebuild 921 BLAKE2B f91d1a72122c2e6f7e2615c64fec080bb8bd2ea9e1430f87b831af844bd925ef2be813d0a610f5ba6bea709978a71e74c9b2d5beac57224a87323cd5ecf07c78 SHA512 b22214bda000bb3eff9743e3f7f8dd5b2b73b7bdf932aefe34fd38309e8f212929bd36b5c3f775ffcda459e7b2841ab96cfcaa7f19f8cd8ca164a183358ac9f3
 EBUILD plasma-pa-5.19.5.ebuild 897 BLAKE2B fce148bd7d433d3655a74cdf735b139bf59f22721e7e14f1b559bc649f2420fc64713728c7a185fe33c9c828ae1943419da48e3a32f88064750ff77e2302d215 SHA512 b639dff3b9b9e559b10d39574ab5dbe4898886993e1ea49fcc291bcc76e1555c519643a5de9caad1c7b4f756bc7b700f7d704180e019891806ad3ede250e605b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
deleted file mode 100644
index b5f98dfc02f5..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	media-libs/libcanberra
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index d2c661da6799..06dff23d7ca4 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-sdk-5.18.5.tar.xz 263084 BLAKE2B 575235302ade4bc1bcfdcef33f9fd3cc4175d4362aaabd2a3bc8e7d7235d90f3c2f81c8b499e486c0f68e029b298e4879707ebb1d23052230c2403e825d5943e SHA512 1051aa84d70d7a02d3392d3b1628b1fb4d4b666efca6e34f0688dc0015b983527039bd52140cf17f947f2d266cacb63aab7c9b547e6679a0aab094e74c1783a1
 DIST plasma-sdk-5.19.5.tar.xz 263576 BLAKE2B 4752ba4423930bac21893140f397595dc1b5fe9238b054043a7b961756d762a11bd50d806c779e59dd512c2ca304c38bb72ebc1d811d89bb46746cc7f0528dc4 SHA512 66ca604bd27a7c48f8127f04e43c0093c098820e099c944cf7e4715ee0703175761ce6e4be270ffd78b0b1a87fbb2a8e7f670010df0032c4148bcf4275fc32f6
-EBUILD plasma-sdk-5.18.5.ebuild 1254 BLAKE2B 85b6ae2b9ca81257af4d98c697d33ddb57e5a62caf9f7f24afb4b35b6ba614f2920b39c0d0434fabce334802eef716262f4ffda8a9f183688bd36b66923befc6 SHA512 a2840b282743e897f7c5d0e67564a7310cdc622fee4187580e99578c63a5a9e86acb9af405895f29f6effdc4818c0b3526e406b6c0a0a0ac09d6ad3f7db14e76
 EBUILD plasma-sdk-5.19.5.ebuild 1254 BLAKE2B b441d03b8efc4a4313ff64fbd2043d88686aa560f34dbf5ca5e11e7a63987edbb7a528baa80f0c6189b7f5ebb308e8c60830095d8d38ac1639d2d63584bd2aaa SHA512 68a3725ad4cbf259512d135ae2c13829442e5dff5b8f40deb8ac21ac164187798a4a9ba7950281b4c811441d6f68d5479287c8f762484f1d492a9bcc8111e5e4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild
deleted file mode 100644
index 445a30894149..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.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_TEST="optional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 534c95ebe443..f7a0e51f5c66 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-thunderbolt-5.18.5.tar.xz 51248 BLAKE2B e87339f2d81bfcfb60e02284e1e57aa17b1a01844cd4e0157b3b10b1bee4d4de5b02378b15c750977350a768f2c5c2f01e629405c358afcbad0765d1c7943598 SHA512 4768a69abc474b9daa2c3f880ef12829ce4804a44b4502b31e083802a5ba4406ac52001fb397415958cd52d7f76aa7dc54f8945665957a8a5557ca93e345ff76
 DIST plasma-thunderbolt-5.19.5.tar.xz 51300 BLAKE2B c0a9b3665d58ac57c4e4fc71670edaf402d69e8477e0b74875df2d4d666ea8f1c1ce2d0b950f5f20950a431837d651a545f8df19412b60332e0b5d3b08beaa5b SHA512 34c0cb7495b03eaf4f84426fbb6ab2a8b3b336fa1a7f32014231f302c3f1a0e061462e32ded86dab713aa2b602ba5311da3a45e0352f63f59d6e503c1eb7905e
-EBUILD plasma-thunderbolt-5.18.5.ebuild 776 BLAKE2B b25cc92413af7084f906f1e2fb7c6d504274667b34a06277b864ce0fe050d14da49319621a2117a2ea55102a5f2b820d2d39307a10c0d3fb4cfee9bafa17685b SHA512 e68c4c104dea6c3de072b40790526b39ecacbae0c1663d756711429c9e7cf91de2e305c1438c9c03894ee0816f49676317906d3a749f278bd5bb39cea52ecf26
 EBUILD plasma-thunderbolt-5.19.5.ebuild 890 BLAKE2B 5df170041f9c01861849b9274c79d71a2104d57df8736c868445c167a90df77e5e981b358ef49fd7793d426570af2b020d3abf0416b324f02d481964281041e7 SHA512 4140970ca8d0a2bf023fd9c6d249cf43a813bccd7f4f3ed7c751abb1489e82bc293cdc32ef02ddfc9e79ce7f6567ad10f47b3aca97cb23ee0014632201f53a6e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
deleted file mode 100644
index ba958e8362cf..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.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
-
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/bolt
-"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 323cc7ea3e59..253f58b932b3 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,6 +1,4 @@
 AUX plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1928 BLAKE2B c7fc121bd0956d00f51831e92f7178f134cd777f50529a9f3269ee7248e2c984f44285b870f57b7e8252c3a7a74affcd0b0d5bcea8948d6e9e0c1c68c3e536cb SHA512 2dfeaa620444df7d6f5a36c9a4957c9783b8f37c2c75576a21712558b81f7b027f5753aa5b62560045476e26de822f0047d3670c8b3560d8f1606ed169b0e6c9
-DIST plasma-vault-5.18.5.tar.xz 136900 BLAKE2B 29b538760dbfae8cb83d820d51101bbf27436e46cff034fbc9b7541998ed6bc1870435d7fac9894b7bf105e173121e791c9d387a3c5c9476dfddc3a4b335e072 SHA512 66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8
 DIST plasma-vault-5.19.5.tar.xz 145448 BLAKE2B 3b9dff74ab3c7120d9fe1c40007333d514d6773602941987bed55b977c46f7e2b8a27c125c258030a5da638c30e83186d0097ca553e437c2efc13e390b7471db SHA512 d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771
-EBUILD plasma-vault-5.18.5.ebuild 1229 BLAKE2B 3820124d691b0eb7422dd9967facc5c0a500e1bca599c5c295dc521a0d9d5e546b1613015679307cf0c65a5db0f92a6b60d396ed5f2c40f4cadaf3dea1b7d13f SHA512 7459542ca31413e9b88f3f9fb096757a5d699dda153839610d9b74a24f60ede9523715b267c76031502e6e48f2b809482a3577e774ed4c316780ad048c064a11
 EBUILD plasma-vault-5.19.5.ebuild 1406 BLAKE2B cca54b9f66bade1812e2419327ab7a7fe5a553c69d1bb4e872dbbde0fee3ec957547b25683141ab1a7a43b7aa35465e7aec518ce859e5d54e830fd759b1fae8f SHA512 6a5faa085e8fb38d80d1d861e62bedeeda9f76705357d15ac66aa7b37c6d9eb96f6a648e47d6219492eb4bab8161bf212e70f5cdb81100c60392a323c438aab9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
deleted file mode 100644
index ca9ff36158a9..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="networkmanager"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 93a8d6921690..ccf65ef4fabb 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-workspace-wallpapers-5.18.5.tar.xz 37110292 BLAKE2B 34dcfad8d3d47a32b63a3d002cd3ce4c59a4b5127002df4c5a39c7df4296890ef59713fbe4c52693ce728aa7a349ffbf3c133a28699f314791e485b28cbdda95 SHA512 75d5042fd955849cb67b1f7711b2e3e63d03ece7aacd4fc88bcd8c8652ca40a62351c1666b9c86275d1b495fa73d0089e8046dc1f65fc6fb23d9010ddc6f514e
 DIST plasma-workspace-wallpapers-5.19.5.tar.xz 41824532 BLAKE2B 08b90cd0869e5935320a00fe7687c6a15a3978bcf3288e8e37f48dcef53baaf84921f573949f8dbeeaac2f5861151a4625520fd6a89de264e150918955d39da9 SHA512 79723d50f47412d4904effddbb641d75675a66f517e70164bf55f89e31cbb8246ea1617f90e4cd8e1c5ec169332187586443ead7bc2721b0df85a693ada9287f
-EBUILD plasma-workspace-wallpapers-5.18.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
 EBUILD plasma-workspace-wallpapers-5.19.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
deleted file mode 100644
index 56aeacaf1b52..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.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
-
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Wallpapers for the Plasma workspace"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 4bf2720bb52c..e42423a1f5ab 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,14 +1,10 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
-AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
-AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
 AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc
 AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41ba945f049d03e30e4810fa107d2f7198913476a90aef0e9e0fa381413f94bd1725a4694a07eeafa147b31e2baa2810257ee0e608c SHA512 6d8eadea96bb388a64704e1b1c30190cd06b0c872b084a8b6e16f1c510fd619dd2e64ae0b9c65b39e3c020a312a451a73a8ba241b3c8575870528e97c59d46fd
 AUX plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch 1608 BLAKE2B 1d6b2679d7f41863f83c69a2d11791b972275f7e9b838bc8a252c8ed4661f5774d6b43c019d9c4653f7f9af407b154869378d6845fec878972b6bd59e4fdbfa8 SHA512 08971de678b6e4c9148c4f55b44eb64870a639c9b0ecbeacdcea3565e9204f720205fd9707cc52c3284d94c0228d3f2e1464a70551582af4d49e95172f64f390
 AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
 EBUILD plasma-workspace-5.19.5-r2.ebuild 7161 BLAKE2B 616371d4525a652790da41eb4e8f126f35f73b200bb90cec0715b2194b249dd9b0db638c93b40c042a261268c87c22d8ae95324790592f2841c43629c3c9d0d1 SHA512 6e757950dd26c93fdec581dcb8a04eaf5b090d9d12843a8309a142e278e3cbd2278a170616a48dd72ac64ce6face681d72ee48b2bec407f14f3537319564c149
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
deleted file mode 100644
index 7cbe139a1669..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 68601675d13bdf44248991a56e888093e58c56c3 Mon Sep 17 00:00:00 2001
-From: Filip Fila <filipfila.kde@gmail.com>
-Date: Wed, 13 May 2020 18:08:27 +0200
-Subject: [sddm-theme] Prevent the logo from leaking in after a fadeout
-
-Summary:
-Even when the vendor logo is turned off it can be briefly seen when the login screen changes from the fadeout state back into normal.
-
-Comments in other code say that "OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" so this patch replaces it with NumberAnimation.
-
-There's also a minor fix included - placing the drop shadow sooner in the hierarchy because it should be drawn underneath an object, not in front of it.
-
-Test Plan:
-Reduce the fadeout time to something small and then:
-
-`sddm-greeter --test-mode --theme /usr/share/sddm/themes/breeze`
-
-Reviewers: ngraham, cblack, #plasma, mart
-
-Reviewed By: ngraham, #plasma, mart
-
-Subscribers: mart, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29351
----
- sddm-theme/Main.qml | 44 +++++++++++++++++++++++---------------------
- 1 file changed, 23 insertions(+), 21 deletions(-)
-
-diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
-index 6746238..9910e7f 100644
---- a/sddm-theme/Main.qml
-+++ b/sddm-theme/Main.qml
-@@ -411,26 +411,6 @@ PlasmaCore.ColorScope {
-             }
-         }
- 
--        Image {
--            id: logo
--            visible: config.showlogo == "shown"
--            source: config.logo
--            anchors.horizontalCenter: parent.horizontalCenter
--            anchors.bottom: footer.top
--            anchors.bottomMargin: units.largeSpacing
--            asynchronous: true
--            sourceSize.height: height
--            opacity: loginScreenRoot.uiVisible ? 0 : 1
--            fillMode: Image.PreserveAspectFit
--            height: Math.round(units.gridUnit * 3.5)
--            Behavior on opacity {
--                OpacityAnimator {
--                    duration: units.longDuration
--                    easing.type: Easing.InOutQuad
--                }
--            }
--        }
--
-         DropShadow {
-             id: logoShadow
-             anchors.fill: logo
-@@ -444,7 +424,29 @@ PlasmaCore.ColorScope {
-             color: "black" // matches Breeze window decoration and desktopcontainment
-             opacity: loginScreenRoot.uiVisible ? 0 : 1
-             Behavior on opacity {
--                OpacityAnimator {
-+                //OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-+                NumberAnimation {
-+                    duration: units.longDuration
-+                    easing.type: Easing.InOutQuad
-+                }
-+            }
-+        }
-+
-+        Image {
-+            id: logo
-+            visible: config.showlogo == "shown"
-+            source: config.logo
-+            anchors.horizontalCenter: parent.horizontalCenter
-+            anchors.bottom: footer.top
-+            anchors.bottomMargin: units.largeSpacing
-+            asynchronous: true
-+            sourceSize.height: height
-+            opacity: loginScreenRoot.uiVisible ? 0 : 1
-+            fillMode: Image.PreserveAspectFit
-+            height: Math.round(units.gridUnit * 3.5)
-+            Behavior on opacity {
-+                // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-+                NumberAnimation {
-                     duration: units.longDuration
-                     easing.type: Easing.InOutQuad
-                 }
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
deleted file mode 100644
index 83539c14c043..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2958702524348e9e4fcbdf490be731e92b353dad Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 24 Mar 2020 08:10:54 -0600
-Subject: Stop multiplying duration values
-
-Summary:
-After D28144, some animations are now too long because they were inappropriately
-multiplying a duration value. That's no longer necessary, so let's remove the
-multiplication.
-
-Depends on D28144
-
-Test Plan: Various things that were a bit too slow before feel just right now
-
-Reviewers: #vdg, #plasma, cblack
-
-Reviewed By: #vdg, #plasma, cblack
-
-Subscribers: cblack, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D28238
----
- applets/devicenotifier/package/contents/ui/FullRepresentation.qml | 2 +-
- applets/systemtray/package/contents/ui/ExpanderArrow.qml          | 2 +-
- lookandfeel/contents/components/ActionButton.qml                  | 4 ++--
- lookandfeel/contents/components/UserDelegate.qml                  | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-index d15e47c..80b9c73 100644
---- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-+++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-@@ -225,7 +225,7 @@ MouseArea {
-                     popupIconTimer.restart()
-                 }
-             }
--            Behavior on height { NumberAnimation { duration: units.shortDuration * 3 } }
-+            Behavior on height { NumberAnimation { duration: units.shortDuration } }
-         }
-     }
- }
-diff --git a/applets/systemtray/package/contents/ui/ExpanderArrow.qml b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-index 9baf654..729f56b 100644
---- a/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-+++ b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-@@ -37,7 +37,7 @@ PlasmaCore.ToolTipArea {
-         anchors.fill: parent
-         onClicked: root.expanded = !root.expanded
- 
--        readonly property int arrowAnimationDuration: units.shortDuration * 3
-+        readonly property int arrowAnimationDuration: units.shortDuration
- 
-         PlasmaCore.Svg {
-             id: arrowSvg
-diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
-index 9fbd2a8..7a66c56 100644
---- a/lookandfeel/contents/components/ActionButton.qml
-+++ b/lookandfeel/contents/components/ActionButton.qml
-@@ -44,7 +44,7 @@ Item {
-     opacity: activeFocus || containsMouse ? 1 : 0.85
-         Behavior on opacity {
-             PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
--                duration: units.longDuration * 2
-+                duration: units.longDuration
-                 easing.type: Easing.InOutQuad
-             }
-     }
-@@ -59,7 +59,7 @@ Item {
-         opacity: activeFocus || containsMouse ? (softwareRendering ? 0.8 : 0.15) : (softwareRendering ? 0.6 : 0)
-         Behavior on opacity {
-                 PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
--                    duration: units.longDuration * 3
-+                    duration: units.longDuration
-                     easing.type: Easing.InOutQuad
-                 }
-         }
-diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
-index 8882e39..cdb55f1 100644
---- a/lookandfeel/contents/components/UserDelegate.qml
-+++ b/lookandfeel/contents/components/UserDelegate.qml
-@@ -72,7 +72,7 @@ Item {
-         Behavior on width { 
-             PropertyAnimation {
-                 from: faceSize
--                duration: units.longDuration * 2;
-+                duration: units.longDuration;
-             }
-         }
-         width: isCurrent ? faceSize : faceSize - units.largeSpacing
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
deleted file mode 100644
index a47bf9b9589e..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	qalculate? ( sci-libs/libqalculate:= )
-	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/kio-extras-19.04.3:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/ksysguard-${PVCUT}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
-
-	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
-
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backport):
-	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local md5
-	local srcfile=/etc/plasma/XX/10-agent-XX.sh
-	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
-	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
-		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
-			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
-			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
-		fi
-	fi
-
-	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
-		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
-			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
-			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
-		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
-	fi
-	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
-		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
-	fi
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package qrcode KF5Prison)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${T}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${T}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	# Clean up pre-5.17.4 scripts
-	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
-	fi
-	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
-		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	fi
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 70ad587547c1..b3de9e581a57 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST plymouth-kcm-5.18.5.tar.xz 41872 BLAKE2B 29e9f8e56478140c0f4d54d297c9efdc33d2f20b18d9e1b1f16640c1abd1a2f5b6033ebf3053384dda6380d2a51c476842fa8587d402cba2e9bc0f98d6d44823 SHA512 ab9c883d4ed23315e925884662c72b42b350a1938b7dcf24dc30e0486fdd4c4449dcdc30abc45b3007d586e07998c96834918d2e91fcda3163c0f9f5b62c37cf
 DIST plymouth-kcm-5.19.5.tar.xz 41680 BLAKE2B d9a7a0c5d512322d0a9074e810fd8ebbdc2308985f471280c9c862f71aef77270fc39c9a6a4b4b2e8691c78501496fb101cd288b4b39b638cfc2f8f518ca50b5 SHA512 fbcebcec7ee4c69491b6425c5cac09801a26310ff15bc252bb66bdf8e322734c0d1551b97a4eb3e725e08e70010a0a4949560e2c5a58f61d1aa004620c8ac6cc
-EBUILD plymouth-kcm-5.18.5.ebuild 958 BLAKE2B 21ee959fc8ec20b11b30b272728d545f94a78c85ed6ec54cac60f2d2b2b9611d34e116b75d362f574e6ec80ef8d1c68436a46306a3e91ee7a3796ea444286b68 SHA512 9af21656b05c7c475b25fd37040987bd4c020b226d6660cbe05ff529eecd5b79280b8facf5d1a7804c8b1055f5bd24b250a66545860b2d2d757022812b469695
 EBUILD plymouth-kcm-5.19.5.ebuild 958 BLAKE2B 78e51aee8b32d3ae877e2302461c7d27b4acc64a5f96b88de213d58bafb2bf1ee5e5167e01c0ad0e1a1657a504f6cf4602b0190e56fb1a2af8d7a704dffca324 SHA512 a919680546d045c374efaa5ed77bcc2242a106022a66f9fbd8bac4b7139e4ef0a472ff10f0b206dc12c32b9505054ddbd442da4c9448a8276bf9faca9e534e4a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
deleted file mode 100644
index b10b03c30f97..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.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
-
-BOGUS=1
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 832fe8a44643..0f4db7c8f082 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-kde-agent-1-5.18.5.tar.xz 44592 BLAKE2B c9fe8bdc719bf5719358ff2633a143690114f5d6aafa2321cc02e15f1ffcdb78bff0666e05f4a028d504d6fec85e40c7b18489782fa6dc10db71e45bb8d343a9 SHA512 d9441e2379b665aa28d79451e5390a22f7a06f946020fb8c498352b0202a7ecbf7ca2e8dfccc7ee390d51ad441aeb6d818610d0d2e6a753e63326e4c350aba30
 DIST polkit-kde-agent-1-5.19.5.tar.xz 44824 BLAKE2B 117b1ccd5ec5ec38ec45edd45c33671b30fbea7bf53a444e9e172cad4d88d0165c60e59d9664348422f11930ddb089f574af03eea743c10e85b036702dc7ed3d SHA512 f0e27056af864535c533a2bedbe2445f9e1648789150eac16031a1486f6676f8a4c929fee5f8cfbd7e48a904045f6c2d283083b33bbb823a2da27549d42090a5
-EBUILD polkit-kde-agent-5.18.5.ebuild 805 BLAKE2B 3eafa464c89ff32e66657919a6993be2c96fc57e43001ebee550d1946b97705fa2bac08c905b5900e9d7b80187215a55b3d76c6b0b324d7c219de729ffcd360a SHA512 b0f4bb931f111dce6bc76a0a46848de76b46af967c1dc4a9c14c197d59a4ff46b546dfc151cc0c40d26f59fe6e08cdded592d566ef013c2980a190d8e206dc59
 EBUILD polkit-kde-agent-5.19.5.ebuild 797 BLAKE2B 6dbe80ef5baa4ad5176045b9826863eba32332d96492c475a38b0d0cc4439605dfe01b7834bf5cb9d181cdcc99b8195c407bb2dc4e590757ad465ae877619c69 SHA512 4b83db76c503e0f790cba85edb4e5c8f9090553f49efc0d5ac668c2fe4247e0c65ada2a2993723e71a24f8ac1b6b30f0a75979e9893b9cf8cac363606013d9d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
deleted file mode 100644
index e2e80ae0f5b2..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.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
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index ce90e3682f15..da49cba4d0a0 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,8 +1,4 @@
-AUX powerdevil-5.18.5-fix-powermgmt-inhibition.patch 3326 BLAKE2B 56eed72622b6432f3e823ef0cfe9f99d963ab7563fdcf95655072551d45d32a0dec83c5d125ea804a0749225c62f1f02e9d4df546acd3df225a7439d75b0cbaf SHA512 8713a906e70f5c11e8da95258c7db130ec8f81031813203472fb7696076296e59085fcb7b704152937efd7829a9bea7d4c9e1b3d60e3ac976d810d06f0a35941
 AUX powerdevil-5.19.4-ddcutil-0.9.9.patch 975 BLAKE2B b151f0109b4ee804359c63171df3020334f8410baaa4f24155d9f478540254645866eabb594040f334ae811d2bb6c4016cb5c175a64626aafd229babe312e391 SHA512 d1bfb6d7b16b80077989af9bf7600d063c5811d1fa115ce8985099022b468bacd54a4cd41283766780eb5734dc3d8d26798c9d74f5aa7f2bc003aa76b7c131ad
-DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
 DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
-EBUILD powerdevil-5.18.5-r1.ebuild 1955 BLAKE2B dd399d4215373ca4e4ddcd8746d0d2f809bec25f3ab771723eded65fa3a9513780d50e33b8f808651e9059ff11ad595a15a19bb6f9f7f42f26bdd7d8d3071e4f SHA512 a6b9381c04af9a398640dfcb3c2752f94d1c7b35c6d04b232ff66b0ff8c58172d85376d71d35d151526298bac19dae53b55e53f6f8e815eb5f28292dacd91432
-EBUILD powerdevil-5.18.5.ebuild 1872 BLAKE2B 46ab9c544e709262b937789c9e04a04aeeb6ab849d79590f9e75a6cb558f9cdcac31e9961e17da24ef19ec3fa67e92cacd1438ec0943603de314d9832c3771b8 SHA512 612c2b81b1b6ee6b76c6d9d82ef0046f6ee007702c6870540dcd3b560e1f72dc42e4ba2df3d70396ba1f279b92beec234ed6e82fdf304ce6a40e47400ef91871
 EBUILD powerdevil-5.19.5.ebuild 1945 BLAKE2B 764373c637212f2bbe811f850f6963980c0f4675b5ee34ed93defe6d63cc2eb19c83286c311c77b55701b6df34ff34953bd2f479a19572dbf395bf4077c76b81 SHA512 cfb3119edd15b9d212b1296d761bf4cf6e07cc59b21ea5406674e877177d21e7a644ccd62d211a8384954a678d2f7c4c91d8e4715c44a40545243537515b4f1e
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
deleted file mode 100644
index cb6e27b7a977..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d21102cc6c7a4db204a29f376ce5eb316ef57a6e Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Fri, 19 Jun 2020 19:51:06 +0200
-Subject: [PATCH] Watch DBus service right away to discard pending inhibitions
- reliably
-
-PowerDevil delays applying a power management inhibition by 5 seconds to avoid brief inhibitions
-to e.g. wake up the screen and similar.
-However, when an inhibition was posted and the process then quit, we would then still
-enforce the inhibition as it wasn't explicitly revoked.
-Fix this by always watching the inhibition sender and remove it from pending when the
-service goes away.
-
-BUG: 423131
-FIXED-IN: 5.18.6
----
- daemon/powerdevilpolicyagent.cpp | 26 ++++++++++++--------------
- 1 file changed, 12 insertions(+), 14 deletions(-)
-
-diff --git a/daemon/powerdevilpolicyagent.cpp b/daemon/powerdevilpolicyagent.cpp
-index a7d92dfd..2c2b1152 100644
---- a/daemon/powerdevilpolicyagent.cpp
-+++ b/daemon/powerdevilpolicyagent.cpp
-@@ -513,6 +513,11 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
- 
-     const int cookie = m_lastCookie; // when the Timer below fires, m_lastCookie might be different already
- 
-+    if (!m_busWatcher.isNull() && !service.isEmpty()) {
-+        m_cookieToBusService.insert(cookie, service);
-+        m_busWatcher.data()->addWatchedService(service);
-+    }
-+
-     m_pendingInhibitions.append(cookie);
- 
-     qCDebug(POWERDEVIL) << "Scheduling inhibition from" << service << appName << "with cookie"
-@@ -532,11 +537,6 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
- 
-         m_cookieToAppName.insert(cookie, qMakePair<QString, QString>(appName, reason));
- 
--        if (!m_busWatcher.isNull() && !service.isEmpty()) {
--            m_cookieToBusService.insert(cookie, service);
--            m_busWatcher.data()->addWatchedService(service);
--        }
--
-         addInhibitionTypeHelper(cookie, static_cast< PolicyAgent::RequiredPolicies >(types));
- 
-         Q_EMIT InhibitionsChanged({ {qMakePair(appName, reason)} }, {});
-@@ -596,22 +596,20 @@ void PolicyAgent::ReleaseInhibition(uint cookie)
- {
-     qCDebug(POWERDEVIL) << "Releasing inhibition with cookie " << cookie;
- 
--    if (m_pendingInhibitions.contains(cookie)) {
-+    QString service = m_cookieToBusService.take(cookie);
-+    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
-+        // no cookies from service left
-+        m_busWatcher.data()->removeWatchedService(service);
-+    }
-+
-+    if (m_pendingInhibitions.removeOne(cookie)) {
-         qCDebug(POWERDEVIL) << "It was only scheduled for inhibition but not enforced yet, just discarding it";
--        m_pendingInhibitions.removeOne(cookie);
-         return;
-     }
- 
-     Q_EMIT InhibitionsChanged(QList<InhibitionInfo>(), { {m_cookieToAppName.value(cookie).first} });
-     m_cookieToAppName.remove(cookie);
- 
--
--    QString service = m_cookieToBusService.take(cookie);
--    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
--        // no cookies from service left
--        m_busWatcher.data()->removeWatchedService(service);
--    }
--
-     // Look through all of the inhibition types
-     bool notify = false;
-     if (m_typesToCookie[ChangeProfile].contains(cookie)) {
--- 
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
deleted file mode 100644
index 79f0394f5fe1..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=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/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-powermgmt-inhibition.patch" ) # KDE-Bug 423131
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
deleted file mode 100644
index da5ea9b9b346..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.18.5.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=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/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 35f5cb02cda4..379d11d91842 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST sddm-kcm-5.18.5.tar.xz 62184 BLAKE2B d4d55383540882eefafd39cdc65b2f686e271f7e3bfa1f2859b2de55a46a25f03db3413533b74d73782415decbd2dd84fc6f2c9ed517381e55b0917929832c99 SHA512 614cb8780549592ffc8f4f310aca7bcdb68b04b847118d77308b039711c81aee7a9c04726d0e2002b3c00a06c09465752a8886374a286574dfb7aeaa0919089c
 DIST sddm-kcm-5.19.5.tar.xz 62468 BLAKE2B e02a9c839cfaeb8d90a9bb317a6025be9d65399963a4ffbff562572bcf722d499cd20e007f13614f609ffce75322ee6b834b0cc760dd59d35952bbde22d85ecc SHA512 5eb79696addcb08e8c6eb95960a43cfd7ec5013a7948d67b025430fd09ad20917a71e903b5a2b0b0f1d47e7dbce7473cfa69dd143b9c6b2f4fbb8828cdd86704
-EBUILD sddm-kcm-5.18.5.ebuild 912 BLAKE2B d6782262b8cba1070aa63505619974da1511c983549e6a4a7aea9c7931dd8ba08378a9aa8563c62cfb8a9a3866229d28bdfe40193dd94879da287dddc9f0a4e5 SHA512 f66add63329fe686ef76e203db0698242eff2a1419b191305beaa38bf2bed68071ceef78e45fef52050bd5cce92d8b267f35b14c6ee0e999e517e3ed75a27a8f
 EBUILD sddm-kcm-5.19.5.ebuild 912 BLAKE2B be1a56103d4842a9677d7e123d05f0dcfb67ed81029d78cb105c09e12b1d3c32c17536da667dc8a728db3e90e75172e6d62424d9848600e2cf878488413db263 SHA512 753d2993319ff3e41a74c578cd92813c38dc4fdf8af10a015ec6882a3fade54d4201242e568823307ac212e7177720314c17065b1c8fce32b0603e016738c7bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
deleted file mode 100644
index 2fe831b8abab..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index bc4fb17deea6..0f2063692cb2 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,3 @@
-DIST systemsettings-5.18.5.tar.xz 178252 BLAKE2B ac8ec0ddb6eb54cf6133f1616284d41afbb630fd97ac55cc6eb68846c3a7e9028ecc2caed41c35f624235a74e28d810a81196ed3d6891cb0ff1387ff4bf45f32 SHA512 b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
 DIST systemsettings-5.19.5.tar.xz 183360 BLAKE2B dc8eb9b466f2f86405175e29e7abf54a243e64022222f5e8a370d17bedcf44a5b35e760b0f2f9a7da67a5845d68a77049d7d2ba405f2574b4676a42fea0b0676 SHA512 381aa73e5bc195f2c05cf4df904a031f8415fffb99eaf33414604bdb623e8618c66ffa2e5b108b7838f5d9cb83cec578cefa4e414d9d7fa3fe258c864e1568fb
-EBUILD systemsettings-5.18.5.ebuild 1825 BLAKE2B 59492e2f140213e274061c6a5decb4c0e0e5cd4858e3d43a39588aa214f7012039c21e738989efef2165055008d37f90e2f2cf3fe20615e424c94ef06f12971f SHA512 b3edc87210717f0e4354d2d0ac359aac653913f52bbf7d32a9cb884399ea4b931b1936c26589b3262ca54e52305837d55fcbe7b1b0614de56bcf9a119cdfe08c
 EBUILD systemsettings-5.19.5.ebuild 1698 BLAKE2B 4963706de0bb6d75e70bfba760302c92b1929c1bb1a4b7321de2adbf98e751b3f5e4e4cd8a2b1132ca0feb584a2011fdc18a3faa4467624dc64caf23da0ccc60 SHA512 68ce3c2eca46848c3301ae2881f8c7a75a1290aec1c9ff3be43c1461a577013d3c7dd707f5c8429c64d6783c41ba0e8848a3f401947b24c8d6a20cf013a2d7db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
deleted file mode 100644
index 0f5b48d3d7d3..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.18.5.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
-	fi
-}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 8ee1c81e79d1..25ceacf45562 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,3 @@
-DIST user-manager-5.18.5.tar.xz 2165888 BLAKE2B 011f40ce9cf18b9bc35c33ed56de416eca8ca6320f07ab725631ec335d58c2103425326c2c2e7d95385e0a70eda4b59419284dfe1d48259da45dfdc4dc04ba08 SHA512 fd3f26f1f95782e4e2ca04e92adc38953d026db9e840f823be38f66f9c790a9e154255dd821358f62c624194be8b4867354292df25289092ceaf87ce590cc9a8
 DIST user-manager-5.19.5.tar.xz 9930268 BLAKE2B 62ad7d6ae0847ee53e6529428c5ea52840a92d32b512c24310da98a50d78a0706c617b210129c4b9abc8da947edcc0d2c90b3962697eb64ba2b6457648cc58df SHA512 de892a390f8843a4b81e5cb357fcab20b8fcb2a55f0dd83ce551a5eac3c07b80688af0a87ed44630827ebc1060b21371b19936a726f23cfb38fa298e8b162bd1
-EBUILD user-manager-5.18.5.ebuild 830 BLAKE2B 898ba4ca8eaf9707001ff3fa1c2862880c73c9932835b505ac7babacca39a7edefb9e89600d287eaf7b9c292b1f20eae7b9313e036bfebde69cf7db201b58d8b SHA512 063f2bd3657fe1156c21241d323d9cc5e591169db53130ecc42e2f45bd3820906458d555013cfce9790db6bad644213629b2218c0b5304d471e13efcb094daa6
 EBUILD user-manager-5.19.5.ebuild 830 BLAKE2B 36f3a6f34a5c43ba4f87670afa68d306c1934bbdf9be872aa367e9e1ab7223377996dbcc321af71fd7b1eb2373006c99e737265f42dd524b71b9e2f4e857a514 SHA512 3647de8d236cfb4f1293f9e401c354d0f0a26c7ffdacd5fd4ebdfbc8bdc12a4237533af23b29929c501a83b4f2dff72dc55e8df91ff3a8ffdf8f4ae55245ca8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.18.5.ebuild b/kde-plasma/user-manager/user-manager-5.18.5.ebuild
deleted file mode 100644
index 9c51358e83b2..000000000000
--- a/kde-plasma/user-manager/user-manager-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index dbecfb11e7f2..c2f2a3d00220 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-kde-5.18.5.tar.xz 65068 BLAKE2B 0455aafc8e9c0544bbb5df398ca80fa395391d5205e4e1a88a09e0f8bd399bfd5c5d56ef5b2cae8892cd48e4ddaf1c49dd583e04a0157204c646d3833005690f SHA512 2380250e4d159b69a518e6cffc0f9310386683d7d852ac9b5d6c63390ccf95f325197d3a6e27482b17602d0ce7e69bd12262dceaf178ce93a81f7ad6f95d7f6a
 DIST xdg-desktop-portal-kde-5.19.5.tar.xz 76348 BLAKE2B d3205542ec76bd6c9fa4ae5076d0716c1f201f8c90aeeb61dfcaf9010ada0b21a3e80cff70089077646059d56d19033f8ae887b34c9f30c54b8190d559df0a09 SHA512 5d82e5a1553e9fcb471895e356a23915cbad1215ae1fff5fa6fac6f1673af4c406171131222a88a13eee847dc0d99f8bab00dac1849dfa6844b1672ae7545bb7
-EBUILD xdg-desktop-portal-kde-5.18.5.ebuild 1310 BLAKE2B 21540d4659f2e56546b591e55aad777ac7f404cb506e223a2704855d231f64c7744627d4676d57d0d429b6084082b26769e8ddf25f017a546febc7c469e38b33 SHA512 9a32516c5a495ef62b2b668bca6cb0903ade52a91814df05fcb711b82f5f24816025b7e338a74ccba8dddf372cf6f1652a669c4713aab0793e3e25ee5245ed5f
 EBUILD xdg-desktop-portal-kde-5.19.5.ebuild 1213 BLAKE2B 3a9514d45be2e1b59d30cb76b0057e291829a1aaac7cd8f2832f5719ab9585272185b4b064eca40f23f3a3295c562e296ca505eb9b75640e8f7cd1801a704ec4 SHA512 425f92eeaf6ab77c520df2dc69ed3bd7a1e5be79dba8afce0f656ff138c94772d63d71be4731420aa2c65ac4dd3f515f72536be6c1ee8b54b04110ec53775398
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild
deleted file mode 100644
index cfa74d3b881c..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.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
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="screencast"
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	screencast? (
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal[screencast?]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package screencast PipeWire)
-		$(cmake_use_find_package screencast GBM)
-		$(cmake_use_find_package screencast Epoxy)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 1cd2d8cd1481..5c3da5381e4e 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD xembed-sni-proxy-5.18.5.ebuild 1045 BLAKE2B 7bd18d0916a8b9bf85c558043162a446f94860769f32cd741919a535ff3227170e2ee1afd9edbc48f98c99e4acfef71788c3e6f85dd1be035a494d930639f4f4 SHA512 bf1bfc4583de9178b0d525662baaaebe96cc600b90761c1c6516a8e2b1a757f5afae3edcf986486b63cc2c4849850d8720e97763488a3092c2acc98c1979b582
 EBUILD xembed-sni-proxy-5.19.5-r1.ebuild 1048 BLAKE2B 2335a894410e71d1d7e46696ad9365008f99c4275e99c44c379a57099c8ab6c3d06f2d88c0d48d5bacaecd08a830875370f016c9eda77ea2e2ed294341c64e01 SHA512 43fc124032ccbca8f033373fde1b4432e0caf762d03d476f909c4e4732d2e2dcb4f9144e1fd3f4e1724249fc066e3e98b860b51c2f088c3bb9a8b37f9513ca42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
deleted file mode 100644
index 4879c278a1ef..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.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
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index b0e90e959273..8cce1eff5c15 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/meme b/licenses/meme
deleted file mode 100644
index b8a99b53f409..000000000000
--- a/licenses/meme
+++ /dev/null
@@ -1,32 +0,0 @@
-    Copyright  (c)  1994-2006  The  Regents  of the  University of 
-    California.  All  Rights  Reserved.                        
-                                    
-    Permission  to use,  copy,  modify,  and  distribute  any part
-    of this  software for  educational,  research  and  non-profit 
-    purposes,  without  fee,  and  without a written  agreement is 
-    hereby  granted,  provided  that the  above  copyright notice, 
-    this paragraph  and the following  three  paragraphs appear in 
-    all copies.        
-                                    
-    Those  desiring to  incorporate this  software into commercial
-    products  or use for  commercial  purposes  should contact the     
-    Technology  Transfer  Office,  University of California,   San 
-    Diego,  9500 Gilman Drive,  La Jolla,  California, 92093-0910,         
-    Phone: (858) 534-5815.
-                                    
-    IN  NO  EVENT  SHALL THE  UNIVERSITY  OF CALIFORNIA  BE LIABLE 
-    TO  ANY  PARTY FOR  DIRECT,  INDIRECT, SPECIAL, INCIDENTAL, OR     
-    CONSEQUENTIAL  DAMAGES,  INCLUDING  LOST PROFITS, ARISING  OUT 
-    OF  THE  USE  OF  THIS  SOFTWARE,  EVEN  IF THE UNIVERSITY  OF 
-    CALIFORNIA  HAS  BEEN  ADVISED  OF  THE  POSSIBILITY  OF  SUCH 
-    DAMAGE.
-                                    
-    THE SOFTWARE  PROVIDED HEREUNDER IS ON AN  "AS IS" BASIS,  AND 
-    THE  UNIVERSITY OF CALIFORNIA  HAS  NO OBLIGATIONS  TO PROVIDE         
-    MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.  
-    THE UNIVERSITY  OF CALIFORNIA  MAKES  NO  REPRESENTATIONS  AND     
-    EXTENDS  NO  WARRANTIES  OF  ANY  KIND,  EITHER  EXPRESSED  OR 
-    IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF  MERCHANTABILITY  OR  FITNESS FOR A  PARTICULAR PURPOSE, OR 
-    THAT  THE USE  OF THE MATERIAL  WILL NOT  INFRINGE ANY PATENT,         
-    TRADEMARK OR OTHER RIGHTS.
diff --git a/licenses/shrimp b/licenses/shrimp
deleted file mode 100644
index be557939051a..000000000000
--- a/licenses/shrimp
+++ /dev/null
@@ -1,18 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that neither the name of Stephen
-M. Rumble nor the names of any contributors are used to endorse or
-promote products derived from this software without specific prior
-written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/licenses/vienna-rna b/licenses/vienna-rna
deleted file mode 100644
index e77ea2f10f06..000000000000
--- a/licenses/vienna-rna
+++ /dev/null
@@ -1,19 +0,0 @@
-			 Disclaimer and Copyright
-
-The programs, library and source code of the Vienna RNA Package are free
-software. They are distributed in the hope that they will be useful
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-Permission is granted for research, educational, and commercial use
-and modification so long as 1) the package and any derived works are not
-redistributed for any fee, other than media costs, 2) proper credit is
-given to the authors and the Institute for Theoretical Chemistry of the
-University of Vienna.
-
-If you want to include this software in a commercial product, please contact
-the authors.
-
-Note that the file ./lib/naview.c has its own copyright attached.
-The ./Readseq/ directory contains a modified version of Don Gilbert's
-public domain readseq program.
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 7ebfdbfe364f..d56ff9dcccb6 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index d0057a852624..b711d4d80f8a 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1,5 +1,6 @@
+AUX kube-0.7.0-appdata-location.patch 1119 BLAKE2B 339212db48eb8ab60eb576cc0721908f638fe6fa727b798a5fa6400aaf34ecc1f8a6ec5b0c02bec6f4fb33932d719943af7dbc1151df4b74651b370eba86a0ae SHA512 697454634b2e5a38375b1b6ae66e597b553a7472d0a4e8dfc450b8e76ebba3fdb725f143bb806967d9548a42888fb9713b88f8e1d8e2bc0c82c5a5c161f58a39
 AUX kube-0.7.0-require-cxx14.patch 1178 BLAKE2B 8a5cc7253df28f2da7cd211802f340106f56fe5ee97d53959ed30470158fe8ebdd24781d0bcf21b62449ab6a99e62e5d864412ef8e6f9374c0bf1201a7b73aeb SHA512 8023b089fd46f6c47d93f485539d582d18e2332638db274bb69432bb2592b601461889c0542c618f2b521d8cd38ce6b37e61444e3699be1e7dc1b13b99127d01
 AUX kube-0.7.0-tests-optional.patch 1778 BLAKE2B 27c16346086039f8604f47ca1f54dec51f553633cc1a96594ab8c99cf6ae58dcfe06f9599276e27aad6b9cf335f9bb682f2972264a2ae2f873a4d101c2ddb021 SHA512 0e018d404437a00c5a8d673d1e6db76af810c7e97e6a2d19bdb884d592fe09ccccb0c35d91c314c95dccf44b3d8f67881038590d2ea181ba87f366cb05690599
 DIST kube-0.7.0.tar.xz 627968 BLAKE2B 3dcdbd3a26c7940e360a8a97039ae832dd0e143b0a595f7a5dc30ddf20b41d0fdb3132bb6aa26d0322dac66fd1a6b0adc52e684c76205066d751a0b3067b3a5a SHA512 48ca740e54393da4aaa9b662860a479f2d9458f1d2da0fce3efa7091ccabc56d7e4778b9df994d53c3bcd6f26a367280337e785da6f0a34bd31e81c764fcd8ad
-EBUILD kube-0.7.0-r1.ebuild 1502 BLAKE2B 126ef86ee0dfd9572b6533c73c1670b17def99f1bebefca1b11a336882694ebbda0a1905cd2daf677072718192c18d43c82069ddbadf4514b33085d0587ce512 SHA512 dbdc97609d8e97f7fa36d2d50fc02c41c7c72787fca7b68100e18b5733379ee350eda5253548d7f26ccde6a53f090f597bf1f71e01822cd7586350a41be239e9
+EBUILD kube-0.7.0-r1.ebuild 1512 BLAKE2B 54c0194d2902e55783468509fc578606492ef221128e048ffe0f0526f23f5b27f47a77d25222f674885d1bb56ca7cb33b04ec8c5660feef26b302298d7468517 SHA512 dff5daa9397dfcc49819dc41fac47a3ecd148c89593de415877847b67471b1ef10612a5edec35d6545d29a6db0808ff01b102e7d7a147cc272ab770197157f4c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/mail-client/kube/files/kube-0.7.0-appdata-location.patch b/mail-client/kube/files/kube-0.7.0-appdata-location.patch
new file mode 100644
index 000000000000..6e771c037177
--- /dev/null
+++ b/mail-client/kube/files/kube-0.7.0-appdata-location.patch
@@ -0,0 +1,23 @@
+From bf9e6bc6e9885d30f2db124e803403ea327af138 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 10 Oct 2020 17:55:19 +0200
+Subject: [PATCH] Fix appdata installation path to /usr/share/metainfo
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ applications/kube/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applications/kube/CMakeLists.txt b/applications/kube/CMakeLists.txt
+index 761d1f18..f92f66f0 100644
+--- a/applications/kube/CMakeLists.txt
++++ b/applications/kube/CMakeLists.txt
+@@ -49,4 +49,4 @@ set(KUBE_APPDATA_HELP "https://kube.readthedocs.io/en/latest/" CACHE STRING "app
+ set(KUBE_APPDATA_PROJECTGROUP "KDE" CACHE STRING "appdata projectgroup property")
+ set(KUBE_APPDATAFILENAME "${KUBE_APPLICATION_ID}.appdata.xml")
+ configure_file(kube.appdata.xml.in ${KUBE_APPDATAFILENAME})
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KUBE_APPDATAFILENAME} DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata/)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KUBE_APPDATAFILENAME} DESTINATION ${KDE_INSTALL_DATAROOTDIR}/metainfo/)
+-- 
+2.28.0
+
diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild b/mail-client/kube/kube-0.7.0-r1.ebuild
index fa227d0bc5e9..50f1f2d0eb75 100644
--- a/mail-client/kube/kube-0.7.0-r1.ebuild
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,10 +30,7 @@ RDEPEND="
 	kde-frameworks/breeze-icons:5
 	kde-frameworks/extra-cmake-modules:5
 	kde-frameworks/kcodecs:5
-	|| (
-		kde-frameworks/kcontacts:5
-		kde-apps/kcontacts:5
-	)
+	kde-frameworks/kcontacts:5
 "
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
@@ -44,6 +41,7 @@ RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}/${P}-tests-optional.patch"
 	"${FILESDIR}/${P}-require-cxx14.patch"
+	"${FILESDIR}/${P}-appdata-location.patch"
 )
 
 src_prepare() {
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 9dfbec787977..61e89bf39b62 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,130 +1,9 @@
-AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a850355fabf7d1a167f73f51c86fb77ef4ec651fa48cea3010752836feb51dc71c1ba787c95fe4deef SHA512 d65275c671277af884c5de99131dd785754fc68d222029fe2e863f08e821afb98e4b614ae0509b9b0aa7501ef72c52ae469f98806024ec661e09a684e2796d0f
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44f2dc0daf90762a0307c56eb1777e0acd572c6e131e5494c6586c4af2154e0980d25c0f4d4ab3cf4df1747892 SHA512 924313eb0e23b3609b27e3984cc39545122fdecf69d6382d11f18e92962d7a2018a1846404329f21b5880b7baed9491c7506fec998081413fc7c2c4c6c4e6bd1
 AUX icon/thunderbird-bin-r2.desktop 851 BLAKE2B 09f88c3e849ef901ff7825752c560c212e746aa6bc941b01ac76db64d0b992130550561214ebc868373a67fa99be63d6048cda392e0a6766f7fa6254615bfe21 SHA512 8d0f5e526bc974b82f4fa8e077c2c3f816af704ec2db5b5d16059085700afadfff313ea5d039c790d82e3ad54029e63d4050836523fdf2836ff89c2e30165a35
-AUX icon/thunderbird-bin.desktop 248 BLAKE2B 959030dc5f1e8a6376259903d3c61b40eb04ca625bf6fba91e71a809580665879775681e040ecd7627bd6f527843afbf7e1fa66180921657922bbd05aa656b75 SHA512 8cc1460c0b48e3f527b1e990b5588fa23f38d27ecbb7689e638eda79c9a3689087c0c90f2e99f5d36c50193d3d42ff7b8f01eb49af7768be69ebd33f962f9b23
 AUX thunderbird-bin-wayland.sh 128 BLAKE2B 015511404f636845d7248fd3cec02eb9a4ec70567da442bfa5ca8f2168634347cb478c63161c422facbf47c8d5a6b7358ce7ee9cdbd48c4e555460248287e06e SHA512 9df7306d7046a9f51e60e70572e6e8e22d42e6065900416fd407dce5c083dab3212877ee9dfc7f5af7337996951577e7b7c75e583ab811d6ceaadf6e6c903a7b
 AUX thunderbird-bin-x11.sh 122 BLAKE2B 40fdde93db7c5c27174e22295b946834ebe37763b0499f710e4aa7030941654bdab714c886d4bc4ef4c8623e54819ca2ce6d6786901e8f5ce29213ec59228472 SHA512 907d34b5e67b8806dd3f546f67ab3818dc0fe5d487aa8706046feaf68e23ef69be6e0ead0a31c89c559151854f8837bda93fbeb336bf73d96839656ae649d1d3
 AUX thunderbird-bin.sh 2972 BLAKE2B f9cdb961ae34636c178df29094ef8e42ec29fd5f70d9aa830cfa4113b32c69aa5a47bed083e0923d2315b5b7a0ea72aabb298695b3457968a3338e28bd2c8159 SHA512 ce4afc6834268d3a42deea5da2173548fde02a4ea4a6ff69595f07af41886e7e31e1c8514abac1c52bdedf23e40a9366df83bbe8c2a00d9cb23fd2958dbf9fb0
-AUX thunderbird-gentoo-default-prefs-r1.js 425 BLAKE2B 407ac0280bf3716b7bbf122938079b111b234b0a82e60ea984c1ef773b37b9ab7b0fbf34e4f2a74dd6f0d252cb16ca7da3ea95e7909f6e3035c3f75ed47354d7 SHA512 c3f9b42dfb39654d3109025fff27170e5e02cce031acdd1563c31f85d68eceaa19448ef2fe960499aea4993f8976336669f45fb0763181ddd6b497cadeaa33cf
-DIST lightning-68.0b6.tar.xz 1786960 BLAKE2B 96d09f3743796aca6b01bb84d3b93f9e25e4ce92f10fbab026ab64c1e5c0a67f97f71c73df52ba1f2ea7f9acb4fdf62436843a88c501a7ce6dd1fb9d7c02bdc6 SHA512 876efa20219b83fc5c6badd8e7fac5e8395cbeb25cb0ed0d8971d57df4962949d9c5a1de386540fb175a1ce6ff5e9de2e36cd6c7829e97375c9c190ed56aaded
-DIST thunderbird-68.12.0-ar.xpi 617167 BLAKE2B ba476e918fb2a0229ff75eb8daeb7823fe285e79088788fcb0c638c99e55feb79f78a4df0ea2b0dd837be8d12988330fdfc1117dfbdc65e6fb99676b94aae404 SHA512 05169e14a9c8a8bd5e36dd377d4ccc034d3603320298eea5ef2eb329ec3f72595bb6afd57930d3b04c1cfc6b99c122d98a78a9f6a258e6b78c14843e68652adc
-DIST thunderbird-68.12.0-ast.xpi 551299 BLAKE2B 5117f06a35ab88735295175ad900fde7c09d1f9563e96cdac087121e686f056722c939d65544d57b1637300d358ae50d8869973e9c17869bbfd6c42e3d843330 SHA512 54cce22c335e1361ce8e92d5174b0edfaf1b635be13b55acd505ecabb84e7a9dc0ebbb83168a10772a0e95b1906b1574b91b6f2f6e1901cf56e70fcf08bc16af
-DIST thunderbird-68.12.0-be.xpi 646280 BLAKE2B bad2e5dc2615457f62daa019e59083c0546db35d4eb95876abf4fcd6552731f318337af0cccad400bdc001c11ef306e7e736e56a1105f5234f12c5ead8c584e4 SHA512 1ee9e0b4dd0b8598aab1cd9efba5e454b6930dd6f564b7006576dde20ba71c344ff260d7595796061d8f8fbfd6aaf157abfbcb374415c293e3cc928e2e73ffa9
-DIST thunderbird-68.12.0-bg.xpi 646226 BLAKE2B 85a22c4f52cddd0f1f5d7f0c556b77b2d5d79c2be0d6f6fc870193a129bb202c069ac5ba15cf12e4481228db3dd3c445eb43c43c2db3b38f5dcb563492211ee7 SHA512 b7b87144ba2c1a2214b6452a5f571fb5c94029a72d6deb5beffec45c2382fabd00f025029c011726ef48a9aa423c1527f37991e19631a08f698981d6974281c4
-DIST thunderbird-68.12.0-br.xpi 574852 BLAKE2B d97715924e85f5a1b3d6bc97921db245f1cbad777eec89420ecf0ac90b8879cd8c8e7fb2a597e2021b76b84ac96edc680eadce8535f30e8aa880edbade038abb SHA512 6dae361254800caee67570de0a894cce70a8f379e7d71e788d18045bc52a5f7965460ae29c1ee28ca348f2a6d4ecccfe28314dac0f213e7d4855ac8fe670f849
-DIST thunderbird-68.12.0-ca.xpi 578439 BLAKE2B c4caba0b285ee619110e8ccae5bc8a9c53f3f83320bd2970961057e3718a47809a7c14f89444190f290eff642ca0d4b4502bb9ae789f574b5f98866dab24c7c1 SHA512 5992863563165e3ec4bde17c6f88f9e6237d7a09f4905ea4626eb24b470e413476f6eb2ce90081ead02913cf27d338965bf3d31fb42ad2294443f7cd7f75fc29
-DIST thunderbird-68.12.0-cs.xpi 603043 BLAKE2B 1dd17b8abea3fe7bd31442895eb988f880f50aa729bafca6cef5aeace46e4a42e7cb47874ca244a606ac2db9481e5b06b28d327b3bd329a7c5d2c21609e5759a SHA512 5e972cb6c41603d122cf7e08b4403770513706ff748708e31a0b2c7148e7106ba1c3f175469d0152e6534dfb0414818ff565552ce65c7fe3ddbc59853024723f
-DIST thunderbird-68.12.0-cy.xpi 589903 BLAKE2B 9a232e7fb3fbb838b9fb9a16ffd688da7784a176df8bcfcabd41e0f21f3e51b10a1a5b1fa9ed453088949706056ca41a511bbea53ad192a53928cf554b1c2749 SHA512 ab0d2637f17a6c49dce83d80e229fe76f5187aa0ab160bf4c03a7d0678112149195105ed9b0b977af09f8efe29dacaf0846c7e5a8567cbeca1ace37d0a5224c6
-DIST thunderbird-68.12.0-da.xpi 588350 BLAKE2B 2a8a6e2ad4faea2ed9278b24d0035721bd651689ca4d6c638f11c696b1cbb666833162b6be3f586ced77b8ce8eb2e604b1bf788f1432c2914b2b9435814efe89 SHA512 04b0051c2a2d74bc0091e4f770537439284fcba936f283529abaea7818285739adf5ca979f0e843cae238fbae9f1c4d1ee9916a296224edb9945f0a4e357b0d8
-DIST thunderbird-68.12.0-de.xpi 597804 BLAKE2B 240bdcc509f5c7a79972b9be1bd333cd1c09e27ae216d19486c5cac0c59bde904088d8113101d26bd1c078dc29b89cbfd284a8187a98a6eebc649bba729bdbff SHA512 f7fc5eb9ea5f74c257ffcdcc1dd450f0cd0bf2a247e893ac251a26fe9c7a4e2b83df4b9fe71c3eadec8b86fa525c0a989ca76550718ed992e48e8e05f796751b
-DIST thunderbird-68.12.0-el.xpi 699222 BLAKE2B fab210e1541353bebb78d72d3d344f6cbfff67b42af3039dcd9c2eead44395befa51aa9128c62ebf7eaae196cc62807094b20b3c8f636e969db4871a03db6050 SHA512 323bdf6823e32efeb18962fbf4429e335b8301039bd821b7edb1f7278b939c3f54b1cc3765318570da69ba4e1da9bbbede6c870c9d17a607f3e77a3637d85319
-DIST thunderbird-68.12.0-en-GB.xpi 556404 BLAKE2B 44738d9782ada22595fd6df8239361a5c93c7f1886b9f682292c0e0fb6ef8242cb305b1a8838f1631d867a736639b0665edc69aac9106a9d389f63cd60720c5d SHA512 68915a4575043f54db65d6653889452b376cae01709605c7a9a176e96d44c259f9aa79fe40ffab62d697721f9ee1c24900b04ea6f8554be9834bc8ab11d3c612
-DIST thunderbird-68.12.0-es-AR.xpi 596552 BLAKE2B f1ab6b345d91388d41ced66b384c472fdc10c6d8f29c178499a97cdd03df022591f61b7614d12d6ba83c6bcc6d804dd93deefa5b1bd57685f76616996e12f0fb SHA512 e715bca3a5c8f50bc40d3236345a78fec93a5adaf0b87e301556ac4af0ffde6fc3aa484f5876430360872b4043fb1c54c5250a2d51281abba0d4bb1ce11d6c65
-DIST thunderbird-68.12.0-es-ES.xpi 518351 BLAKE2B ec0a48e5d1ccf00f2a526ad49dce5b05b4ae10ea00cc782ad0826bd721c855f4cddd7d9ae6ca3acb9f4387fd0e78145563089f782cb60408ea65dfadee1e14d7 SHA512 9bf65da2390d887f9d6f094c9d35d47714deaff7dbe2de84f2fa7d4096305b70e20664c2aada6411c4da5dc6f98cdb1c33c6e6b6c692565b8baa09cbd930ec72
-DIST thunderbird-68.12.0-et.xpi 573581 BLAKE2B a27d14f8f40fb3b43dee3f1bc50bf8cc5274e8bf8ea1f638787b72b43aca7caa7bb179a817c798e6ae3cc747bb167b6b6c6a1816f273f00cc31bf9d739821ba3 SHA512 5207357b4050788be11171104ce96e0825abcc759c03dc32d80bc96de0ddf2e480ecc27169d4cd82acc420e20d308c27a34deb215734cf401bcbf97e0f3a8df2
-DIST thunderbird-68.12.0-eu.xpi 579944 BLAKE2B bb9a4c87f07e50936908fbea490878ba268217454a26ae6f2dcec0e346da10ffdace85b26cf17309fecf47d971fd06651405ada674604859de6ab00a4609c3af SHA512 ddcdd5ea01dd5962e41dc575e3b2af2bc42142198817a6e24d1359f4788d5e666b4ad7888ea009b8b0c22da2312044003749caf8268b51574d853dfbf438037a
-DIST thunderbird-68.12.0-fi.xpi 578418 BLAKE2B 0621d3d063193e3a4d1317257223e8188f168f08fdfd051e34318de494fa5645e6f5bcf039619b539b0412119d3bf95aa40cd14dfcfe31c8c7ed324bce85a75d SHA512 65ba058bd9a45c27a60df4d7fe7c17b5d908d523f98a904f6e9aa0daaae40a21280f408af849e5badadfcf246d274cb3c4254ae31c59d27bdbcb6d283a9f15bd
-DIST thunderbird-68.12.0-fr.xpi 607810 BLAKE2B 7d43145d139c80131efe9926a874bec0ef443bc652697d657844b59954a6658794b2c98f49f97bf2de111bff5f9be62326cca69a9464b9dfe08ea78e6edf3683 SHA512 a9bd8838d6633453dd5aa2856335b3f0b506797207321426ab566161582793c597b7ca1f1747b25c34d8b6d465a4442c45eb287ecb7074fd922069617509c955
-DIST thunderbird-68.12.0-fy-NL.xpi 594467 BLAKE2B c9b55123ad37cd29142f8fcf17c8d74231cad02a87101cfde9966e76d7cbd532a35cd6b9f631af4221837be41b22579ec67547c4180f48c3e09ed08771ac6bef SHA512 46f48ae4a4164d5d3ab522036492f96321d636accc554f4c39ba518637f6c354c92d68015c1a3a899ece04d265787805427623f32c5eae08b5fc28fd2648fec3
-DIST thunderbird-68.12.0-ga-IE.xpi 588710 BLAKE2B 50e6ca57fa6f8bed26727e12ced047f251e3fc762e38802df45947ad0d39367c085e2ae305abd95cb4cb0217a05ab53a34cc52fad11ea3466d3b4fddfdfdf844 SHA512 c849c2f7b6f236a02daa6b49fa853b73e1166af8e0f5a809ad0e5431baee587ffc261126df768362ebf2edce94f5267bf947e0967324f416509fbbf637cf0024
-DIST thunderbird-68.12.0-gd.xpi 587109 BLAKE2B c7e2fb96e5e8b6dfa1d21f5dece3dbb5dc807e51f65ba810b9dc6cf32f359e3ee5396f35f41e89b2db7c475ae25927c76d3b29edb1e3e04f8c2ad6e44ca0b058 SHA512 70b4da18533019e5125fc180cd9488d8d140819d1358f12bdc335035903efd53340d09f2446b7170d2497d6b8d22bd3ea9318e9de0f0bee0dece0edc3abd6150
-DIST thunderbird-68.12.0-gl.xpi 568397 BLAKE2B 8db7da3d74147ec6c1c16af6664b8913963770c2b6f398187134efc1eebf0b500c5edd87a4ecf390ac5017347c062c95fd845d0cbb63eef31d219f042551956e SHA512 0217b33dcb2ca993b17dbd3f83ba49c0a197ea3a1452e8cdede89ce56ad5f18d18029baa6b9bafa2d731a49e17f248cdf526f05c90176eb165462343d6e17330
-DIST thunderbird-68.12.0-he.xpi 604788 BLAKE2B 72448fc91e8bd8b721e181e6fca0cc18dc83461e64571845c5e8d7b00a9125569ef9de5d03e38f9e611e9c65ed5362dc046d0c0d789e0a70b7c0e3a48b6b1f3d SHA512 eb3713132811e4e6e7fbf46962c7f413dcd063db69fd12cf1753e0cec776be6e94f080618ad2ea865f854aa5aad125e787abed4272df499f412a68560deae596
-DIST thunderbird-68.12.0-hr.xpi 583783 BLAKE2B fe6e1b4f52fa7cb62b26ff492a6720845cada25aa409dd24b00a6fd3aaf1c8eb4d7b35e83377ae1a83d8ed8a2e66c3660f171c86f65af222d402492660b56c7c SHA512 e45c6cca928833d9038fc92a1ae154726ed8dc7515c1584f79a9777d70582f57117e273778c8af00187f0fb067c97e2cf9588496b64a580854d60f71017d2186
-DIST thunderbird-68.12.0-hsb.xpi 616036 BLAKE2B 500020d637e8ec8019dce44d3b02334da1f7544403cdddfa0bf77fd39de75915ed70ebab928a329b1744796875b081db003c1b46b242f9dcc315069f95e4d07c SHA512 d6ac9354224f4460b69353865b6a3c175629c70099582ebc7f80ff06d14722f51157266d48a65418f56161151d93e7cf32002cf5f491909404a3526da78232d3
-DIST thunderbird-68.12.0-hu.xpi 618153 BLAKE2B 6116b03fc6ba21b82e85b2b958f44a297432dc84626ec51d9a236adabb52b1911d7e33046e808c186e69cd9e852e9d539f8c3e416dcad14d6f79359525b0d1d6 SHA512 be96a66e6bcbfa68975a936b14422a976a4fa0adc788ce41fc7bc8e94a19e12c1da631a35819f1c3e9955b1d71259578ea32c66cce602af92be6ff7488771621
-DIST thunderbird-68.12.0-hy-AM.xpi 631978 BLAKE2B 6c06758f90ef61dde88a75c2b6edde064d30ffefcf86822ecf4ea6cfe44437c34d783a0c0cac59d194abdaf00895c83bf8557197622e13159f64462fdf8a1a49 SHA512 6d21144aad495108bbe4ffc292a89ffedd19f562b69c7553a6a6df3ac20677f17f8f775f42e8ecaebca441902972eb171601aa205652bf6ca08fbbe3609e0dc7
-DIST thunderbird-68.12.0-id.xpi 567746 BLAKE2B 2b92005ee2cd07534d9c953057413bec21cc921b1d373736f63002f7827024fcbd718b3accd4f8e1152984d461ec116ee067b653b8aad30b3f424d7a432acf53 SHA512 dd98cac286338fc4850062a12f3339736d0d44da77456a066d72388b74c2de435347ebef550e060a3a77c3515997f2476559d8d9bd8a22756279ca6ad74658e9
-DIST thunderbird-68.12.0-is.xpi 575440 BLAKE2B c56bf3f8ea9a7b91f95d6efb56ee0bd96cd62f55a985dab3b8d213ff90e29c89e9be2d1f391e0a22420ff00504469ef76d48d1beb85c63061a58a534bf7a3753 SHA512 9410efb17bb67f6b515cb686a8fe56db7c9d7711f2a0804ca673def9902feddb156d6ae94e7676fb8eb995b7a580bc7355f0152898da0a0f4db42cd1a762b2be
-DIST thunderbird-68.12.0-it.xpi 489519 BLAKE2B 43e8189f8b7f6e45b27a417be13a27ad118f290cd5f88a1b7549918949056bc0c047219a8ba9d85f576424bd0f184e415db4cf8c57a79a185ca92a506f547e92 SHA512 3aeececfbbe840215723cbb887863b2ba1407c3ec6b13afd2ca7e689e4bdae322f390cf76ac4a3d2f1979f21d92c5e08e224ac6cc9893e29e0c6f959808a0098
-DIST thunderbird-68.12.0-ja.xpi 643575 BLAKE2B 1156894b9de9b86a76f84b2f48019c0ad7f3d449b7a2cbe97d0c8c6ea4482a477af12f17819370d29928925e01a19fda6aa6aa4c12246511c222da79ba58e8b5 SHA512 5866b6e26a7028f8e284387da77e13f6397c0967c8736a0a75674deac469cbab821988b9da088cc14029519e8b8bc1e5c1def3897226d302b143b7fc3c0cfdf1
-DIST thunderbird-68.12.0-ko.xpi 620530 BLAKE2B 82472fa84b7d1867cf9126d261fca517b40aa6af008a23e6135a75884e9a06f0d67431249e4f0c4e24a817a2e3d6ba78fbff59cff2ac82fceb6b94809c7afd7e SHA512 e43da3733c87b634c9dc884373eab8a227c246eb7d37ce10576a04c1814ea7e427a0a89cc6c48770ee0b350aa6c2fb00034a6d9510585b9973ff41d8f927d3ab
-DIST thunderbird-68.12.0-lt.xpi 603846 BLAKE2B 651bcaf634b09317c20665f41a69f9f4b60083cf94c655dccfa5b63cdd0227dbf80e2c6c9ee6f0e9ca616e35da0f17166311c206b5b5b5381fd500b5ee07829b SHA512 9cae9bd9ee29912a57b26fe3c87d263b5619f2d7bf911fa46c0a483ae974a4d576a2ad38c3b2e23d9826c813659d9c8804aacbdff8dd1ab765cb6c59742d95a1
-DIST thunderbird-68.12.0-nb-NO.xpi 574021 BLAKE2B cd935c75f7f09f139daf9471263c3147892f1e26fa6bbff548c54abf079956efa132916ae8fd0c2714d1b76b7664ad8ee7b05452ad1f2efd9ba344ca436b952e SHA512 80d569870022fd3e9cc7ddbd9b748e9a2b88143f22505f07eea7d2240dd9b1dc162cae6f16489c19c6967126b9cecc3bebdc146ab1bf4ee28b05f40d57b3c3a4
-DIST thunderbird-68.12.0-nl.xpi 581354 BLAKE2B e9968de9cf447ff3d7b8a982e54ff5c925a9351c8b0fac23c2c985538d6a2866411e376a4f708c658060f8433a36f1b33360dcc2a97f9de1ae1797e0fe8281af SHA512 c7e82a61fa04912600f739c4864e0ab83040c73c28f3ad5ed5374d98663085d103670cb57baead8b0db8652af5b60d13ba654887275cf8ec9ea0feb8837e3197
-DIST thunderbird-68.12.0-nn-NO.xpi 574949 BLAKE2B ab075d0f7c8e88fd335a8084a608e7fce59eae9b9c7e8e9679f952607065984229e475b6a0e2df21f422fbd9b0297540deed7186e6ca9e7c1838a5cb0c294023 SHA512 442cd2e223339be3f09ddced160a957c46216fc2cebe314ab5c07f696ae565f08965b45a203cd9a0b7ef87f052664f2851a8c77e2451959daf4a891b0ae9bd1b
-DIST thunderbird-68.12.0-pl.xpi 576086 BLAKE2B 499e8cd7dadd6e571647c0effe9cba11cdac93c5c67b0e214930645f523a2a0a6aa196e10312719c532be758ca4a74f1979a37ae429909cd59934ee91ea7287c SHA512 0320e992271e00260acd183002a9881c9d1c7ea75842eb8d62243419f460b89e5e8abc4b34399431caf1fbbc8c43658b1be794eb3e52ab666154e5a013994fce
-DIST thunderbird-68.12.0-pt-BR.xpi 589837 BLAKE2B f16bfe8896665854c5da9744aaa05164ccbf15eb19f6e42c918b29873ddd46a47f4a1b90beebb20f9d022f03b208696a7cfcac5ab09c7f72bafc18c777cd601e SHA512 a19ddb968c2de6cf36bae15446568100d83e67ca8129df5762dee97937cf10809bc3ceeae724a79811cf5f526bf79b1b893e66babf9c73fe30746080db56d874
-DIST thunderbird-68.12.0-pt-PT.xpi 588103 BLAKE2B 503e42c95697beae15466e9f7221d61ae093215624d23aa97445137d457056f3046c7c02d6227564afe9e647c0e9634cd70de82155f7f4bcc9ba89ed93afba07 SHA512 e889bb7533b4dd8fda77ce44d4d57b323e89b8ddbda9de8e1d236e3f8ca4108bef5d44d357757dc03d03d7e3805557d896cea01856ae96b9bad6b6089bc88f53
-DIST thunderbird-68.12.0-rm.xpi 578050 BLAKE2B 256eb26ba22de7c8d71153cf3dbb68d155df647d77978179aa59b21c3912546d599b3bbab523171564d9f428de313e1a2da0a947519b687449546b9cad05b153 SHA512 cbc399b40b3de6c4154011e6574c540962623fe30e3c4874f5bce4bcb8990405fe04fe7c436d22258a102cc358a50becbb5f93ce206a880c395a707f78ad4bf7
-DIST thunderbird-68.12.0-ro.xpi 594841 BLAKE2B 97cece8b2ddff6d1bd8652ed8680aa36332fcf3303022aa1c7d3fe5f8786b52c44cb5dec474a85ba7efd9ab0c813c0f8ab16e6ad785448505a7b40f12d4da6b0 SHA512 da21338a677b5bc68a94eb92a7a03865108904818d7d1ff499c5e2f21aff52bf7cb219e8b0945d7efafdae58b4556ae8363d5f1a0974920206fb768236dab619
-DIST thunderbird-68.12.0-ru.xpi 683324 BLAKE2B 33ee0a6d363f2b39dcc50e6c6231cd4d9356bc72ebaf407bf0d1804f9d596e7e7d6f72aeffead806a1da9082962d21f9743e6169a5cc073319e737ca373e7e68 SHA512 51c60e425340b4445381be67d9b57112ccd612242f034aed113ee682f5f71f329760e0dedee63cb16471b4d2c0517a1ec5a1d0cc0074c8791049e7115580e16b
-DIST thunderbird-68.12.0-si.xpi 637405 BLAKE2B 660e2034150dc59c0309b1ea920d45d93422699f035aa839532f51ac016382ca72f09def2352a6ac8e87acdc3dcdab12e1edc21e8947ef456f4943c2cd70b8df SHA512 d9194f57d6d5df9986a30ddcef9d264a272b323ad54f39de68a3f034f67e63db54da20f2827dd324dfaa95a2471d55fc25887a7a05946d682bf0ba589c5f3275
-DIST thunderbird-68.12.0-sk.xpi 609752 BLAKE2B ce7ea87f231c67acb3e07fe15ab1202cfd0a7a7971425e6fb3a55a46c6d6addb395e3eb753601a28fd4d44fd6591598d9dce5ccee7546edcf5a094a620ff7eaf SHA512 56eecefe834810473a20a93b4170680a892cebafc948823a4c38b552485bd25d56049ff98def4ce21e261a0a5068f25c14ed76a065f76dfaa6e64a4d8dbd799d
-DIST thunderbird-68.12.0-sl.xpi 590627 BLAKE2B 97236877fec37b022f55a46a4dd945ca93a1847ada1dafa51678b7bba946795bfc039c6ed008fa4e6bbcc3b759a91dd6f8102dd9d8643536f6231c515537d0aa SHA512 d8f642226f1a4ad102f3817fb351104f942cfd2b713395ac1ae690b66c9073bf75abf48b7a91b80edd4f7f08a2f40b3628da729e88d94555dd8637ff952a9161
-DIST thunderbird-68.12.0-sq.xpi 598900 BLAKE2B e281ec52b5f575a3780d3c791cb7676e3fb6babafd165eaaa0e0e21d6440b0aec020b6aae7af9637a62b7e1a6b3a45878f74c09219e9442838778c38fd2082cf SHA512 12425897cb3bbce072210b6b9a23d06cda77eb6ae07a8c92f83e8b047a68ad3ff6530885f2d8d308225a6906f9616fecb33ec18918d4af25862f32e0ce164cfd
-DIST thunderbird-68.12.0-sr.xpi 624897 BLAKE2B 0ed713fee9f5ba3f646052795541f1e67c08fef60a6e1fa078ef89ef2f9f497e551d966170f8c01f629d3a19079aa33e90052b04b6cea4c91a8804511238766e SHA512 9e42eaef1fdf2bc68c8bbd1b53da36566b03de026757f1b215b3e23791b6cb9acb937f92d7ad76d37908ee035fc56a48a0598876a76c15c16034330ec470bcfa
-DIST thunderbird-68.12.0-sv-SE.xpi 591596 BLAKE2B a2eec3c8854567c04b5dac549ff62904ad4c4dad405cc05667222e004ff362be79d3ca90b02e7dfe9f219bdeebff2d80af74cca0098866262f734c9c97eb77b9 SHA512 2fb305dab393647d9d86d1418cee346b79278dbbff2f135763495a4e2d2fb6389c681571e4915a1884f89544bf4083715e618c6b1a5942924adfc2e151893363
-DIST thunderbird-68.12.0-tr.xpi 599706 BLAKE2B b93f904006a8ce06288369fc1891ef614d4a1a89c0ae0bc8b82aef0a6511f409d4196928e16843aa7d5e06e437d34db84b8a14b61eddbe02ea3650f0dce08ea8 SHA512 98d2bd580007c3dea0a269b3dc3c7c4d2920659ffe1d4ee03a6dce19922cbc37ef46af30d90c872225451551a4ab5a8d87d82b51eaf0b77f5dd33216469a3077
-DIST thunderbird-68.12.0-uk.xpi 671453 BLAKE2B 8a7b23e96f19bb4f2347de915b93769029c404538e453616c5f1d9c2e3fbaf18ab5dcba94a50d1b17113652d6e05ae4e71b1ea9eae7d915383ef13665c05518e SHA512 eefa89011245bbeaba891e4656489ed5fb12535c75f752f0da753f74c5db35f54de9149adc8a02477a48672b5895f3ee4309d634585227c00ba4f96e9a1a726c
-DIST thunderbird-68.12.0-vi.xpi 623422 BLAKE2B 4b66830b6c485ce2b8d004741ba9ae2e620e9b32642010d2a2c14f16242b96bf891acedb3b3bd90f03366f574ae0f398f8a5732d63ee618179ff6bdd56e51169 SHA512 2cdf993d65212b75cbb865c13beb22a86a4eedc129519e4d84031caf21eafa7a9657ba62e8f4f480e717db3311de1ed0a8f0e357f8c5d73d1aeaa202aa0ccbee
-DIST thunderbird-68.12.0-zh-CN.xpi 626820 BLAKE2B 301d3ad3413700879ff1d8f39c471d887ac250f3f1c0f4e47c755d7744aff322d6e71d19e5b62222569e839f4e354bf833e6a098b9d22e2039949a391b7234d9 SHA512 88fd1a6a69fbaa3636861cab50b6f2556b8bbc87f303e5e06285ce7cde51701998459fe6e7339578daad4acfba0d994ac7f2202ea266d6987c702a93d0588dce
-DIST thunderbird-68.12.0-zh-TW.xpi 627476 BLAKE2B d3f0ecd246e9834013494868303287403de78e67c028144f2cb7d4d929745728de5507a40b23dcd1fc04914fff9ff7fabfcbe080ca50768d48d12b61c147034e SHA512 b8104fc5bfdab328e0e9d3ccf373b43fdd15741fec5084da64ff5a8e6221d1b9b383de8ee71a89000e643be3b761921d3490579d6d12c9e88359a32ba8d3a2e6
-DIST thunderbird-78.3.1-af.xpi 548782 BLAKE2B 4dc5e65a284fb0ce87a0665040d86961e998340449b1d51125a5b29bc44607524e85e095f001d1b9b7b7c55b6b368022a563c1404ba16e63ab2706b5db442a99 SHA512 2589639eb44d2b33caf89dec6933218aa9959ed4b449be30f6761c2cd894da1909851fb60404c11c2aba45b9a45dd0710ddcb52a813380a012a53e1159be4dc1
-DIST thunderbird-78.3.1-ar.xpi 649063 BLAKE2B df72eaaa069d3740abdce0a360bbc1576500164b898539e37f4ea356414b47e6b150f60f84428b30f072b98115de772162ec1c062eeb904443dcb2db36887f71 SHA512 33a83d85e26a58dabfc93e1af7fece7e4a6eec1f637697be4e0b81cdc379d593f78f70f57178912cbbed7dfa8928b9f177ac54092d85d1ced4317e4827a44938
-DIST thunderbird-78.3.1-ast.xpi 561707 BLAKE2B 13d65d2e543bfc0c123bea1b2699f4fe5ef9fc095db49607096115eab485b8074530c689c2ec88689ae044f16d571416c108eefbc75d9bce37b8940f5e344f73 SHA512 7cf31eaf4333e35872bfb07876540ec2af44a7ac6d82eb34e873d97778cff5914000cc7fe8ed012c88747b539c5d11c65a50fba2cac2587a9dee7d1e49e76cbc
-DIST thunderbird-78.3.1-be.xpi 667138 BLAKE2B 4b5acf2045f3a10622de056a5a047994ec0d9897cbb586b78c971802a632f4d290336338f592c422857c742b7dac97d22ddd51334f8b4c29c219102a0f0414d1 SHA512 618c1ce0164a56b9ffe374f2e17f6c23a8cf8c8fc3e7feeb337a4a381b2a2c8098adf10ce677e322564c3358ffc8d8c0b71e093fde6e4284ceba318eedc7cfb4
-DIST thunderbird-78.3.1-bg.xpi 672894 BLAKE2B f4f0386c29332c4abedf76b100a7f91ad3b2eaad056700a7396ec837da7b9511248efb82c12ea10b80e900930cccd6a14daa9329f2210ce84ab52ba91b5e3dda SHA512 5f61710dbe5ffeb23d7d8af681324371c00d069c9eb90eebbefa3af06e9bb19d85b2db66980c385be4b4849183d247b7fe1b4da64b78e2af2fd6c40a8c0e264f
-DIST thunderbird-78.3.1-br.xpi 604955 BLAKE2B 12f35d2db76715824bfb614b9bec7c2dbd548db253439e90bbf98990888d9bee90f6862b55662f4c2ebf5167e80f6685ca0c2bbca3bdb761ab20abc16d1f947e SHA512 f43fecd3ea16ee18198da6af80236200d38c0cf7016e4db0e376d3ceff6dfc3f607398d0fec6ece764b36f5a1c7ce3322c9d07ddbd2a0a0b6bbbb826a8ea8925
-DIST thunderbird-78.3.1-ca.xpi 620862 BLAKE2B 995a8a5f8ab01d12b0bdeeafd411ee1fc9c675c51a3fb3f3eab3e763a761d72b5bd6811547ee68c3d1637bd316edfe584ed5e8f609b712704262a37f4bcf6109 SHA512 427f8a5481c56a3d651c777e675e3f963ddbce2853f3cc9e464fe951d779a51bc2fb7e09579de1dbd4638abf6e3496a54f1838452145b62f6dda2e9cd7f8922e
-DIST thunderbird-78.3.1-cak.xpi 636111 BLAKE2B e997193b02c5e3b2181449d1a9362c614f334012449b016fb010e51dca2b70ac2c018d716e9d74da8bf522501f577b983a40fea3ae5f2a13c227dfaabd1ba9e1 SHA512 7174bcbf8283612d5e02bbda2f17599728a40f80326c924680f2aa937a9b740c2971c06b928702b986ae6ee6cfce6c9b3142a3ee034bdad12b758dec12ab9ca2
-DIST thunderbird-78.3.1-cs.xpi 635782 BLAKE2B ffc9b07f3ab3e0b3c5893d6f8891ab18ec4b5c303ab248e20ce201e90228be04593ee0536bf1469e5ed38dbbc2a6f6eb048f92f90f595e655cb2c9e9e0374331 SHA512 acf70ac0e9917e26645c6c718471e957e57b522c845b9d96416a7bb852fceab225826a36022874f6bc32c2468420f5f95e4a8202b753070cde2e1de7b187f599
-DIST thunderbird-78.3.1-cy.xpi 646684 BLAKE2B 8fd3129d58954dc8bc615c659f4d257b6429f73f319996992ce66d7bf73237eee1b15f6077c98a4b68f7115ab6c4968d2136d04fe1fce4e0d847b24439047d11 SHA512 ade5c2bbc35120f7d7c9ee0c5ecec6848af49e69c5780460318d1e0e5d3499e455488c571ceab0e69870d0700ea28dd4d03c697fa5cfa22815e724285c096c2e
-DIST thunderbird-78.3.1-da.xpi 621423 BLAKE2B 6f7beb82d02a699f8bd8030ebd5deab9ceed2bfb3b71ae3f35cdd347c9750621de7881700d9af49e5284d1540c0ef828415586550d743d1d3b359790752bad54 SHA512 b2f0b03fd6ebd4c2e2574c33c3df2119b94c187091d00a8c3fc93ed77a64888c0e33b38f5fd17ae00a4a9aeb028e8a5e7e1c2fb084e6a41e6f4871047cb7ae0c
-DIST thunderbird-78.3.1-de.xpi 665616 BLAKE2B 95fc97e2aeea007b0246736fa9fdd049d73ecd07059a73b1302439985e2179e718121b624e7fd3ca9a8113b3300eff24ac41e4b17857aee2d77749ccf1103010 SHA512 6213f36d707e637fbe9a5c4962308363e682d99857a0f2ad7ec5043c8214f06b2da3a58f9ffc184fd120f99c569df6592287033267c2d71b376e366d096cd017
-DIST thunderbird-78.3.1-dsb.xpi 667214 BLAKE2B f9f4f28da04930d13ae4597b1b98f5a08d406228f4ff6ca81c8179a9ac2648e25885ebe58c82c075fe1e4ecfa98240b869d0db71af24096030d4a9f393034ccb SHA512 c2b127cec59a7d489fb68d014e96121c1836d24f69b5b4e9d36bba5ec967eb256681b82286534ad44d7ee542f184756d9cff2b2596e2a654e3d3094449eb21e7
-DIST thunderbird-78.3.1-el.xpi 774935 BLAKE2B 6de9247fa5c607619bef641e3498947ca814eba543da21e529cf44fe3051c14e666f9ec38cb36ffd4ffab617f2afc3c3635af138d20e4e37b653b5fd65950a83 SHA512 2c226faf878c2b719bae93e1a1cf497bfa5c6c4062d8264d7872027d0cc0f3f4cf31bd9e225c320375ee1f90248fa464844300258cb4f3d01105b12498b48cc5
-DIST thunderbird-78.3.1-en-CA.xpi 612236 BLAKE2B 7ae0e62ce467e400e42b7adc22fc2812ed54829eda0109b10a0c387e1a0ca52ce8cb2980988622d7319cfa8920b377cf443946d082783cdbd1d2b3d3ab89f706 SHA512 8242a669120be9e9e47aaf6bf266b1fc79b82529471acde533c71fc86e357d2efa90415843058ad0d2550cfab863412115e9acec0b467339bed3d278f75a6129
-DIST thunderbird-78.3.1-en-GB.xpi 611650 BLAKE2B 08a855964fb3f44498072edc0ccd10b8da6b52cdf9fda408e7d613a3b88dba61206a1923ed214533c8e8227d7c5cfa336080776f8fde429b12de03e2cb6ab633 SHA512 8741513f4e9c26a1550dd4124a315d1b17ecff9dd0c2abcd16337e61f431c53beca83e01db8725a2409d185d47917cea7a4fb9c4428c4c70457958b3924ec92c
-DIST thunderbird-78.3.1-es-AR.xpi 658242 BLAKE2B 38d2ba10e42e3c48a29b2f21680ff948f748ae96f7ffc5fc5efd347055fc03432090c0c74063b763d9fc10c00414c4ae668884cdccfe24fa1775a1f5d72a017d SHA512 119657565129f7529d48a313474c4e3ab4e163e7257c6e2ca571d68094bd9d66c8fae0b0e404960176dd116349c7b832f9aabdfbc3588cde0e02fd88be992508
-DIST thunderbird-78.3.1-es-ES.xpi 570250 BLAKE2B 90184b8c0e9a7e6a0dcf4d4ed47c012ef26c072639d701ba276144e335c797b3e3b6afcea49b7a4e1099858eb16cf0b1d25c5f10f13682d0ae545f33abd3ddf4 SHA512 46fcc62fb91452524c59cfc22ee440ba7d9b1c088d34792ad5ab53f1038f4fc08a17b38a4cce6cb190b2e1dc2922e9a0b75d7e2d96782edb1965b23d65067e4e
-DIST thunderbird-78.3.1-et.xpi 598159 BLAKE2B 524440339ddc0f749e9c48f1bdc6139e75d7788c298a72686e91240597432f18b2c0669553683aa3b551a827ee88b6f487f3bf16dcdbaaa3bf1f5b6272beba37 SHA512 059cff9a9033d43d19eafab739c7e886e1a6fbfde9be91a5826f025e34794c3f1372728974da701518fb9c81e1f694cbc979d3e50b3b97d6c70716299c041233
-DIST thunderbird-78.3.1-eu.xpi 633360 BLAKE2B c5b3315ec5a0995187dfaa52b6fe7047554bf40b1dfb85df00eee624b6f02b7416367fcc24a221fbbfb1962e6e8ffe897e225e191867c2851d6f9d5613727b8d SHA512 d7f7361e1d0bc4fea5613e1d3365272042e70e12a6a4da5f25681b3173b3ba681ae7280c739caf89ea8d762d32a70d70e8ab1abd39d26036576bfcee96f8d3d6
-DIST thunderbird-78.3.1-fa.xpi 640169 BLAKE2B 7a5ff7350ad93ab5350e60fc1ea7bad47b8300a04bb6cec0e9139f32e1393ae0cfeb83d1756f9617bae1e55f8d02343c5d0db209242e714d16e0ce5adf85b2fc SHA512 6b7a5f6f416b719f7dc1ef8419c60e87403ca81d95300530e2b6d95772cb922f75d619549a123c735e224e4db08b55b1c4c297b0de3a66585d65d363fb846a04
-DIST thunderbird-78.3.1-fi.xpi 642882 BLAKE2B fe3fbdb6488806441c58d822d1cce751eaa373a3df6fb042af17a5896004e6e59fdbf323349d509d83c7d604ca573b88e2d249be5fbad77a0c06ef690eed7ea7 SHA512 e7adadc00ec3616f68b90d3b48928025847c7691daed391c54b1155df389f8b1ca7644bce13b225e5977237ba7c47594e8a2c2c7b2fe9b0832ce716a2966a98f
-DIST thunderbird-78.3.1-fr.xpi 669932 BLAKE2B 697e4ddd6aa6209bec3755c2579d623708453c4764ea1d4485748387d61619772e9838657ca7998abefaec7764d2c61d836ec62b5e736d352800f4c5ecb0dcf9 SHA512 c3bc9ef32f22db6bedd41136b63a51e77e31d9886858c4df56e4044a63885fee21fbee164ecb53e03028cf37ca3cc8bd27c2603c1fb707f269a179faccae7549
-DIST thunderbird-78.3.1-fy-NL.xpi 653515 BLAKE2B 3a529efe3409e0a73408ff4a7b46571f1386d294b043828eb6985e259e12e165155bdadf239322fc671c4c5a565d674c1752ce2e66a54af72e8dba15cb083560 SHA512 e56584b69aa292b820c1c5fdddca4c2fb715d8e33b7e742ceac781152078847a1891f2b2d511d0188eeb86c2bc646376473e5382322ed4e2c317c2c67609cf0b
-DIST thunderbird-78.3.1-ga-IE.xpi 601172 BLAKE2B 1dbc1e10785a3d7bca215234aa85f8d16c03afa2c30e1c2d304903390836fae3e092f222984b0ae48c6bdc415128f88fb172671433cd028f97eda6aba312167f SHA512 61a595a25fbae0f87e318072b04423b5b88204439ae0713ce5d234fb2f6565fec79e32a8209288870a7b9e81771787339be4c4bcb039256536326f8485f68854
-DIST thunderbird-78.3.1-gd.xpi 609820 BLAKE2B 5a59a4b5bb9aa6765344890a967f5ea7322a5be57079393c6e8bc5a24bf41a3fd6111fc134b14c5335c47949d5ef2b2cee120dd2d9196a54aa0856147838c272 SHA512 bdf20675f57bf037c0003d480d8ccba7e06ee83412317c7229e70d29c0f9add266414ed539818175481d49d6444463495b0a0f9aec050a0ca0db8c143596cc10
-DIST thunderbird-78.3.1-gl.xpi 616197 BLAKE2B 50133bb1aea400e500dbbd34e0530d2965b81411d2726857dffe6d76f7c9c60fdde0adcd1af2b45578d536d8d508febe44efe3f1f74f8e1bc233f4aec50b8ed2 SHA512 454baabe2d5084ed8b9b57369711ec7924d77b8d5bd0ae740091ff15068892a0b89603f6ba6078da3fbd74712b8d0dae4facd302009463e14611f308eb3a1922
-DIST thunderbird-78.3.1-he.xpi 640978 BLAKE2B 58a4f377aa8ee88d4ec73bb7b67729bb35f7d013b2cb28dfe3b81103e1537faf7938e872e887fcd3e3699db2eee11179ba777a54e574cca7c753b40b6f65a423 SHA512 1b71d51a2a78f800b4e3c4e73ce8690499615f7f75975c6d159ae025c8751723ef2b1f3cc19967115d21f746f20576ee789c4b35776f5a980e95a6be64807ffe
-DIST thunderbird-78.3.1-hr.xpi 629425 BLAKE2B a02e62c2544a97bc506606529b8dd0171c1579868ff1ee3ebe780487def6fe4306ee6148f87aae591cba4bbad8aebdf7a0d70991adf26b7f9bc3c8a350dfb6c6 SHA512 c3cba6adb7b0119a0bde17ee6a0a9a4f5a42025359f6abfbdce9b596e18f20866eaae618ce123908c8178172fd7542ce906ad730c2f00182f22b757f4280f12c
-DIST thunderbird-78.3.1-hsb.xpi 669044 BLAKE2B 236ef3c424164c3b25af50b2832720a66fe9cba1afbe7e9e6c87e1a0e1277eb53e0473b8da4ac68c412e825b12e1b2510bc7d738bcd996a3b2b429f73bed8946 SHA512 c00827dc37274dfe7d59d18f15588d80dd31f62fe51c304fc035c10520d2d38d5d9c50f5ac8e8255d4c9db6bfc4cd4ffb9b3105b210a62a6207698a4de180f7f
-DIST thunderbird-78.3.1-hu.xpi 680276 BLAKE2B 63e5ae79a62b6e1f8495ce354f5550054373018f9537416b0b65132d8a9fee9cc7979ca73f1ae13aa2c6de4a51fbeaa5a3d0a0d9fa36246e0786cd7143e66e62 SHA512 7008a82af0366dfa206039da35ecace8d819459d475ff2f7fffc0d1c8ff81aa6ae8dd4c1b1970da86e4209ff9c6c7f1ae13ab5c85d96ac46a7f3edb5dd5a167e
-DIST thunderbird-78.3.1-hy-AM.xpi 713775 BLAKE2B 6f60d07c8b2395157e7295b82753a8d908ca30872f4d652db5f9d7e1f670874cb4e0eaf948b8e5b37e69faa9940526be2966d555cdc01e64ca4546e1e952956b SHA512 8881730a3f7c27dd4df5bbafdcc04907b8cbc7aa145bb0c8e044f00e6a4749bcaebff35573b40556a46463e920385c9e5ecd2814376c84fad58fd0101ace31e4
-DIST thunderbird-78.3.1-id.xpi 621070 BLAKE2B 7fa306b8dce3b384614f3051370ff675fc8c365577668df090c4efbf296eb80de5b8e9a8262d7789616882b077a59f7a91546b45fb55abb04cb3830deac4cbe1 SHA512 a3f81788c3f52f80bd912da95512829ed84043465b03228a2832d6d427ef4b1709c69582d4b76e1cefe3e2d90bbd558c0b6a91bb846010f3fbe89f40a4830153
-DIST thunderbird-78.3.1-is.xpi 582081 BLAKE2B 4c2eb7f2688d4dd69f7efe6af569550abb0b6ba635fa887afe13b28a4e4591311e1f7efefb2d650e32a16215fc9374b25a2b72da62805af9f175086ba99e215f SHA512 7f2e399743e3163c18fdb6728b164d66cb2ef40e67dc7fc63eede9ece19dc000cf31942f8594b14572d79eefd7ae913b7a82ebcb2ea9e48fac44709204d870a6
-DIST thunderbird-78.3.1-it.xpi 573401 BLAKE2B 422db414da26dc9df7e8f38f00d00e1127615ba6e0086bb75f88788f8aa4609e3cab7a5ed8cb239b156312fed090c622aa4b43f266f2c05739efab635c9e3dcf SHA512 69fa612c28224a6472a0ffbc1034003e8fd628eaf8c983932a530dde5e3049afb9de2cdd039b5a582de7e2a7080845577e627a253af1eb846163c0f6489025e8
-DIST thunderbird-78.3.1-ja.xpi 722921 BLAKE2B 825c4668dcbfe1e2223ceb46b61cd8d7db72e131bc37d85997c71263ea18044260dd5602a4295b97070b7c7e4dc778874731a9acaffaad64f9e97a98cf567ec7 SHA512 dfd831e9ccd4eef5f6028ef7cda086dc9a652c8febf613b35a87d3b5ff64736962c0b4824404f9f2146d3115fcb3489936a35c199d751b588880186570d4d79a
-DIST thunderbird-78.3.1-ka.xpi 717490 BLAKE2B c4c2d820262bb4cefd4b83a59e1ec684933229f496196d61c8b402c1360ae35d5eeae7a1d1fc2173f9d10a2790bf42ea79c92fb0f80a5cf69d1babc99ff5df2a SHA512 5489f8e470df550fc4d6cd83dda29e62d69819e6f539805bccb14a436213c834aad349ba600ead36153d142deaed9a7ec2b8ec6e5247d2e51adcb1f95a140baf
-DIST thunderbird-78.3.1-kab.xpi 652354 BLAKE2B f29a58957db51af566853e28aeeb3f33d31bb8c56b2705f1fbd263418e41c6acd49e8c8211ecda7fc8c29cde98161a84687fc2f22e327eb0905220b7d258957b SHA512 fd57398522951d615ff406130eb4f9320ec7c8bd6815530d83b857baa53bd55ae44c87652ecdbd93c6a74f6f28c503f7889cd8e7e92fd9493fa76266b0318e42
-DIST thunderbird-78.3.1-kk.xpi 720911 BLAKE2B df08f3625194041473bf2df8ee8efe6d0c0866976a283b2cdce469339a31a3665eb9d2096e035fa38713ffa8377af84b8a4883b4e821b7e4ed7d3f009a2faa82 SHA512 8b1697f76701616c6ccd30f5e3a93d2a506287dc8dc46051377ecf877875c712b5e92fb94ebbe690767dc23974d7d79fac2ccb1a3c6d0f5447582f5a4c278c9f
-DIST thunderbird-78.3.1-ko.xpi 688662 BLAKE2B 65f6fa0d16fb8d5dfd07664a8c57aecfcc0a21ae18c5dc3d5f2ac3a26e7dfe3c82a8cc64b5eb389701581de838fe0e11a9553078a12c3158ed3a03137029f2a6 SHA512 20e3b6672444323f8e2b7250a6e539d3e11fef6de3967b1c677c29457227a024e5db9dadfc1d713a59d6624b76cfc8a0fbeec4fd9cb85a5cde2be7061e23e6f5
-DIST thunderbird-78.3.1-lt.xpi 660723 BLAKE2B a411b460c32439edf00fca6746b5b72167db3b8c1d6cd6243b6de213d835b2110479e9478babd1cb40256d4223268971fc44041388e576a5a2736d3e4bafb56a SHA512 5941c8ba6f95bc6501e9844f3e73e52d96927531a53234c340eea63da6b8fc2a6dcb37f7ba89baf15b809311db91c5e5ee212578fe9fa4fc34b765242e6b5baf
-DIST thunderbird-78.3.1-ms.xpi 572598 BLAKE2B 99bfcb01d80352698272e4c00e18fd1448dd057c0496b4f81f208e693bcc67fe92880bfc1fa7a55065ca95794fa36f43859110ac7d1e6058d62e0ad36efa9adc SHA512 04a0f67fc24f21bc1108976a06ac663690e9ddbba68068a8fde267ad070310a695ba410c20ffa17e7a0745311c34f59cb4e939837c4c804c0386868f4e812736
-DIST thunderbird-78.3.1-nb-NO.xpi 637687 BLAKE2B da46540fe9570f04e254153df3a9b606e4a095236f7cd72b0976d0bd405368b7b6a1e703777bffac34d448c30256149a1aa3fa681f258fd50d9b4946efe9a732 SHA512 af76ee9f52ee23c4b50e47886232ad1ddab3b7e56e481239e2b61bc1b7b44185c30d13cc76157c0ca7bef2c8ed71c70cea7acda9d17c87f55180103cb2a8e6bc
-DIST thunderbird-78.3.1-nl.xpi 644785 BLAKE2B 030af1b512ba282402564c7ffaa5ebcfdf59feecf17f38800e068382362d482136ad0653b11c186572182ca97759f52080af1dfea7058627b97e220102cb719e SHA512 43572179ee12444378d0c82080d4d8ca78cd407eb5612fdc326f09330b8e5c9348cd033c8a808a3e47e8b232eba57dc02e6f7e5d3d66b2009790e31d036fc0c0
-DIST thunderbird-78.3.1-nn-NO.xpi 641129 BLAKE2B f0625a150b2f8ce8f2395060570e748b26fcea764abd4277302782ed9a36f1d01de9119a2e78ff3a6b1062bac14a31e3eb7eeb6ba07f6ec529a5589aedb0168e SHA512 2aabaffcb7a53254d14fa5e9b464f5c4e2f61c96a726f9da07aa5d7d676b313ca61859ff3e9332011413635660b2d816092713661e1250a19219d7955f5414dc
-DIST thunderbird-78.3.1-pa-IN.xpi 633700 BLAKE2B d395a8f9bfb9ffe050f1c32f36873c0e91d7b62984779145132d1989f7eb35ce8c602bc61d9c0072334526b68592c88d4b389f2c38e2520fe9cdfc4a54889e69 SHA512 c14c765fae3e704812589d86961f0829607a44ad5e27021981b67d5474e7049e009b32d7f66a9a1e0ebc9bf15d42e9cc2130a3fe678d7be13f9e123c15acfdd3
-DIST thunderbird-78.3.1-pl.xpi 637576 BLAKE2B f5443fa4e6b61e97914b97205930fde4332a2c5f7ad2fbe0b266a0ef5748d172ffc69674db2645b362bc707c93b0f129fe92045732a1aad60f273a62e2d15c03 SHA512 5b470814f52dea00f83828230e013f60f4f60cf29a3afc394ad056da875442d026c6df0cdc8f9a9260a1b476225f4585847daafffa7c67c23615059d3fb72719
-DIST thunderbird-78.3.1-pt-BR.xpi 649863 BLAKE2B dc64cdd0ba41588be1dbbe3f024d6b1a52633483523388cafa5da3e3aa0139716a485bf19ac87e9671634a2fe1cff622817b17e83f6317b70cea50c851f67aa5 SHA512 57170789cba1d3ea0f5293d5c3e89bb36408a7db5d8749f322b4e07f4273cb8bea1b3d21cd2d9a169fd1b9f1ac274714de2a340d8c5c0408892f85a09c584c12
-DIST thunderbird-78.3.1-pt-PT.xpi 655963 BLAKE2B dc0e8dd6353aa4c3fd6935818289bd812d8829732ed75b838669813fd36810ef7c3b520f10eb6de13a892a9e4cbeac2dc70e8fd6750e379c5af2321a2d13f6b2 SHA512 8eee29ede9b7a0dae952f56eb1b32c2dca2eb994a893010012f49dd8509ac57b3c681ecc107bacf828aea39d3c00ef2e17dbc6e7eaa7e64be963517978fbb834
-DIST thunderbird-78.3.1-rm.xpi 646970 BLAKE2B b82d1f6480f5dee6fb45c731ab3ba9a7d41cc1836ac016e6504332e06143658350a1d15b95701ec025235e48b99e2293422e48efabedbac05abae5bceb6aefea SHA512 7149edb2ae34646a921ec1bf17c0c7b738a5af69cb1cef0b85d65e0fcb06d027b7ae40606b3e8f3bf600eec26dcd23decf163f6e22f8c2fa8864478d8dfde9be
-DIST thunderbird-78.3.1-ro.xpi 663069 BLAKE2B 99680865354b7630b3dbf084380de27441e14a3476507663e8ea7d9beb42d8c5da4ed25c80cd8feeee40c4a10ad01c1edb4c42b3ce31b4edd86bced5b48e9d5b SHA512 05d987df713a6122ca040faba84b453646adf86c2821abf5ecf6148653ec6a0acf2f9dab004cc2079630879cd39e4fb9939fc6a7b6e67b520538b33d901c7c11
-DIST thunderbird-78.3.1-ru.xpi 756670 BLAKE2B 7d09c57855488b01f9979e2f6e99ec8db318f778ff183d4b6ef83eba84f24f438e923ce60f1a8860f11208db5a6429ec9ca0ff519d46e5f38b285d0519a3506c SHA512 6cb05d8fa9f856ffc9f7f85c8a02699421559b83c15c06a08c6c91f1afd64c7e5520536d7e09557f1e1d752f2137c83078f9573aff8e876e4b23cf8f73ac801d
-DIST thunderbird-78.3.1-si.xpi 651575 BLAKE2B 1121bb3cbffa8b7bb5ef3cbbe43afa1f2bbe859fa9449d052eafac03eda8e034f560559748a3e119cd35c04830156816c132f760868b64477be712c5866d8638 SHA512 bf911bf0cab1811c733a5dd0cf213511cf2a09dd792ae932ff4cfedab0e17de97ef3d6cb89812564cc87787dc66c564121ac205d56241439596fb758170546ec
-DIST thunderbird-78.3.1-sk.xpi 643646 BLAKE2B 5f125c4f2b8fef0c3ff05340cc0b42709a85e88eba74769d0445174cc11c1e67b99f5e63f5eeefb62f99e14ba71e851832c0cc11e870568fb3d72dae8a40a891 SHA512 5b03c9e7402307814c856b2522060705d2c69eb257065c3831c413156f75915ad0336dcaccc9916e566f4d97903de4be8e0bbf5fc91c6a432b25bfb076932f94
-DIST thunderbird-78.3.1-sl.xpi 632783 BLAKE2B ae517f5529e4c1f5fac4f9d3610627b2232af269614b00078c5bb81b9f1d1201f275ff81675145e80ebf8f8cbcb758382083c869f0ef15f9bf5f1c7df919ef1c SHA512 1af6cabae65d89b822fd4e47d750dbb492c6fd99ca03959fdc62411beb284c8f7fd21de9e3a2d24ea8d9b175aa173627a591d2d3807ba80d233a171217eec1a3
-DIST thunderbird-78.3.1-sq.xpi 658261 BLAKE2B d53fe15652b9ce481510ec29fc63e9e54ccffb6cdf24ae942a10240a2e83e833da53bdc294724a97f229a602cd2e35166122ebf3b64caf70335ded5404963b53 SHA512 0c7fdce68e8bee7dfe007c16488aab3e4fe72e5f08ffcb20d7042b911c8bd1190694341ea7e6aafa6bd079aa05fd10a6bf099552b6b89c9c7e0b82d5f224fe76
-DIST thunderbird-78.3.1-sr.xpi 683545 BLAKE2B 63b03414500ef514c3bb389528b8396cb800b8a0d21f27e82db30350f93f3a61dd5ef4e174b8121a974e05cec4145e5077990437782c6405fefe6fdf46a43186 SHA512 5d320b9d235125e5aeb30e9fc24e8f69e34f2d50ca9a9876b497e533af389c89da5a2dae501165f8d88ef6f91fbf16001fb2679292e9a06b8d06c8a40e6046fd
-DIST thunderbird-78.3.1-sv-SE.xpi 649319 BLAKE2B 7df7855f3e0929c54555be90c59c94913de0d8894d0e14192445c7343d0ea3f8ef76542dbddf2c0e6d18048cf501809363f5ed508724c1b6ec7d68aa477a7f7d SHA512 2fe6160b86f394ba1452a0c9329e4df36e642e6fea06a88a0eca3f546736128f70ad70567fb35e82570792046eac576a226a9f9bae5ff2833599d8c33740989f
-DIST thunderbird-78.3.1-th.xpi 712506 BLAKE2B 93caee49f04cc5510591daaa6783d951e3ef71122a01f360e2616f42d7e6566c7daf92792c93bb85e293b325e1c5d393ebf49d56ab1f3866d04ba7a8b40d6582 SHA512 d1a77b81cb85ed54b5ca2ae95a136497a5a4cb700b150811c4eaac73ff27292ee3d95ac1cb0afb7be49f1ffe4a22277420e514542812b142fb7ab73ac9c64039
-DIST thunderbird-78.3.1-tr.xpi 649516 BLAKE2B 2b75c653a1951836cc50c754e5b89765e1bd776e2334028f8156839af779b73651b85e58d698f419ca109c43ca9cc878e01c3fd68f48997361ed3cd89598d9e4 SHA512 df9433590f181530661f00312a88b44b6d5f2327f5c0d1e2f80e602b571bc620789936524a13e0784c398f47ee66ddb752d2e735d7404fd43fc4262c11410af5
-DIST thunderbird-78.3.1-uz.xpi 587044 BLAKE2B 42fc36748431c3b220a745018eb45a1259d11bafa72f0692c674e28fcfaab188eabb1ade199362a17c4f7f54923975645aa5b1d5368e94b07abf6948ed7dd1df SHA512 ad51facbefd36118cacbf4841a16aa7a8887774db423d0082c514ac750b2c3b772c1296f0c8cd07bbd061fd41076709f0c40b836594d4a7799d0726860e099f7
-DIST thunderbird-78.3.1-vi.xpi 675050 BLAKE2B ce2b4b590242dd840cad62ccbd5c146d26b5c7cee1e01437cc5fd1bed004241ddb458f18e72ebf168eb867fba19c7a04b7521a35527844712bce08d3a5a45b81 SHA512 36bb9da0979cf9f6661c9c295a90e8cd10c1abedc3b6693f6f5925555e71893a58ae3d0c6e27b8f3057977bc9cb4a450b419ac9981c75daa2c13b39edc55a93b
-DIST thunderbird-78.3.1-zh-CN.xpi 687634 BLAKE2B c5e3aa4419c8637630e9b030380d971b76a103f974c67b7778c789d11dec6192e36e868b6571ca10050e1b7d580edee10f5cf494a7c2235206c298dd1deeb0da SHA512 0a550fbd21cb3fb047b1965ab62d0ea68b58bd49907c16c603f5e202ea20c2dd621abafa8aa41c0f4c0eb08dd09ee0fe44e294d3ae003699b6d18efaea294e19
-DIST thunderbird-78.3.1-zh-TW.xpi 688074 BLAKE2B 5e12b4cbf2f142a8de23356712162df9d370df06a1172acd3e9272cb3717776c6747cfb4975524cc1ef8efc026cbdbbc251898d67e2fca38aa9f982af12ed497 SHA512 f47fc7545dad00baad3e7088ff6ba06865a3d24cacad274740c7efb16c47b36682c0c56a5d00f07614eb609b6dc140318396e5c3b14a6b316c501dcb2d72bb11
 DIST thunderbird-78.3.2-af.xpi 548780 BLAKE2B 143522732016ad215d9d8531334b4aa6d2adcbb997b6ce499e429c336c119eebbb0ffa1acea5bc96d3f3bcacd956a126c4b4793cf2068de2c9735c47fa568e2e SHA512 f6e130943effc59150dee4d73d3cb92f1bc6fb4ec26cbef0692f971c549b43e440e695e8180a933714ad2b10dbdb9dd025685b0555ac4845f817360e89d93b9e
 DIST thunderbird-78.3.2-ar.xpi 649070 BLAKE2B 453b834df835f5f564739309b17a25465a6ad1d5a93c46132ea571b419d66763c72049f583300cf09bc61fdbc110a3037fc1fe926315b00772d2b3f1bee16437 SHA512 fc68874afc3856413ed1340e0c58631fed1f97af4b6d77a79ea7cbdb42785cf1dc6566b1a8a69fd1de88f3a36fd84124530f8f5eb710d441519b474525c3e079
 DIST thunderbird-78.3.2-ast.xpi 561706 BLAKE2B db0dda8009c0d629fe1c6270411b3a1f8d337012bf445edac609422fd11fbac42f4d0456e204a1a2bfaea616fa1ecd4099eb4e0580c0fd540699b4c8453e6023 SHA512 c5487b36ea471d0a08da8bb53d31a1bf4d80b80cd2858af2e96237e97bce7096f8fcd09d94f1089150919a5a0517570b8408fd5d6e4301753f5db233835126ae
@@ -189,13 +68,7 @@ DIST thunderbird-78.3.2-uz.xpi 587054 BLAKE2B 9cba02d4db009b46801f31e41822fe5aff
 DIST thunderbird-78.3.2-vi.xpi 675058 BLAKE2B fdf93c745b6d06a5fb7b8f5e1632369dd7b63072fe76b9672df3e3b210d4e03b165e345bf46e24a86695ea8b35c536e29182c7623b953fbc334f81a943f2b74e SHA512 4a2611c77652fe0c8abd8961f1e0cda94a6d754aa4cf9006ab273936df89faf4274bc0bcea6bdb54509477a452b3832ef51ea3d83902c57b1de11b519e324fc0
 DIST thunderbird-78.3.2-zh-CN.xpi 687627 BLAKE2B 954b3b481d8ebb5b90f5d715a91f70af6f472b74721eb98dd18f565bfe8fc539543ba6928e095fdf418db2c779141886db6ff69220bcb0e830aeb55834093102 SHA512 6857b1fa099f0b9c4af88edfd719aa37b632bc3cd659b12495dffe87ef606c939948c09a2737faa42db34f385775854ab9610f934acd326e5d56596471dc7e26
 DIST thunderbird-78.3.2-zh-TW.xpi 688071 BLAKE2B 11825906d0a9cf1182ce0e2beb171f51dc93b3399b5d817d46f6c756cc866ac5db8f85ec5b28079ec20acb2a5de75d181901279a20003592b3719ffaafea2e36 SHA512 3590fa64a247f7e856fc19de53284a1c70cb7aa6d226c08d6ca376ee3ec18cdf7730193778a670e5dffd3b7df483f4984188dcc8bd8665c4f5e46528ca1e8ac5
-DIST thunderbird-bin_i686-68.12.0.tar.bz2 58205447 BLAKE2B ffce44daf6ea623652d465b12713709ad56fa2060e2142045dc0bcf5089376ff104ef75d85078a7423ffed6f94ef30ff1980c9b008f109df1ae54f9140fbd1a0 SHA512 e893553a65b4eb28aedccc6426092b6f42049b8013944edac177d3521ee3b77017f438d160d0c8d71ba3e1e863a9932385dad6c2abdabf61420854a1183e5d68
-DIST thunderbird-bin_i686-78.3.1.tar.bz2 68038065 BLAKE2B cde3064448bc44428e7a24e37d8634b3ed2483b24a3f57c469a934a7aad75a56936bfb78f186121c4e8327554970e6579849c0c709ac2b149c3061c212082eca SHA512 dd2121ba1ee74b9f539ee0ef5ab8d3c361921f654d2c48025dcd35f7baa7893e306b20a02bab0ae01283443507656956948f83170397f22b643e025a44ecd442
 DIST thunderbird-bin_i686-78.3.2.tar.bz2 68116200 BLAKE2B 9f25b836bf6a904e2d16eb83e2a26c3462393b0b2cb3d0a1bf96a52f3ee892c31b929febfbf4675b4543ed8bc497b5a93316fd679e07719533ae05c620a83f14 SHA512 7b6bb69675ae7f752acad7ca2db7171d598d83c035cda5354219a5d82d6c3eb44e5ce96094746c29825711327bcea5fad8d620a6ba555d505d09d68402e08e9d
-DIST thunderbird-bin_x86_64-68.12.0.tar.bz2 55664843 BLAKE2B 3240756d42f7ec2c3db70f60a79768ff5f664d76c318b002d82e113e86f7268dbd623ceed12c78b71d2651de5c0e00f5b08773c97edb9c43cf7099f8795ec7a2 SHA512 0fce8e2b43cd03e074e3b8eb96f7380134db1d27b3b49ab3c346bcf0125fdfc08630605f0ccd4713212725822e90ada2b691af296472a7dc21567c87e898ac0c
-DIST thunderbird-bin_x86_64-78.3.1.tar.bz2 65114451 BLAKE2B 15dd33954720ce079e693dd37ac5568cefef594f3c40049962651e7684c18d39a4ff3b6f72da5aaa33d9cbdb4726d9edbdcd92cc4723190b3cabbb4894d6d745 SHA512 03d5626900cbc33f302afbf1ed3a5e442263e9cf85b44ad11e0a942e9da0a9c711c99aaad0fe9de5ee7e01b6dabf8c9f381f04de8d9c4d8fc775eeb70d5399db
 DIST thunderbird-bin_x86_64-78.3.2.tar.bz2 64958907 BLAKE2B aa6b89129a42a625ea7588cde9795baf0cd4527b96c5dc3e2d60f0efc41ba54405d76ba8ec6e6bee98bb3fa1ae1c1c07e619361f95b55deac5369e4db5ecc92d SHA512 2bb693056f71aaaf90de6e9abb163a131be3dc2f066eaaf4560ee3df311aea0ad6ff11cd2ee57aff709da04cbc7e0a146dbdd08b3a9ac571d5320a6415c42f84
-EBUILD thunderbird-bin-68.12.0.ebuild 5481 BLAKE2B e3773b6ccac70dcc1edeb7704981c13e0c7dafff6616f8c8940e92ce96504b6e28d59e8b9d7e0c5ae57f0c74f11ce0b25bb06fbb446f261750f9e7d849d6d305 SHA512 c66579e068b5b5665aaf3f73cba297d52b16af6b4a7ec56d2c1aed6f983413f58e6a414cb59cc5eb56cc5540eaf85854c4f5e2698ade10c8f65176152061c0ae
-EBUILD thunderbird-bin-78.3.1-r2.ebuild 10043 BLAKE2B 9c16a5095897f2184f9730886430492f3fc68567c7cdad3058d927161bdfba6b7c0ea800dcff4014c17fa136371102a8f5ba68f54c8dc5dc3466b91dc5d499f9 SHA512 00ada3c69221e734dae3e4fac84bd8dda35e1f960ba4f149d767b42970f457c344d713f51c09013feb8c6ef69f0491059b05e06571eebeec7b63dcbd8ff22017
-EBUILD thunderbird-bin-78.3.2.ebuild 10043 BLAKE2B 9c16a5095897f2184f9730886430492f3fc68567c7cdad3058d927161bdfba6b7c0ea800dcff4014c17fa136371102a8f5ba68f54c8dc5dc3466b91dc5d499f9 SHA512 00ada3c69221e734dae3e4fac84bd8dda35e1f960ba4f149d767b42970f457c344d713f51c09013feb8c6ef69f0491059b05e06571eebeec7b63dcbd8ff22017
-MISC metadata.xml 336 BLAKE2B 55825ba82688b11e1fc3d2c51af169c356a4976d4810a826a22a0f6d87fb256c9adbc25124656c97c26c5248e4e791887f2b973996848adc6b3f6d7523eac6db SHA512 125ee918ddd82e8e4839fbe429998559c39937dcfcf2dbf583260799bd9634863afdb29530c560dfc1eed735574c9ab638157f33cfc60b615ff03abcd8731168
+EBUILD thunderbird-bin-78.3.2.ebuild 10058 BLAKE2B fd6231ff4d9df63a06c56a1ef16347a881fe9d9478a8da6c9ab3bc053ade1da3ecefe1c26f391fbc3deab2af762301eadef87ec28231c4096c3609e5418c78e3 SHA512 7a937b8a8ef52e3d4ae401e9c39f06dc12c4a3add77ce23333ffa61040a1f6f8d6cdc012e5dbcfad0e361dc891169372629b63f2b2c539e690b65253a2d41505
+MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/files/10thunderbird-bin b/mail-client/thunderbird-bin/files/10thunderbird-bin
deleted file mode 100644
index f1338b82757c..000000000000
--- a/mail-client/thunderbird-bin/files/10thunderbird-bin
+++ /dev/null
@@ -1 +0,0 @@
-SEARCH_DIRS_MASK="/opt/thunderbird"
diff --git a/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop b/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop
deleted file mode 100644
index 239a86f295bb..000000000000
--- a/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird (bin)
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird-bin
-Icon=thunderbird-bin-icon
-Terminal=false
-Type=Application
-Categories=Office;Network;Email;
-MimeType=x-scheme-handler/mailto;
-StartupNotify=true
diff --git a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs-r1.js b/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs-r1.js
deleted file mode 100644
index 6c5a4dc6b6e9..000000000000
--- a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs-r1.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// disable auto-update
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-
-// localization
-// "intl.locale.matchOS" doesn't exist anymore, see https://mail.mozilla.org/pipermail/firefox-dev/2017-December/005991.html
-pref("intl.locale.requested", "");
-
-// misc
-pref("browser.display.use_system_colors", true);
-pref("mail.folder.views.version", "1");
-pref("mail.shell.checkDefaultClient", false);
diff --git a/mail-client/thunderbird-bin/metadata.xml b/mail-client/thunderbird-bin/metadata.xml
index 1e8158dc0e0b..19b8198d9b8c 100644
--- a/mail-client/thunderbird-bin/metadata.xml
+++ b/mail-client/thunderbird-bin/metadata.xml
@@ -5,7 +5,4 @@
 		<email>mozilla@gentoo.org</email>
 		<name>Gentoo Mozilla Team</name>
 	</maintainer>
-	<use>
-		<flag name="crashreporter">Enable crash reporter for bugs</flag>
-	</use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.12.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.12.0.ebuild
deleted file mode 100644
index 11460e64d1a1..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-68.12.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="68.0b6"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
-	https://dev.gentoo.org/~juippis/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz"
-# the below only works when upstream releases the xpi with all locales bundled
-#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="https://www.thunderbird.net/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip
-	app-arch/zip"
-
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	>=media-libs/alsa-lib-1.0.16
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10:2
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/pingsender
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-}
-
-src_prepare() {
-	default
-
-	# Lightning
-	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	local emxpi="${S}/distribution/extensions/${emid}.xpi"
-	if [[ ! -f "${emxpi}" ]]; then
-		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
-	else
-		ebegin "Add localization to Lightning ..."
-		# hide warning regarding extra bytes at beginning or within zipfile
-		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
-		rm -f "${emxpi}" || die
-
-		# Install language packs for calendar
-		mozlinguas_xpistage_langpacks \
-			"${WORKDIR}/${emid}" \
-			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-		# roll a .xpi that mimicks what upstream would roll
-		pushd "${WORKDIR}/${emid}" &>/dev/null || die
-		zip -9 -q -r "${emxpi}" * || die
-		popd &>/dev/null || die
-		eend 0
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	local size sizes icon_path icon name
-	sizes="16 22 24 32 48 128"
-	icon_path="${S}/chrome/icons/default"
-	icon="${PN}-icon"
-	name="Thunderbird"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
-	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" \
-		mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	newbin - thunderbird-bin <<- _EOF_
-		#!/bin/sh
-		unset LD_PRELOAD
-		LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
-		exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-	_EOF_
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
-
-	# Disable built-in auto-update because we update thunderbird-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
deleted file mode 100644
index 315fc2ad9d8a..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-inherit desktop pax-utils xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-
-CDEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-
-DEPEND="${CDEPEND}"
-
-RDEPEND="${CDEPEND}
-	dev-libs/atk
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	sys-apps/dbus
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.11:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-sound/pulseaudio )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="opt/${MOZ_PN}/*"
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi 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-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-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
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	mkdir "${S}" || die
-
-	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
-			MY_SRC_FILE=${_src_file}
-		fi
-	done
-}
-
-src_install() {
-	# Set MOZILLA_FIVE_HOME
-	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	dodir /opt
-	pushd "${ED}"/opt &>/dev/null || die
-	unpack "${MY_SRC_FILE}"
-	popd &>/dev/null || die
-
-	pax-mark m \
-		"${MOZILLA_FIVE_HOME}"/firefox \
-		"${MOZILLA_FIVE_HOME}"/firefox-bin \
-		"${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || 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}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# 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 icons
-	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
-
-	local icon size
-	for icon in "${icon_srcdir}"/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 wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^} (bin)"
-	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="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-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="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${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
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	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-r1 ; 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/mail-client/thunderbird-bin/thunderbird-bin-78.3.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.3.2.ebuild
index 315fc2ad9d8a..c765e73cbbf9 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.3.2.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.3.2.ebuild
@@ -177,9 +177,9 @@ src_install() {
 	popd &>/dev/null || die
 
 	pax-mark m \
-		"${MOZILLA_FIVE_HOME}"/firefox \
-		"${MOZILLA_FIVE_HOME}"/firefox-bin \
-		"${MOZILLA_FIVE_HOME}"/plugin-container
+		"${ED}${MOZILLA_FIVE_HOME}"/firefox \
+		"${ED}${MOZILLA_FIVE_HOME}"/firefox-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
 
 	# Patch alsa support
 	local apulselib=
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b15fb0b26a93..1e2b7319d44f 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,143 +1,10 @@
-AUX 1000_fix_gentoo_preferences.patch 866 BLAKE2B 836e42f394db6233ec4ad8550fd68b427f12474a7dbbe6671da4b60ebccbb762bb8e4096838569e58b2860bc3ad49dae7e66fa03a3a994228f043c7b17a6de95 SHA512 60693c96667dc6bf34bf0b58e4e06a50041b69656c1ea3b945521866a1ae86887169d7afb1afbe54e6b5b6ebb87eb6138fcba716509627966374a933b8a00016
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44f2dc0daf90762a0307c56eb1777e0acd572c6e131e5494c6586c4af2154e0980d25c0f4d4ab3cf4df1747892 SHA512 924313eb0e23b3609b27e3984cc39545122fdecf69d6382d11f18e92962d7a2018a1846404329f21b5880b7baed9491c7506fec998081413fc7c2c4c6c4e6bd1
 AUX icon/thunderbird-r2.desktop 851 BLAKE2B 09f88c3e849ef901ff7825752c560c212e746aa6bc941b01ac76db64d0b992130550561214ebc868373a67fa99be63d6048cda392e0a6766f7fa6254615bfe21 SHA512 8d0f5e526bc974b82f4fa8e077c2c3f816af704ec2db5b5d16059085700afadfff313ea5d039c790d82e3ad54029e63d4050836523fdf2836ff89c2e30165a35
-AUX icon/thunderbird-unbranded.desktop 281 BLAKE2B e2d0eb949dee413112021cdd0b8f5f1428aef25750fcba1424da747478ffbba2ea5b70f9ed8c8eee0bec2cd4ae0ea962389a899cefd9c6ca1b7d3841b9932fbc SHA512 a96d276aeb995d8f082bdad692406247548fb261c4d91acd9dd6e15d83fe35aef8bdf595d6150cb9789da0e7af57fa9fb8cc99a5be9b7e1d46ab1131e0adf62a
-AUX icon/thunderbird.desktop 270 BLAKE2B 6598b4fcf7f898a2a9beff9304db1c25a9906253569a24e593391946d14910e2235b16735439d967831f601fcfafd783064cc5f2330ba38d4868320a86dce57e SHA512 caf020e8af0df7b51d67649889b04d3af481850c4355dd0bd17a17e8681790731458648576a3a2a6c9ef7d0ab6d149eb9dca54d1362ccfc796e8c36d87c41d3f
-AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
 AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71ffe40b2aa7179d8a5622fe9b837f9430f93371cc83582118682fbb95d8ed5f66b4019924cf9b023e67cb696c SHA512 41a680a7d615bbfceabb49c9753feac5efb1276ad0e709164ee16fb4a0655886da29ac60bf1fc6886e1d4c00b84b3889cb85f42f1ebbc72a52bce80817a4ead0
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
-DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
-DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
-DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
-DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-68.12.0-ar.xpi 617167 BLAKE2B ba476e918fb2a0229ff75eb8daeb7823fe285e79088788fcb0c638c99e55feb79f78a4df0ea2b0dd837be8d12988330fdfc1117dfbdc65e6fb99676b94aae404 SHA512 05169e14a9c8a8bd5e36dd377d4ccc034d3603320298eea5ef2eb329ec3f72595bb6afd57930d3b04c1cfc6b99c122d98a78a9f6a258e6b78c14843e68652adc
-DIST thunderbird-68.12.0-ast.xpi 551299 BLAKE2B 5117f06a35ab88735295175ad900fde7c09d1f9563e96cdac087121e686f056722c939d65544d57b1637300d358ae50d8869973e9c17869bbfd6c42e3d843330 SHA512 54cce22c335e1361ce8e92d5174b0edfaf1b635be13b55acd505ecabb84e7a9dc0ebbb83168a10772a0e95b1906b1574b91b6f2f6e1901cf56e70fcf08bc16af
-DIST thunderbird-68.12.0-be.xpi 646280 BLAKE2B bad2e5dc2615457f62daa019e59083c0546db35d4eb95876abf4fcd6552731f318337af0cccad400bdc001c11ef306e7e736e56a1105f5234f12c5ead8c584e4 SHA512 1ee9e0b4dd0b8598aab1cd9efba5e454b6930dd6f564b7006576dde20ba71c344ff260d7595796061d8f8fbfd6aaf157abfbcb374415c293e3cc928e2e73ffa9
-DIST thunderbird-68.12.0-bg.xpi 646226 BLAKE2B 85a22c4f52cddd0f1f5d7f0c556b77b2d5d79c2be0d6f6fc870193a129bb202c069ac5ba15cf12e4481228db3dd3c445eb43c43c2db3b38f5dcb563492211ee7 SHA512 b7b87144ba2c1a2214b6452a5f571fb5c94029a72d6deb5beffec45c2382fabd00f025029c011726ef48a9aa423c1527f37991e19631a08f698981d6974281c4
-DIST thunderbird-68.12.0-br.xpi 574852 BLAKE2B d97715924e85f5a1b3d6bc97921db245f1cbad777eec89420ecf0ac90b8879cd8c8e7fb2a597e2021b76b84ac96edc680eadce8535f30e8aa880edbade038abb SHA512 6dae361254800caee67570de0a894cce70a8f379e7d71e788d18045bc52a5f7965460ae29c1ee28ca348f2a6d4ecccfe28314dac0f213e7d4855ac8fe670f849
-DIST thunderbird-68.12.0-ca.xpi 578439 BLAKE2B c4caba0b285ee619110e8ccae5bc8a9c53f3f83320bd2970961057e3718a47809a7c14f89444190f290eff642ca0d4b4502bb9ae789f574b5f98866dab24c7c1 SHA512 5992863563165e3ec4bde17c6f88f9e6237d7a09f4905ea4626eb24b470e413476f6eb2ce90081ead02913cf27d338965bf3d31fb42ad2294443f7cd7f75fc29
-DIST thunderbird-68.12.0-cak.xpi 602711 BLAKE2B 72ccca4545d820b9f317156df25849377a125a28b1b540c94a2830366b62423b0eedbb3ac4fc2d7e9b9e1412faf687b222b04e71fa7316c07b92ad5b7c64a572 SHA512 4c7780f33d6fe6549bf43ed4ab6d7e6c80e228032d8e759f8f40629a95c3d3d32e9cee847c7f221294550a2396b690239a05d8ead884dd4f01529e460a4df61e
-DIST thunderbird-68.12.0-cs.xpi 603043 BLAKE2B 1dd17b8abea3fe7bd31442895eb988f880f50aa729bafca6cef5aeace46e4a42e7cb47874ca244a606ac2db9481e5b06b28d327b3bd329a7c5d2c21609e5759a SHA512 5e972cb6c41603d122cf7e08b4403770513706ff748708e31a0b2c7148e7106ba1c3f175469d0152e6534dfb0414818ff565552ce65c7fe3ddbc59853024723f
-DIST thunderbird-68.12.0-cy.xpi 589903 BLAKE2B 9a232e7fb3fbb838b9fb9a16ffd688da7784a176df8bcfcabd41e0f21f3e51b10a1a5b1fa9ed453088949706056ca41a511bbea53ad192a53928cf554b1c2749 SHA512 ab0d2637f17a6c49dce83d80e229fe76f5187aa0ab160bf4c03a7d0678112149195105ed9b0b977af09f8efe29dacaf0846c7e5a8567cbeca1ace37d0a5224c6
-DIST thunderbird-68.12.0-da.xpi 588350 BLAKE2B 2a8a6e2ad4faea2ed9278b24d0035721bd651689ca4d6c638f11c696b1cbb666833162b6be3f586ced77b8ce8eb2e604b1bf788f1432c2914b2b9435814efe89 SHA512 04b0051c2a2d74bc0091e4f770537439284fcba936f283529abaea7818285739adf5ca979f0e843cae238fbae9f1c4d1ee9916a296224edb9945f0a4e357b0d8
-DIST thunderbird-68.12.0-de.xpi 597804 BLAKE2B 240bdcc509f5c7a79972b9be1bd333cd1c09e27ae216d19486c5cac0c59bde904088d8113101d26bd1c078dc29b89cbfd284a8187a98a6eebc649bba729bdbff SHA512 f7fc5eb9ea5f74c257ffcdcc1dd450f0cd0bf2a247e893ac251a26fe9c7a4e2b83df4b9fe71c3eadec8b86fa525c0a989ca76550718ed992e48e8e05f796751b
-DIST thunderbird-68.12.0-dsb.xpi 618835 BLAKE2B f79c9c1d53954d6d4b3fc6a384d7debf98be80835031d7d472b91cc0c7fd3a9ef03a1051a3a1e8f2943a90e9eaa87135c92dd2d7962e04ad4bb05ec39a8f668b SHA512 f6851ee32c2e80803488ebf390d345b495019b001ca1817ad994263f3f97a97fb6cd68e6cac0a885aef7a323384eff69b6a5cd752eea2173cc8a9cd0c39c8527
-DIST thunderbird-68.12.0-el.xpi 699222 BLAKE2B fab210e1541353bebb78d72d3d344f6cbfff67b42af3039dcd9c2eead44395befa51aa9128c62ebf7eaae196cc62807094b20b3c8f636e969db4871a03db6050 SHA512 323bdf6823e32efeb18962fbf4429e335b8301039bd821b7edb1f7278b939c3f54b1cc3765318570da69ba4e1da9bbbede6c870c9d17a607f3e77a3637d85319
-DIST thunderbird-68.12.0-en-GB.xpi 556404 BLAKE2B 44738d9782ada22595fd6df8239361a5c93c7f1886b9f682292c0e0fb6ef8242cb305b1a8838f1631d867a736639b0665edc69aac9106a9d389f63cd60720c5d SHA512 68915a4575043f54db65d6653889452b376cae01709605c7a9a176e96d44c259f9aa79fe40ffab62d697721f9ee1c24900b04ea6f8554be9834bc8ab11d3c612
-DIST thunderbird-68.12.0-es-AR.xpi 596552 BLAKE2B f1ab6b345d91388d41ced66b384c472fdc10c6d8f29c178499a97cdd03df022591f61b7614d12d6ba83c6bcc6d804dd93deefa5b1bd57685f76616996e12f0fb SHA512 e715bca3a5c8f50bc40d3236345a78fec93a5adaf0b87e301556ac4af0ffde6fc3aa484f5876430360872b4043fb1c54c5250a2d51281abba0d4bb1ce11d6c65
-DIST thunderbird-68.12.0-es-ES.xpi 518351 BLAKE2B ec0a48e5d1ccf00f2a526ad49dce5b05b4ae10ea00cc782ad0826bd721c855f4cddd7d9ae6ca3acb9f4387fd0e78145563089f782cb60408ea65dfadee1e14d7 SHA512 9bf65da2390d887f9d6f094c9d35d47714deaff7dbe2de84f2fa7d4096305b70e20664c2aada6411c4da5dc6f98cdb1c33c6e6b6c692565b8baa09cbd930ec72
-DIST thunderbird-68.12.0-et.xpi 573581 BLAKE2B a27d14f8f40fb3b43dee3f1bc50bf8cc5274e8bf8ea1f638787b72b43aca7caa7bb179a817c798e6ae3cc747bb167b6b6c6a1816f273f00cc31bf9d739821ba3 SHA512 5207357b4050788be11171104ce96e0825abcc759c03dc32d80bc96de0ddf2e480ecc27169d4cd82acc420e20d308c27a34deb215734cf401bcbf97e0f3a8df2
-DIST thunderbird-68.12.0-eu.xpi 579944 BLAKE2B bb9a4c87f07e50936908fbea490878ba268217454a26ae6f2dcec0e346da10ffdace85b26cf17309fecf47d971fd06651405ada674604859de6ab00a4609c3af SHA512 ddcdd5ea01dd5962e41dc575e3b2af2bc42142198817a6e24d1359f4788d5e666b4ad7888ea009b8b0c22da2312044003749caf8268b51574d853dfbf438037a
-DIST thunderbird-68.12.0-fi.xpi 578418 BLAKE2B 0621d3d063193e3a4d1317257223e8188f168f08fdfd051e34318de494fa5645e6f5bcf039619b539b0412119d3bf95aa40cd14dfcfe31c8c7ed324bce85a75d SHA512 65ba058bd9a45c27a60df4d7fe7c17b5d908d523f98a904f6e9aa0daaae40a21280f408af849e5badadfcf246d274cb3c4254ae31c59d27bdbcb6d283a9f15bd
-DIST thunderbird-68.12.0-fr.xpi 607810 BLAKE2B 7d43145d139c80131efe9926a874bec0ef443bc652697d657844b59954a6658794b2c98f49f97bf2de111bff5f9be62326cca69a9464b9dfe08ea78e6edf3683 SHA512 a9bd8838d6633453dd5aa2856335b3f0b506797207321426ab566161582793c597b7ca1f1747b25c34d8b6d465a4442c45eb287ecb7074fd922069617509c955
-DIST thunderbird-68.12.0-fy-NL.xpi 594467 BLAKE2B c9b55123ad37cd29142f8fcf17c8d74231cad02a87101cfde9966e76d7cbd532a35cd6b9f631af4221837be41b22579ec67547c4180f48c3e09ed08771ac6bef SHA512 46f48ae4a4164d5d3ab522036492f96321d636accc554f4c39ba518637f6c354c92d68015c1a3a899ece04d265787805427623f32c5eae08b5fc28fd2648fec3
-DIST thunderbird-68.12.0-ga-IE.xpi 588710 BLAKE2B 50e6ca57fa6f8bed26727e12ced047f251e3fc762e38802df45947ad0d39367c085e2ae305abd95cb4cb0217a05ab53a34cc52fad11ea3466d3b4fddfdfdf844 SHA512 c849c2f7b6f236a02daa6b49fa853b73e1166af8e0f5a809ad0e5431baee587ffc261126df768362ebf2edce94f5267bf947e0967324f416509fbbf637cf0024
-DIST thunderbird-68.12.0-gd.xpi 587109 BLAKE2B c7e2fb96e5e8b6dfa1d21f5dece3dbb5dc807e51f65ba810b9dc6cf32f359e3ee5396f35f41e89b2db7c475ae25927c76d3b29edb1e3e04f8c2ad6e44ca0b058 SHA512 70b4da18533019e5125fc180cd9488d8d140819d1358f12bdc335035903efd53340d09f2446b7170d2497d6b8d22bd3ea9318e9de0f0bee0dece0edc3abd6150
-DIST thunderbird-68.12.0-gl.xpi 568397 BLAKE2B 8db7da3d74147ec6c1c16af6664b8913963770c2b6f398187134efc1eebf0b500c5edd87a4ecf390ac5017347c062c95fd845d0cbb63eef31d219f042551956e SHA512 0217b33dcb2ca993b17dbd3f83ba49c0a197ea3a1452e8cdede89ce56ad5f18d18029baa6b9bafa2d731a49e17f248cdf526f05c90176eb165462343d6e17330
-DIST thunderbird-68.12.0-he.xpi 604788 BLAKE2B 72448fc91e8bd8b721e181e6fca0cc18dc83461e64571845c5e8d7b00a9125569ef9de5d03e38f9e611e9c65ed5362dc046d0c0d789e0a70b7c0e3a48b6b1f3d SHA512 eb3713132811e4e6e7fbf46962c7f413dcd063db69fd12cf1753e0cec776be6e94f080618ad2ea865f854aa5aad125e787abed4272df499f412a68560deae596
-DIST thunderbird-68.12.0-hr.xpi 583783 BLAKE2B fe6e1b4f52fa7cb62b26ff492a6720845cada25aa409dd24b00a6fd3aaf1c8eb4d7b35e83377ae1a83d8ed8a2e66c3660f171c86f65af222d402492660b56c7c SHA512 e45c6cca928833d9038fc92a1ae154726ed8dc7515c1584f79a9777d70582f57117e273778c8af00187f0fb067c97e2cf9588496b64a580854d60f71017d2186
-DIST thunderbird-68.12.0-hsb.xpi 616036 BLAKE2B 500020d637e8ec8019dce44d3b02334da1f7544403cdddfa0bf77fd39de75915ed70ebab928a329b1744796875b081db003c1b46b242f9dcc315069f95e4d07c SHA512 d6ac9354224f4460b69353865b6a3c175629c70099582ebc7f80ff06d14722f51157266d48a65418f56161151d93e7cf32002cf5f491909404a3526da78232d3
-DIST thunderbird-68.12.0-hu.xpi 618153 BLAKE2B 6116b03fc6ba21b82e85b2b958f44a297432dc84626ec51d9a236adabb52b1911d7e33046e808c186e69cd9e852e9d539f8c3e416dcad14d6f79359525b0d1d6 SHA512 be96a66e6bcbfa68975a936b14422a976a4fa0adc788ce41fc7bc8e94a19e12c1da631a35819f1c3e9955b1d71259578ea32c66cce602af92be6ff7488771621
-DIST thunderbird-68.12.0-hy-AM.xpi 631978 BLAKE2B 6c06758f90ef61dde88a75c2b6edde064d30ffefcf86822ecf4ea6cfe44437c34d783a0c0cac59d194abdaf00895c83bf8557197622e13159f64462fdf8a1a49 SHA512 6d21144aad495108bbe4ffc292a89ffedd19f562b69c7553a6a6df3ac20677f17f8f775f42e8ecaebca441902972eb171601aa205652bf6ca08fbbe3609e0dc7
-DIST thunderbird-68.12.0-id.xpi 567746 BLAKE2B 2b92005ee2cd07534d9c953057413bec21cc921b1d373736f63002f7827024fcbd718b3accd4f8e1152984d461ec116ee067b653b8aad30b3f424d7a432acf53 SHA512 dd98cac286338fc4850062a12f3339736d0d44da77456a066d72388b74c2de435347ebef550e060a3a77c3515997f2476559d8d9bd8a22756279ca6ad74658e9
-DIST thunderbird-68.12.0-is.xpi 575440 BLAKE2B c56bf3f8ea9a7b91f95d6efb56ee0bd96cd62f55a985dab3b8d213ff90e29c89e9be2d1f391e0a22420ff00504469ef76d48d1beb85c63061a58a534bf7a3753 SHA512 9410efb17bb67f6b515cb686a8fe56db7c9d7711f2a0804ca673def9902feddb156d6ae94e7676fb8eb995b7a580bc7355f0152898da0a0f4db42cd1a762b2be
-DIST thunderbird-68.12.0-it.xpi 489519 BLAKE2B 43e8189f8b7f6e45b27a417be13a27ad118f290cd5f88a1b7549918949056bc0c047219a8ba9d85f576424bd0f184e415db4cf8c57a79a185ca92a506f547e92 SHA512 3aeececfbbe840215723cbb887863b2ba1407c3ec6b13afd2ca7e689e4bdae322f390cf76ac4a3d2f1979f21d92c5e08e224ac6cc9893e29e0c6f959808a0098
-DIST thunderbird-68.12.0-ja.xpi 643575 BLAKE2B 1156894b9de9b86a76f84b2f48019c0ad7f3d449b7a2cbe97d0c8c6ea4482a477af12f17819370d29928925e01a19fda6aa6aa4c12246511c222da79ba58e8b5 SHA512 5866b6e26a7028f8e284387da77e13f6397c0967c8736a0a75674deac469cbab821988b9da088cc14029519e8b8bc1e5c1def3897226d302b143b7fc3c0cfdf1
-DIST thunderbird-68.12.0-ka.xpi 646012 BLAKE2B 3f79d74b427f9795e20790572fa6e0b760ba883ea869d4396611d7b898078878adb37369d56d1646bab03127534b6d822ce8eec7fdbea4ea49b7eb8ac6ab34ea SHA512 b10994c5c095b2c0d6d7154a132a4f8cb7378988e33de40e657acf4f8806d60db8eaf37917da08d7e2e84841815f5ee876820caca1595fe85dc89f433c765674
-DIST thunderbird-68.12.0-kab.xpi 589821 BLAKE2B 53f5c63463fd6adfe77e5f6663d0b301a449ac5dd9101d03f15ce850a0684fb1f922e895b95d52ab595b71cac08e0d51db82e1505a0e96aa471ca4424ccadb7e SHA512 6d4ef0d0faf885beb892ff71557a7b01e9266781a0f8cf0e525de8b2804c034ffc41e6310439d5908b2208079bb2832d4d761dee19ef0fd33a89c1e38126c258
-DIST thunderbird-68.12.0-kk.xpi 664807 BLAKE2B 24ad198ce5219775713c773c32f3bd92a98e185a703af9ad2289b59a4e9bc6ac6a857843434a7451da499033ec4fc42b2435e1c9e7e089e8ccc61c108bcb3c36 SHA512 e13a85108aaa96ed168537f1d372e210ed6ad15508a4daaaa6f1b22a60e5cbce1d8c281adcd1ec8dcb87564629e42406528cc5e7b8a64370ec213510485e9cc0
-DIST thunderbird-68.12.0-ko.xpi 620530 BLAKE2B 82472fa84b7d1867cf9126d261fca517b40aa6af008a23e6135a75884e9a06f0d67431249e4f0c4e24a817a2e3d6ba78fbff59cff2ac82fceb6b94809c7afd7e SHA512 e43da3733c87b634c9dc884373eab8a227c246eb7d37ce10576a04c1814ea7e427a0a89cc6c48770ee0b350aa6c2fb00034a6d9510585b9973ff41d8f927d3ab
-DIST thunderbird-68.12.0-lt.xpi 603846 BLAKE2B 651bcaf634b09317c20665f41a69f9f4b60083cf94c655dccfa5b63cdd0227dbf80e2c6c9ee6f0e9ca616e35da0f17166311c206b5b5b5381fd500b5ee07829b SHA512 9cae9bd9ee29912a57b26fe3c87d263b5619f2d7bf911fa46c0a483ae974a4d576a2ad38c3b2e23d9826c813659d9c8804aacbdff8dd1ab765cb6c59742d95a1
-DIST thunderbird-68.12.0-ms.xpi 559015 BLAKE2B 1e565a0b7adf4761bf59ed1214893afd4975504154d1f0f105ff1210fde077736cfc2d69abc769f27ba9cd1113a9c9e18eb8cad79f96ab9f1824690b7df718fa SHA512 6c31f73da033a65479d7e0caf93b7e316e2db64270d58a81686b2efe3ecf7dfc5e2534cabc83379142b5ae76d60d6f1ae5fe677a6df5379059c4756990f989ff
-DIST thunderbird-68.12.0-nb-NO.xpi 574021 BLAKE2B cd935c75f7f09f139daf9471263c3147892f1e26fa6bbff548c54abf079956efa132916ae8fd0c2714d1b76b7664ad8ee7b05452ad1f2efd9ba344ca436b952e SHA512 80d569870022fd3e9cc7ddbd9b748e9a2b88143f22505f07eea7d2240dd9b1dc162cae6f16489c19c6967126b9cecc3bebdc146ab1bf4ee28b05f40d57b3c3a4
-DIST thunderbird-68.12.0-nl.xpi 581354 BLAKE2B e9968de9cf447ff3d7b8a982e54ff5c925a9351c8b0fac23c2c985538d6a2866411e376a4f708c658060f8433a36f1b33360dcc2a97f9de1ae1797e0fe8281af SHA512 c7e82a61fa04912600f739c4864e0ab83040c73c28f3ad5ed5374d98663085d103670cb57baead8b0db8652af5b60d13ba654887275cf8ec9ea0feb8837e3197
-DIST thunderbird-68.12.0-nn-NO.xpi 574949 BLAKE2B ab075d0f7c8e88fd335a8084a608e7fce59eae9b9c7e8e9679f952607065984229e475b6a0e2df21f422fbd9b0297540deed7186e6ca9e7c1838a5cb0c294023 SHA512 442cd2e223339be3f09ddced160a957c46216fc2cebe314ab5c07f696ae565f08965b45a203cd9a0b7ef87f052664f2851a8c77e2451959daf4a891b0ae9bd1b
-DIST thunderbird-68.12.0-pl.xpi 576086 BLAKE2B 499e8cd7dadd6e571647c0effe9cba11cdac93c5c67b0e214930645f523a2a0a6aa196e10312719c532be758ca4a74f1979a37ae429909cd59934ee91ea7287c SHA512 0320e992271e00260acd183002a9881c9d1c7ea75842eb8d62243419f460b89e5e8abc4b34399431caf1fbbc8c43658b1be794eb3e52ab666154e5a013994fce
-DIST thunderbird-68.12.0-pt-BR.xpi 589837 BLAKE2B f16bfe8896665854c5da9744aaa05164ccbf15eb19f6e42c918b29873ddd46a47f4a1b90beebb20f9d022f03b208696a7cfcac5ab09c7f72bafc18c777cd601e SHA512 a19ddb968c2de6cf36bae15446568100d83e67ca8129df5762dee97937cf10809bc3ceeae724a79811cf5f526bf79b1b893e66babf9c73fe30746080db56d874
-DIST thunderbird-68.12.0-pt-PT.xpi 588103 BLAKE2B 503e42c95697beae15466e9f7221d61ae093215624d23aa97445137d457056f3046c7c02d6227564afe9e647c0e9634cd70de82155f7f4bcc9ba89ed93afba07 SHA512 e889bb7533b4dd8fda77ce44d4d57b323e89b8ddbda9de8e1d236e3f8ca4108bef5d44d357757dc03d03d7e3805557d896cea01856ae96b9bad6b6089bc88f53
-DIST thunderbird-68.12.0-rm.xpi 578050 BLAKE2B 256eb26ba22de7c8d71153cf3dbb68d155df647d77978179aa59b21c3912546d599b3bbab523171564d9f428de313e1a2da0a947519b687449546b9cad05b153 SHA512 cbc399b40b3de6c4154011e6574c540962623fe30e3c4874f5bce4bcb8990405fe04fe7c436d22258a102cc358a50becbb5f93ce206a880c395a707f78ad4bf7
-DIST thunderbird-68.12.0-ro.xpi 594841 BLAKE2B 97cece8b2ddff6d1bd8652ed8680aa36332fcf3303022aa1c7d3fe5f8786b52c44cb5dec474a85ba7efd9ab0c813c0f8ab16e6ad785448505a7b40f12d4da6b0 SHA512 da21338a677b5bc68a94eb92a7a03865108904818d7d1ff499c5e2f21aff52bf7cb219e8b0945d7efafdae58b4556ae8363d5f1a0974920206fb768236dab619
-DIST thunderbird-68.12.0-ru.xpi 683324 BLAKE2B 33ee0a6d363f2b39dcc50e6c6231cd4d9356bc72ebaf407bf0d1804f9d596e7e7d6f72aeffead806a1da9082962d21f9743e6169a5cc073319e737ca373e7e68 SHA512 51c60e425340b4445381be67d9b57112ccd612242f034aed113ee682f5f71f329760e0dedee63cb16471b4d2c0517a1ec5a1d0cc0074c8791049e7115580e16b
-DIST thunderbird-68.12.0-si.xpi 637405 BLAKE2B 660e2034150dc59c0309b1ea920d45d93422699f035aa839532f51ac016382ca72f09def2352a6ac8e87acdc3dcdab12e1edc21e8947ef456f4943c2cd70b8df SHA512 d9194f57d6d5df9986a30ddcef9d264a272b323ad54f39de68a3f034f67e63db54da20f2827dd324dfaa95a2471d55fc25887a7a05946d682bf0ba589c5f3275
-DIST thunderbird-68.12.0-sk.xpi 609752 BLAKE2B ce7ea87f231c67acb3e07fe15ab1202cfd0a7a7971425e6fb3a55a46c6d6addb395e3eb753601a28fd4d44fd6591598d9dce5ccee7546edcf5a094a620ff7eaf SHA512 56eecefe834810473a20a93b4170680a892cebafc948823a4c38b552485bd25d56049ff98def4ce21e261a0a5068f25c14ed76a065f76dfaa6e64a4d8dbd799d
-DIST thunderbird-68.12.0-sl.xpi 590627 BLAKE2B 97236877fec37b022f55a46a4dd945ca93a1847ada1dafa51678b7bba946795bfc039c6ed008fa4e6bbcc3b759a91dd6f8102dd9d8643536f6231c515537d0aa SHA512 d8f642226f1a4ad102f3817fb351104f942cfd2b713395ac1ae690b66c9073bf75abf48b7a91b80edd4f7f08a2f40b3628da729e88d94555dd8637ff952a9161
-DIST thunderbird-68.12.0-sq.xpi 598900 BLAKE2B e281ec52b5f575a3780d3c791cb7676e3fb6babafd165eaaa0e0e21d6440b0aec020b6aae7af9637a62b7e1a6b3a45878f74c09219e9442838778c38fd2082cf SHA512 12425897cb3bbce072210b6b9a23d06cda77eb6ae07a8c92f83e8b047a68ad3ff6530885f2d8d308225a6906f9616fecb33ec18918d4af25862f32e0ce164cfd
-DIST thunderbird-68.12.0-sr.xpi 624897 BLAKE2B 0ed713fee9f5ba3f646052795541f1e67c08fef60a6e1fa078ef89ef2f9f497e551d966170f8c01f629d3a19079aa33e90052b04b6cea4c91a8804511238766e SHA512 9e42eaef1fdf2bc68c8bbd1b53da36566b03de026757f1b215b3e23791b6cb9acb937f92d7ad76d37908ee035fc56a48a0598876a76c15c16034330ec470bcfa
-DIST thunderbird-68.12.0-sv-SE.xpi 591596 BLAKE2B a2eec3c8854567c04b5dac549ff62904ad4c4dad405cc05667222e004ff362be79d3ca90b02e7dfe9f219bdeebff2d80af74cca0098866262f734c9c97eb77b9 SHA512 2fb305dab393647d9d86d1418cee346b79278dbbff2f135763495a4e2d2fb6389c681571e4915a1884f89544bf4083715e618c6b1a5942924adfc2e151893363
-DIST thunderbird-68.12.0-tr.xpi 599706 BLAKE2B b93f904006a8ce06288369fc1891ef614d4a1a89c0ae0bc8b82aef0a6511f409d4196928e16843aa7d5e06e437d34db84b8a14b61eddbe02ea3650f0dce08ea8 SHA512 98d2bd580007c3dea0a269b3dc3c7c4d2920659ffe1d4ee03a6dce19922cbc37ef46af30d90c872225451551a4ab5a8d87d82b51eaf0b77f5dd33216469a3077
-DIST thunderbird-68.12.0-uk.xpi 671453 BLAKE2B 8a7b23e96f19bb4f2347de915b93769029c404538e453616c5f1d9c2e3fbaf18ab5dcba94a50d1b17113652d6e05ae4e71b1ea9eae7d915383ef13665c05518e SHA512 eefa89011245bbeaba891e4656489ed5fb12535c75f752f0da753f74c5db35f54de9149adc8a02477a48672b5895f3ee4309d634585227c00ba4f96e9a1a726c
-DIST thunderbird-68.12.0-uz.xpi 570418 BLAKE2B 85149773838e7223fd48bdc6839aef54f70aa559a20382757436a1df39b20ca0ae366656e773f37780acdb766d1b0bf8949291b555e3a99e5fa8415c046743b1 SHA512 40d1c39f3e5153049e0414c788c8ae670a8676990ffd171548064355a8d0f72784fdac6fa8ab518a309360195115f99b19735086d7b9f92c8304b0b779634076
-DIST thunderbird-68.12.0-vi.xpi 623422 BLAKE2B 4b66830b6c485ce2b8d004741ba9ae2e620e9b32642010d2a2c14f16242b96bf891acedb3b3bd90f03366f574ae0f398f8a5732d63ee618179ff6bdd56e51169 SHA512 2cdf993d65212b75cbb865c13beb22a86a4eedc129519e4d84031caf21eafa7a9657ba62e8f4f480e717db3311de1ed0a8f0e357f8c5d73d1aeaa202aa0ccbee
-DIST thunderbird-68.12.0-zh-CN.xpi 626820 BLAKE2B 301d3ad3413700879ff1d8f39c471d887ac250f3f1c0f4e47c755d7744aff322d6e71d19e5b62222569e839f4e354bf833e6a098b9d22e2039949a391b7234d9 SHA512 88fd1a6a69fbaa3636861cab50b6f2556b8bbc87f303e5e06285ce7cde51701998459fe6e7339578daad4acfba0d994ac7f2202ea266d6987c702a93d0588dce
-DIST thunderbird-68.12.0-zh-TW.xpi 627476 BLAKE2B d3f0ecd246e9834013494868303287403de78e67c028144f2cb7d4d929745728de5507a40b23dcd1fc04914fff9ff7fabfcbe080ca50768d48d12b61c147034e SHA512 b8104fc5bfdab328e0e9d3ccf373b43fdd15741fec5084da64ff5a8e6221d1b9b383de8ee71a89000e643be3b761921d3490579d6d12c9e88359a32ba8d3a2e6
-DIST thunderbird-68.12.0.source.tar.xz 331226160 BLAKE2B 2712dc52cb7ee2b2d75b08907f7dbf945e89f776d12550427134de7f03538f1f4b1c7e747c407becf9be4cd70c9506c5661a9d4fa0e4d19c2499f11384848dc0 SHA512 e7559536a9e024747e3ac7c20e4ffde5adf57657d02109ea32c39bf736ad03707fc7a14a0d3f1c91fa6fd69ead3c38d6c32ce78bd468834d9ba7f77f728332c6
-DIST thunderbird-78.3.1-af.xpi 548782 BLAKE2B 4dc5e65a284fb0ce87a0665040d86961e998340449b1d51125a5b29bc44607524e85e095f001d1b9b7b7c55b6b368022a563c1404ba16e63ab2706b5db442a99 SHA512 2589639eb44d2b33caf89dec6933218aa9959ed4b449be30f6761c2cd894da1909851fb60404c11c2aba45b9a45dd0710ddcb52a813380a012a53e1159be4dc1
-DIST thunderbird-78.3.1-ar.xpi 649063 BLAKE2B df72eaaa069d3740abdce0a360bbc1576500164b898539e37f4ea356414b47e6b150f60f84428b30f072b98115de772162ec1c062eeb904443dcb2db36887f71 SHA512 33a83d85e26a58dabfc93e1af7fece7e4a6eec1f637697be4e0b81cdc379d593f78f70f57178912cbbed7dfa8928b9f177ac54092d85d1ced4317e4827a44938
-DIST thunderbird-78.3.1-ast.xpi 561707 BLAKE2B 13d65d2e543bfc0c123bea1b2699f4fe5ef9fc095db49607096115eab485b8074530c689c2ec88689ae044f16d571416c108eefbc75d9bce37b8940f5e344f73 SHA512 7cf31eaf4333e35872bfb07876540ec2af44a7ac6d82eb34e873d97778cff5914000cc7fe8ed012c88747b539c5d11c65a50fba2cac2587a9dee7d1e49e76cbc
-DIST thunderbird-78.3.1-be.xpi 667138 BLAKE2B 4b5acf2045f3a10622de056a5a047994ec0d9897cbb586b78c971802a632f4d290336338f592c422857c742b7dac97d22ddd51334f8b4c29c219102a0f0414d1 SHA512 618c1ce0164a56b9ffe374f2e17f6c23a8cf8c8fc3e7feeb337a4a381b2a2c8098adf10ce677e322564c3358ffc8d8c0b71e093fde6e4284ceba318eedc7cfb4
-DIST thunderbird-78.3.1-bg.xpi 672894 BLAKE2B f4f0386c29332c4abedf76b100a7f91ad3b2eaad056700a7396ec837da7b9511248efb82c12ea10b80e900930cccd6a14daa9329f2210ce84ab52ba91b5e3dda SHA512 5f61710dbe5ffeb23d7d8af681324371c00d069c9eb90eebbefa3af06e9bb19d85b2db66980c385be4b4849183d247b7fe1b4da64b78e2af2fd6c40a8c0e264f
-DIST thunderbird-78.3.1-br.xpi 604955 BLAKE2B 12f35d2db76715824bfb614b9bec7c2dbd548db253439e90bbf98990888d9bee90f6862b55662f4c2ebf5167e80f6685ca0c2bbca3bdb761ab20abc16d1f947e SHA512 f43fecd3ea16ee18198da6af80236200d38c0cf7016e4db0e376d3ceff6dfc3f607398d0fec6ece764b36f5a1c7ce3322c9d07ddbd2a0a0b6bbbb826a8ea8925
-DIST thunderbird-78.3.1-ca.xpi 620862 BLAKE2B 995a8a5f8ab01d12b0bdeeafd411ee1fc9c675c51a3fb3f3eab3e763a761d72b5bd6811547ee68c3d1637bd316edfe584ed5e8f609b712704262a37f4bcf6109 SHA512 427f8a5481c56a3d651c777e675e3f963ddbce2853f3cc9e464fe951d779a51bc2fb7e09579de1dbd4638abf6e3496a54f1838452145b62f6dda2e9cd7f8922e
-DIST thunderbird-78.3.1-cak.xpi 636111 BLAKE2B e997193b02c5e3b2181449d1a9362c614f334012449b016fb010e51dca2b70ac2c018d716e9d74da8bf522501f577b983a40fea3ae5f2a13c227dfaabd1ba9e1 SHA512 7174bcbf8283612d5e02bbda2f17599728a40f80326c924680f2aa937a9b740c2971c06b928702b986ae6ee6cfce6c9b3142a3ee034bdad12b758dec12ab9ca2
-DIST thunderbird-78.3.1-cs.xpi 635782 BLAKE2B ffc9b07f3ab3e0b3c5893d6f8891ab18ec4b5c303ab248e20ce201e90228be04593ee0536bf1469e5ed38dbbc2a6f6eb048f92f90f595e655cb2c9e9e0374331 SHA512 acf70ac0e9917e26645c6c718471e957e57b522c845b9d96416a7bb852fceab225826a36022874f6bc32c2468420f5f95e4a8202b753070cde2e1de7b187f599
-DIST thunderbird-78.3.1-cy.xpi 646684 BLAKE2B 8fd3129d58954dc8bc615c659f4d257b6429f73f319996992ce66d7bf73237eee1b15f6077c98a4b68f7115ab6c4968d2136d04fe1fce4e0d847b24439047d11 SHA512 ade5c2bbc35120f7d7c9ee0c5ecec6848af49e69c5780460318d1e0e5d3499e455488c571ceab0e69870d0700ea28dd4d03c697fa5cfa22815e724285c096c2e
-DIST thunderbird-78.3.1-da.xpi 621423 BLAKE2B 6f7beb82d02a699f8bd8030ebd5deab9ceed2bfb3b71ae3f35cdd347c9750621de7881700d9af49e5284d1540c0ef828415586550d743d1d3b359790752bad54 SHA512 b2f0b03fd6ebd4c2e2574c33c3df2119b94c187091d00a8c3fc93ed77a64888c0e33b38f5fd17ae00a4a9aeb028e8a5e7e1c2fb084e6a41e6f4871047cb7ae0c
-DIST thunderbird-78.3.1-de.xpi 665616 BLAKE2B 95fc97e2aeea007b0246736fa9fdd049d73ecd07059a73b1302439985e2179e718121b624e7fd3ca9a8113b3300eff24ac41e4b17857aee2d77749ccf1103010 SHA512 6213f36d707e637fbe9a5c4962308363e682d99857a0f2ad7ec5043c8214f06b2da3a58f9ffc184fd120f99c569df6592287033267c2d71b376e366d096cd017
-DIST thunderbird-78.3.1-dsb.xpi 667214 BLAKE2B f9f4f28da04930d13ae4597b1b98f5a08d406228f4ff6ca81c8179a9ac2648e25885ebe58c82c075fe1e4ecfa98240b869d0db71af24096030d4a9f393034ccb SHA512 c2b127cec59a7d489fb68d014e96121c1836d24f69b5b4e9d36bba5ec967eb256681b82286534ad44d7ee542f184756d9cff2b2596e2a654e3d3094449eb21e7
-DIST thunderbird-78.3.1-el.xpi 774935 BLAKE2B 6de9247fa5c607619bef641e3498947ca814eba543da21e529cf44fe3051c14e666f9ec38cb36ffd4ffab617f2afc3c3635af138d20e4e37b653b5fd65950a83 SHA512 2c226faf878c2b719bae93e1a1cf497bfa5c6c4062d8264d7872027d0cc0f3f4cf31bd9e225c320375ee1f90248fa464844300258cb4f3d01105b12498b48cc5
-DIST thunderbird-78.3.1-en-CA.xpi 612236 BLAKE2B 7ae0e62ce467e400e42b7adc22fc2812ed54829eda0109b10a0c387e1a0ca52ce8cb2980988622d7319cfa8920b377cf443946d082783cdbd1d2b3d3ab89f706 SHA512 8242a669120be9e9e47aaf6bf266b1fc79b82529471acde533c71fc86e357d2efa90415843058ad0d2550cfab863412115e9acec0b467339bed3d278f75a6129
-DIST thunderbird-78.3.1-en-GB.xpi 611650 BLAKE2B 08a855964fb3f44498072edc0ccd10b8da6b52cdf9fda408e7d613a3b88dba61206a1923ed214533c8e8227d7c5cfa336080776f8fde429b12de03e2cb6ab633 SHA512 8741513f4e9c26a1550dd4124a315d1b17ecff9dd0c2abcd16337e61f431c53beca83e01db8725a2409d185d47917cea7a4fb9c4428c4c70457958b3924ec92c
-DIST thunderbird-78.3.1-es-AR.xpi 658242 BLAKE2B 38d2ba10e42e3c48a29b2f21680ff948f748ae96f7ffc5fc5efd347055fc03432090c0c74063b763d9fc10c00414c4ae668884cdccfe24fa1775a1f5d72a017d SHA512 119657565129f7529d48a313474c4e3ab4e163e7257c6e2ca571d68094bd9d66c8fae0b0e404960176dd116349c7b832f9aabdfbc3588cde0e02fd88be992508
-DIST thunderbird-78.3.1-es-ES.xpi 570250 BLAKE2B 90184b8c0e9a7e6a0dcf4d4ed47c012ef26c072639d701ba276144e335c797b3e3b6afcea49b7a4e1099858eb16cf0b1d25c5f10f13682d0ae545f33abd3ddf4 SHA512 46fcc62fb91452524c59cfc22ee440ba7d9b1c088d34792ad5ab53f1038f4fc08a17b38a4cce6cb190b2e1dc2922e9a0b75d7e2d96782edb1965b23d65067e4e
-DIST thunderbird-78.3.1-et.xpi 598159 BLAKE2B 524440339ddc0f749e9c48f1bdc6139e75d7788c298a72686e91240597432f18b2c0669553683aa3b551a827ee88b6f487f3bf16dcdbaaa3bf1f5b6272beba37 SHA512 059cff9a9033d43d19eafab739c7e886e1a6fbfde9be91a5826f025e34794c3f1372728974da701518fb9c81e1f694cbc979d3e50b3b97d6c70716299c041233
-DIST thunderbird-78.3.1-eu.xpi 633360 BLAKE2B c5b3315ec5a0995187dfaa52b6fe7047554bf40b1dfb85df00eee624b6f02b7416367fcc24a221fbbfb1962e6e8ffe897e225e191867c2851d6f9d5613727b8d SHA512 d7f7361e1d0bc4fea5613e1d3365272042e70e12a6a4da5f25681b3173b3ba681ae7280c739caf89ea8d762d32a70d70e8ab1abd39d26036576bfcee96f8d3d6
-DIST thunderbird-78.3.1-fa.xpi 640169 BLAKE2B 7a5ff7350ad93ab5350e60fc1ea7bad47b8300a04bb6cec0e9139f32e1393ae0cfeb83d1756f9617bae1e55f8d02343c5d0db209242e714d16e0ce5adf85b2fc SHA512 6b7a5f6f416b719f7dc1ef8419c60e87403ca81d95300530e2b6d95772cb922f75d619549a123c735e224e4db08b55b1c4c297b0de3a66585d65d363fb846a04
-DIST thunderbird-78.3.1-fi.xpi 642882 BLAKE2B fe3fbdb6488806441c58d822d1cce751eaa373a3df6fb042af17a5896004e6e59fdbf323349d509d83c7d604ca573b88e2d249be5fbad77a0c06ef690eed7ea7 SHA512 e7adadc00ec3616f68b90d3b48928025847c7691daed391c54b1155df389f8b1ca7644bce13b225e5977237ba7c47594e8a2c2c7b2fe9b0832ce716a2966a98f
-DIST thunderbird-78.3.1-fr.xpi 669932 BLAKE2B 697e4ddd6aa6209bec3755c2579d623708453c4764ea1d4485748387d61619772e9838657ca7998abefaec7764d2c61d836ec62b5e736d352800f4c5ecb0dcf9 SHA512 c3bc9ef32f22db6bedd41136b63a51e77e31d9886858c4df56e4044a63885fee21fbee164ecb53e03028cf37ca3cc8bd27c2603c1fb707f269a179faccae7549
-DIST thunderbird-78.3.1-fy-NL.xpi 653515 BLAKE2B 3a529efe3409e0a73408ff4a7b46571f1386d294b043828eb6985e259e12e165155bdadf239322fc671c4c5a565d674c1752ce2e66a54af72e8dba15cb083560 SHA512 e56584b69aa292b820c1c5fdddca4c2fb715d8e33b7e742ceac781152078847a1891f2b2d511d0188eeb86c2bc646376473e5382322ed4e2c317c2c67609cf0b
-DIST thunderbird-78.3.1-ga-IE.xpi 601172 BLAKE2B 1dbc1e10785a3d7bca215234aa85f8d16c03afa2c30e1c2d304903390836fae3e092f222984b0ae48c6bdc415128f88fb172671433cd028f97eda6aba312167f SHA512 61a595a25fbae0f87e318072b04423b5b88204439ae0713ce5d234fb2f6565fec79e32a8209288870a7b9e81771787339be4c4bcb039256536326f8485f68854
-DIST thunderbird-78.3.1-gd.xpi 609820 BLAKE2B 5a59a4b5bb9aa6765344890a967f5ea7322a5be57079393c6e8bc5a24bf41a3fd6111fc134b14c5335c47949d5ef2b2cee120dd2d9196a54aa0856147838c272 SHA512 bdf20675f57bf037c0003d480d8ccba7e06ee83412317c7229e70d29c0f9add266414ed539818175481d49d6444463495b0a0f9aec050a0ca0db8c143596cc10
-DIST thunderbird-78.3.1-gl.xpi 616197 BLAKE2B 50133bb1aea400e500dbbd34e0530d2965b81411d2726857dffe6d76f7c9c60fdde0adcd1af2b45578d536d8d508febe44efe3f1f74f8e1bc233f4aec50b8ed2 SHA512 454baabe2d5084ed8b9b57369711ec7924d77b8d5bd0ae740091ff15068892a0b89603f6ba6078da3fbd74712b8d0dae4facd302009463e14611f308eb3a1922
-DIST thunderbird-78.3.1-he.xpi 640978 BLAKE2B 58a4f377aa8ee88d4ec73bb7b67729bb35f7d013b2cb28dfe3b81103e1537faf7938e872e887fcd3e3699db2eee11179ba777a54e574cca7c753b40b6f65a423 SHA512 1b71d51a2a78f800b4e3c4e73ce8690499615f7f75975c6d159ae025c8751723ef2b1f3cc19967115d21f746f20576ee789c4b35776f5a980e95a6be64807ffe
-DIST thunderbird-78.3.1-hr.xpi 629425 BLAKE2B a02e62c2544a97bc506606529b8dd0171c1579868ff1ee3ebe780487def6fe4306ee6148f87aae591cba4bbad8aebdf7a0d70991adf26b7f9bc3c8a350dfb6c6 SHA512 c3cba6adb7b0119a0bde17ee6a0a9a4f5a42025359f6abfbdce9b596e18f20866eaae618ce123908c8178172fd7542ce906ad730c2f00182f22b757f4280f12c
-DIST thunderbird-78.3.1-hsb.xpi 669044 BLAKE2B 236ef3c424164c3b25af50b2832720a66fe9cba1afbe7e9e6c87e1a0e1277eb53e0473b8da4ac68c412e825b12e1b2510bc7d738bcd996a3b2b429f73bed8946 SHA512 c00827dc37274dfe7d59d18f15588d80dd31f62fe51c304fc035c10520d2d38d5d9c50f5ac8e8255d4c9db6bfc4cd4ffb9b3105b210a62a6207698a4de180f7f
-DIST thunderbird-78.3.1-hu.xpi 680276 BLAKE2B 63e5ae79a62b6e1f8495ce354f5550054373018f9537416b0b65132d8a9fee9cc7979ca73f1ae13aa2c6de4a51fbeaa5a3d0a0d9fa36246e0786cd7143e66e62 SHA512 7008a82af0366dfa206039da35ecace8d819459d475ff2f7fffc0d1c8ff81aa6ae8dd4c1b1970da86e4209ff9c6c7f1ae13ab5c85d96ac46a7f3edb5dd5a167e
-DIST thunderbird-78.3.1-hy-AM.xpi 713775 BLAKE2B 6f60d07c8b2395157e7295b82753a8d908ca30872f4d652db5f9d7e1f670874cb4e0eaf948b8e5b37e69faa9940526be2966d555cdc01e64ca4546e1e952956b SHA512 8881730a3f7c27dd4df5bbafdcc04907b8cbc7aa145bb0c8e044f00e6a4749bcaebff35573b40556a46463e920385c9e5ecd2814376c84fad58fd0101ace31e4
-DIST thunderbird-78.3.1-id.xpi 621070 BLAKE2B 7fa306b8dce3b384614f3051370ff675fc8c365577668df090c4efbf296eb80de5b8e9a8262d7789616882b077a59f7a91546b45fb55abb04cb3830deac4cbe1 SHA512 a3f81788c3f52f80bd912da95512829ed84043465b03228a2832d6d427ef4b1709c69582d4b76e1cefe3e2d90bbd558c0b6a91bb846010f3fbe89f40a4830153
-DIST thunderbird-78.3.1-is.xpi 582081 BLAKE2B 4c2eb7f2688d4dd69f7efe6af569550abb0b6ba635fa887afe13b28a4e4591311e1f7efefb2d650e32a16215fc9374b25a2b72da62805af9f175086ba99e215f SHA512 7f2e399743e3163c18fdb6728b164d66cb2ef40e67dc7fc63eede9ece19dc000cf31942f8594b14572d79eefd7ae913b7a82ebcb2ea9e48fac44709204d870a6
-DIST thunderbird-78.3.1-it.xpi 573401 BLAKE2B 422db414da26dc9df7e8f38f00d00e1127615ba6e0086bb75f88788f8aa4609e3cab7a5ed8cb239b156312fed090c622aa4b43f266f2c05739efab635c9e3dcf SHA512 69fa612c28224a6472a0ffbc1034003e8fd628eaf8c983932a530dde5e3049afb9de2cdd039b5a582de7e2a7080845577e627a253af1eb846163c0f6489025e8
-DIST thunderbird-78.3.1-ja.xpi 722921 BLAKE2B 825c4668dcbfe1e2223ceb46b61cd8d7db72e131bc37d85997c71263ea18044260dd5602a4295b97070b7c7e4dc778874731a9acaffaad64f9e97a98cf567ec7 SHA512 dfd831e9ccd4eef5f6028ef7cda086dc9a652c8febf613b35a87d3b5ff64736962c0b4824404f9f2146d3115fcb3489936a35c199d751b588880186570d4d79a
-DIST thunderbird-78.3.1-ka.xpi 717490 BLAKE2B c4c2d820262bb4cefd4b83a59e1ec684933229f496196d61c8b402c1360ae35d5eeae7a1d1fc2173f9d10a2790bf42ea79c92fb0f80a5cf69d1babc99ff5df2a SHA512 5489f8e470df550fc4d6cd83dda29e62d69819e6f539805bccb14a436213c834aad349ba600ead36153d142deaed9a7ec2b8ec6e5247d2e51adcb1f95a140baf
-DIST thunderbird-78.3.1-kab.xpi 652354 BLAKE2B f29a58957db51af566853e28aeeb3f33d31bb8c56b2705f1fbd263418e41c6acd49e8c8211ecda7fc8c29cde98161a84687fc2f22e327eb0905220b7d258957b SHA512 fd57398522951d615ff406130eb4f9320ec7c8bd6815530d83b857baa53bd55ae44c87652ecdbd93c6a74f6f28c503f7889cd8e7e92fd9493fa76266b0318e42
-DIST thunderbird-78.3.1-kk.xpi 720911 BLAKE2B df08f3625194041473bf2df8ee8efe6d0c0866976a283b2cdce469339a31a3665eb9d2096e035fa38713ffa8377af84b8a4883b4e821b7e4ed7d3f009a2faa82 SHA512 8b1697f76701616c6ccd30f5e3a93d2a506287dc8dc46051377ecf877875c712b5e92fb94ebbe690767dc23974d7d79fac2ccb1a3c6d0f5447582f5a4c278c9f
-DIST thunderbird-78.3.1-ko.xpi 688662 BLAKE2B 65f6fa0d16fb8d5dfd07664a8c57aecfcc0a21ae18c5dc3d5f2ac3a26e7dfe3c82a8cc64b5eb389701581de838fe0e11a9553078a12c3158ed3a03137029f2a6 SHA512 20e3b6672444323f8e2b7250a6e539d3e11fef6de3967b1c677c29457227a024e5db9dadfc1d713a59d6624b76cfc8a0fbeec4fd9cb85a5cde2be7061e23e6f5
-DIST thunderbird-78.3.1-lt.xpi 660723 BLAKE2B a411b460c32439edf00fca6746b5b72167db3b8c1d6cd6243b6de213d835b2110479e9478babd1cb40256d4223268971fc44041388e576a5a2736d3e4bafb56a SHA512 5941c8ba6f95bc6501e9844f3e73e52d96927531a53234c340eea63da6b8fc2a6dcb37f7ba89baf15b809311db91c5e5ee212578fe9fa4fc34b765242e6b5baf
-DIST thunderbird-78.3.1-ms.xpi 572598 BLAKE2B 99bfcb01d80352698272e4c00e18fd1448dd057c0496b4f81f208e693bcc67fe92880bfc1fa7a55065ca95794fa36f43859110ac7d1e6058d62e0ad36efa9adc SHA512 04a0f67fc24f21bc1108976a06ac663690e9ddbba68068a8fde267ad070310a695ba410c20ffa17e7a0745311c34f59cb4e939837c4c804c0386868f4e812736
-DIST thunderbird-78.3.1-nb-NO.xpi 637687 BLAKE2B da46540fe9570f04e254153df3a9b606e4a095236f7cd72b0976d0bd405368b7b6a1e703777bffac34d448c30256149a1aa3fa681f258fd50d9b4946efe9a732 SHA512 af76ee9f52ee23c4b50e47886232ad1ddab3b7e56e481239e2b61bc1b7b44185c30d13cc76157c0ca7bef2c8ed71c70cea7acda9d17c87f55180103cb2a8e6bc
-DIST thunderbird-78.3.1-nl.xpi 644785 BLAKE2B 030af1b512ba282402564c7ffaa5ebcfdf59feecf17f38800e068382362d482136ad0653b11c186572182ca97759f52080af1dfea7058627b97e220102cb719e SHA512 43572179ee12444378d0c82080d4d8ca78cd407eb5612fdc326f09330b8e5c9348cd033c8a808a3e47e8b232eba57dc02e6f7e5d3d66b2009790e31d036fc0c0
-DIST thunderbird-78.3.1-nn-NO.xpi 641129 BLAKE2B f0625a150b2f8ce8f2395060570e748b26fcea764abd4277302782ed9a36f1d01de9119a2e78ff3a6b1062bac14a31e3eb7eeb6ba07f6ec529a5589aedb0168e SHA512 2aabaffcb7a53254d14fa5e9b464f5c4e2f61c96a726f9da07aa5d7d676b313ca61859ff3e9332011413635660b2d816092713661e1250a19219d7955f5414dc
-DIST thunderbird-78.3.1-pa-IN.xpi 633700 BLAKE2B d395a8f9bfb9ffe050f1c32f36873c0e91d7b62984779145132d1989f7eb35ce8c602bc61d9c0072334526b68592c88d4b389f2c38e2520fe9cdfc4a54889e69 SHA512 c14c765fae3e704812589d86961f0829607a44ad5e27021981b67d5474e7049e009b32d7f66a9a1e0ebc9bf15d42e9cc2130a3fe678d7be13f9e123c15acfdd3
-DIST thunderbird-78.3.1-pl.xpi 637576 BLAKE2B f5443fa4e6b61e97914b97205930fde4332a2c5f7ad2fbe0b266a0ef5748d172ffc69674db2645b362bc707c93b0f129fe92045732a1aad60f273a62e2d15c03 SHA512 5b470814f52dea00f83828230e013f60f4f60cf29a3afc394ad056da875442d026c6df0cdc8f9a9260a1b476225f4585847daafffa7c67c23615059d3fb72719
-DIST thunderbird-78.3.1-pt-BR.xpi 649863 BLAKE2B dc64cdd0ba41588be1dbbe3f024d6b1a52633483523388cafa5da3e3aa0139716a485bf19ac87e9671634a2fe1cff622817b17e83f6317b70cea50c851f67aa5 SHA512 57170789cba1d3ea0f5293d5c3e89bb36408a7db5d8749f322b4e07f4273cb8bea1b3d21cd2d9a169fd1b9f1ac274714de2a340d8c5c0408892f85a09c584c12
-DIST thunderbird-78.3.1-pt-PT.xpi 655963 BLAKE2B dc0e8dd6353aa4c3fd6935818289bd812d8829732ed75b838669813fd36810ef7c3b520f10eb6de13a892a9e4cbeac2dc70e8fd6750e379c5af2321a2d13f6b2 SHA512 8eee29ede9b7a0dae952f56eb1b32c2dca2eb994a893010012f49dd8509ac57b3c681ecc107bacf828aea39d3c00ef2e17dbc6e7eaa7e64be963517978fbb834
-DIST thunderbird-78.3.1-rm.xpi 646970 BLAKE2B b82d1f6480f5dee6fb45c731ab3ba9a7d41cc1836ac016e6504332e06143658350a1d15b95701ec025235e48b99e2293422e48efabedbac05abae5bceb6aefea SHA512 7149edb2ae34646a921ec1bf17c0c7b738a5af69cb1cef0b85d65e0fcb06d027b7ae40606b3e8f3bf600eec26dcd23decf163f6e22f8c2fa8864478d8dfde9be
-DIST thunderbird-78.3.1-ro.xpi 663069 BLAKE2B 99680865354b7630b3dbf084380de27441e14a3476507663e8ea7d9beb42d8c5da4ed25c80cd8feeee40c4a10ad01c1edb4c42b3ce31b4edd86bced5b48e9d5b SHA512 05d987df713a6122ca040faba84b453646adf86c2821abf5ecf6148653ec6a0acf2f9dab004cc2079630879cd39e4fb9939fc6a7b6e67b520538b33d901c7c11
-DIST thunderbird-78.3.1-ru.xpi 756670 BLAKE2B 7d09c57855488b01f9979e2f6e99ec8db318f778ff183d4b6ef83eba84f24f438e923ce60f1a8860f11208db5a6429ec9ca0ff519d46e5f38b285d0519a3506c SHA512 6cb05d8fa9f856ffc9f7f85c8a02699421559b83c15c06a08c6c91f1afd64c7e5520536d7e09557f1e1d752f2137c83078f9573aff8e876e4b23cf8f73ac801d
-DIST thunderbird-78.3.1-si.xpi 651575 BLAKE2B 1121bb3cbffa8b7bb5ef3cbbe43afa1f2bbe859fa9449d052eafac03eda8e034f560559748a3e119cd35c04830156816c132f760868b64477be712c5866d8638 SHA512 bf911bf0cab1811c733a5dd0cf213511cf2a09dd792ae932ff4cfedab0e17de97ef3d6cb89812564cc87787dc66c564121ac205d56241439596fb758170546ec
-DIST thunderbird-78.3.1-sk.xpi 643646 BLAKE2B 5f125c4f2b8fef0c3ff05340cc0b42709a85e88eba74769d0445174cc11c1e67b99f5e63f5eeefb62f99e14ba71e851832c0cc11e870568fb3d72dae8a40a891 SHA512 5b03c9e7402307814c856b2522060705d2c69eb257065c3831c413156f75915ad0336dcaccc9916e566f4d97903de4be8e0bbf5fc91c6a432b25bfb076932f94
-DIST thunderbird-78.3.1-sl.xpi 632783 BLAKE2B ae517f5529e4c1f5fac4f9d3610627b2232af269614b00078c5bb81b9f1d1201f275ff81675145e80ebf8f8cbcb758382083c869f0ef15f9bf5f1c7df919ef1c SHA512 1af6cabae65d89b822fd4e47d750dbb492c6fd99ca03959fdc62411beb284c8f7fd21de9e3a2d24ea8d9b175aa173627a591d2d3807ba80d233a171217eec1a3
-DIST thunderbird-78.3.1-sq.xpi 658261 BLAKE2B d53fe15652b9ce481510ec29fc63e9e54ccffb6cdf24ae942a10240a2e83e833da53bdc294724a97f229a602cd2e35166122ebf3b64caf70335ded5404963b53 SHA512 0c7fdce68e8bee7dfe007c16488aab3e4fe72e5f08ffcb20d7042b911c8bd1190694341ea7e6aafa6bd079aa05fd10a6bf099552b6b89c9c7e0b82d5f224fe76
-DIST thunderbird-78.3.1-sr.xpi 683545 BLAKE2B 63b03414500ef514c3bb389528b8396cb800b8a0d21f27e82db30350f93f3a61dd5ef4e174b8121a974e05cec4145e5077990437782c6405fefe6fdf46a43186 SHA512 5d320b9d235125e5aeb30e9fc24e8f69e34f2d50ca9a9876b497e533af389c89da5a2dae501165f8d88ef6f91fbf16001fb2679292e9a06b8d06c8a40e6046fd
-DIST thunderbird-78.3.1-sv-SE.xpi 649319 BLAKE2B 7df7855f3e0929c54555be90c59c94913de0d8894d0e14192445c7343d0ea3f8ef76542dbddf2c0e6d18048cf501809363f5ed508724c1b6ec7d68aa477a7f7d SHA512 2fe6160b86f394ba1452a0c9329e4df36e642e6fea06a88a0eca3f546736128f70ad70567fb35e82570792046eac576a226a9f9bae5ff2833599d8c33740989f
-DIST thunderbird-78.3.1-th.xpi 712506 BLAKE2B 93caee49f04cc5510591daaa6783d951e3ef71122a01f360e2616f42d7e6566c7daf92792c93bb85e293b325e1c5d393ebf49d56ab1f3866d04ba7a8b40d6582 SHA512 d1a77b81cb85ed54b5ca2ae95a136497a5a4cb700b150811c4eaac73ff27292ee3d95ac1cb0afb7be49f1ffe4a22277420e514542812b142fb7ab73ac9c64039
-DIST thunderbird-78.3.1-tr.xpi 649516 BLAKE2B 2b75c653a1951836cc50c754e5b89765e1bd776e2334028f8156839af779b73651b85e58d698f419ca109c43ca9cc878e01c3fd68f48997361ed3cd89598d9e4 SHA512 df9433590f181530661f00312a88b44b6d5f2327f5c0d1e2f80e602b571bc620789936524a13e0784c398f47ee66ddb752d2e735d7404fd43fc4262c11410af5
-DIST thunderbird-78.3.1-uz.xpi 587044 BLAKE2B 42fc36748431c3b220a745018eb45a1259d11bafa72f0692c674e28fcfaab188eabb1ade199362a17c4f7f54923975645aa5b1d5368e94b07abf6948ed7dd1df SHA512 ad51facbefd36118cacbf4841a16aa7a8887774db423d0082c514ac750b2c3b772c1296f0c8cd07bbd061fd41076709f0c40b836594d4a7799d0726860e099f7
-DIST thunderbird-78.3.1-vi.xpi 675050 BLAKE2B ce2b4b590242dd840cad62ccbd5c146d26b5c7cee1e01437cc5fd1bed004241ddb458f18e72ebf168eb867fba19c7a04b7521a35527844712bce08d3a5a45b81 SHA512 36bb9da0979cf9f6661c9c295a90e8cd10c1abedc3b6693f6f5925555e71893a58ae3d0c6e27b8f3057977bc9cb4a450b419ac9981c75daa2c13b39edc55a93b
-DIST thunderbird-78.3.1-zh-CN.xpi 687634 BLAKE2B c5e3aa4419c8637630e9b030380d971b76a103f974c67b7778c789d11dec6192e36e868b6571ca10050e1b7d580edee10f5cf494a7c2235206c298dd1deeb0da SHA512 0a550fbd21cb3fb047b1965ab62d0ea68b58bd49907c16c603f5e202ea20c2dd621abafa8aa41c0f4c0eb08dd09ee0fe44e294d3ae003699b6d18efaea294e19
-DIST thunderbird-78.3.1-zh-TW.xpi 688074 BLAKE2B 5e12b4cbf2f142a8de23356712162df9d370df06a1172acd3e9272cb3717776c6747cfb4975524cc1ef8efc026cbdbbc251898d67e2fca38aa9f982af12ed497 SHA512 f47fc7545dad00baad3e7088ff6ba06865a3d24cacad274740c7efb16c47b36682c0c56a5d00f07614eb609b6dc140318396e5c3b14a6b316c501dcb2d72bb11
-DIST thunderbird-78.3.1.source.tar.xz 353920472 BLAKE2B 5afcec30c23480a239f3cfff56d67e403d300be00e1f374e9ee8a594d9845e9fba4262c410b552cc2ce9b529d8cb9221f81f2367d9c6ee0776d496af0ae88a58 SHA512 16b05e51776ba16503bc5fba02a6d0b5050a206e264a4707544354ad76af61902fd2dcf5d97b82b432dc69362ccd18543a0acccd80e06648e6c6f470886da450
+DIST firefox-esr-78-patches-03.tar.xz 172416 BLAKE2B 2d67e793e4f4bde447a3a3f3296d1c5ea6c92843439f87e0ab08b51d2f0dd74f0d37762807a1f24853e56f7987e18af65f010027602e32d40a3444c7e418ef47 SHA512 86f35b89ad573c10b839b1631149c6fce3374943d101a6496c40a69a813525826cb2bac4926fc7813dca334c9dcca534e0a963b0725ac3f95fbd3a1c2bf8dc3e
 DIST thunderbird-78.3.2-af.xpi 548780 BLAKE2B 143522732016ad215d9d8531334b4aa6d2adcbb997b6ce499e429c336c119eebbb0ffa1acea5bc96d3f3bcacd956a126c4b4793cf2068de2c9735c47fa568e2e SHA512 f6e130943effc59150dee4d73d3cb92f1bc6fb4ec26cbef0692f971c549b43e440e695e8180a933714ad2b10dbdb9dd025685b0555ac4845f817360e89d93b9e
 DIST thunderbird-78.3.2-ar.xpi 649070 BLAKE2B 453b834df835f5f564739309b17a25465a6ad1d5a93c46132ea571b419d66763c72049f583300cf09bc61fdbc110a3037fc1fe926315b00772d2b3f1bee16437 SHA512 fc68874afc3856413ed1340e0c58631fed1f97af4b6d77a79ea7cbdb42785cf1dc6566b1a8a69fd1de88f3a36fd84124530f8f5eb710d441519b474525c3e079
 DIST thunderbird-78.3.2-ast.xpi 561706 BLAKE2B db0dda8009c0d629fe1c6270411b3a1f8d337012bf445edac609422fd11fbac42f4d0456e204a1a2bfaea616fa1ecd4099eb4e0580c0fd540699b4c8453e6023 SHA512 c5487b36ea471d0a08da8bb53d31a1bf4d80b80cd2858af2e96237e97bce7096f8fcd09d94f1089150919a5a0517570b8408fd5d6e4301753f5db233835126ae
@@ -203,7 +70,5 @@ DIST thunderbird-78.3.2-vi.xpi 675058 BLAKE2B fdf93c745b6d06a5fb7b8f5e1632369dd7
 DIST thunderbird-78.3.2-zh-CN.xpi 687627 BLAKE2B 954b3b481d8ebb5b90f5d715a91f70af6f472b74721eb98dd18f565bfe8fc539543ba6928e095fdf418db2c779141886db6ff69220bcb0e830aeb55834093102 SHA512 6857b1fa099f0b9c4af88edfd719aa37b632bc3cd659b12495dffe87ef606c939948c09a2737faa42db34f385775854ab9610f934acd326e5d56596471dc7e26
 DIST thunderbird-78.3.2-zh-TW.xpi 688071 BLAKE2B 11825906d0a9cf1182ce0e2beb171f51dc93b3399b5d817d46f6c756cc866ac5db8f85ec5b28079ec20acb2a5de75d181901279a20003592b3719ffaafea2e36 SHA512 3590fa64a247f7e856fc19de53284a1c70cb7aa6d226c08d6ca376ee3ec18cdf7730193778a670e5dffd3b7df483f4984188dcc8bd8665c4f5e46528ca1e8ac5
 DIST thunderbird-78.3.2.source.tar.xz 353894084 BLAKE2B 7d00fb365e6f6fe9be78e751abe6cbbcee46e600b3fb1b29f6ad9584d5083ab0f7cd6b9342ccc71ec76344187009909405aff08d7e4b24ce3e9e7d970734d9de SHA512 8c0beb2a54f34f9b06605ddc54443c8dbb4e376911bcfa2d5c4b235d4e6f484f1862afba977d0cfcac1222c1b738f967c9b74397ba99c84bd16cc70480a455d8
-EBUILD thunderbird-68.12.0.ebuild 26071 BLAKE2B 82898015ffdebf24d9db99d8f5b6e77696684590a12f867c83b272c597dd3c747f6b713058d0d205aeeee3edc21a63902342b7580b168ab4f11021dde64fd9b4 SHA512 407d1b130e5888f47f4b99a0a97372f4fad66f94a2df0b4aec9b2d38ae98165381395d6ecbe94ab659644e5bf69c3c3647946c1473b7007756d71266fc7b1edd
-EBUILD thunderbird-78.3.1.ebuild 26677 BLAKE2B 2bb5f6dfb68ecef8f90629d24fdb467f1972885e772eb2adf1e4e96c9122952ec3f096e68dfdf1927fae45e50f1ae247831b104149ff91001efb367f2a8aa597 SHA512 547fce8440fde23bd1b3f66c5eb2dfaf2908b49abfbf395c15989e415703b1e820b1d9fa52f23822da092893e694c5b7a6be602f7e2df3d4d3a43bcaf1904861
-EBUILD thunderbird-78.3.2.ebuild 26679 BLAKE2B dd44028779019aac677529b64ad6cd94219f694365b00e565eea177fb84a2eca65dbedac5807605bb1716db288cb889802038eb326105b77b19f86658373e628 SHA512 64d9d4d417f4dec2eb04c6b74402199e8754ca8d4c32b7588cd49ff1061b6f4b35113fb6d0e94fd95c79cd8e497fd7da2ca1fd1ce02a8c8df65055464258e906
-MISC metadata.xml 2348 BLAKE2B 1689e26bc110fde832c3516221e337e4c2576410361c38b19c211d11502678908e9204315f2d30abeac3d4e78720adbf1b8bc0cee62208fa5cfaf5bab9e3dce4 SHA512 3faec169348e453af970cfc41077cc02106371036fd3cf0a3fa52edc985bcf1cfbc0b377a3126590f638ae88dd18fb77c5475a7a8e087f8982efeafd17e12b6d
+EBUILD thunderbird-78.3.2.ebuild 28283 BLAKE2B 93bb0ae8a27ccbada03905b7db159fe53232575172e605bcc5befd288cf281301c4991fde2993cd936f0f5850ee9daf8357de4b226e278381535ed2613747c7f SHA512 e131760cb9d9ca6f9e656b3626c135524f3693a21728e4eee3dbc04638b2a931edf11840b80e76433cbdd4aaf5030d9b692b29a230e442af6867d111b191edd8
+MISC metadata.xml 1646 BLAKE2B c8c3a757f3fd2da52a41466c40abb57e2ef493439ee51648730d92935ee98fff2c87e486537ebb0f03ba50461b05e123e3f5b0939aabf0e47f2a23a68b1838c5 SHA512 33520a230924981a68191e8373cac6e211851ed878111b778748e90639f4f4570a038ea9ad0e1d91aedf65dd89c9b472bdc6b08464b3ce1f5687f28ba83a0eb3
diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
deleted file mode 100644
index 01542105e64d..000000000000
--- a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jory A. Pratt <anarchy@gentoo.org>
-
-Add the gentoo preferences for the omni.jar creation
-
-diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
---- a/mail/installer/package-manifest.in
-+++ b/mail/installer/package-manifest.in
-@@ -313,16 +313,17 @@
- @RESPATH@/components/devtools-startup.manifest
- @RESPATH@/components/devtools-startup.js
- 
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ; Default Profile Settings
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; default pref files
-+@RESPATH@/defaults/pref/all-gentoo.js
- @RESPATH@/defaults/pref/all-thunderbird.js
- @RESPATH@/defaults/pref/channel-prefs.js
- @RESPATH@/defaults/pref/composer.js
- @RESPATH@/defaults/pref/mailnews.js
- @RESPATH@/defaults/pref/mdn.js
- @RESPATH@/defaults/pref/smime.js
- @RESPATH@/defaults/pref/thunderbird-branding.js
- @RESPATH@/greprefs.js
diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
deleted file mode 100644
index 055bca45ef80..000000000000
--- a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon-unbranded
-Terminal=false
-Type=Application
-Categories=Office;Email;
-MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
-
diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop
deleted file mode 100644
index 3ab5826de9fd..000000000000
--- a/mail-client/thunderbird/files/icon/thunderbird.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon
-Terminal=false
-Type=Application
-Categories=Office;Email;
-MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
deleted file mode 100644
index 9770a1aca5ab..000000000000
--- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
+++ /dev/null
@@ -1,10 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors",   true);
-pref("intl.locale.matchOS", true);
-pref("intl.locale.requested", "");
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("mail.shell.checkDefaultClient", false);
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.autoDisableScopes", 0);
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index ebca529ee305..ae7a481e18f0 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -6,16 +6,8 @@
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
 <use>
-	<flag name="bindist">Disable official Firefox/Thunderbird branding (icons, name) which 
-		are not binary-redistributable according to upstream.</flag>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="custom-optimization">Build with user-specified compiler optimizations
-		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
-	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
-		downloaded and kept up-to-date in user profiles</flag>
-	<flag name="lightning">Enable app-global calendar support
-		(note 38.0 and above bundles calendar support when this flag is off)</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
 		or LDD linker when using Clang</flag>
 	<flag name="openh264">Use <pkg>media-libs/openh264</pkg> for H.264 support
@@ -34,8 +26,6 @@
 		instead of bundled.</flag>
 	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
 		instead of bundled.</flag>
-	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-		installation with secure-delete enabled</flag>
 	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
 		instead of bundled.</flag>
 
diff --git a/mail-client/thunderbird/thunderbird-68.12.0.ebuild b/mail-client/thunderbird/thunderbird-68.12.0.ebuild
deleted file mode 100644
index 69386afec0e1..000000000000
--- a/mail-client/thunderbird/thunderbird-68.12.0.ebuild
+++ /dev/null
@@ -1,810 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ar ast be bg br ca cak cs cy da de dsb el en en-GB en-US
-es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ka kab kk ko lt ms nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl
-sq sr sv-SE tr uk uz vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patches
-PATCHFF="firefox-68.0-patches-15"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=10
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 multiprocessing virtualx
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
-	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon
-	pgo pulseaudio selinux startup-notification +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-sqlite system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )
-	wifi? ( dbus )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.44.4
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=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
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-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 || use test ; then
-			CHECKREQS_DISK_BUILD="8G"
-		else
-			CHECKREQS_DISK_BUILD="4500M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug || use test ; then
-			CHECKREQS_DISK_BUILD="8G"
-		else
-			CHECKREQS_DISK_BUILD="4500M"
-		fi
-
-		check-reqs_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 \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE \
-			XAUTHORITY
-
-		addpredict /proc/self/oom_score_adj
-
-		llvm_pkg_setup
-	fi
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply firefox patchset then apply thunderbird patches
-	rm "${WORKDIR}"/firefox/2016_set_CARGO_PROFILE_RELEASE_LTO.patch || die
-	eapply "${WORKDIR}/firefox"
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/toolchain.configure \
-		|| 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"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Bug 689358
-			append-cxxflags -flto
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang && ! use arm64; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/mail-client/thunderbird/thunderbird-78.3.1.ebuild b/mail-client/thunderbird/thunderbird-78.3.1.ebuild
deleted file mode 100644
index b8242df5acf0..000000000000
--- a/mail-client/thunderbird/thunderbird-78.3.1.ebuild
+++ /dev/null
@@ -1,984 +0,0 @@
-# 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=11
-
-PYTHON_COMPAT=( python3_{7..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 [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-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/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-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
-	hardened jack lto +openh264 pgo pulseaudio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			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
-	)
-	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 )
-	!<x11-plugins/enigmail-2.2"
-
-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}/${PN}-${PV%_*}"
-
-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=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi 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-x86_64/xpi/${lang}.xpi -> ${MOZ_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="5400M"
-		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="5400M"
-		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
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	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/*-LTO-Only-enable-LTO-*.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
-
-	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}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-	mozconfig_add_options_ac '' --enable-calendar
-
-	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
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		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
-	[[ -n ${MOZ_ESR} ]] && 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_add_options_ac '+eme-free' --disable-eme
-
-	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 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
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		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
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# 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}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-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}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.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 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 icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/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 wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_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="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-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="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${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
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-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 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
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	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
-}
diff --git a/mail-client/thunderbird/thunderbird-78.3.2.ebuild b/mail-client/thunderbird/thunderbird-78.3.2.ebuild
index 16eb8f0cf1c3..957c25faefb0 100644
--- a/mail-client/thunderbird/thunderbird-78.3.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-78.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-esr-78-patches-03.tar.xz"
 
 LLVM_MAX_SLOT=11
 
@@ -49,7 +49,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.mozilla.org/thunderbird"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0/$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
@@ -201,7 +201,7 @@ llvm_check_deps() {
 		fi
 	fi
 
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
 }
 
 MOZ_LANGS=(
@@ -382,6 +382,25 @@ pkg_setup() {
 
 		llvm_pkg_setup
 
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
 		python-any-r1_pkg_setup
 
 		# Avoid PGO profiling problems due to enviroment leakage
@@ -480,6 +499,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
 	local have_switched_compiler=
 	if use clang && ! tc-is-clang ; then
 		# Force clang
@@ -733,6 +757,9 @@ src_configure() {
 	# when they would normally be larger than 2GiB.
 	append-ldflags "-Wl,--compress-debug-sections=zlib"
 
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
 	# Pass $MAKEOPTS to build system
 	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
 
@@ -748,6 +775,11 @@ src_configure() {
 	# Set build dir
 	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
 
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
 	# Handle EXTRA_CONF and show summary
 	local ac opt hash reason
 
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 605d2e94f085..182eb3d7a87e 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index fa8ce404a31f..c4fa10781b9c 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 1566 BLAKE2B 3d2e65e56e735c2c6bf1eb02cb62f16c05f64e9d58fd10fb0da3e9f925a891a4bf795d36cf3d8d93d6746195029836ec2f475127750946ee6b53b3e3ca32fb7b SHA512 541dbf949a7477299d70026427b2010f6fa3a98c93381d10bdb34297c8e244cea582841a0bb14386af90da407e80489279088ce491899e13505080c914c151fd
+EBUILD pyzor-1.0.0_p20200523.ebuild 1564 BLAKE2B 0ccda5b5a942a8bfa0a528f9c0a5180c95f3b3a7be80a7374b827b117512f7af7fb8ceffb10d582efbf914661b11c37230a1e316d2b208042b18df7b446fe2c5 SHA512 8c8633ca2795a84fd19a9a77d5cd6d19097061923abf891aa8f8c1416c6e5ad1b2821ebac04fe183db02c2f8a681ab70132b9a3df007b50e446d5a3d93dd00c9
 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 67282d845663..9f79f129b429 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-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 427be8b0ad3a..cb8be05400cc 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,7 +2,6 @@ AUX rspamd-2.5-replxx-gcc10.patch 280 BLAKE2B 56d8ffde0ac9ba834ef65df2ccc8107f32
 AUX rspamd-2.5-unbundle-lua.patch 3169 BLAKE2B 77ff33b618a824008da0d4d71a79c252bacbfc48a7fa8f288cfdf901883498a6bcdb2acc21959c9c49aabf4e2b2f6445eb7f9b906a008f31e54a9deb730946d0 SHA512 02b59ade0a715c9d7875fb154129724a9e4f392f31928e1c460bd720de0ffb649883c8d29480f8ac09d8cb69281a8395547cb0f6a082a9b422de7adb81469bb0
 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda
 AUX rspamd-2.5-unbundle-zstd.patch 4191 BLAKE2B 3d053efdfbf66dfd793b20d00a534bf5d46f5a85c48f432a45d17781be960db916bb28decd92c089d5bca734edb18559f552590ad804f27c494a2342a52b8606 SHA512 afdbfb264243bdc27c8010c9a2b89a855d16054d445c82a13656f505550670f7ab978008c0900c9d04144677b043976101d882e6deb9a32215110e0d96e74179
-AUX rspamd-2.6-unbundle-hiredis.patch 2934 BLAKE2B 938103c055927564aae5a46d1eef871d43463db871a2c7a7c6aa362a0138a2cc755f022c82014c17a6e53db30fbf7b5f9d4371acb17e8e60e46c6e1c528727c0 SHA512 2a13764cc72ac8ee29d22bbf0a6c1ced8cedc1fabd26f70b9c72f7a7b251a3655661fc497f44b530a99467be8ef07ee562714f479190e61994b3f15cc2beb56a
 AUX rspamd-2.6-unbundle-lua.patch 3229 BLAKE2B 894ca1cb7fe0195bd6e75b66ab6e62913b0e8885e7006206064a762257b881c43a237749b21aad43a6d3d8c115b22970aa66e2667169aa6f414ea4b392b99b37 SHA512 2b637c428c6bfef7bddb1f9e354d9e06095eaebc8709c3b586934b687bfea9aa47527eb7beb8985dbecea46533dc5f1310dc23a52e0ec856a4ac01ec9cf41f87
 AUX rspamd-2.6-unbundle-zstd.patch 4085 BLAKE2B aba3487956b3a92296adffc748775ef88dfbbd8595fde5c50e33e67a9d6d517e8f73dc22a288aee73b4131b8c49f84968b9e6aa5c697c7e7a0a68b7f938cac38 SHA512 9c9a2ac7bd25fdc9dd2ae6aebd18a1a88358b5de0f2b7bb63b7af5c405125e0517df0869e6007f79c87d5f650395589f543581c189b91d1cbc1e8ab76c2df0ee
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
@@ -12,6 +11,6 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab
 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 EBUILD rspamd-2.5.ebuild 2618 BLAKE2B 640c6571440eababc6f615512678b48524d55086220ab8858baff5c324626f9f411b3bfed716171b0a9a9b49d0eda6554e985e1f785ced1bc32f770faa273408 SHA512 afff2531fb1af8a0203dd0d89868b9a87c6144f0fa358aa020aa86496954581ce707538ba16742f9a696ad365cc039423b807090fe0810723cccea3b99a1a337
-EBUILD rspamd-2.6.ebuild 2665 BLAKE2B 7316a61266ef58dea0ca360ef1b2661046d09f2c6b8727d04f519f5fc839504c52f8123ed9f054cbf7020f40ae469e51eebef82417f67f95266cd7407047a4ce SHA512 ea139ed134b2d29884acfb37626e4a05a2df7d6d2c130fd0c6e6956370cbb013895504818308b9d0ea57fbcc001b7b13b0be7df662bc03b17cbdd52464e82cb0
-EBUILD rspamd-9999.ebuild 2665 BLAKE2B 7316a61266ef58dea0ca360ef1b2661046d09f2c6b8727d04f519f5fc839504c52f8123ed9f054cbf7020f40ae469e51eebef82417f67f95266cd7407047a4ce SHA512 ea139ed134b2d29884acfb37626e4a05a2df7d6d2c130fd0c6e6956370cbb013895504818308b9d0ea57fbcc001b7b13b0be7df662bc03b17cbdd52464e82cb0
+EBUILD rspamd-2.6-r1.ebuild 2588 BLAKE2B 7dd0e9a890e4ae4d1a7706eaf6434984b54077b203204c9c050b95e3df759e96f92204bf7205c2b064cf726411f4646943a6f218184c60a0a0a9fe101f2bfbd0 SHA512 d65816b0b42099f2c31bce89da693611ecf5b49f5fe6111185cfca186bf8ccbd52f83c650adec3f1b4dff1850be02499260536a3f3003bf3fec4911de79765a2
+EBUILD rspamd-9999.ebuild 2588 BLAKE2B 7dd0e9a890e4ae4d1a7706eaf6434984b54077b203204c9c050b95e3df759e96f92204bf7205c2b064cf726411f4646943a6f218184c60a0a0a9fe101f2bfbd0 SHA512 d65816b0b42099f2c31bce89da693611ecf5b49f5fe6111185cfca186bf8ccbd52f83c650adec3f1b4dff1850be02499260536a3f3003bf3fec4911de79765a2
 MISC metadata.xml 751 BLAKE2B 612a7de6326aba8b0319fb58cb7dd8669bc8d2d59e0e606afbe6b202c287e6953023e5a026750866dc015b9a2aa0249be3ccd46b48cf950a78b2cf497bc86147 SHA512 d958864849fa7a74e578046d1d2a7599b0a3e3d8b1d7f9d520833ce1037aff77f39dff49ad1996eb600f3293f23ba84919ab046abddc75490816799ea6865494
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
deleted file mode 100644
index 875009da41aa..000000000000
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0afb5feff..966173075 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -170,6 +170,8 @@ ELSE()
- 		ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
- ENDIF()
- 
-+ProcessPackage(HIREDIS LIBRARY hiredis INCLUDE hiredis.h
-+	ROOT ${HIREDIS_ROOT_DIR} MODULES hiredis)
- ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
- 	ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
-@@ -555,9 +557,7 @@ ENDIF(NOT DESTDIR)
- 
- 
- ################################ SUBDIRS SECTION ###########################
--ADD_SUBDIRECTORY(contrib/hiredis)
- SET(WITH_HIREDIS 1)
--INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis")
- 
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
- IF(HAVE_FETCH_H)
-@@ -604,7 +604,6 @@ ENDIF()
- IF (ENABLE_SNOWBALL MATCHES "ON")
- 	LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer)
- ENDIF()
--LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
- 
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie)
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-t1ha)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e0e2edd58..4908013da 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -190,7 +190,6 @@ ENDIF()
- IF (ENABLE_SNOWBALL MATCHES "ON")
- 	TARGET_LINK_LIBRARIES(rspamd-server stemmer)
- ENDIF()
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-hiredis)
- 
- IF (ENABLE_FANN MATCHES "ON")
- 	TARGET_LINK_LIBRARIES(rspamd-server fann)
-diff --git a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
-index d1e3e7532..882acdf6a 100644
---- a/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
-+++ b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
-@@ -22,8 +22,8 @@
- #include "cryptobox.h"
- #include "str_util.h"
- #include "upstream.h"
--#include "contrib/hiredis/hiredis.h"
--#include "contrib/hiredis/async.h"
-+#include <hiredis.h>
-+#include <async.h>
- #include "lua/lua_common.h"
- 
- #define REDIS_DEFAULT_PORT 6379
-diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
-index 7e835013c..fccf189e1 100644
---- a/src/libserver/redis_pool.c
-+++ b/src/libserver/redis_pool.c
-@@ -18,9 +18,9 @@
- #include "contrib/libev/ev.h"
- #include "redis_pool.h"
- #include "cfg_file.h"
--#include "contrib/hiredis/hiredis.h"
--#include "contrib/hiredis/async.h"
--#include "contrib/hiredis/adapters/libev.h"
-+#include <hiredis.h>
-+#include <async.h>
-+#include <adapters/libev.h>
- #include "cryptobox.h"
- #include "logger.h"
- 
-diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
-index f9dbbdd13..b885a8b61 100644
---- a/src/lua/lua_redis.c
-+++ b/src/lua/lua_redis.c
-@@ -17,8 +17,8 @@
- #include "lua_thread_pool.h"
- #include "utlist.h"
- 
--#include "contrib/hiredis/hiredis.h"
--#include "contrib/hiredis/async.h"
-+#include <hiredis.h>
-+#include <async.h>
- 
- #define REDIS_DEFAULT_TIMEOUT 1.0
- 
--- 
-2.25.3
-
diff --git a/mail-filter/rspamd/rspamd-2.6-r1.ebuild b/mail-filter/rspamd/rspamd-2.6-r1.ebuild
new file mode 100644
index 000000000000..1488b0696d24
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.6-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake pax-utils systemd tmpfiles
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+
+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? (
+		virtual/blas
+		virtual/lapack
+	)
+	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=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
+
+	sed -i -e 's/User=_rspamd/User=rspamd/g' \
+		rspamd.service \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	newconfd "${FILESDIR}"/rspamd.conf rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+	systemd_newunit rspamd.service rspamd.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-filter/rspamd/rspamd-2.6.ebuild b/mail-filter/rspamd/rspamd-2.6.ebuild
deleted file mode 100644
index 4c166ee4b01a..000000000000
--- a/mail-filter/rspamd/rspamd-2.6.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 cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-
-RDEPEND="
-	acct-group/rspamd
-	acct-user/rspamd
-	app-arch/zstd
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/hiredis:=
-	dev-libs/icu:=
-	dev-libs/libev
-	dev-libs/libsodium
-	dev-libs/snowball-stemmer
-	net-libs/libnsl
-	sys-apps/file
-	blas? (
-		virtual/blas
-		virtual/lapack
-	)
-	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=] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/ragel
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-		-DENABLE_BLAS=$(usex blas ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_LUAJIT=$(usex jit ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use jit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 4c166ee4b01a..1488b0696d24 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	app-arch/zstd
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-libs/hiredis:=
 	dev-libs/icu:=
 	dev-libs/libev
 	dev-libs/libsodium
@@ -61,13 +60,12 @@ PATCHES=(
 	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die
+	rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
 
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 9150e3916f22..06610999b005 100644
Binary files a/mate-extra/Manifest.gz and b/mate-extra/Manifest.gz differ
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 9944a9339387..49e7ea443a38 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,6 +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
+EBUILD mate-screensaver-1.24.0.ebuild 3019 BLAKE2B c0733bc666d0a3267afd70e62433761277a29124bd5df24c26a9d4f271b5bd1425a7e1cb4afe086115eea8b7930fafdb5651c346c8b8d51821e0a697c7ed7927 SHA512 5b4f1fe5b6b37b5605eeacdc87233b63bbddde4a66082c6088c386c085f312d6f13befbabb6bf7186ad6b323a9b45f0ad55b40a0da02b66c1ab70a82f4d96985
+EBUILD mate-screensaver-1.24.1.ebuild 3021 BLAKE2B d61744e295fd8001a450ae67858ba2b3add837d9420933cf7b050fdda54841f6e393246d931bd10781d9256acd7b2fcafb7851238e2ba6bef74aedee62a842ef SHA512 4169f1fcb5b42c90e74542834289e672867370396d5b69f065db7d5b7df1bebf1f3659b0915a8779337b16a6528522dbe89da783453a9aa69442d491e13003e8
+MISC metadata.xml 345 BLAKE2B 28455ac89b99bf42e67e5da0bf1efb013c7275aebdd43b3c3c518f86afcd517eb761f9f4ee23a0558dbd797ac3d9a6ef04fc0dcc54666e38a51233742598406c SHA512 d9cd02ca623afdaf1d5edf70bbca3cb7f21e510f3a7f51d7293f104c0e445ec1e1f90c8d3f2ad8493599227ea2a46144b2748db27499d81e4f6d72e1da2cb2cf
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
index 91e4469d03f3..c496eac13b11 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
@@ -13,7 +13,7 @@ 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"
+IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DOC_CONTENTS="
@@ -39,7 +39,6 @@ COMMON_DEPEND="
 	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 )
@@ -68,8 +67,8 @@ src_configure() {
 		--with-xf86gamma-ext
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
 		$(use_with X x)
-		$(use_with consolekit console-kit)
 		$(use_with elogind)
 		$(use_with libnotify)
 		$(use_with opengl libgl)
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
index 485f4ee1e39c..b17ccf088202 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
@@ -13,7 +13,7 @@ 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"
+IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 	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 )
@@ -68,8 +67,8 @@ src_configure() {
 		--with-xf86gamma-ext
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
 		$(use_with X x)
-		$(use_with consolekit console-kit)
 		$(use_with elogind)
 		$(use_with libnotify)
 		$(use_with opengl libgl)
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index 4be378966bcd..79f7982345f0 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="consolekit">Enable support for 
-			<pkg>sys-auth/consolekit</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-screensaver</remote-id>
 	</upstream>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 30a41edc8c2b..9aa91d0e5cc5 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 89f8059a60a4..e93fc32c01d7 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,8 +1,6 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
-DIST fira-code-3.1.tar.gz 5665465 BLAKE2B d1ad5d8e2d217d9dc1f06b9ac52dcf87f4f108aab1469399f0d1fb011f3619a1ce1c85803213da33a7b7f6e48fffddc194627b3fe560f7340a6a41b15d822062 SHA512 6acb941664a773a1186e6b6150ce747977fc95963d4be8756de05eddf7c2785ba0a5eac8319361779f6e747e8cd1edadeff1a72045cdeb3b152ce5bb2c1b77dd
 DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4aaffac00357bc7ad0ed99436b44220180f9753a0bc6f2fccc5dafe4a47df9cac91dc87fb1441952e1f04eeae SHA512 037698435b3f77f5ad2dcfb6ea6ff3063c50d224c2b95ada472bf9b12a6342e892d60220e1993045858697fff9c4fb5da97b41ac3437c4fa50f48ef1398c9738
 DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
-EBUILD fira-code-3.1.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
 EBUILD fira-code-4.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
-EBUILD fira-code-5.2.ebuild 648 BLAKE2B eee09a876a83a583f76dec4a1384b93395737fab3efc135b457704b1e05d98b01f45dff4d51669ce15e8138613f3e5697e5eb921288720c1c05515be2eb5763b SHA512 9490431823171e136a9f97cc3ad1fad613a4a7dfc21090fcb4bd216a280a98ac20f11b5273ec336dfa1894bef905433206333600c550193274978710f9f54278
+EBUILD fira-code-5.2.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-3.1.ebuild b/media-fonts/fira-code/fira-code-3.1.ebuild
deleted file mode 100644
index c9c8dbb7c8aa..000000000000
--- a/media-fonts/fira-code/fira-code-3.1.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 font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/ttf"
-FONT_SUFFIX="ttf otf"
-
-DOCS="README.md"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-5.2.ebuild b/media-fonts/fira-code/fira-code-5.2.ebuild
index 73fe57c4a3dc..c9c8dbb7c8aa 100644
--- a/media-fonts/fira-code/fira-code-5.2.ebuild
+++ b/media-fonts/fira-code/fira-code-5.2.ebuild
@@ -12,7 +12,7 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 64b579f01bb2..9d428afb3b79 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 73415ba4f3c6..b630945633a1 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -12,8 +12,8 @@ DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd2
 DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e
 DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026
 DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210
-EBUILD asymptote-2.61.ebuild 4627 BLAKE2B e96e10d46b053e2f4e77a7ff95d4462ada1d67c46ada65d5c5f2cf7904c8470ca08a9801a09ea51f3a59e0a2e7371a1a86735b544e25c63ead28ea6f5a9a6879 SHA512 5ad08eabea089f9e96d0f79eb50c1c428a2e3bdb002b0d34417a58af5ed59d4e24eb41adb45241890cbadadc6cb745c00811a0fcd2d5d878e091a210cfcfc095
-EBUILD asymptote-2.62.ebuild 4629 BLAKE2B 325473944f50c21e9b7f1336cb406569a1b85c902ff14e37aca970a5586c45adadda1fdeed9c9e9d5858aa2f0ef1d7fd45e8bc4a145d57cda7da4398fb82483f SHA512 31f06d0ca6e5ed329ee76e69ea26fe4868806aecc047a552efa7a1e6cfb06b9f9c2d9fa9f0db16098185342820a997716479361c4ac68b41ad496315283e0bf9
-EBUILD asymptote-2.65.ebuild 4629 BLAKE2B 2a7ec12b9db7c4ecc297f90488589551bc6c47598f91ef1be2b5769dcdcda3a7bd21fab0ce3c22e2591139b711a375a12e70215d4eb592708a420cfb2f31ee7f SHA512 787257f2b70b8f9f2ccea3b595a967440570aa0a5b4141080c0a383e624dae7d483e11086747e3147de4128e3215bae12f3a2f902e2b25ed6327449717a717d9
-EBUILD asymptote-2.67.ebuild 4816 BLAKE2B afc3b823d83c7ad94fba1c04aeba5f77238b9b42e3e8b01950cda82f41aa657c77f6d9235f0e20c8495e85adc73bf008499759148ce5628ddac695e0d5f6e9ac SHA512 82e7b1c5f1add1e1f75e340fb1587c53c65357831800f414e522709042dea0f7373e183f36d981d63b9e681d3d8a5f5adfdb1f5bdb1c03cd7bc58f09fa825a4c
+EBUILD asymptote-2.61.ebuild 4627 BLAKE2B 211e3136584bbf32862382b9e8320493c2380430b92f79fee46a35174db8dcbd73140c4460f31f37c3aff378cc45ae5fc6d188d859e162209fb843c1c48e19fa SHA512 52f15e395335622fdd219b9c589ba5c296bbf39de02e69275f70016e865a71206c40424a236022212d793bca2847fb7ceefa5819197a18cc9ffed44377050e15
+EBUILD asymptote-2.62.ebuild 4629 BLAKE2B c19da5209a22a836a6c9c59870c1a7456c5724886296de32d668258990ac221a49059c81dd8b5fab8f376fd42e20f53a6e0a30d71d86251c3c4ab3828d1c87a4 SHA512 b6d960457b9ffaadaf842ab6fc335a15a62b576b83ba0d76bdacbc1cb3d961f494901a16cb31bfc9305faebf85716a0b5a1b18fc9e4270825d56382e816b9833
+EBUILD asymptote-2.65.ebuild 4629 BLAKE2B b79215e02d3e4f59e190025daae4a4d6f328d0eebec055da2ae73ba81afb42534d41a1c81b2b9f6cfb2b1857fa099985ef57d15a433cc80ed1095718f8e4368f SHA512 94bf7f665139cc77125185918e2236ac31c0c7a1a8732eb2cc37d777c54d7b30bb2bd850502243bc219c55e38204c175d1017011e03a6bfa3a1d70dd16fe97d0
+EBUILD asymptote-2.67.ebuild 4816 BLAKE2B 6d7e6563239cfca0317d25ea4180b1e1079578148969375018782bea8bd234376da6516be67f89f40746e8b8fa0c57ddaaefa087a31614e8521aca00cdbfa896 SHA512 0af77d5679a84feaca0ab4ae6cbb95b77fa415056d4f38306d34debfde4c480fd8668c3a57c3e74a071222f6dae2f671b42e4bb1618ee7d8c9b0aa9b5b05bf10
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
index 90caa2a04989..0117ea06a1dd 100644
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/asymptote/asymptote-2.62.ebuild b/media-gfx/asymptote/asymptote-2.62.ebuild
index 5f683b025c14..af22df7d3e9b 100644
--- a/media-gfx/asymptote/asymptote-2.62.ebuild
+++ b/media-gfx/asymptote/asymptote-2.62.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild
index be68de6d52cb..99fe53927a88 100644
--- a/media-gfx/asymptote/asymptote-2.65.ebuild
+++ b/media-gfx/asymptote/asymptote-2.65.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/asymptote/asymptote-2.67.ebuild b/media-gfx/asymptote/asymptote-2.67.ebuild
index 581f8fb50a44..1e7593538a89 100644
--- a/media-gfx/asymptote/asymptote-2.67.ebuild
+++ b/media-gfx/asymptote/asymptote-2.67.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 3b0f133dd8e2..3b92b59f5e3b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -6,7 +6,7 @@ AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
 DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
-EBUILD blender-2.79b-r2.ebuild 8330 BLAKE2B a8e25b98ba96c2f0a75e8502ba8132e4a7dd3819ab01903310d6ddbd081a3b655a4406d15020c3d063d65bcfd5fbcb878e8a9ee4967b489a0edc581806341567 SHA512 303bc0821d1aa8cadb5c5cbeeda7e4fee64daece469c5cc1d304844cf89430e54017f7811dbd7d31e8ad61bfe51cdae98e0d9ff4716a902bcb4103c5c92b187b
-EBUILD blender-2.83.4.ebuild 8559 BLAKE2B 7291ae9d7790cbb9183201e91ac7d1f08c6fc2fd0481f19adf7bc23e29af2855e4390c0da45a7d68687102d885093e805bf1cc436fc628541068d566cd6d174a SHA512 be6584a264b10fb0ccfef5bff93c3f3e4d3b789a1e32507534d4a6215cf408a215d3541d299b7730e6c64a28c3732b49dce4a73f735f6c97b6b251a88e0201d6
-EBUILD blender-2.90.1.ebuild 8592 BLAKE2B d44b28a099215f7bfca57593318d756c49683bb4b85e0d1cca410777d74c4abab716480cf686f7a7ead91b1739396e9dcca3d2b78bc78c531b2e226c888c2df6 SHA512 d03f0da6838ad2e91a3eee76d6d9b78f0d3b4f40bf5fec13cff60b83fa2895d057ccec54368608e663f54dbfd3da6203095524e04d1c38e56a10233cf72e7c8d
+EBUILD blender-2.79b-r3.ebuild 8332 BLAKE2B 453cf8b959c9fc1d30927c0d56e330f067344f51a65699e1a360823b040b36a6b80e4a8a8357bf58e69ef77728c20ac1fec0065ca4d8da4d173527c85dd7aebc SHA512 76c16618851b50622aad2bb252b96ce1477dab33b81cb8634064cf9dee02f97c672a2426804b29cbea6eb47460f9ec14bcf3e29209ef53a51c02702283e77cb4
+EBUILD blender-2.83.4-r1.ebuild 8561 BLAKE2B 4bb5a974abddb3e19d1300498ff496fe63f7033f26523361b53c41b61bb0098e940190d0cde2f971418bc6f46637d73f07bf83154488d99120d845d91572787a SHA512 bc6a7d8491fc824681f99d450a791b4d205dddf7dc98807d449ee767920d6954a9558518a324cf3372d7bb5f5dc73ca31f779d8fe5fef3822d39ba9e27ed6b55
+EBUILD blender-2.90.1-r1.ebuild 8594 BLAKE2B 1eea748af879ef517c436f8105dfa6f63537e4cc43fa3bd5f07e003afd418940c7f47a2b3fab8e5605a7e5afc7ca582cc71c6c14d00d3b05a523dae94d7bec86 SHA512 f0a5797d2aa739e47311dc66e6464431f6620d6bdd322dbca3cfd9dd1daa4e5e7df4d4665ae855690c3701d72b89dc917cffd566d72c8e98c8c1168c0f6c26cc
 MISC metadata.xml 3132 BLAKE2B d4679d2ca60cc618bb93a3a904842813014ef93e05f52346452629a8975d79bd60ead97f3d9d94439f2e858e3e1fe66695ede0290992e2dae3d8317a5b30a9b4 SHA512 c450c3f4727a95ffe4dc9bbb3e1a7b2173d51d5876203a4872ef8c29fb13e2f096c344c8e15ccb07f0e662a2dbf81c68d0911c774d6a9c4b286f2e50dc7b9dca
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild
deleted file mode 100644
index 977f12110a6a..000000000000
--- a/media-gfx/blender/blender-2.79b-r2.ebuild
+++ /dev/null
@@ -1,298 +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 check-reqs cmake-utils flag-o-matic xdg-utils \
-	pax-utils python-single-r1 toolchain-funcs eapi7-ver
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-SRC_URI="https://download.blender.org/source/${P}.tar.gz"
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
-	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
-	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
-	osl player sdl sndfile test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	opencl? ( cycles )
-	osl? ( cycles llvm )
-	player? ( game-engine !headless )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.62:=[nls?,threads(+)]
-	dev-libs/lzo:2
-	$(python_gen_cond_dep '
-		>=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/freetype
-	media-libs/glew:*
-	media-libs/libpng:0=
-	media-libs/libsamplerate
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0=
-	virtual/libintl
-	virtual/opengl
-	collada? ( >=media-libs/opencollada-1.6.18:= )
-	color-management? ( media-libs/opencolorio )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	llvm? ( sys-devel/llvm:= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-1.7.0 )
-	openexr? (
-		>=media-libs/ilmbase-2.2.0:=
-		>=media-libs/openexr-2.2.0:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
-	openvdb? (
-		<media-gfx/openvdb-7[abi4-compat]
-		dev-cpp/tbb
-		>=dev-libs/c-blosc-1.5.2
-	)
-	osl? ( media-libs/osl:= )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-3.2.8:3
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-install-rules.patch"
-	"${FILESDIR}/${P}-gcc-8.patch"
-	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
-	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
-	"${FILESDIR}/${P}-fix-opencollada.patch"
-)
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# we don't want static glew, but it's scattered across
-	# multiple files that differ from version to version
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	local file
-	while IFS="" read -d $'\0' -r file ; do
-		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
-	done < <(find . -type f -name "CMakeLists.txt")
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-	    -i doc/doxygen/Doxyfile || die
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-	# Blender is compatible ABI 4 or less, so use ABI 4.
-	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
-
-	local mycmakeargs=(
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_C11=ON
-		-DWITH_CXX11=ON
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CUDA=$(usex cuda)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GAMEENGINE=$(usex game-engine)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_X11=$(usex !headless)
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_MOD_FLUID=$(usex elbeem)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PLAYER=$(usex player)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() {
-	if use test; then
-		einfo "Running Blender Unit Tests ..."
-		cd "${BUILD_DIR}"/bin/tests || die
-		local f
-		for f in *_test; do
-			./"${f}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	cmake-utils_src_install
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED%/}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${MY_PV}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/blender-2.79b-r3.ebuild b/media-gfx/blender/blender-2.79b-r3.ebuild
new file mode 100644
index 000000000000..9d41808c3002
--- /dev/null
+++ b/media-gfx/blender/blender-2.79b-r3.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit check-reqs cmake-utils flag-o-matic xdg-utils \
+	pax-utils python-single-r1 toolchain-funcs eapi7-ver
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.gz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="amd64 ~x86"
+IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
+	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
+	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+	osl player sdl sndfile test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	opencl? ( cycles )
+	osl? ( cycles llvm )
+	player? ( game-engine !headless )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.62:=[nls?,threads(+)]
+	dev-libs/lzo:2
+	$(python_gen_cond_dep '
+		>=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/freetype
+	media-libs/glew:*
+	media-libs/libpng:0=
+	media-libs/libsamplerate
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0=
+	virtual/libintl
+	virtual/opengl
+	collada? ( >=media-libs/opencollada-1.6.18:= )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( >=media-libs/openimageio-1.7.0:= )
+	openexr? (
+		>=media-libs/ilmbase-2.2.0:=
+		>=media-libs/openexr-2.2.0:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+	openvdb? (
+		<media-gfx/openvdb-7[abi4-compat]
+		dev-cpp/tbb
+		>=dev-libs/c-blosc-1.5.2
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+	valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.2.8:3
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-install-rules.patch"
+	"${FILESDIR}/${P}-gcc-8.patch"
+	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
+	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
+	"${FILESDIR}/${P}-fix-opencollada.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+	    -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+	# Blender is compatible ABI 4 or less, so use ABI 4.
+	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
+
+	local mycmakeargs=(
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_PYTHON_INSTALL_NUMPY=OFF
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_OPENJPEG=ON
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_C11=ON
+		-DWITH_CXX11=ON
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CUDA=$(usex cuda)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GAMEENGINE=$(usex game-engine)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_X11=$(usex !headless)
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PLAYER=$(usex player)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake-utils_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED%/}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.83.4-r1.ebuild b/media-gfx/blender/blender-2.83.4-r1.ebuild
new file mode 100644
index 000000000000..857b08cf0809
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.4-r1.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	elbeem? ( tbb )
+	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
+	osl? ( cycles llvm )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_X11=$(usex !headless)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.83.4.ebuild b/media-gfx/blender/blender-2.83.4.ebuild
deleted file mode 100644
index 190185272e9c..000000000000
--- a/media-gfx/blender/blender-2.83.4.ebuild
+++ /dev/null
@@ -1,318 +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 check-reqs cmake flag-o-matic pax-utils python-single-r1 \
-	toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
-	abi6-compat abi7-compat alembic collada color-management cuda cycles \
-	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
-	man ndof nls openal opencl openimageio openmp opensubdiv \
-	openvdb osl sdl sndfile standalone test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	alembic? ( openexr )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	elbeem? ( tbb )
-	opencl? ( cycles )
-	openvdb? (
-		^^ ( abi6-compat abi7-compat )
-		tbb
-	)
-	osl? ( cycles llvm )
-	standalone? ( cycles )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[nls?,threads(+)]
-	dev-libs/lzo:2=
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	media-libs/freetype:=
-	media-libs/glew:*
-	media-libs/libpng:=
-	media-libs/libsamplerate
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg
-	virtual/libintl
-	virtual/opengl
-	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
-	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( media-libs/opencolorio )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	llvm? ( sys-devel/llvm:= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	opencl? ( virtual/opencl )
-	openimageio? ( media-libs/openimageio )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
-	openvdb? (
-		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
-		dev-libs/c-blosc:=
-	)
-	osl? ( media-libs/osl )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tbb? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )
-"
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# we don't want static glew, but it's scattered across
-	# multiple files that differ from version to version
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	local file
-	while IFS="" read -d $'\0' -r file ; do
-		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
-	done < <(find . -type f -name "CMakeLists.txt")
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-		-i doc/doxygen/Doxyfile || die
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-
-	if use openvdb; then
-		local version
-		if use abi6-compat; then
-			version=6;
-		elif use abi7-compat; then
-			version=7;
-		else
-			die "Openvdb abi version not compatible"
-		fi
-		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DWITH_ALEMBIC=$(usex alembic)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-		-DWITH_CYCLES_STANDALONE=$(usex standalone)
-		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-		-DWITH_MOD_FLUID=$(usex elbeem)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
-		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_TBB=$(usex tbb)
-		-DWITH_X11=$(usex !headless)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() {
-	if use test; then
-		einfo "Running Blender Unit Tests ..."
-		cd "${BUILD_DIR}"/bin/tests || die
-		local f
-		for f in *_test; do
-			./"${f}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Pax mark blender for hardened support.
-	pax-mark m "${BUILD_DIR}"/bin/blender
-
-	if use standalone; then
-		dobin "${BUILD_DIR}"/bin/cycles
-	fi
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	cmake_src_install
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherent risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${MY_PV}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/blender-2.90.1-r1.ebuild b/media-gfx/blender/blender-2.90.1-r1.ebuild
new file mode 100644
index 000000000000..7ad59e31836d
--- /dev/null
+++ b/media-gfx/blender/blender-2.90.1-r1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	elbeem? ( tbb )
+	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
+	osl? ( cycles llvm )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=OFF
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_X11=$(usex !headless)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.90.1.ebuild b/media-gfx/blender/blender-2.90.1.ebuild
deleted file mode 100644
index 4c25969a1ec1..000000000000
--- a/media-gfx/blender/blender-2.90.1.ebuild
+++ /dev/null
@@ -1,319 +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 check-reqs cmake flag-o-matic pax-utils python-single-r1 \
-	toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
-	abi6-compat abi7-compat alembic collada color-management cuda cycles \
-	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
-	man ndof nls openal opencl openimageio openmp opensubdiv \
-	openvdb osl sdl sndfile standalone test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	alembic? ( openexr )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	elbeem? ( tbb )
-	opencl? ( cycles )
-	openvdb? (
-		^^ ( abi6-compat abi7-compat )
-		tbb
-	)
-	osl? ( cycles llvm )
-	standalone? ( cycles )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[nls?,threads(+)]
-	dev-libs/lzo:2=
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	media-libs/freetype:=
-	media-libs/glew:*
-	media-libs/libpng:=
-	media-libs/libsamplerate
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg
-	virtual/libintl
-	virtual/opengl
-	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
-	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( media-libs/opencolorio )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	llvm? ( sys-devel/llvm:= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	opencl? ( virtual/opencl )
-	openimageio? ( media-libs/openimageio )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
-	openvdb? (
-		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
-		dev-libs/c-blosc:=
-	)
-	osl? ( media-libs/osl )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tbb? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )
-"
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# we don't want static glew, but it's scattered across
-	# multiple files that differ from version to version
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	local file
-	while IFS="" read -d $'\0' -r file ; do
-		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
-	done < <(find . -type f -name "CMakeLists.txt")
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-		-i doc/doxygen/Doxyfile || die
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-
-	if use openvdb; then
-		local version
-		if use abi6-compat; then
-			version=6;
-		elif use abi7-compat; then
-			version=7;
-		else
-			die "Openvdb abi version not compatible"
-		fi
-		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DWITH_ALEMBIC=$(usex alembic)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-		-DWITH_CYCLES_EMBREE=OFF
-		-DWITH_CYCLES_STANDALONE=$(usex standalone)
-		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GHOST_X11=$(usex !headless)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-		-DWITH_MOD_FLUID=$(usex elbeem)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
-		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_TBB=$(usex tbb)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() {
-	if use test; then
-		einfo "Running Blender Unit Tests ..."
-		cd "${BUILD_DIR}"/bin/tests || die
-		local f
-		for f in *_test; do
-			./"${f}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Pax mark blender for hardened support.
-	pax-mark m "${BUILD_DIR}"/bin/blender
-
-	if use standalone; then
-		dobin "${BUILD_DIR}"/bin/cycles
-	fi
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	cmake_src_install
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherent risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${MY_PV}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index c4812eb3ff6e..52317dd32d6f 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,16 +1,7 @@
-AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
-AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f00460f16f5539dcf22e0db93210a90be533a1dfa7dabc4ae787bb404ff7ca38c7b4fdb0113cdfdf0f20a2f7907bfcb827dbcf SHA512 d88923ae9baef2889b952f6fe85e312890390228afb8ab27edab5e0abac48eba57b5a78ae0a913c96bf420fcc9f98a5281ede19c0d23d784104c85715d6bb7aa
 AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
-DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
-DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
-DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
-DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
 DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
-EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
-EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
-EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
-EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
 EBUILD cura-4.6.1-r1.ebuild 1555 BLAKE2B e85dd7c3db1b31a5a00b59786cb34ad397c009317df00685d4b1bfbbe8807e1dbb63fc0143b34c37dcdb328bb4918cfca20f4bd56cbefc2e8a208091dfd6fade SHA512 085dcb0e2548540af6aa8389016ea80576ff95cbf69412efebceec675e4d58d40785fb552fbbd9e5a9e862129241b86da34d9e6a46eff42cc37ce92af4eae46e
+EBUILD cura-4.7.0-r1.ebuild 1875 BLAKE2B 8ca138f6101407a0830689da2efc4bf3bdc2f6763577d9f3beb7a1eaef7c861e06b32c37bc6bbb8f86d25fa8443df90c0b6db3fd6a46c5760b3198b44429aac1 SHA512 0629048d1c2324f004429cb82f5d45414066db0553d3c508a01e0655a5b34b9845b793c6357eaead2c489664a8eadcfec53a3963920474ec0a176d2b94e3429d
 EBUILD cura-4.7.0.ebuild 1562 BLAKE2B 5013051eab23a054a73afda2d283a34ec352eaf5d7a738a1d851566fd95ab27d229b05613c4039598b42034ec5caa597356fc5b54e8fd62cb26d4155275d1e09 SHA512 76beb567cbff2cb0888b8c265c8f70856910600f4430b275f1ff5164da2150d559c72259ff177074a81190c7bdab3a15bc0bca8faf6d4daf7097d38bf47cae57
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
deleted file mode 100644
index f1b275618c69..000000000000
--- a/media-gfx/cura/cura-3.4.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=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
deleted file mode 100644
index f1b275618c69..000000000000
--- a/media-gfx/cura/cura-3.6.0.ebuild
+++ /dev/null
@@ -1,75 +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 cmake-utils fdo-mime gnome2-utils python-single-r1
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
deleted file mode 100644
index d72614d316d0..000000000000
--- a/media-gfx/cura/cura-4.2.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=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.3.0-r1.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild
deleted file mode 100644
index d72614d316d0..000000000000
--- a/media-gfx/cura/cura-4.3.0-r1.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
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..032d2437193b
--- /dev/null
+++ b/media-gfx/cura/cura-4.7.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..8})
+inherit cmake desktop python-single-r1 xdg
+
+MY_PN=Cura
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~media-gfx/curaengine-${PV}
+	~media-gfx/fdm-materials-${PV}
+	$(python_gen_cond_dep '
+			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
+			sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+PATCHES=("${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch")
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -i -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# trimesh not available in portage
+	local mycmakeargs=(
+		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon icons/*.png
+	python_fix_shebang "${D}/usr/bin/cura"
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
deleted file mode 100644
index 066f9148c4d9..000000000000
--- a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Cura-3.1.0-orig/CMakeLists.txt  2017-12-04 18:05:38.000000000 +0200
-+++ Cura-3.1.0/CMakeLists.txt   2017-12-29 18:11:19.508034087 +0200
-@@ -36,10 +36,20 @@
- 
- find_package(PythonInterp 3.5.0 REQUIRED)
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
-+
- install(DIRECTORY resources
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
--        DESTINATION lib${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-             DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -53,10 +63,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
deleted file mode 100644
index fc10d727d130..000000000000
--- a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN Cura-4.2.1-orig/CMakeLists.txt Cura-4.2.1/CMakeLists.txt
---- Cura-4.2.1-orig/CMakeLists.txt	2019-07-31 15:34:07.000000000 +0300
-+++ Cura-4.2.1/CMakeLists.txt	2019-08-04 18:39:24.106917187 +0300
-@@ -47,6 +47,15 @@
-     find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
- endif()
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
- 
- if(NOT ${URANIUM_DIR} STREQUAL "")
-     set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
-@@ -64,7 +73,7 @@
- install(DIRECTORY resources
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
--        DESTINATION lib${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- 
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-@@ -79,10 +88,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 00c0f3254f8e..58fb1d65cf9f 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,14 +1,6 @@
 AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
-DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
-DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
-DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
-DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
 DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
-EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
-EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
-EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
-EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
 EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
 EBUILD curaengine-4.7.0.ebuild 2287 BLAKE2B edf6a643b44302269a589d8040ed39d54d26ef5a602f9d8d2e6a196e754f78b0e3e0f3439781f6b29afa39424642b57914b34538ccfc510f2de1a8291394a5c7 SHA512 5b83c30d7ace834f57ea23f3a963bfbbf407a46d87175181df73d1e367725eb0d1fed080204f90a352965ba83ce45c70ae81b7f6852bfd7cb70af525049893ed
 MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
diff --git a/media-gfx/curaengine/curaengine-3.4.1.ebuild b/media-gfx/curaengine/curaengine-3.4.1.ebuild
deleted file mode 100644
index 4b6d43259726..000000000000
--- a/media-gfx/curaengine/curaengine-3.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-3.6.0.ebuild b/media-gfx/curaengine/curaengine-3.6.0.ebuild
deleted file mode 100644
index 4b6d43259726..000000000000
--- a/media-gfx/curaengine/curaengine-3.6.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=6
-
-inherit cmake-utils
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild
deleted file mode 100644
index 812973727d59..000000000000
--- a/media-gfx/curaengine/curaengine-4.2.0.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 cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( <sys-devel/gcc-9 <sys-devel/clang-8 )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]] && [[ $(clang-major-version) -ge 8 ]]; then
-		eerror "Compilation with sys-devel/clang-8 or newer is not supported"
-		eerror "See https://github.com/Ultimaker/CuraEngine/issues/984 for more information"
-		eerror ""
-		die "Incompatible clang version found"
-	elif [[ $(gcc-major-version) -ge 9 ]]; then
-		eerror "Compilation with sys-devel/gcc-9 or newer is not supported"
-		eerror "See https://github.com/Ultimaker/CuraEngine/issues/984 for more information"
-		eerror ""
-		die "Incompatible gcc version found"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild
deleted file mode 100644
index e0161146a043..000000000000
--- a/media-gfx/curaengine/curaengine-4.3.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
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build
-	if use doc; then
-		doxygen || die
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 99c8b021eac6..40d1f8a52e09 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,14 +1,5 @@
-DIST fdm-materials-3.4.1.tar.gz 20852 BLAKE2B 7ad125e62c1a1cf2a05440c6ef593bf5115e6998d1a2d190063eaaadf8b9d0d93a1c98a1f2fdf672657e2c47159cc49ba6402e47ef5b55b880a8f0a7bffc9969 SHA512 c635bb3d3875e10abdc8f54c22ee74abf678cf8409ebeda6f083ac368025f90bd1871f9b13ad94c843f80073e0ae20d1dc08e80bed37ea7e2bfb3161d8ee8f0d
-DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfeff9ba5cc8d9986ad672f95fe864007c931ef37d38c8702201d286c1cdb9770ab5709e364335833fd40c8c1e4c0f68f SHA512 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
-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-3.4.1.ebuild b/media-gfx/fdm-materials/fdm-materials-3.4.1.ebuild
deleted file mode 100644
index a11c9629a10d..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-3.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild b/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
deleted file mode 100644
index 8d5efda44626..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
deleted file mode 100644
index db648b1ea936..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
deleted file mode 100644
index db648b1ea936..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
deleted file mode 100644
index db648b1ea936..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2dfcf42efd1b..2580db4342e0 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,5 +3,5 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
 EBUILD graphviz-2.42.3-r1.ebuild 7864 BLAKE2B 4390c7d22ec3e914d25445eda9ffab4bd879c5a1316355a69cd0cea756a3d85c15c3dc31bcbf97161de877eb70605e230b7a43b2c3201d980387f49653231278 SHA512 9105485fa2e67399edd207249ad80ed7b16c2f9378b33e2f844f402a4e7cbef53868ef8fb4800d06672deb75f62a51ec68949fd2d16c2cf345846116c0e68b74
-EBUILD graphviz-2.44.1-r1.ebuild 7828 BLAKE2B ccb3b572a5f9233f796e92972c0706a12873c8520d4b1ee5c688c37712cadc1621b6d05a7d48c78d8708c7b39333779a572e090a46c741b96d8216524b314e36 SHA512 6239cd60bdcf14260e92cc8a50b7c361d0eef7b115df705a3f0664023faf7ebe7667942ad0a06ba4a190306428dc2a2d501f1b726f81b0d079af74572cfd6b09
+EBUILD graphviz-2.44.1-r1.ebuild 7830 BLAKE2B 19f5260cf992b446d4b1e9ea745abdf1f63f1055326a0c72b563884578404b3d30bb5b174a984bf632770280e9fcdb58ef39f786562f35f278df9c8931f31ba7 SHA512 a4393ed01752bb891ec10c7a78d83b3eede794c3734d85b7dfece62efe6d6f1df05dbdc35a25e55e88be8e9fc5dc23879a2f1abfecfcd31d967196e990a79184
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index cab048b373aa..cc8390a654b3 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 33664a520021..769c3d745123 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.11-31.tar.xz 9225744 BLAKE2B 0a540862ac6cf3504e0ad081748c5e6a99b8858ed52e145b8be142a3294a5e354ee8453987c9783deb924a69fe2dbf340d88e9bc7bcdb14b98f33a6bf18e3039 SHA512 11a33d75c2e9ff35ff5e8d0c40a470874dcbe39350f84f7816c536798af0be5da78cd28416ce74e6f045a4cfdb0f70e1f7fb58dd7bf88465a744fb587c098ee4
+DIST ImageMagick-6.9.11-34.tar.xz 9223292 BLAKE2B d61fa1c81f10fe443b9f1bbb7714ecfa85e5622f38799ec9df9e2b9f23acfe2d21d4421ac6763979bc7fcbb497f718aedefb8290ad5010ab736fe58b09425163 SHA512 ace130218105064469f8017d67b4374b26e7db01cdaa2f0d39d97a7ac7853f804e203292bf47986325d0a0492c04b39b3717720977429fadfe4d911dd16903b9
 DIST ImageMagick-7.0.10-31.tar.xz 9653808 BLAKE2B 14c02ed0be35d817ebc2ccb0fcd436e34a7350dbe459ec3acd1a6ed94e46b181b5f713c9e8b5260e08287d5feb34c7a23b4e57bda0752a8206352c10b5379825 SHA512 0f6a2e098706186e43be3b91f10ac243aef4d96ce8943e88709243f9673205ec2261502c623f10af4f8fa126d8b4d5e3f636c9820790e5d730e54c5e634a61b3
+DIST ImageMagick-7.0.10-34.tar.xz 9655368 BLAKE2B 599610cb7e96ca4c3415636a071a6a0da8af898031a597365c58d934330de3006aee62c4cfc9e47a261b62b0c4d5c518ff611ab63cb022aef5399d9e95e2772e SHA512 f3637c929d75bd1eff7845c7fb85ca58bb6e00f618f2c39883e7ea5e080e3fcbc3f5d5989935df17c5498ff11723e0362f684e77f5bcbbff30bb0b30208c23d3
 EBUILD imagemagick-6.9.11.31.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-6.9.11.34.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
 EBUILD imagemagick-7.0.10.31.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
+EBUILD imagemagick-7.0.10.34.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
 EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.34.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.34.ebuild
new file mode 100644
index 000000000000..02b0c9655fe7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.34.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+	!test? ( test )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/ImageMagick6-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.34.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.34.ebuild
new file mode 100644
index 000000000000..ac9609f64eff
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.34.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 4fc7545c80c1..5e8a2860b516 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,7 +1,4 @@
-DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
-DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
-EBUILD nomacs-3.14.2.ebuild 1928 BLAKE2B 65f9e2319a248fbe8a81cd4cca751c26125ba299b9203e369405eb1cca92345ca9c4b2e5c4210ce4424e40d3738fc8bdeab64a90511e8302078ce6b55b00ccb3 SHA512 82000a615de936bd8434a43f4aeb9936aeffa4f833263169dfa6353f0c735814f11c3f62fbe71218c3c7f4bc16afc0d805c453b0c7881ca7a5b096f3a1351100
-EBUILD nomacs-3.16.224.ebuild 1858 BLAKE2B 1d19c9aa6e77375b35dc0b97fea3ca39b3a8c975284bcb0a75b554792bd11ddbfc92982074a18e34e82fd18501122059143c7da866cfe6f8fbb36ef6ea85de58 SHA512 40defd4de6eab31a453038e29d029942922a48b6e65e736e42650365ce41f7845f1661f12a4ddef6863b13527bd7d8a5c86ce1f1ae3777960200b31e19e350c3
+EBUILD nomacs-3.16.224.ebuild 1857 BLAKE2B a2e81270aca33f91efa823b838b0c194d763a8031d559cab8e32b412432d0ffca660dc18550769c083efe1f2d9ea4c80b77341dc8740ddb8576459ea5387cdb3 SHA512 68e42c71845989c8551f01bab2d13aa3216ec4ffeac30e2351676d1355f1ee69af5f874d49e6438ed9756cfe01c5dedc8c194f3abaea38455ebfd45cf510bf82
 MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild
deleted file mode 100644
index 399cf622d2d9..000000000000
--- a/media-gfx/nomacs/nomacs-3.14.2.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 cmake xdg-utils
-
-PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg +opencv plugins raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/exiv2:=
-	opencv? ( >=media-libs/opencv-3.4:= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff
-	)
-	zip? ( dev-libs/quazip )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	if use plugins ; then
-		unpack "${PLUGIN_PKG}.tar.gz"
-		mv "${PLUGIN_PKG}" "${S}/plugins" || die
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	if use plugins ; then
-		# Fix nomacs-plugins installation and search library directory
-		sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/plugins/cmake/Utils.cmake" || die
-		sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/src/DkCore/DkPluginManager.cpp" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CODE_COV=OFF
-		-DUSE_SYSTEM_QUAZIP=ON
-		-DENABLE_TRANSLATIONS=ON
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index fa7e271df5e1..252958e43a9a 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -13,7 +13,7 @@ plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 2e36954f7975..c739be904fd8 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,5 +1,7 @@
 AUX pencil-0.6.4-fixes-for-qt-5.15.0.patch 823 BLAKE2B ea39062880493e22b5c58c3864581a37a3db38e171a065230fc18cbe79e79db420992aec838972d99ac2b0a3a23a47035ffd6df7644d0fda4daae136fa1e158c SHA512 93138586a3e6f353712a2f3e0ff4abdd88e2224d996b3069fbe11f3b4cde2ecadec21a33b7ac5ac2de7a49727332e6155cb09154e179bc42e870aaba375eb0db
 DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
+DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B 0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625 SHA512 6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
 EBUILD pencil-0.6.4-r1.ebuild 1245 BLAKE2B 64ac22d27b4b39ed72aea5c885c4328f3078d3d1e278fae29547354274303da49deeb655081e1db182829cd6e1952e8a33cdc77ff0c1259bdf988bec195aa0c0 SHA512 ab3ee1d4ec5f3f7aa1b3356807564805bec48a3cb937b557e316364f5c52d379a590df3502f0224f350116d4c597bb5bb5ddc5575e8a43fb300d7f56bf457966
 EBUILD pencil-0.6.4.ebuild 1179 BLAKE2B 0527c9a25c2a5ece6d99a9032d1e9760170a3d479d812cd1704946d28805baf6cac08aead03e211d2f583387081dcd911e92bf5719495044ecb460d72c5cfbf5 SHA512 38f900e8f322fe4b4dd20fc0e12e466f35824b52aa5e98577db97eb297c8afdfe9182cc8edec1b2b85ee478c43dbb5ea6e739985665be398402a37219c302a01
+EBUILD pencil-0.6.5.ebuild 966 BLAKE2B ef2012732856d262aead896f2e3d565d01f839c216c9bea2951995582c8fc7aa28a77e8d46bff58182badf6a4093eab1d7358e2be3dcc533f9a3153fc97c2c8e SHA512 f55de16e96d20f0b0d73462531c0920925a9697c5818b8af0d3ae6ec59f97fb2d1dc2cd797c132ab684cd16811325c3ebf15007ef77e2e8267818b0d3a4306c7
 MISC metadata.xml 328 BLAKE2B d37566524ba0b352bca868e5a9db91ac4faf995bc4f9fca49be83be786c8e7b3ba305a10fcc1aea71b610a1442fa1b398ca549b9fcfccf0275c958d99e9d1279 SHA512 4e393e069c386f40fd7f817af383e3ee77d2f4592059a2b3cb54f68eae45eb665db9873971a29d94612dea0c8022bc0a3c2a01bac19e62d774739d3b666aac3e
diff --git a/media-gfx/pencil/pencil-0.6.5.ebuild b/media-gfx/pencil/pencil-0.6.5.ebuild
new file mode 100644
index 000000000000..ecd137f12e37
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="2D animation and drawing program based on Qt5"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	default
+	sed -e "/^QT/s/xmlpatterns //" \
+		-i core_lib/core_lib.pro tests/tests.pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr
+}
+
+src_install() {
+	einstalldocs
+	emake INSTALL_ROOT="${D}" install
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index b2030db0dca2..cedf8a2224c8 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,8 +1,8 @@
 AUX sam2p-0.49.3-build-fixes.patch 6108 BLAKE2B 85c608628a932c698a5ad7f44394c85138f850f3e4c2807101eab1fefee5721bd76cd3edfebf71d57221b94709e2aa1c09c415821f3128d3ee5f71c37640365d SHA512 70e14339b6fb8f587adc4692982601db0b1d0343a737cf08931101589eaecc419e8f571bd138a6e585a7a9a7a9f2e8f3ebf3ccf4c315d805be9f625a917a56c3
 AUX sam2p-0.49.3-perl526.patch 648 BLAKE2B 0fa1d54116325cfbf1720c8465ddf5d8bc6a3a11843207e075f63ffae803e128e8c961ff9ca33f961f169f1af2f1419bb5edddb139c87a7193da064aab8cc6da SHA512 22628eadcf9399ba89a652ad41ac55e98fdb596df029e466a4bbc609131e914e456451362e8639c98dbf59c7e288296b4940fa2e92d8ce671715103e9b622f0d
-AUX sam2p-configure-strip.patch 789 BLAKE2B 1de81a0b310b8d090932d9d29430570d48e5431988af504b51dc5e39bf8d01bfbcbd2b9a7b799e8ae30dd71c570b127ab3df6ceda10d19062b76bc93c4606141 SHA512 ff31206c80c3741049354db8ac0123048a9aa1343c70be3bd8f41e19663a646fff5d18da5519fae76825840f265c4922fc76be12bf737dee1eba717f72b775b5
+AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
 EBUILD sam2p-0.49.3.ebuild 977 BLAKE2B f271f97481d19a1bc58930007ea2674d8237435b3a1ae0977a2a1f784e4d82dbe038982bebb1a458c074180ad8a96da3b0d97e5905f31d8d91256dc1c4efa988 SHA512 274eea35289dc9a180dc0b962e26568e8aeb522edbc6917265cdbd500448aaead014fb7f00bca1d0edbf5d2ba8581e56f1e8c0e4c8c330c30d74fa31ada257e9
-EBUILD sam2p-0.49.4_p20190718.ebuild 1275 BLAKE2B 83a5870bbc6b63c1184b984089b58d4438fa53a8765d3fec41fdbbd6eeb59b855ae081345e8287d939cbd7e10b209558e095ef3fff4aea3439bff1ad1ea1ffa9 SHA512 987f392ce41bcf1c11220205836e3ff6ed90b310643b0667735a2af32c78ee90f40f9b4a01d682a6a09c55bfefde5156ab0b23485115ba10d5562a489d154551
+EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1222 BLAKE2B 592b280a0f21f84aa4beb080ca5e18d478d0492774217ed40457c2dd6e082c21c9181c0475865ffedfecb48f726026c9a637c34625480c90cdc674945cc88bd0 SHA512 ee55485eb5d86a9f16cd8741b8a8774989cda2309a204f489b0e09e05c749b6afcb0ea90cf797c3b555e70c8bfb9d6ac23821e949ab34df47d82aaf023e5bb8e
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/files/sam2p-build-fixes.patch b/media-gfx/sam2p/files/sam2p-build-fixes.patch
new file mode 100644
index 000000000000..6a1c80175127
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-build-fixes.patch
@@ -0,0 +1,53 @@
+Make stripping configurable, correct CC/CXX/CFLAGS/CXXFLAGS handling, add
+missing include
+
+diff --git a/Makefile b/Makefile
+index 1433167..38bb7cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
+ MAKE_DIST=000
+ endif
+
++GCC_STRIP ?= -s
+ BASH=bash
+ PERL_BADLANG=x
+ export PERL_BADLANG
+
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -46,8 +47,8 @@ CXXX=$(CXD_checker)
+ LDALL=checkerg++ $(LDFLAGS) $(LIBS)
+ endif
+
+-CXXALL=$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
+-CCALL =$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
++CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB)
++CCALL =$(CC) $(CFLAGS) $(CXXFLAGSB)
+ CXDFAL=$(CXXFLAGS) $(CXXFLAGSB) $(LDFLAGS) $(LIBS)
+
+ .PHONY: clean dist dist-noautoconf dist-more allclean distclean dist-install
+@@ -67,7 +68,7 @@ ifeq ($(MAKE_DIST),)
+   #
+   # echo to config.h is needed to make config.h younger than config.h.in;
+   # configure doesn't change the timestamp of config.h if it's unchanged.
+-  Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h; ./configure MAKE=$(MAKE) --enable-gif --enable-lzw && echo "" >>config.h
++  Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h;
+   Makehelp:;
+   include Makehelp  # Defines CXX. File generated by ./configure.
+   include Makedep   # Contains ALL+=... .
+@@ -101,8 +102,8 @@ IDE_MODES := release debug
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+
+-CXD_assert =$(CXX) -s -O2
+-CXD_no     =$(CXX) -s -DNDEBUG -O3
++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
++CXD_no     =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
+ # CXD_yes    =$(CXX) $(GFLAG) -lefence
+ CXD_yes    =$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/files/sam2p-configure-strip.patch b/media-gfx/sam2p/files/sam2p-configure-strip.patch
deleted file mode 100644
index be78fad0f736..000000000000
--- a/media-gfx/sam2p/files/sam2p-configure-strip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1433167..b662e33 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
- MAKE_DIST=000
- endif
- 
-+GCC_STRIP ?= -s
- BASH=bash
- PERL_BADLANG=x
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -101,8 +102,8 @@ IDE_MODES := release debug
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no     =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
-+CXD_no     =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
- # CXD_yes    =$(CXX) $(GFLAG) -lefence
- CXD_yes    =$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
new file mode 100644
index 000000000000..87c54a14bfc1
--- /dev/null
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+COMMIT="b953f63307c4a83fa4615a4863e3fb250205cd98"
+
+DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
+HOMEPAGE="https://github.com/pts/sam2p"
+SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
+IUSE="examples gif"
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
+
+src_prepare() {
+	default
+
+	# configure.in files are deprecated
+	mv configure.{in,ac} || die
+
+	# missing include for memset
+	sed -i '1s;^;#include <string.h>\n;' pts_defl.c
+
+	# eautoreconf is still needed or you get bad warnings
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	econf \
+		--enable-lzw \
+		$(use_enable gif)
+}
+
+src_compile() {
+	emake GCC_STRIP=
+}
+
+src_install() {
+	dobin sam2p
+	einstalldocs
+
+	if use examples; then
+		# clear pre-compressed files
+		rm examples/*.gz || die
+
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
deleted file mode 100644
index 2460983318f6..000000000000
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718.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 autotools toolchain-funcs
-
-COMMIT="b953f63307c4a83fa4615a4863e3fb250205cd98"
-
-DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
-HOMEPAGE="https://github.com/pts/sam2p"
-SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="examples gif"
-RESTRICT="test"
-
-BDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=( "${FILESDIR}"/${PN}-configure-strip.patch )
-
-src_prepare() {
-	default
-
-	# configure.in files are deprecated
-	mv configure.{in,ac} || die
-
-	# upstream thinks they're being helpful by running configure with `make`
-	sed -i '/Makedep/s/ .\/configure.*//' Makefile || die
-
-	# eautoreconf is still needed or you get bad warnings
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CXX
-
-	econf \
-		--enable-lzw \
-		$(use_enable gif)
-}
-
-src_compile() {
-	emake GCC_STRIP=
-}
-
-src_install() {
-	dobin sam2p
-	einstalldocs
-
-	if use examples; then
-		# clear pre-compressed files
-		rm examples/*.gz || die
-
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index e325a411d817..bb84cbc924a0 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -2,5 +2,5 @@ AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18e
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
 DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8
 EBUILD sane-frontends-1.0.14-r3.ebuild 1325 BLAKE2B 15ca465ddb4abdc4da68f09ae7f4e764ef39c3fdb15694ec30dfc7ddebb4dd3a618f3c4ff2e99251fb41e5ba20b4e3fc2bac54d7141319b8dfd692c2dc6e8926 SHA512 80071ec62e4d7a952bc78b7d93e0631694c30a333a22a0640b68797bb2d9e5b04b3746401b7b2339e891f40474cc7cabad9d57aba1778faae44991f04ecd52d0
-EBUILD sane-frontends-1.0.14-r4.ebuild 1472 BLAKE2B 346d15cc4d372c1f58615595e76c1875356a2b12c0fa27fb9e896692c5ad7ff96af481f7f3febe8d4672201bee95dec99cc92a39d88b882f7a9c38e55cac0ef3 SHA512 82ae275c29f2b817ac66cd8c70d707629a344f1d1ec4eb3a22158bec687870b82634889047d3429fdf7d18a26d5ad9f83894c6a058278d7c780bf52ecb4492cf
+EBUILD sane-frontends-1.0.14-r4.ebuild 1479 BLAKE2B a33ce9e46c05c91dc93f57226e7f4dcdd9f6d990c2ff528b5ac5921091585936c3fdaf175fcd41714eaa4be006856b4f828639fde98dead02a34296e2f48aee6 SHA512 43eb6027f96d11bf3e8ad821ff8e38e848a789b07a28450e1750cb47be61f1b543410ec2dc85800dbb421329cf395d39a4b83e1be096e107239a42d3f0e0dc98
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
index 7db138001934..e979f88f592c 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://salsa.debian.org/debian/sane-frontends/-/archive/upstream/${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gimp gtk"
 
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 57dce906eb79..9f33509616c0 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -7,5 +7,6 @@ DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c773
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
 EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
-EBUILD slic3r-9999.ebuild 2689 BLAKE2B 1aa5771deef7a1b0b475ebdfb28a1b7866be011da3207fbd7ffa3a215bb4f154afbe2a540fee751d776117be0ffef6d53ac5f837b6d0705239108ab7b5f8d73e SHA512 c96177d936221f8251b3859b24b64a9188eb814354e5a2c849ae87170c5791f8f4433bd020196f1a6c931296f3624eabbaa3b697937d1f1bee2d9b918dd519ab
+EBUILD slic3r-1.3.0-r2.ebuild 2896 BLAKE2B b02342bf78e7a0a90af62a5dc5d0c430763e04d7ea6bd474404ae60380e75edecc9f86e6bd26433081461a9903d7c01487b9eca1938e4c7bf08a4a100746323f SHA512 9f40f4d2e8e454bb9f3419e96b05ed8ee0363f3e61ecea3828deb2bcd24debb7d856ecd7693fe8053c7a126c2be46b054b5effdd3bab034c3e9af7c56aed239f
+EBUILD slic3r-9999.ebuild 2700 BLAKE2B 3977555fb2da32181d4ef307e7666ed1ff33d1384644e724cec22e7e7f185b6f2bb5faa8d8f020a217a3fcab1ffe61a6332302ec3db258a623cb3d7b9a6787bc SHA512 af562137cbb1306cfaae9b7cb017d2fb44c17147c9101fee74c1f9e96eee22aa6558567b42777cf8711ce182f0587e1049f5231100fbfff53f99fea8f40f0fca
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..60c8950aab45
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+RESTRICT="!test? ( test )"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+	>=dev-libs/boost-1.55[threads]
+	dev-perl/Class-XSAccessor
+	dev-perl/Devel-CheckLib
+	dev-perl/Devel-Size
+	>=dev-perl/Encode-Locale-1.50.0
+	dev-perl/IO-stringy
+	>=dev-perl/Math-PlanePath-53.0.0
+	>=dev-perl/Moo-1.3.1
+	dev-perl/XML-SAX-ExpatXS
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-parent
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Test-Simple
+	virtual/perl-Thread-Semaphore
+	>=virtual/perl-threads-1.960.0
+	virtual/perl-Time-HiRes
+	virtual/perl-Unicode-Normalize
+	virtual/perl-XSLoader
+	gui? ( dev-perl/Class-Accessor
+		dev-perl/Growl-GNTP
+		dev-perl/libwww-perl
+		dev-perl/Module-Pluggable
+		dev-perl/Net-Bonjour
+		dev-perl/Net-DBus
+		dev-perl/OpenGL
+		>=dev-perl/Wx-0.991.800
+		dev-perl/Wx-GLCanvas
+		>=media-libs/freeglut-3
+		virtual/perl-Math-Complex
+		>=virtual/perl-Socket-2.16.0
+		x11-libs/libXmu
+	)"
+DEPEND="${RDEPEND}
+	dev-perl/Devel-CheckLib
+	>=dev-perl/ExtUtils-CppGuess-0.70.0
+	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+	>=dev-perl/ExtUtils-XSpp-0.170.0
+	>=dev-perl/Module-Build-0.380.0
+	>=dev-perl/Module-Build-WithXSpp-0.140.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
+	>=virtual/perl-ExtUtils-ParseXS-3.220.0
+	test? (	virtual/perl-Test-Harness
+		virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+	pushd "${WORKDIR}/Slic3r-${PV}" || die
+	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+	eapply "${FILESDIR}"/${P}-no-locallib.patch
+	eapply "${FILESDIR}"/${P}-boost.patch
+	eapply_user
+	popd || die
+	# drop std=c++11 to compiler defaults...
+	sed \
+		-e '/c++11/d' \
+		-i Build.PL || die
+}
+
+src_configure() {
+	SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+	perl-module_src_test
+	pushd .. || die
+	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+	popd || die
+}
+
+src_install() {
+	perl-module_src_install
+
+	pushd .. || die
+	insinto "${VENDOR_LIB}"
+	doins -r lib/Slic3r.pm lib/Slic3r
+
+	insinto "${VENDOR_LIB}"/Slic3r
+	doins -r var
+
+	exeinto "${VENDOR_LIB}"/Slic3r
+	doexe slic3r.pl
+
+	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+	make_desktop_entry "slic3r.pl --gui %F" \
+		Slic3r \
+		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+		"Graphics;3DGraphics;Engineering;Development"
+	popd || die
+}
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 61ef1b641af8..404994de740e 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -106,7 +106,7 @@ src_install() {
 
 	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
 
-	make_desktop_entry slic3r.pl \
+	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
 		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
 		"Graphics;3DGraphics;Engineering;Development"
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index d3134b7fbf89..4d5a15de583d 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -5,9 +5,9 @@ DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b
 DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
 DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
 DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
-EBUILD wings-2.1.5.ebuild 1227 BLAKE2B 99b1a96187c9ce18f06178f1de1d770553b49a6868df2cdf95fb094706b66ec7eeca4ff1b7bbe53d0d3808f4952fc839e5f6a1cc694bbf5b6ed701ae872e6f8d SHA512 f96956083b40c8dac25b07d5710b6585e83f4de755e872beb6066a821ccadfc4c561ecc0cad8b72b0c9fcbee2479f432533ed6355fbab7a91e6d515b8d62526c
-EBUILD wings-2.1.6.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
-EBUILD wings-2.1.7.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
-EBUILD wings-2.2.5.ebuild 1034 BLAKE2B 5ad8926041f33e1eaf6dacec8c12acfd5668a4ec9149cb964096e88e921b5e41bc41cee8a7a2c55ee0e5d2948d6fabf887c5483f2fdf46a3c640c894350494bd SHA512 1a2717be399c5ed478e2099a82b0953eac8b4675c2078b5bc7659023df0f6902f6e99c2136682a7faacadcf7dfaf01b74731c9cacbd31d1f69d46fb77ff6fd8f
-EBUILD wings-2.2.6.1.ebuild 1034 BLAKE2B f3216f917744465ace1882b970b6501a197059953cce001d72f525825bf44c7d01a5f0ebd3db5671c09be5e2a0a94fad30d331e4251590c9da8b2ae6e6e8eb5f SHA512 1cf1d639585abfe8237caec443b277ed112c454d94eb5ebdd0450b57ab7c7eedc7558e3b43b292b2fa1b8333c173ad9835a5a806ba93036dc7001071a3db7460
+EBUILD wings-2.1.5.ebuild 1180 BLAKE2B 5bef1461396a3add3e4890f6c5da41bc8f05ed6c83a505af235c589c4f8ec82530cef1abee5ec245fb57bb5cb4399bb9f6a5224e6266c8bb3bd7e9b9bc3b4be3 SHA512 07d6bce373c8cb86aefbdb75af8d993f5ba26df4a5efb57553a9bfe0ccbeda95212989d1857f34afd46c3edbb8f659246790f7b638ba9b447d2365cfb11d28e2
+EBUILD wings-2.1.6.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
+EBUILD wings-2.1.7.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
+EBUILD wings-2.2.5.ebuild 987 BLAKE2B 41187682d8691f9e16585b1dec9648ba0a92d3cb2ffd6ea2e3fa839e4072daa27344086bc4aaeade4b1c0a4afa458717ab65d15a1e395b2b0b8842ad6a29bdfc SHA512 8e6301935d3fea8c0c42151ce31611db965f6a288a72995a3ec12f8e61b8245637ea9683b7fdb2e9c7328c8de2b0b746b064dc6a84444a7ba442661c00f8283b
+EBUILD wings-2.2.6.1.ebuild 1120 BLAKE2B 9582d9c4b7b84f76202405bd621028996fff877611e52462ad2cdd0f7be872b65181b42ab00cc8924f197b654ad93a4bed581256f32b2458ffb3ad12487e769e SHA512 dbee199ff0ec6f27a151e704a51e40b65ba410ff9164312f8cecd1706de217c0d85efdc19cc9b6a6830e4ae6cbc8f7f61d1e71d2ea94b1823c42245b09e10d1c
 MISC metadata.xml 610 BLAKE2B d2119ccef4d09c2b0114c626a6d04e655a09ea9683a1eabd0016531dee81a63bf15018547e33749b8d4aba2720a0824089dc9cd8c53f1e695067eb7f7645d463 SHA512 b4e380f9dd075cf85c13e6ed4caf1b44e9239ce9cc1914a66bb40acb07310c5dae12e21d2cb9b42b9d261f50a4b8972e9d5c5cb81bda0eb775e5e4e60aacdf26
diff --git a/media-gfx/wings/wings-2.1.5.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
index 04bf89ee2191..be3e01a0d82e 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.1.6.ebuild b/media-gfx/wings/wings-2.1.6.ebuild
index 3772405f629a..9f5e9713d19b 100644
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ b/media-gfx/wings/wings-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
index 3772405f629a..9f5e9713d19b 100644
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.2.5.ebuild b/media-gfx/wings/wings-2.2.5.ebuild
index 8ae2e6a7556a..b6561579ab68 100644
--- a/media-gfx/wings/wings-2.2.5.ebuild
+++ b/media-gfx/wings/wings-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild b/media-gfx/wings/wings-2.2.6.1.ebuild
index 81caee71f2ed..d030dc78202e 100644
--- a/media-gfx/wings/wings-2.2.6.1.ebuild
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Wings 3D is an advanced subdivision modeler"
 HOMEPAGE="http://www.wings3d.com/"
@@ -12,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
@@ -25,8 +23,14 @@ DEPEND="
 	${RDEPEND}
 "
 
+src_prepare() {
+	sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die
+	default
+}
+
 src_compile() {
 	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+	tc-export CC
 	# Work around parallel make issues
 	# Set ER_LIBS to the top source directory
 	emake vsn.mk
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index cdbad9dd4e44..7818a3833508 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,6 +1,8 @@
 AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b175376157583f60659564f846348dbb5a205669989f7fd31e8069548af32a424be87548b6b3033d004bcd24e1a44d262a53c38 SHA512 4c5b523f17cacc85839eeb287a82192c9c3d8c704cca34c8de87d38aa05fb502afdadb9169a396573fb977e650ca7a1fabbdab067fb128be024dea724cb791be
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
+DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
 DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
 EBUILD xfig-3.2.6a-r1.ebuild 1180 BLAKE2B 9409fdba002eaacf0e5fd75da24e05d8b196ddd2aab2c6a47e173bbe6accbceb7c81050e6a36682b4c8f7b7923ed106ed551f17569d8429d97e9560a5396258a SHA512 1608fda4f8a1d6616a5436bf5d56df08eddeb717944479a3be6032c0fc472b6e485ca9aacf568c7b61cfec1f14fd63d92e43dd132778922860a6edb4744bb3c8
+EBUILD xfig-3.2.7b.ebuild 1231 BLAKE2B 9bfb60befbaa13aefe44a8e491f4388043fd2bfe64e1104c796d680d0233d22a21364af451ea83dc1590dec19c09057ea9d059ba81f4043c9291a8bd2e4ec8a0 SHA512 a1b1f02d9562e41176ec71e0df89dbf37871d8d32dd1412bde030ad121107192eb4574969ee0ea13e17c510ee9c2108d9c00ff4f21dc0379e58e9920c20831a7
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/xfig-3.2.7b.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild
new file mode 100644
index 000000000000..3232a773a657
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.7b.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://mcj.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="jpeg nls postscript"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXi
+	x11-libs/libXt
+	media-libs/libpng:0=
+	media-fonts/font-misc-misc
+	media-fonts/urw-fonts
+	>=media-gfx/transfig-3.2.5-r1
+	media-libs/netpbm
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( x11-libs/libXaw3d[unicode] )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
+	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+	"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls i18n)
+		$(use_enable jpeg)
+		$(use_with postscript gs)
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 7c40e7ac02c7..8e5d63df3fcd 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1955 BLAKE2B 0e55ca414d96e0b467320301fc78c75d4c67578cb04802d3293cb8da952e8d618b0af21785202f0362e4edd4a80b4637eb177b690b206bf0a98f9758ba86d939 SHA512 b1ac31544d7044df876f41377719eb5cc35f5ea584b737e9c53436427815342cc706e2df7bdbfbf901804064aad1d1f675e421f7bf865f61e872ea0164d7d273
+EBUILD xli-1.17.0-r5.ebuild 1962 BLAKE2B 8ce3029218540ae042b0cf1fc716a3c3b970bf7510249cd27ce193d91281eb89a65aaf950dead5816147ce05c85d12cdba2bc5f994522f16a159739d3c915d3f SHA512 f8be77b1d95c5a4b2e169fdd63b1b69e7494bb99614a24b349c23141d7f301968efb1ef220bc2d0db4fab5417c01b28c1b2e360ab7eeb7583f83fa741b2305b5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 97d0eeaee455..7d885d6770dc 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="app-arch/bzip2
 	>=media-libs/libpng-1.0.5
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 1fef601b60db..9b9903a0d1e5 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103b
 DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r2.ebuild 2187 BLAKE2B fd9e08c5327b3456acfec78efd7f22dc40aec9200989f63e9a351cd80bad042335b5149d3cd22e0ea07e4887da86468e93d87694beafe0309713cbaf38f57a28 SHA512 007a65f4365c17dc5a21d92453032704c1b4d29f181c00ccc46d2eef12f0e1d7187f936f1dd310385d51716e38cd0bee2c8e4606ee55d930cb417a9108b9b27e
+EBUILD xsane-0.999-r2.ebuild 2194 BLAKE2B 5e495b8dded0ba7c4d531bab1fbc05f125d1c2daf888e2f477186b177e5c0b2a3b93243c5a69210caa8e5b5719bab663d143bcdb0b94a83d2f617462ac88d0db SHA512 15e45002c3eabd0fba221659a9ac5036cdd912f04e15ef408e1629aed2f2dac80f937d0abe9b57fa0ab393cf6c77d59a96876ba0e422e6b4e632f707dc0686a0
 MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f
diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
index da19a27bb818..6d380c05701c 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index db2d6d741f71..844b8e1f449c 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest
index a4d8648263a3..9aa57f4ababc 100644
--- a/media-libs/ampache_browser/Manifest
+++ b/media-libs/ampache_browser/Manifest
@@ -1,5 +1,5 @@
-DIST ampache_browser-1.0.1.tar.gz 73526 BLAKE2B 8939712957bacf8e3ed9ed808ada265a4c065e0d983ffb9dbc913ea51325eb61e2fe782a32f1cac5a3cae49207acd9bfc7d61c6c5a4affe448815ff74334cf27 SHA512 1e0100789a63c90f89d24c64bc2b139fbd4ca926f1a5225bc9d4a2061007302dcf6ce26e193dffe4e4f0f965d451e8b7a568ee11fa1d8d29d0dbc4218f51c12b
 DIST ampache_browser-1.0.2.tar.gz 73592 BLAKE2B 5b73d7e043bed38a4655de5bf6bf42229f8794d53bbee9a0f1df331957d3246954faad16f817ec8961e85bb1f147d20f901f4c6a6e1081c30fa3405e94f870f7 SHA512 c96008ffa3abc87c9ca8a534e1eb8e8b6aea85c404421f8bd635f1755774673e6f0c956e36e1be642c5f0e1443547c59c2ae9283fb75b0dcefa4c5f9d23e438b
-EBUILD ampache_browser-1.0.1.ebuild 573 BLAKE2B 544aecf7021daa36866b6a54dd8dcb068fae39b5fe0783b05342430c8c038a8b31b5556313c95ae5466113d6f6f55c6ff171229750246fbe5899540fc27db208 SHA512 cc041f7bd684fc4e107a783a90de93b4a4a7fca10d7b46f469e56927fb30d318ef140f3b177d378ce6a43f97859d0753a8b101512f68235864b14c9329ba25fc
+DIST ampache_browser-1.0.3.tar.gz 73608 BLAKE2B 057143939fba168e55e450bf7a702eb9f0093432191de5103117b0bd661618704183d40bf468aea08368cab2f0a3eab63c7ca016a305793cf922d03f02380058 SHA512 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c
 EBUILD ampache_browser-1.0.2.ebuild 568 BLAKE2B a370b965616e0775cf5a30983fcaa9b296aba0da0e2b2ccb0bf65de485cf6aac852a31fc3cd2785a7cc8f589985fc3eafd9e312a071b601f4ca954820390c435 SHA512 218a484d44a176adfb004e9d2230388b085d44bda6a657fb1660893971d8f182da3d90e3cb0242e19fa018f2221c36430045991884d2184de3cb15feb2182be4
+EBUILD ampache_browser-1.0.3.ebuild 609 BLAKE2B c4aa6c674154d63345335d45482ff7d0e19b2d50b6cb021f87624b0e8668121df1ce08fbd633a192c5bc184074d159d5f6c0a3604cef1204de7dd618c381f8e2 SHA512 9961a61ee16a6481cae3fda72792734899be4381608edd1f23da69382f88014f1f1d8afe1c9610389606c6a12d876fe9fe464be3e470b011756956c7882d5efb
 MISC metadata.xml 470 BLAKE2B bd5d864586a58f4f52c781bf056cdfe0f3ba9dee7544c2e89a050b5c07534257b6d464fc5ee85c3da6e8ca3b4ab8a840682e3e3e874c221834fb5921e8a5c2e9 SHA512 08a104211da6abdd2eee64dd4a24647f838a324d3a20a430d9ce676df02e5a0785562c34a06c7d0be43a9e3225ef767ae320d401e2199f0633948823e6377429
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.1.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.1.ebuild
deleted file mode 100644
index 217a76ee6d7f..000000000000
--- a/media-libs/ampache_browser/ampache_browser-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Ampache desktop client library"
-HOMEPAGE="http://ampache-browser.org"
-SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls"
-
-RDEPEND="dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_NLS="$(usex nls)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
new file mode 100644
index 000000000000..9e5bd068163d
--- /dev/null
+++ b/media-libs/ampache_browser/ampache_browser-1.0.3.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="Ampache desktop client library"
+HOMEPAGE="http://ampache-browser.org https://github.com/ampache-browser/ampache_browser"
+SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+
+RDEPEND="dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_NLS="$(usex nls)"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 4095761ae82c..7be2ae6447b2 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -13,5 +13,5 @@ AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc26
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
 EBUILD coin-3.1.3-r2.ebuild 2518 BLAKE2B 9652bab68031e7b0311861812b6cdf47eab72173971963f1e9b15613b1f9df0a55a2f3e8c262106e9d8fdbe87d893d6cb86e065b290d00cfed0f827905795724 SHA512 56a8baace6f1ce77bd17e1da422f096ad968a78827bd0c5c7ec3ad711a000ffe5a91192ebcdc639e3517ff5c0993c3a252d8e15455ba6f163bf33f6a4f428cea
-EBUILD coin-4.0.0.ebuild 2764 BLAKE2B 3609d56f8ca3e993c32d9d7ec617f1a1fd5af99376f899e96ff452454ec03bce87ee7f217382bd4cb405475761a0f6b0ed3464ebc740a25f646d1f549d5dfe98 SHA512 5e9b330525847d5eeab1a334a2d7b8be65a3b63e51985996548219bb9eff6c4606ed7a18347c49e20e9a2ec88f06ad90f4200ce8e3c6134fc354852b3a36a162
+EBUILD coin-4.0.0.ebuild 2763 BLAKE2B 50e79002571255b544aa0e69151ed5b7e86fc916f6c4ba5f500aa2ad3a006817017ef2fe85653d801fc6a8927ca386664a9807f8a52636c501b4bf09ca00e0ce SHA512 68be6c6a83e9ca4b6f5b644d8744b88b28ce5d81801652f90ff0e5067c8c2f7715bdef818557b41ede049d9adf0d5f9ca51e8253f996723244c1d60a9fc6bb10
 MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142
diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index cc839ad99b06..c67bb1304313 100644
--- a/media-libs/coin/coin-4.0.0.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/coin3d/coin/wiki"
 SRC_URI="https://github.com/coin3d/coin/releases/download/${MY_P}/${P}-src.tar.gz"
 
 LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="debug doc +exceptions javascript man openal qthelp test threads"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 3a2ecb5ad484..7d4496218553 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,6 +1,6 @@
 DIST dav1d-0.5.2.tar.bz2 554192 BLAKE2B 29305d0bb20a3de0048d102789fe1fdb1a030596213a1e2f025918ac6bb37c92c8c5f8078320487702ed66b16d4d63234823b5475d84bdea853b92e76be4c70e SHA512 37da9138a1dba68b9e723ba48b23eab567f839308132fc5a28727c131280f2eca3e160b074982f5265c914dcad0e4029af9ce23909b32bb9ec60f235c623e384
 DIST dav1d-0.7.0.tar.bz2 613106 BLAKE2B e41dcf4c597da437c0840753eedb3d4c8c7e53494376128f7c0cabf9fe00038fbe676f093f4bce079233934c9f78def0b98b4f09a464c6bd162b7b2fb9f88410 SHA512 2ee1de4c29db6a5cbba0a1db669fb1143f3bae26595c4ea3f17c555fdccbaabc814b7af5caf738cf4dbffd22c690cfe869d33cd830533e24990679b7b9cb4b8b
 EBUILD dav1d-0.5.2.ebuild 1175 BLAKE2B 8be48906d6eb61ba878631fda7fd52868d936b7a662237d15ef0e0607223bdefaded31334536d4bf7d06e57ae4d784e44b3e2c7c6484076faefe28303ecff521 SHA512 8e4d96a829b824eb3ab63d391e63aabaf1685ce65bedd1a28e6984bf6322f7a77054b8317450378bfbc0c97da142d2c1daa03d0c5b46120844519942000873f8
-EBUILD dav1d-0.7.0.ebuild 1181 BLAKE2B e26b5781df9273443f32f8c913e8ad9254ab2eb70eef5fc302aef333a2477cba4f02b04dd7d3dfa9e355791b58bfdd59fae940dc640c4743959ca41699e884c6 SHA512 c08db9034f18ca6d6ccc830fdb499ae7818de86b430697bba337e9d4b18078f21306ef84cb06c58c86ac3db11b4f57acdd2d3d8d17b05323d752be0ae0e09e93
+EBUILD dav1d-0.7.0.ebuild 1175 BLAKE2B c22a14777ab513828543133397ee75aef8ffd765ffdd1b1c6ca90f21304727617e6689e4251e1ccd97db34c908c4ec981927634f9609c33db2d0486ed4960233 SHA512 1a0fd0605c5383d5a8d4094c3cf7e74d8fd369b2cbafba952c391655f20d23db5f513e4cee3597a92c432855911e4671a4efaf45dce750842bb7ee11fd8d9bec
 EBUILD dav1d-9999.ebuild 1181 BLAKE2B 0e249792fe05fd2d7c9734b25f88e9116eccd34cfe5c959822070f9f5a2653fed974be6c2ebf7e579ff6eabf0c013237b2076b9297a9acde53e203d90a5d2db4 SHA512 6ee1ec6338b474090ba936710359a7e1fc97d78b52f0e6f2dc76dc8e392cb3f9c0bc202098d702dfe636f776f36aa5cd6818a81403268bf49a7398fa95b95f65
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.7.0.ebuild b/media-libs/dav1d/dav1d-0.7.0.ebuild
index b5737f217f03..92d86ac5f998 100644
--- a/media-libs/dav1d/dav1d-0.7.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.7.0.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 1f9b30342453..5e73d56ded62 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,17 +1,12 @@
+AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31e3d5b658398afa7209c5d7c89dbbf90c98385d0827960545b83573425c6be8e4615311f76d93e40ff6237977bfe160639587 SHA512 64e3cc7820bd0b8816ad34108fa174da90f2a0b8f96a3c94425900ba5f5eb8b01074fdfa3bee699815d7eb74ec44cf043239a932a228c2971557fad0caec912f
 AUX freetype-2.4.11-sizeof-types.patch 1041 BLAKE2B dce55cf1b31d426bb5a59aee20681e1e15ec24ee4468627e3e4f19f3a8fcd2ea89402292db24efffae3a3a0293c929f5e06bac3c87e6762d380b74d68a7ef71a SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc
-AUX freetype-2.7-enable-valid.patch 533 BLAKE2B 64449eceea9c394ee4a0e2dfb1722c95950561003d3d5ae894b4a571614d8ac6b89a895f883e90ed7d4bdbd225d26bb4a09e49e2b93c4354b8acf1358bb1b067 SHA512 bb8caa36cbd941a24347c761e0110f21aad3f783aab7507de831cdde1d2e83032cbca58ccedac94ce2f5233921a63436fc799f0dd615f21009f7f309d15c6863
-DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650
 DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
-DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
-DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e
+DIST freetype-2.10.3.tar.xz 2416752 BLAKE2B 8ce360c07777ad5b031ff7a840ef0cec95f358e764897f1aea9e8fd40a21e8bada3610943dc70b279856116396e6703b5127a4d672fb6e0dc8e5fe7f9233265e SHA512 3f9d1a44cdae51ec4b13116aba5af1730e6be46132ddd9e49486e8d681b61756baa9897daaf0f06e79f00f2db0e57e0fa66d27f44d65735da1167d5b3c170373
 DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
-DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
-DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
+DIST freetype-doc-2.10.3.tar.xz 2079036 BLAKE2B fca0915a5f268ce4d5205822d712b451f73d891e00518b3db0dd7c431fd7bd6544fa36fc374344c94f43d731fe7a1076724c3fdd42c8143647aa5763b4736556 SHA512 135ae51706197d1bd208cb48d8d1881c14aeee5283dbdab88a7fa6864aed888613df43bd3deb24ff530fa767f94fe997f97dee10bf2be7763231211bf7d5225f
 DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
-DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
-EBUILD freetype-2.10.1.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e
+DIST ft2demos-2.10.3.tar.xz 235388 BLAKE2B c1c7e9d61fde441b2cc107a3ad8f1499c03ce8219a54b2bdc4ab7168a0d61a6c83c7e6e3d2de6a8ed0f09b29c398708618e4683d5ed24d6e8ae7505b8920770f SHA512 860fbeefd70caa4aa9483d90df5c3376ee2bef8fe93ab26010c4ca4f95cfd281870da461e2f335f42d3e6d2007f8e46c99d7834d2177b7806a2d92422ed08b41
 EBUILD freetype-2.10.2-r1.ebuild 6783 BLAKE2B a11fa72fc58ab86599ec752d0b3189add79ec33ee7b1de77c6d36ac35306a88f63c947580adb9563471ff3e31f6c8f6c4d9be38f3c5c45ee8a308c92082f21f0 SHA512 e2ebce63a8b9409db873d3e739ceb3c1c9a5937b99202a9c0ab81fa0959b38e6cac548f40c3fa09206c2166c28e1d0197d14107f1fbc05d5cb858553b57309b4
-EBUILD freetype-2.9.1-r3.ebuild 6659 BLAKE2B e60afd962ec321996c11b948912e3d809a9842fad9ffb9e126028eb93640a35a22b918cbd38a977828ace531721aa2e0d0946aae44a1d82ceca2c4c618751ad0 SHA512 70b9bf7943f2e095e1b4e226831d026c0c80fd48c425140927a568cdecb7cafccfc9c9ab68f904514a4542cb08ceff18a4c9ecc624bd5954e5780a6bf5315c53
-EBUILD freetype-2.9.1-r4.ebuild 6669 BLAKE2B dadd3c7643ee9da87dabfce17e5ea8ce9bc2b106385708031e2b2483f64c90620d6f35a0ccaf12174ed4ac33e23841d4a17c6a7db0c7d686e85eaa799156b896 SHA512 1fcece6d60327b7dec038b7e368b18941dfde5527caa41639f78140423be2250518098680137e7b28121e2e65f66ec98122da3724e8cd413a2c0a3f1c2a291bc
-EBUILD freetype-9999.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
+EBUILD freetype-2.10.3.ebuild 6792 BLAKE2B cb4d191b0847f84ce7932c5a528b0873175bd2c6f6632151b7e48e7ef4c3be2313959a1b3b7f7fcb937496333a7e4387a238699c183c054572e60328d5089b08 SHA512 b11e00a433873180df27567b23b787642ebe9517965badfb5a158fe13ec1cf119568fc11b5dd4f271a607ead2fe195b7f4581758f2ca59a4e12b93f0e875b171
+EBUILD freetype-9999.ebuild 6792 BLAKE2B cb4d191b0847f84ce7932c5a528b0873175bd2c6f6632151b7e48e7ef4c3be2313959a1b3b7f7fcb937496333a7e4387a238699c183c054572e60328d5089b08 SHA512 b11e00a433873180df27567b23b787642ebe9517965badfb5a158fe13ec1cf119568fc11b5dd4f271a607ead2fe195b7f4581758f2ca59a4e12b93f0e875b171
 MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
new file mode 100644
index 000000000000..ea02a15df115
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
@@ -0,0 +1,31 @@
+From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 11 Oct 2020 08:59:08 +0200
+Subject: [PATCH] Prevent apps from using the autoconf sizeof branch.
+
+Use #error to make sure that any app trying to enable that branch fails
+miserably. This guarantees the code to be multilib-friendly and also
+removes the header differences triggering QA errors.
+---
+ builds/unix/ftconfig.h.in | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in
+index 00b5a8226..020593a95 100644
+--- a/builds/unix/ftconfig.h.in
++++ b/builds/unix/ftconfig.h.in
+@@ -45,10 +45,7 @@
+ #undef FT_USE_AUTOCONF_SIZEOF_TYPES
+ #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
+ 
+-#undef SIZEOF_INT
+-#undef SIZEOF_LONG
+-#define FT_SIZEOF_INT  SIZEOF_INT
+-#define FT_SIZEOF_LONG SIZEOF_LONG
++#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org."
+ 
+ #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */
+ 
+-- 
+2.28.0
+
diff --git a/media-libs/freetype/files/freetype-2.7-enable-valid.patch b/media-libs/freetype/files/freetype-2.7-enable-valid.patch
deleted file mode 100644
index 76600aeb162b..000000000000
--- a/media-libs/freetype/files/freetype-2.7-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.7/modules.cfg
-+++ freetype-2.7/modules.cfg
-@@ -120,7 +120,7 @@
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -143,7 +143,7 @@
- # OpenType table validation.  Needs ftotval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/media-libs/freetype/freetype-2.10.1.ebuild b/media-libs/freetype/freetype-2.10.1.ebuild
deleted file mode 100644
index d6f5e68744d3..000000000000
--- a/media-libs/freetype/freetype-2.10.1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
-		mirror://nongnu/freetype/${P/_/}.tar.xz
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	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 ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_egit_repo_handler() {
-	if [[ "${PV}" == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-src_fetch() {
-	_egit_repo_handler ${EBUILD_PHASE}
-}
-
-src_unpack() {
-	_egit_repo_handler ${EBUILD_PHASE}
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	# This is the same as the 01 patch from infinality
-	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# Will be the new default for >=freetype-2.7.0
-	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-
-	if use infinality && use cleartype_hinting; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype_hinting; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
-
-	if ! use adobe-cff; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--disable-freetype-config
-		--enable-biarch-config
-		--enable-shared
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		dodir /usr/bin #654780
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
-				"${ED}"/usr/bin || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge; then
-		# Probably fontforge needs less but this way makes things simplier...
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header; do
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ "${PV}" != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/media-libs/freetype/freetype-2.10.3.ebuild b/media-libs/freetype/freetype-2.10.3.ebuild
new file mode 100644
index 000000000000..b8b52e17acc9
--- /dev/null
+++ b/media-libs/freetype/freetype-2.10.3.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+	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 ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# inspired by shipped autogen.sh script
+		eval $(sed -nf version.sed include/freetype/freetype.h)
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		eautoheader() { return 0 ; }
+		AT_M4DIR="." eautoreconf
+		unset freetype_major freetype_minor freetype_patch
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	# This is the same as the 01 patch from infinality
+	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-biarch-config
+		--enable-shared
+		$(use_with brotli)
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		dodir /usr/bin #654780
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
+				"${ED}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
deleted file mode 100644
index a44767d97c51..000000000000
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
-		mirror://nongnu/freetype/${P/_/}.tar.bz2
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	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+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	# This is the same as the 01 patch from infinality
-	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
-
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_egit_repo_handler() {
-	if [[ "${PV}" == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-src_fetch() {
-	_egit_repo_handler fetch
-}
-
-src_unpack() {
-	_egit_repo_handler unpack
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# Will be the new default for >=freetype-2.7.0
-	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-
-	if use infinality && use cleartype_hinting; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype_hinting; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
-
-	if ! use adobe-cff; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--enable-biarch-config
-		--enable-freetype-config
-		--enable-shared
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		dodir /usr/bin #654780
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
-				"${ED%/}"/usr/bin || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge; then
-		# Probably fontforge needs less but this way makes things simplier...
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header; do
-			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ "${PV}" != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
deleted file mode 100644
index 159d8a075501..000000000000
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
-		mirror://nongnu/freetype/${P/_/}.tar.bz2
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	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+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	# This is the same as the 01 patch from infinality
-	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
-
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_egit_repo_handler() {
-	if [[ "${PV}" == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-src_fetch() {
-	_egit_repo_handler fetch
-}
-
-src_unpack() {
-	_egit_repo_handler unpack
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# Will be the new default for >=freetype-2.7.0
-	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-
-	if use infinality && use cleartype_hinting; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype_hinting; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
-
-	if ! use adobe-cff; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--disable-freetype-config
-		--enable-biarch-config
-		--enable-shared
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils; then
-		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		dodir /usr/bin #654780
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
-				"${ED%/}"/usr/bin || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge; then
-		# Probably fontforge needs less but this way makes things simplier...
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header; do
-			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ "${PV}" != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 37247e155193..b8b52e17acc9 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
 )
 
 _egit_repo_handler() {
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index b0bf6888a20b..43c977242ec6 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,5 @@
 DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
 DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
 EBUILD glfw-3.2.1.ebuild 890 BLAKE2B 1547fc4dbaba7dcc405c6768cbce0fc351e1d1b089136e0ddda290ce80667c4293d9cf2b9f3c7039f5b11e83ab3886354038eaf5e96f8f2bcbeba7751227ecc6 SHA512 9f3b7e2b0c15b3883a88244b8c7e89e1dec2513a968f44839ae83471e060b29663ea343e80693bf818267ab0505e237fa03e5f081a508caa048758bd3059ce44
-EBUILD glfw-3.3.2.ebuild 906 BLAKE2B 3f6edea121143f506607b8a3382ed968dce0f4286c43e7a8520e29df634b5a9444ed81bc5c5304ff910d959e6e587ae6cd31355a0533661cac887546d1967b47 SHA512 cb6c9c1bbd6ac9f56a613919cd9b98771177d74eccfb944203f9ace868119e711e1f1546251b06b923395032e7769ae1dd3594c31988666d00aa621f4aceb45e
+EBUILD glfw-3.3.2.ebuild 905 BLAKE2B 0c76598ad07c43c3f0f34038b1b3463df232f7967a612a168b82cb9e4e26b1d5b105ee0d6b5fa8d930ba918982d542a56884d02b5a8105d9602a01107965180c SHA512 3e2461242b7e26ab61922b243f170fe947780465229331f3e4c2ab2c2541431f95b43a2be9188e130dfd430f6979647d89fbfd050f33ac5be678a84459834fcf
 MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
diff --git a/media-libs/glfw/glfw-3.3.2.ebuild b/media-libs/glfw/glfw-3.3.2.ebuild
index 2e804187ab26..06a86d65afc1 100644
--- a/media-libs/glfw/glfw-3.3.2.ebuild
+++ b/media-libs/glfw/glfw-3.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="wayland"
 
 RDEPEND="
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 8a23e1a14abc..acace06cc2e8 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 1176 BLAKE2B afd31301c6d69a7684843eb4ca10f15433d8570e3e3cba4f4fc784c213b9491683eb287e80ca49edc472b5eddd1845be7f65cfd80191b6c88e2cc9fef1f34c3d SHA512 f7ec1b8802ae4571efcdc451505c4e88e15ed777a80b7ecaf45960a0500b6e61b84a224ac7dfdefa80d425aa3fd229cfa58ebf99230de20923281d2c9060ed12
+EBUILD lcms-2.11.ebuild 1175 BLAKE2B edb606f9ad9492f41a18a7580b7f35fe440af453411b68d42c75e6da04bc8b398779441c034a284d03fdc979fd9c636d0e82b9e97500412130dccf0f2312c5ce SHA512 17d45e9a6aea955ce211f8cbc609ff20e2c19694cdc354891ee9ea0c511748a2199c14216a6a3942e0e8a0fde827f93a18ada53be90fda16d2be22b551339445
 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 8d467c9e0db4..ccfaaba4d2d7 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/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index f6fa9cf47719..69b3369ac00a 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -4,7 +4,7 @@ AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da4
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
 EBUILD lib3ds-1.3.0-r1.ebuild 554 BLAKE2B 606e9436fbbe9d2f2f8c7ff27a611dc411b2e52af03bfac3e897211365036b9f7b95f97171f40ade5a943a8482c6f920874e22381d67e95459bbc25c15467793 SHA512 67812bdf404fd8be46b8c11d38f5c1da89f3e36849add8843aa16e63a2569438941f770ff6bf0e680f1dee356d02f8a99e6d6c8714aa37f62165c5c84bca200c
-EBUILD lib3ds-1.3.0-r2.ebuild 641 BLAKE2B c648731715e8212113b50d6a8167012c9e4c83483df0e418b7aee9d1fbdac59c8bda155a5dc02a9feffb5f200e6220659691d934bea36a33a8209cc1289219de SHA512 2c3f6e204917099a8634557c87b0eabd88f7a367879e676c527da8f92f7ad8a5c45f40002e5745dfadb4b7be8afbacff015e994a23d43a21a877b6c1b7c0f5e6
-EBUILD lib3ds-2.0.0_rc1-r1.ebuild 700 BLAKE2B b249e9f31877cd0f015732ee654a946229d795927223e67ea60403ee3de7300cbd9d19ababe3c36aa31a9bba77fbb4953ca314f3115a83f04eeab894d256797b SHA512 f4b72f7f7dd13d4c03b5499db0f8112884f318bf4045c4b4ea7a85fbe23f9f313eb1c11ef23734fcef8cbc5347cf8a8694397833e2b5fd6f3b45db267ce759ec
+EBUILD lib3ds-1.3.0-r2.ebuild 640 BLAKE2B 3bfb11f5a8c068985efa79b1383ba2fb064d1abb292d296896c20cea4ef82c70adeea74c7cc088c0059c35610efd6ff6f54f03b1f693a10e8e8d162e0e9be651 SHA512 b5e009cf9ba4510b6802b72e61e8de44cbea936b610c875bccfecc1e7f65f2249930aa4da7047b0834dc0d490d0c1f54eae2a0d1221a48ce1e58c12162bd12e4
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 699 BLAKE2B c7ed09eaa47b6efe577f63dd0048411a86e0d71b4b3fdd31c8fc9065542365b412c6b9f82d39cc05d30ce5ce4ba61c660d65a318e59ddce58ebc3cc99fabfd53 SHA512 9c5cb3890adc65efddc6f80cf168a92c03b5b24552f811e1815aee45f052758e29aa317b3222bc86deab6f8c35963d6b1269554ecc5788fa9e6e7dbbc5ee01a5
 EBUILD lib3ds-2.0.0_rc1.ebuild 652 BLAKE2B a85855fa5d699c0e592437ba23fad789905ade2d5a3d8bc4d331c6fb0683dc451f57bd6674984324a0619a71f8bc5ee687f386dd9c569ac7ce203f21bd129594 SHA512 a1bc042ebaabe3775150cc52bda1fc5509a677057082a836b27e27181b706b1f0f00d7961df7faf2ec4e4a8d1f81be0fdecbdd4c0e4ac72d58adab07a9a256fe
 MISC metadata.xml 431 BLAKE2B c469c1c5f88e5e3014221c85aa47b95ac8720257705c35e79a76945aaebbe075d559696e6941d64c9237e849969c9a369c7a8db96d24965bef78b88b85ace7d5 SHA512 09ba499ac33f3a9162ac15c23d0c262a32606c731a775579a0c8d6d2a24137687e1306aa17e4f66d4aba57d141d991ab4186716e2b7a55ace4ce7526b37680f3
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index d8eb1c263fa8..d9f40c14c6cf 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index 2c4bdc7f86fd..d5322d7ca6ec 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 92d8033ca9e3..59d1c87c0ce2 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -6,6 +6,6 @@ AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f56
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
-EBUILD libaom-2.0.0.ebuild 2315 BLAKE2B 56e5f6ee7d9902442d5ca1e1c22c7059d8bcd0e33467cbd346c256e383f109b87953953d6b7b9e389f22e0a09f2bd4d4cb2eeac068c3ddc48cff523755ab0e18 SHA512 970cf77beff2c5de51342f257a50eb2c248dd23ab61ca9902bdbf34f096d00fc9d71949df49bae47543d98fd7fc23726daca3d97a4a99f81dbc3a35bd12398e6
+EBUILD libaom-2.0.0.ebuild 2310 BLAKE2B a2502dfe3d7ee6cc5f8a4f1d0d268332e733d294ba564063bd0d6804252ce78f29705c68cfb28c77d6f2ebbdc0ce9a13fba72dfd7706daeae0f36b5698b2d7b2 SHA512 84a2ad80d892e7aa475062a1440f3e8dee7bb794ea28402d20da4002085444cbf65a4a54a06081b173eb51e3a0eda9cb8dc01373b948076ec376c8483e84ef63
 EBUILD libaom-9999.ebuild 2413 BLAKE2B b2f16d9046d8ab50c57d76c7798a4e3f59277cbac662a0f1b3e3b4a3176b0ffd4f14dbfdede2ad651a7df19e637b19ce4f5c9aca7b48b097332055754474dfdd SHA512 ebab14a84e97a4a3a0f19f2a1836bccf10a6b1130ed49525b24ef22a73ab4da1dd99fb2e252c5fe8a0b93830b92a19a061bace04b2d7ac2989f6b50c86eaae76
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-2.0.0.ebuild b/media-libs/libaom/libaom-2.0.0.ebuild
index 8e92d73e9986..baa8a33d2747 100644
--- a/media-libs/libaom/libaom-2.0.0.ebuild
+++ b/media-libs/libaom/libaom-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.gz"
 	S="${WORKDIR}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 40a5f88498b0..e28a52f362b2 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -4,5 +4,5 @@ DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b7
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
 EBUILD libdca-0.0.5-r3.ebuild 1432 BLAKE2B 10e11663856f32e42876aea5a6ae2acc618681b57827b8ca11af02803ca4f516e5272fe642f70c6b36042b7c660ef1676d77b2bfa01314f2226c2fdd1f2d80b9 SHA512 a49b93d1aa70a8d814dd1a8b00b50e3ef25208f2ae80c458ab501dc891faab77d00b85f11f272baba2f4b88682c50ee93f9354d54371a19776ef296b69b73cec
-EBUILD libdca-0.0.7.ebuild 1340 BLAKE2B 7a42ae834fdfdb55ccaf41e821e5066dbc9de6673f25540ab1cef06ad5d816cba1d016db7643a636152e86206387940b623f4c31f0b6d92a1cb785d7addb0e98 SHA512 570d70930be3bcf4fe87c17cb2ffae47b0d469f1d226eb0aabba988858e94d2305d6f4a72565dfb2f0d7db84a73bfbaee6addb71570ed77b2434029cb0708d77
+EBUILD libdca-0.0.7.ebuild 1337 BLAKE2B ad0f698466b4501c0f4344767b0871f7074c9c7bf6365700b64dde428cbd295f8d3774d9c23215ee78197174654303235c8489457b6f181797228380b3e04a92 SHA512 82d0eb13501a10e7f9c84f3ad171c27381037f09694ce608070787cc56157a9fb601ef19c3397efc9e4bfa96cd21123b68973c64540ed46468abcfbc3e731ef6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 0e794c3f2109..25c873d85092 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 2c4ab33cbdd9..aaf2a7c22629 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,5 +1,5 @@
 DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
 DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
 EBUILD libmpdclient-2.16.ebuild 1073 BLAKE2B 2628f658dfa8e8bab40607c73316f1da841e7ac294b5f73cf410ea83879931ae544392d5a22b6b8f7086f11d0579f7efa391744bbcf012d0e196cbdf79f11b63 SHA512 869028879f6dfc6305f0611765fbf9cec4920e940a776af84ca4713e3c6d6892e72ca5ca43ce2dd39067625df9d89e3e2a32837f480c9f53cf1f0a07e87aa7c0
-EBUILD libmpdclient-2.19.ebuild 1021 BLAKE2B 1b2913fa2d6957ecc7ab321d49fd7f319a8b674945a71a39619d7886f63a5b67a1776dc17b6656998f047672bfb90b1bf596d6c17e305b2dafb581190ab7fd03 SHA512 3ffb52402ed2466b9debe98296b92121c7c9049b2460e896f954a2425d9e63775fc3c6eea201e0491f75b9a2eed64cbb8759ad181c7b12bafeb181e1f89aeac7
+EBUILD libmpdclient-2.19.ebuild 1020 BLAKE2B 98e192d7285ad5b5fdc6f4aa537de9eef06fb263ae676a95440b1b1a478b7193a4750c7ca71ab98ca24bdfaf34943cb0780f81934cfd5004d1ffcc9fe880aa84 SHA512 90aa28ba71a2cafbeda7f56de32642c93ec7fe28678b93f72056b8dbfbd7ae26aaee7fc9b2c42979fc37187f62f35fc6713b2e9641ba5e23b9e7ae37034d47b0
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
index 0a52798377ee..e23287491575 100644
--- a/media-libs/libmpdclient/libmpdclient-2.19.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 58d0b6ea6a72..5a166f325bc9 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
 DIST libqaccessibilityclient-0.4.1.tar.xz 105280 BLAKE2B 7e8332e4d27e96c0728cecf73f13e9213f264e588dba321f0c0877954400c227e17e8bd4468b2567626407d2a283290e3b9752170ae602c6370d08beec7387d0 SHA512 d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c
-EBUILD libqaccessibilityclient-0.4.1.ebuild 662 BLAKE2B 868be068acc2d847ab0a552ca22df97393a68474ee73b0cc1bc3fe96288374e6e59524629e51bfb15ee8562db6f8d77ff82d49b9a85b117cca9c77ae68e831f7 SHA512 c9f0f12bb2bfca69b8b1510bb96c27ec1bba802e2d15f5495cd02a3aa4fe822fea5ca30500e1fac4ef923a1cae4b5c229e05ce3a32e85686b8e6673880cea299
+EBUILD libqaccessibilityclient-0.4.1.ebuild 669 BLAKE2B ad968e82630b469225bc22e05dccff40752f10d3a9ea9063f4aafe9c03f878810ae22a76aa6f3e57786dc907c68fa7cc306efb76ee016dd761e3fb34f6d9c8b8 SHA512 21e2ad66618285b4d57a24a099fb173507b26abc31ba4d019b3dd7262331feccaa3a2b9da419ad28d35eeed119d30b3068344ca0b4db99d333cfda1a59b5f7aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
index 44f599323dd2..b19c1c9c14dc 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index cd0cee4ef38a..764b67c33100 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -3,7 +3,7 @@ AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf84281
 AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd
 AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-EBUILD libsamplerate-0.1.9-r1.ebuild 1022 BLAKE2B 0a52fcb7d4c28de1938d43b190d625810ceb854d84301d6d5b3a24f759b849ad9cb9c7815f80b76c2cf5c4070b97525298f802dfd89bb8df9aee704d82f5f4fe SHA512 9e92f2cef4c3909911a740e1c28d86a2e7e8b360ea4a8e0e52e2a83af7b53554dbc2b88c9d96d57e7583238ec8d8899605cfd1b94fdd002002fff3291e39921d
+EBUILD libsamplerate-0.1.9-r1.ebuild 1020 BLAKE2B 80bdce9ed5d67df744f92a904b182ce0658aa1b63d78c34fe5169633f4f3489006834f472bfb9686082c0f5389a3a746de3258615f737deed513536841777f66 SHA512 c2388baa0cdcc73c82ee4d57ffa1c4574b593092370cfe82c2c83381a0db60ee2874fa8aaf038f9307cd0197ef1a42c96256c2935c294d3b5f2062a3a1cfafb4
 EBUILD libsamplerate-0.1.9.ebuild 1392 BLAKE2B cfbe8bf1262ea6dbe91ac64897508bade3202943c640f8038b3c496aa012b0050c961d9dc845b4addb712a8a488e9cd24dfafd5dec66d7b1d6c04a4735db2014 SHA512 9a37d903d811f3ee2c4ad9e71f1e6fd1b79deae88ee47d6970b588a882bafb7a8594a07f82e2ccb0586775f34024d3efc8669e3b03f2811e9f65fef55401f2ba
 EBUILD libsamplerate-9999.ebuild 1271 BLAKE2B 500d16139947b14a359eec9ab45bfd74ec2ddf6ecd746ecbce2381f7579b8863f44772f72473008bd50a0324c11f676d6be56c3779f16bf6d9ae900d1ab7fc8e SHA512 77961d3ccdfdfe9861d4c429e3fdef3f9bbda46c37f558fd13f49a92d04d358d8f192c5a1d8f48dffdff9d00b74305a270acb1e2f03067c83d045674c05718fb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
index 1fb03648cc2d..142eb7e1cc89 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 9bc98a1d5aa4..eb99c596bba9 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -3,5 +3,5 @@ AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1
 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
-EBUILD libsdl2-2.0.12-r2.ebuild 5558 BLAKE2B 074f9ac81078cc58ecf9711bc2ad0e774b9235e3e5b200e66f85714e4881749341bd11c3fb17e32d32445acda8bb3d44b7e280b97fdfcf5a169795f3de1c8669 SHA512 a16384495b81c0d6c16975117784341a5e05b0d0da371616ce6a2fcdbc3ace72dc07bdb99cfb11b9f55d3525ad4100ed5e2d93c40e60b959ac6df0a1222b4d7c
+EBUILD libsdl2-2.0.12-r2.ebuild 5556 BLAKE2B 2fe1ffd29d46ddfcc6629c37356e37a7b82176139d3feed9308aac43b72101088d85a11947992ed18ba11ca55bd8c7d3d73cbada1103f7b9ead20c8a37be8e4a SHA512 87b4e29ca2e63285bc592beaa4a976a02bfba661b7facbde15cfcd19e730b67b2f7a0b7e2a110b13df2ed39f99c67e4c3e439df1496b451b9642a589824d06a7
 MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
index 75459c4bcede..e550c24802d3 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index e60fbce41617..b98f9c592d1e 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -1,5 +1,5 @@
 DIST libtimidity-0.2.4.tar.gz 421572 BLAKE2B b92a87ed0adbf00d74c482e17375fe42adbc86896435ebef858b87952f31f5bd4bcc61993aa03fca07f1f85367f57e227f5828f8cb5ff44561a11e5066e84b1b SHA512 185c4ae58a14f69873869a9586cc23a1f7c9b681c67bb7cc9fe3c4ce51f53600004970af6a0d76d3055d9f2cb82a7fd062699006b0c26f90340fb751cb976930
 DIST libtimidity-0.2.6.tar.gz 421927 BLAKE2B 1644608591510e83b3e0fd338ada3bb1ea1846d26f06ec455c58f2bc640a2c8fc182bbcecbcc0465ac0e5da921f26c2494e5aec89014a42b22820bc1f986075c SHA512 e913cdec619001f5deb98c5e50707b1c5c110eab5d14606a6a7385cba1c47844a5143bc848dec17329788c5e1caff2efeeeada9ad37ec9ef704c545bf0e29ee9
 EBUILD libtimidity-0.2.4.ebuild 656 BLAKE2B a7aa688be6f1788d6ae7d81c395267410280e13e2f73fbd07f2cf9377566a45974095212bba990434538cface1e8ffbbc6f071baa774e38272ff4476e6607d59 SHA512 a6083399cb5c29e617ec3b1badd5bcd52f0b0f29b9be7495f696cc300c9701ef239f559587a00c3456b886e751eea4f38592c433b281e762ff20b8dfcfb2f249
-EBUILD libtimidity-0.2.6.ebuild 823 BLAKE2B 35c1b98156bdb7a439c772f892d09dfbb9a010c1db42a1f474e9048f4c3263d03781703c33a22753415b0b47897ed53a74820d180e59a9220c114a414c6fba1d SHA512 ea7635e6fc615e1895ce013003740fdbea860794dd92766f2c1e4105d8980c6e2bc7ab487ee224d9465ddb2faf58a5d9c9ea82e1d6db2bc5fd63ed86889bebc1
+EBUILD libtimidity-0.2.6.ebuild 822 BLAKE2B c66104f17888c19d90264621c0b1976ee0655d44a2b588f6391e3ee297ec61facaf4b69a385a6911f4ccfb5c339e0df5b8d53fa89cc5aef7217567dd874f3759 SHA512 ba0b6b1ff1d01cfa4bb7fef6ae638e79d040c3eed483f3726c8ef02041a8ba7ecbf8d6c148f34e7ef282d4447016691f118f97f34ab3fc2db0174b78d8bef5a3
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
index 81f340f11800..f8b855835bc6 100644
--- a/media-libs/libtimidity/libtimidity-0.2.6.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
 IUSE="ao debug"
 
 RESTRICT="test"
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d07931e68424..a7e4a1b148da 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.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
 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 1701 BLAKE2B a6defc87f62f5b547f6d1108ae72da6a2acfc21548610f052a732c0b5544b022808d4afb53e9ffeeaf5434796485dfbbd2fdf9f4d54db11b4ba5cfbb94748c79 SHA512 e50f92410eb49a1e02f252cad3bb00f775556e9af1ceedab31e6f344195662b31cff103b5758ef1c91b7f0bfbdb7d68f75750c3f50154885bc3376d05f5e8ea6
+EBUILD lilv-0.24.10.ebuild 1673 BLAKE2B 911a456e4f5ee84cf7bf46f19f564bb2099c84d096bb8d9cb89611a032d7a1a4dac45ff86a8d6637b840a5a204d66e42fa2e2b47f8a633db9914a44d8eadbb0f SHA512 1a51b299edebfba8006d3a62c1406cb5202fde71c7f640bf7a6e3aa060737908df071e148fa4a86568ffd50c5f161542ab7b8a9133d837d489b5b5dc06d4d46d
+EBUILD lilv-0.24.8-r1.ebuild 1700 BLAKE2B cb5acdff832430616f13aec5b2396166d6480ef0c01c3e5b0595100cb32c5af06100bdfa9d40c083987367db579eb259b58a38d36da3e15bcbf855aa8f3cb663 SHA512 9bc6eeb31effdb6609052075b5991ec602c94ca8a0b4a0d29ff8508067716aa6140be9729ce5251808d1cf0ebe86a729153ec92163b7eb9137b55bdde561057c
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.10.ebuild b/media-libs/lilv/lilv-0.24.10.ebuild
new file mode 100644
index 000000000000..5e26bcb9168c
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.10.ebuild
@@ -0,0 +1,72 @@
+# 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 bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+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 +dyn-manifest static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/serd[${MULTILIB_USEDEP}]
+	dev-libs/sord[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	media-libs/lv2[${MULTILIB_USEDEP}]
+	media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/unittest2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+	./waf build || die
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	sed -i "/lv2jack/d" utils/lilv.bash_completion
+	newbashcomp utils/lilv.bash_completion lv2info
+
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+	python_optimize
+}
diff --git a/media-libs/lilv/lilv-0.24.6-r2.ebuild b/media-libs/lilv/lilv-0.24.6-r2.ebuild
deleted file mode 100644
index bfcd8e3ac70b..000000000000
--- a/media-libs/lilv/lilv-0.24.6-r2.ebuild
+++ /dev/null
@@ -1,72 +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,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-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 +dyn-manifest static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	>=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}]
-	media-libs/sratom[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-python/unittest2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_compile() {
-	./waf build || die
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	sed -i "/lv2jack/d" utils/lilv.bash_completion
-	newbashcomp utils/lilv.bash_completion lv2info
-
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-
-	python_optimize
-}
diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
index 48b76038331d..bfcd8e3ac70b 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/mutagen/Manifest b/media-libs/mutagen/Manifest
index 62c09e132950..5bd0fc242b28 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,5 +1,7 @@
 DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f
 DIST mutagen-1.44.0.tar.gz 1143320 BLAKE2B 9e4ad11b7ee560a4940e3eaaecdb8b0fad4db54fd1fa9e4f925d84e55c217eb002e07602817fa92f6db9fdd6b6b339d5e147874bf587604c18b665d980d6604a SHA512 88c8c181b1333989451533951727b7c43e4a012defd3fd1f7ddd970d083f938783d61f98970e74c677ee9725dac92c47ee37af4bd7a474e85c7a56793c6063a8
+DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
 EBUILD mutagen-1.43.0-r1.ebuild 1114 BLAKE2B 11fa4894e029448db8d903a9a63224c7803b3fdd64a49e820468a2fd40e0f089a917daa4b78edda79643ba759e0002aee394bb3b6392dd3f3afab0c7bfbfa4f1 SHA512 82659768180b836890c90750c62c6ea1583cd2d43badde3b54a29d2d9194f613ed1835877d436f4b3e279c72d50fdcf1d62c11ca86898f84fb306a87833155f0
 EBUILD mutagen-1.44.0.ebuild 1104 BLAKE2B f36d2c00a4e64d2998d6771cd8cf79b560b5bfc90f68e3ee975e3f04266543cec934ba75c683b710ec18fc84f9f04e40b55db035f16e4bddd63e4304daeac71c SHA512 32dbe431944c217a85dcd32d85558498cca8e0bf997142e833d0a9606ccbf33de553c24a217d40f9c569904c84221c655aa47551bdb454e19c20c91372462337
+EBUILD mutagen-1.45.1.ebuild 1143 BLAKE2B 8f5127d673a6b2fc6b7fe0aed359099bfd5025d39968f5fc9606bfd2dae602be4986299835c2b672bd588ddf9052152f50938ed17ff577d07a8e9c7d2f96bdf8 SHA512 04710a26cfd8e6bce84397a9d75d5417f0732b731044b15427e1a8aa08875f9f4ba1f045fd6eb63c788da387daae745dbbdce84abe38523644a159dde1355eac
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
new file mode 100644
index 000000000000..a4cddd5a2b20
--- /dev/null
+++ b/media-libs/mutagen/mutagen-1.45.1.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,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
+SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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
+# test? ( >=dev-python/eyeD3-0.7 )
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx_rtd_theme
+	)
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	esetup.py test --no-quality
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+	use doc && local HTML_DOCS=( docs/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 9c52bf672c51..60ae8b206cdc 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -3,6 +3,9 @@ AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbd
 AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
+AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
+DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
 EBUILD opencolorio-1.1.0-r4.ebuild 2327 BLAKE2B b3064acecd3582ee6aa687e0bb4a56a68e598002194d96227705e0b9b3bc77d907600478181876684d33efbf9e1339a3ddfc43c1102cdbbae377c44a8eaf516d SHA512 9ce4183f83ae5a3d9d1a33d811ad89a4f5d92613e8b83b337fb83e943125ef976fb483cf13057598a7c5a91f0c18ce229da7f8869f238501ae1989979373589d
+EBUILD opencolorio-1.1.1.ebuild 2352 BLAKE2B f40d9121d0eb5e555a787a407b2d16e95175d22f9a6eb5606289f7718daa597048371b8b3b7ea1e4e30dc4b246afea97b8cd891cc52d7be588d8798454c55675 SHA512 aa75085b2cbbf53f27e1588d5cd842e59ac548c3e2ce4353b6dd3516ead0b278f32fbe2e65a3310bac88187748131cc24062de899975ffc1ad6aee979f039aa0
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch
new file mode 100644
index 000000000000..0f3c3e3ba19b
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch
@@ -0,0 +1,35 @@
+This check is redundant. The appropriate versions of yaml-cpp
+already had a dependency on Boost, but that's not even the case anymore.
+
+Check has been dropped upstream since.
+https://bugs.gentoo.org/747553
+----
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb20913..434e38b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,24 +272,6 @@ if(USE_EXTERNAL_YAML)
+     mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
+ 
+     if(YAML_CPP_FOUND)
+-        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
+-            # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
+-            # Don't bother doing this step if we are already including the boost headers for shared_ptr
+-            if(NOT OCIO_USE_BOOST_PTR)
+-                set(Boost_ADDITIONAL_VERSIONS "1.49" "1.45" "1.44" "1.43" "1.43.0" "1.42"
+-                                              "1.42.0" "1.41" "1.41.0" "1.40"
+-                                              "1.40.0" "1.39" "1.39.0" "1.38"
+-                                              "1.38.0" "1.37" "1.37.0" "1.34.1"
+-                                              "1_34_1")
+-                set(Boost_USE_MULTITHREADED ON)
+-                find_package(Boost 1.34)
+-                if(NOT Boost_FOUND)
+-                    message(FATAL_ERROR "Error: Detected system yaml-cpp version ${YAML_CPP_VERSION} is greater than 0.5.0, and therefore requires boost, but a boost installation could not be found.")
+-                endif()
+-
+-                set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
+-            endif()
+-        endif()
+         set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${YAML_CPP_INCLUDE_DIRS})
+     else(YAML_CPP_FOUND)
+         message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.")
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
new file mode 100644
index 000000000000..dcdc07616a8d
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -0,0 +1,93 @@
+# 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 cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org/"
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-cpp/yaml-cpp-0.5
+	dev-libs/tinyxml
+	opengl? (
+		media-libs/lcms:2
+		media-libs/openimageio
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
+	"${FILESDIR}/${PN}-1.1.0-remove-building-of-bundled-programs.patch"
+	"${FILESDIR}/${PN}-1.1.0-yaml-cpp-0.6.patch"
+	"${FILESDIR}/${PN}-1.1.0-remove-Werror.patch"
+	"${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use python && python_fix_shebang .
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DOCIO_BUILD_JNIGLUE=OFF
+		-DOCIO_BUILD_NUKE=OFF
+		-DOCIO_BUILD_SHARED=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_STATIC_JNIGLUE=OFF
+		-DOCIO_BUILD_TRUELIGHT=OFF
+		-DUSE_EXTERNAL_LCMS=ON
+		-DUSE_EXTERNAL_TINYXML=ON
+		-DUSE_EXTERNAL_YAML=ON
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYGLUE=$(usex python)
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+	)
+
+	use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken
+	cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 111e0779c4c6..0e4647f6a331 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -13,5 +13,5 @@ DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adf
 DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.1.2-r3.ebuild 18316 BLAKE2B 8775108cacc4c8f89fec915f73a4ba2c3908cf69c3e9c6d59c14dde2239c597845c04b5875591bef753ef6076e0009eb0630b95b0024660ac8d5ea773749eef2 SHA512 ed1cc7ba12fff122c700c5d88a2055677db459d0547a1eb465313a0b1db4efa75663618607facc1d33c97c9dd02a517d09bd627140082374851c97a9bec1a38c
-EBUILD opencv-4.4.0.ebuild 19914 BLAKE2B e2ac847b17c69eadcb73c47fb64927eb8cad848955a5d60390c7b98cfca7cb64587da6b46ee482f46bbb0eea089b77ed5f9658b7e748f93c4abdd34bd67df400 SHA512 b482fe7d6c65b1d78b162a8c545e36085299cfd55f52ee06fb4486d02dec1cbaa8e71b10cc58c9649cfc7f62bec4e0af3d29743717a2411f9be8def968e4cb1c
+EBUILD opencv-4.4.0-r1.ebuild 20191 BLAKE2B 71fe0ff850c5c32ccc194e122830b9ec12518f4126e77846a0af0f1f60eb6f93f8fefee6c53610f607abbf8d75750f41a0eeb0ecc7a6b0a3a688b25946a6693c SHA512 dc86728242da0bf6972de26dacc828b69e6a739c3e2de9a6ae3791c7f71b63644b9538e5c49c21636cff07aa7977fa2cc3d3fefa8c3ba802e9f946a1d344d382
 MISC metadata.xml 3132 BLAKE2B 7a499ebf8678ccae68c4947075f925b439ecdcca8a56c77c8a57895d57ffda6ecaade65e1124d12a78bbdf15eef8f9c4524c921bc53009aeb7defd5c489396a6 SHA512 ff59cff9b8f41e69f421bee8d2680eb655c3336f2eafa8c3567ec0d0509707bf9cd0ba41190a8012564d43d87ac5b35e5dc2c827167ed6d315e422a53a13900a
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..259f25ce1f01
--- /dev/null
+++ b/media-libs/opencv/opencv-4.4.0-r1.ebuild
@@ -0,0 +1,553 @@
+# 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} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/${PV}.tar.gz -> ${P}_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="BSD"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? ( virtual/lapack )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-${PV}" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm -rf CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -rf modules/python2 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0.ebuild
deleted file mode 100644
index 783f97e3a22d..000000000000
--- a/media-libs/opencv/opencv-4.4.0.ebuild
+++ /dev/null
@@ -1,546 +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} )
-CMAKE_ECLASS=cmake
-inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/${PV}.tar.gz -> ${P}_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="BSD"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	eigen? ( dev-cpp/eigen:3 )
-	java? ( >=virtual/jdk-1.6 )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-${PV}" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-	done
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index bc6cc034bbcc..a237a36a5bb8 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,7 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
+AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
+DIST openimageio-2.2.7.0.tar.gz 29189796 BLAKE2B 33974c8dc60e7619e139e6f73c48535e90208282b8d1e8e4ab10c36ec75c50bfe7ca7df0d6a80b49ebc4d61e3c6ceb7f87760854c13cc133f4dd031eeeaa5a65 SHA512 a36ffcf150cb1134aea33ec3e7ee2113c9df48c6860812a9e5ca519400211ba0fa5732153226f7e80cc20c2553834bd425adb93cdebbd5354612752f46ebc8e0
 EBUILD openimageio-1.8.17-r2.ebuild 3303 BLAKE2B 36740a48bf14c437d92bdf5882e63353c60745fd3f3677c5398569af267749644ca2423ee42b5f4e4b0e17dc63774e68372e0f47b0b992fd777128b8d91787cd SHA512 911a1f992f1f298e4d496834b1c20f8db8779a02681d572b992a27f7d32b4a8860fc304e2f7e6d893479402fdd799b9c81465d6f3984b541d8a219f386944c99
-MISC metadata.xml 748 BLAKE2B e89aa731461192e01b368333a0832a106ced96d7a6d6dc1aa749e6c8658e28f654e9f4901946fa547d5ffca5c10364277814850d9b9936f5831d86bfa418cca7 SHA512 3ff7883072966c763052d32c6fff17732ccc551e9cddfa4548c1613a08bdc93644f16c1e8e8f88a3ecbe7a10b21a0a920517094ff13e40003adc97ecc0936bec
+EBUILD openimageio-2.2.7.0.ebuild 3339 BLAKE2B 712a38c120b13964fbd4ade7fb35de68e126a72844d9bcea9ad91cf54cc14e7e648ccefd7052b5bc31c3068f831aaef1365559c2f8b90490558ae427e35ea937 SHA512 98514ba311f09ada7d59d7089a9b334cd9cfa24b9029d07e345ea1b76341533b1c29c0a321aa47e7b2d7a250039bc9d1aeda47fcd2e63398807c6c587c16852e
+MISC metadata.xml 1023 BLAKE2B 640b9a4c7acaf609373f193d74501ed4110f14a8a7f5f3e778c09d6ed6b4d2bd4a9bdccf978d653835fcbb0c45abb30d014be0046746b04f74781d2ce682d6e1 SHA512 3cc03366b85bc9ee5f4d3ebff44ad48cf0bc7d1663f49d9d4ffc7f29256ff5161b9fdb70ac8fa9fb1e4c391730af6dae5c45d4c2afab30859e07410c62ff3efa
diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
new file mode 100644
index 000000000000..d5cef06d38db
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
@@ -0,0 +1,21 @@
+https://github.com/OpenImageIO/oiio/issues/2732
+
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 1240f22..5cc5a2e 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -227,6 +227,14 @@ endif ()
+ # allow this to be overridden to use the distro-provided package if desired.
+ option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
+ if (USE_EXTERNAL_PUGIXML)
++    find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
++    find_library (PUGIXML_LIBRARIES NAMES pugixml)
++
++    set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES})
++    set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
++
+     checked_find_package (pugixml REQUIRED
+                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
+ endif()
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 4593e8d4cbff..592d071e5e52 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<use>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
+		<flag name="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag>
 		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-libs/openimageio/openimageio-2.2.7.0.ebuild b/media-libs/openimageio/openimageio-2.2.7.0.ebuild
new file mode 100644
index 000000000000..0dc559efa6f3
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.7.0.ebuild
@@ -0,0 +1,141 @@
+# 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 python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sci-libs/dcmtk
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.6.1-pugixml.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index c81734fa6672..ec301324ab8d 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 829 BLAKE2B 1e1c7e38a6bc07c96c23d65d4c8655e2a395e1cb4ed9986681bdec87d2f14680777cdf97fc60728c1c63647c8a90bbf27b1fe1970f765f29af9cf984809c1612 SHA512 852d716cdae959b018838802b4807dcd99de900dca5643e303fb5d043f8a0a0073efdd630f925406988d34ea1ba95053fc5a0f4af370192c2148b334a6f77421
+EBUILD plib-1.8.5-r2.ebuild 828 BLAKE2B b27bddb3996feb71f6f7f6021e8507e974e41d1874139e3f13fdf9c1ca43b628debbdf999857123c3ca9151ba75262d4cd8145dd564c6200d0496df85e7fa7b9 SHA512 ae4958b5ff7ee436565b4ed13e82804a26800ea2fc789f9ebfa1269c6b79bb589ce77cae206c594549893076b6a544a4233e8a6f3d3d1c19c525f042a615f24a
 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 1a3817704a7e..3e94919f26f6 100644
--- a/media-libs/plib/plib-1.8.5-r2.ebuild
+++ b/media-libs/plib/plib-1.8.5-r2.ebuild
@@ -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/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 3f8566275ff2..d3d921b573e2 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,5 +1,6 @@
 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 1179 BLAKE2B 03843ff169dbdf56d6ec0c7c80f90e0c04f78c20c845687a233a0aa515e41223a8263f047f5d72cf6f6cd9832be6ac69b04ef21816db584cf5f3f92c939dbec3 SHA512 300d9ad1316504b4cc780a6a8ec6895e55356ead0f09ab37570df30d8aa918f26ef6cea4e1f8325a0618faba5a5a9a1629770e4a123f168da01cfe0d83b25a9c
+EBUILD sdl-gfx-2.0.26-r1.ebuild 1205 BLAKE2B c16b4bd22a9cff9db800c4e0a9496bf0ab0a7d27729cd4f6876b266c79fc60519a3a88245569ff7f5e0afcda4c585508b3877dec104367b48ecd73ee2035c353 SHA512 f5a723b7405eeb12d47fdbe06db5dbf92d6684dc93ea65ce364bb193e4684b9b71ebfdcfc91e1b4994b54b19eacb5c66ddce15242d04bd453793d9d9dbecc269
+EBUILD sdl-gfx-2.0.26.ebuild 1178 BLAKE2B 17142db946bbea88c24da66cc2d9408b22a2ee4bbdf0c04879498740709b6e77d6d042f7bd1038b5f7756f4b103039e7f761999c884a9dda019481d506ad07c7 SHA512 ae49f5ea61fe6616f4986b41bf8d719185dfd18802da0a1dea0def0718ff0d1793b9b5a21449014e4ebdac57e3968aadbf1452f0cfbdf3f2ea21eab9ffc81fdf
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
new file mode 100644
index 000000000000..87355eea9721
--- /dev/null
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.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 multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+DESCRIPTION="Graphics drawing primitives library for SDL"
+HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
+SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/16" # libSDL_gfx.so.16
+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}]"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e 's/-O //' configure.in || die
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable static-libs static)
+}
+
+#multilib_src_install() {
+#	emake DESTDIR="${D}" install
+#}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use doc ; then
+		docinto html
+		dodoc -r Docs/*
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
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 68e5a7b02e63..25a871326f1b 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/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 4c0e5c0305d5..4c2d6f1fc8fa 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
 DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7
 EBUILD sdl2-image-2.0.4.ebuild 1537 BLAKE2B bab86ecdd66de54d4f10fb95da27cf77c9195c80dd8593137baff0ab0bc22ccf265301d1c84eec80278c9bd377f27734c636c182e17e3393591703208e407a5d SHA512 805d2cc5436ab8fafe5c834246cf7900b7b45f1fc256ba23014bc37250e20f73e2645ae5bfbf2e54f99239c7c647900d5f09007d7456cab24f6d4e5e05c3b5b5
-EBUILD sdl2-image-2.0.5.ebuild 1586 BLAKE2B dd00c41a8a80d0be998ab820d03cb91e680efbb98c1f093b776f042e96303a70fac5805faca0242e8972ea98f9f305bca0a90cd6cdbe682731e96cd626e85901 SHA512 4273aaab860f52c18199b8f832ea3d62f3fb867616405c41e2ac4a7c4fb2d174c4a1259265e05325099c973f5c3330fbbcb16dcccad49fd6afcdd6a40353cc6a
+EBUILD sdl2-image-2.0.5.ebuild 1585 BLAKE2B 3456a3bc1370b5da676259e635454bae4d259d3179e79773cfd92c57ce6ebf2bc8b8d35d1fe1abb651932717935cef81f9a02912f530928210624bc4242f615f SHA512 3c27a42d57d34f4d7c6e11836f14c377befbc2627e68575fbba5101259776b2cb4b07a36c53db155584d35f74125e0a005f4d094b722ddd1d5b27aa617b4cc5e
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
index caabf37d5bac..e669cf20924b 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 2ef2b725a7a8..07015c07ac45 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -2,5 +2,5 @@ AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066
 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
 EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0
-EBUILD sdl2-ttf-2.0.15.ebuild 1007 BLAKE2B 958285a740978d41dbfb2222f3740d79f8a1df54872712b6ed12844ff40751c755a7bae5367aae64bd21aee6bb054dc29105670f0efac9c0f38cce91a5e5997b SHA512 396dd91aceb37fcec9287b14f570bca47873445eed9f6753b0a1bad338cc77fdffddc32fe1863934693f16a52905de7fc39181c5ddb76f7b18f3c97b11f32b8d
+EBUILD sdl2-ttf-2.0.15.ebuild 1006 BLAKE2B df5f5af3fd071a488184bd829aa80ea491f41ecf7f52c1c163f8b859b7754db781f640bea6297c0078b7eac8501ef3b6be867ae68825bf859652b54e0709bf8c SHA512 3147ec6f09e9eca575f55c049626a09ed2bda4494d0cc8f016bbc50a5888cbd0bf6021e02d2036872a72c75f0ad3d7f726fba6bce0d2a3532f3f9b19992dc1a0
 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
index 7498d7f434f9..4427f02aab97 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="static-libs X"
 
 RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index afc1a6a83474..d6c94603edc8 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,5 +1,3 @@
 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 1707 BLAKE2B 5a1247f94adb3fff7db774b7abf9c5a2d909ff78ccf184bd80a46799442978aabfa9e41578c284003d36c688edf9b2e43b2a727f49b566a121da8c7b063ba6dd SHA512 20f4768b4f9ce7524f365a2ebd4d337b9b3db7934d068dbd8ebc4429f331b3eb1e1bf73ed409cb82ce8b665eadca043a4179376ff58fd29fbefc94986bcd290e
-EBUILD vamp-plugin-sdk-2.7.1-r1.ebuild 1647 BLAKE2B 4b08eb7d49ea76bc132e3ee90e9f71be68c453978356fa89eadf7381b4a3d143861a2ec6409c1472cfa24bbed1269bac1794833aa31ae8dc1e83a6dbc694fdbb SHA512 cc59376395f69f3b7615f2484803f6b9f8b0d673ddf349e0ebc79784766f055aee09f69f0350a956e593500419c6b00da32926eca0a954c660ffa6640cdf5418
+EBUILD vamp-plugin-sdk-2.10.ebuild 1706 BLAKE2B 26de3c8c996d4fcc6f27ad731638b35caeeab630ecb7da5675a3e779b9820a70c4666181a6105ec922b8e12b2c3808e40f0a1fd2118c50ef23b4910a420ca51a SHA512 e76d38037a41f2292b061f2859ef51c2e131aae3f17440d4a03c9fe3c7e16285cb04b9f8d1a546d6bbf659f21705a2ed3119dc0bcd9cace4ec8986e473023d84
 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 6a0e41da4d26..60194e585c58 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-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild
deleted file mode 100644
index 47ba03d2c003..000000000000
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Audio processing system for plugins to extract information from audio data"
-HOMEPAGE="https://www.vamp-plugins.org"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2206/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# multilib for default search paths
-	sed -i -e "s:/usr/lib/vamp:${EPREFIX}/usr/$(get_libdir)/vamp:" \
-		src/vamp-hostsdk/PluginHostAdapter.cpp || die
-	econf
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)"
-
-	if multilib_is_native_abi && use doc; then
-		cd build || die
-		doxygen || die "creating doxygen doc failed"
-		HTML_DOCS=( "${BUILD_DIR}"/build/doc/html/. )
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_SDK_LIBS="${EPREFIX}"/usr/$(get_libdir) \
-		INSTALL_PKGCONFIG="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		INSTALL_PLUGINS="${EPREFIX}"/usr/$(get_libdir)/vamp \
-		install
-
-	# fix .pc files
-	sed -Ei "s/lib$/$(get_libdir)/g" "${D}"/usr/$(get_libdir)/pkgconfig/*.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# don't want static archives, #474768
-	find "${D}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	elog
-	elog "You might also want to install some Vamp plugins."
-	elog "See media-plugins/vamp-*"
-	elog
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 1bda43db0755..9edb57e25d15 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac
-EBUILD vulkan-layers-1.2.141.ebuild 1409 BLAKE2B 7c6f60f8b4301c254d29bbb9ac548f985d850b5334e991ac7833d3fb4696beaba235e944bd13caaf926c2c2f7cfde361757d10f5aba851f2da3b3dde4fa9b72d SHA512 855d33d1f937f70886a5769b31111216eceda493aa14bf71bb0e3075fd80daa7a638d32821ab6920d398cfdbc3a812469f8f64faeb9aeef8453f688b0dc9846c
+EBUILD vulkan-layers-1.2.141.ebuild 1408 BLAKE2B 5084798d4af3b3b5b63bcf16dbe971382e381ca10ce370e4c21df9d0f7752ea914142101cc70d54efc05f915226815dcab2de64c95facd857a56cc2f4b9044a7 SHA512 5f0e13a63b0f05a5af1ac17314ee6d5a04cd39985ecf65f1b08c22af95829c0202a8ef13a2cb0f5d06b5c60a3628f3a63aa7e60582319c5e90fb50c80325309e
 EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6777687928575283d4a4158e3ec0420b28a787c354128dcefaf8256acf98b2129277684de4fbc05bda6a9114a18cc852e8fa3a53fb461a915fc568ce44622d1b SHA512 2787784a813412464c2e28573062fb5a36cb950ed66e31f7dda6b80abe04049dae6c69ef934279e55bdba06b0641e3e5d3384a63522e68a369576112377aa7eb
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
index 19ab38252646..c069c162086e 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 45da8dfe1209..2a4bd5121720 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
-EBUILD vulkan-loader-1.2.141-r1.ebuild 1726 BLAKE2B 05860160b07ac1428c8e29b87adf2770a2c3e0351e6a72ac43e231bf299c4dcea2a8408de1d98e41935c7dfb28f9dd70674813bc0318e3eeb7e7b17e2fe522a1 SHA512 c7a0310647ce77eb027c66785228392117dde88e04b00ca02687ba9413a63cef74d6fb0f460b7d1cb2435defeaa59cf8ddc5d3ee8c4c03187145ab184ccc9e6e
+EBUILD vulkan-loader-1.2.141-r1.ebuild 1725 BLAKE2B 9c7064acb06fef62321cab2d0290477e6d428759ad3015a620c3948ea0a42d4891befdced4bbf51b04f1c1ae1ec2395be37364e6a8c9c0119a81e150124bbb6a SHA512 a99664f8c2b9397e6d55dd695956904b20e192880e5ae429338cc5224ecf35d2e910a0c1f5d63fee1c1cb63f645d35e4a99ca09ba2e6f4287225eadda4fa2247
 EBUILD vulkan-loader-9999.ebuild 1712 BLAKE2B 357fc2e387a06a491ed88d020fe49cfb711207746d8efb1399540295d433c3a146402ba922b21af6d7972b31b23b78a6e0e4a59b2ea8161c70a49fbea6494316 SHA512 2c549cad68ca8363b97c4cd9354398b458789eb80fb724f79b40be7ad05bd076df003f00b19035e7f43a953d33e434b9bdee7070d0a2fd6ee8f17204d5a04067
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
index 5f29407c5d98..affad9ddf648 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 5faf31f1aed0..bff1359c43f9 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -3,5 +3,5 @@ AUX zxing-cpp-1.0.8-version.patch 671 BLAKE2B f44f0b4a3f253f8f856d6c4b957ee8a636
 DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
 DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
 EBUILD zxing-cpp-1.0.8-r1.ebuild 501 BLAKE2B 0eae08515984a7afa9fc1034fd7513f5a7b14198eba294f07ed87e98352a13eeee385a9d69f89245b8624e9e0f7c109db5b11170483b931b3589bb5230362051 SHA512 3ca7f943c841043d95f7bfd100f8f1f36e447265791307154f40dc2628123cb5a9115c5fb4c36c87390a1daed210808d3b831071242bc62fb85cc8501bfc2e1b
-EBUILD zxing-cpp-1.1.1.ebuild 402 BLAKE2B a9e4b0ddefafe3e002dacd42dd6caa470b12984661a04a78607476a31cc6cab6084214b04e24c5fa0b73f5afa29e525c4f6fb7ff2d85aa1ee991fe99e3335ca2 SHA512 e4fdf1251ca059a0dd76af092284ef4b2d00a29d36735414bb97a33b245e1d775313e923f3710d7e3fc1350fdfee7548d8da737516ade48c999d7d037765d306
+EBUILD zxing-cpp-1.1.1.ebuild 584 BLAKE2B 419dfa9a2948a04b6834ff0ed4b2cbb97631e549674bdca6bb8c80454dceb3f37b80f0622295e763d4d58260454aac5d90ad7c8aa05dd20f9ff4681217920f04 SHA512 19525000bfec264f365e24fb97b4daa777e495124cba57fc48f61ea04d8f68960887a96c0a8ef42a283c5dea1e718080157e7e8116fd763703efff463d1ca122
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
index f31cea8e8ba1..cd5a24f0ab97 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
@@ -12,4 +12,14 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF # nothing is installed
+		-DBUILD_BLACKBOX_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index eb4a52913e6b..655743af200e 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/caps-plugins/Manifest b/media-plugins/caps-plugins/Manifest
index 513e502850b5..ae993ec07339 100644
--- a/media-plugins/caps-plugins/Manifest
+++ b/media-plugins/caps-plugins/Manifest
@@ -1,7 +1,3 @@
-AUX caps-plugins-0.9.15-fix-c++14.patch 629 BLAKE2B 13b45c9448bbf1ea98c64ea008e004fed25a37fdae0961d3d73fd290f84ef98e7df3cc3f3d0d1ce8654570a14dcc3c7af0eccb5152273d3b0cb52e72bd567bac SHA512 f99ca7fb9244e0050b70df06103eda150a44d0e2a605642482afbbbfa3a2c06ea435a0289d08e533c27bb4be215b627e93566aa7b1d28d78b0d108aa42b5efc1
-AUX caps-plugins-0.9.24-glibc-2.27.patch 1057 BLAKE2B a61ffcef55d43664c4fb35137e98aae112e77aa04cc79ba7cb2883232e1c7e11d31289cc29a3200ed0a5a56af5b34040160b108f4b40d6f9b9d88ab698fe0beb SHA512 27b508094daedf4e1526b43ffdbb58b681ff52b41d58c2eccf061af5a492cd24741bbc871981927f4d11409e276bd5892c20184796d05fb13e4437ece16e80dc
-DIST caps_0.9.24.tar.bz2 181200 BLAKE2B a26ffd543696de11d1a21d4049944df64540cfe01c138e06815c84dc01e5541ad02c7d1ead1bf46a6296ad450acbe6ba30a8083850afcd697c05cf0f05ac4d3c SHA512 051d59c50302e45cec011a573385665e96b3bb0b6f0328e6b1e4f8fa26515d5cb4c2cc8230ea5bd242b1b8f62c86545997da2ab995e953a89d8de715807fc20d
 DIST caps_0.9.26.tar.bz2 182334 BLAKE2B 3ab75dc1ab6c5ecebe7c4983f5eb8e540396f7bacba147e1f2877c4e3e699c62d1f6af36af16eb9feac537acd9946eec40c3c90de59f6e740f6ce04c8bc0fa71 SHA512 ce9a7219ef0c6c33a5debb407e9b6ea7432c3f50ab32c1915cf91c40cda541a812da887bf57ee536d653195158939889c4baf5fcbe3ded551abc676517e1da7a
-EBUILD caps-plugins-0.9.24.ebuild 930 BLAKE2B ddf6bc2bc5120357944e5252ebe002b3a59367e086082957bbd770789605d920f1bcb138704f0ceabe1c26b17c854f30713b6dfcf61ce8f53ccab8b2897f655c SHA512 5238058fb7895ce82279a21ced457b5a925926324c8dc2c359ef93fc3522990b43ce1b9361afba22d191aa8d3b202181c085ae7972fadca89b9387eb905a2996
-EBUILD caps-plugins-0.9.26.ebuild 824 BLAKE2B 242482f23267dd6b713b0fc52567080a5e17d670a3e7d96e1e182b15b5df753cc5c9a9e17148daead28c16371472dc1a218f7b30fbe140cc74a4fb597d62c5cb SHA512 be32f88745d8328c0d503764be5b87be6d9d2bdde2ab12b80fa91087677ccf7187cdd38aa5dfaaeffb3fb51f5a4826f320e894152e9af81ab859a23e981078f5
+EBUILD caps-plugins-0.9.26.ebuild 823 BLAKE2B a0d37d4e15d4c4b99beef43844f7768edd280f1f3b565192ecba7f1cef3971dc0c01dc8d822dec34ab15a1819f6e31aa43fb53aadc6c2f39117a40bce053c4c7 SHA512 02d376e088cf36223203f6f2d2494b03a07a087a762a95331d44225a0b87ff5ed0e17752fe1eb108aa7bde44fd1c2c991d4674a59ab94a3d1b62744af7fb467a
 MISC metadata.xml 513 BLAKE2B de96870c0cc0d4aee45493a502939900d8cd603effacae05b65ceceda7ec121c6e63e1740c2a69d20f2244fd82656516d4f83e0c50a8e2d81ac8d262cd1c4790 SHA512 d528c2eaf9dc0a9a243ed3ec6ceb80a1ce72f4d5f144c2b7c9917d3a84914e896926bdf2c443ae113ccec7c83f37e4c8b284db9af48962f82b7b67f0a95b272e
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
deleted file mode 100644
index f427ec2503bb..000000000000
--- a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal
-
-MY_P=caps-${PV}
-
-DESCRIPTION="The CAPS Audio Plugin Suite - LADSPA plugin suite"
-HOMEPAGE="http://quitte.de/dsp/caps.html"
-SRC_URI="http://quitte.de/dsp/caps_${PV}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.15-fix-c++14.patch"
-	"${FILESDIR}/${P}-glibc-2.27.patch" # bug 647874
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		ARCH="" \
-		CC="$(tc-getCXX)" \
-		CFLAGS="${CXXFLAGS} -fPIC -DPIC" \
-		_LDFLAGS="-shared ${LDFLAGS}"
-}
-
-multilib_src_install() {
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/ladspa/rdf
-	insopts -m0644
-	doins *.rdf
-}
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
index bbae978c714f..f3b31de8d8c1 100644
--- a/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://quitte.de/dsp/caps.html"
 SRC_URI="http://quitte.de/dsp/caps_${PV}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/ladspa-sdk"
diff --git a/media-plugins/caps-plugins/files/caps-plugins-0.9.15-fix-c++14.patch b/media-plugins/caps-plugins/files/caps-plugins-0.9.15-fix-c++14.patch
deleted file mode 100644
index 32de7c4dee4e..000000000000
--- a/media-plugins/caps-plugins/files/caps-plugins-0.9.15-fix-c++14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Felipe Sateler <fsateler@debian.org>
-Date: Fri, 1 Jul 2016 19:06:31 -0400
-Subject: Avoid ambiguity in div invocation
-
-Be specific and use int version.
-Fixes build failure with gcc >= 6
----
- AutoFilter.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/AutoFilter.cc b/AutoFilter.cc
-index fc087d0..bd6b12f 100644
---- a/AutoFilter.cc
-+++ b/AutoFilter.cc
-@@ -69,7 +69,7 @@ AutoFilter::activate()
- void
- AutoFilter::cycle (uint frames)
- {
--	div_t qr = div (frames, blocksize);
-+	div_t qr = div ((int)frames, (int)blocksize);
- 	int blocks = qr.quot;
- 	if (qr.rem) ++blocks;
- 	double over_blocks = 1./blocks;
diff --git a/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch b/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch
deleted file mode 100644
index 7c688d7f3bfc..000000000000
--- a/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Aurelien Jarno <aurel32@debian.org>
-Date: Tue, 20 Mar 2018 18:29:34 -0300
-Subject: Use standard exp10f instead of pow10f
-
-Starting with glibc 2.27, the latter is no longer supported
-
-Bug-Debian: https://bugs.debian.org/890633
----
- dsp/v4f_IIR2.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dsp/v4f_IIR2.h b/dsp/v4f_IIR2.h
-index a68ecf5..9682f7b 100644
---- a/dsp/v4f_IIR2.h
-+++ b/dsp/v4f_IIR2.h
-@@ -33,7 +33,7 @@
- namespace DSP {
- 
- #ifdef __APPLE__
--inline float pow10f(float f) {return pow(10,f);}
-+inline float exp10f(float f) {return pow(10,f);}
- #endif
- 
- class RBJv4
-@@ -142,7 +142,7 @@ class IIR2v4
- 				/* A = pow (10, gain / 40) */
- 				v4f_t A = (v4f_t) {.025,.025,.025,.025};
- 				A *= gain;
--				A = v4f_map<pow10f> (A);
-+				A = v4f_map<exp10f> (A);
- 
- 				RBJv4 p (f, Q);
- 
-@@ -429,7 +429,7 @@ class IIR2v4Bank
- 					/* A = pow (10, gain / 40) */
- 					v4f_t A = (v4f_t) {.025,.025,.025,.025};
- 					A *= gain[i];
--					A = v4f_map<pow10f> (A);
-+					A = v4f_map<exp10f> (A);
- 
- 					RBJv4 p (f[i], Q[i]);
- 
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 324ad196f20e..394287b00289 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -5,6 +5,7 @@ DIST kodi-peripheral-joystick-1.4.9.tar.gz 111161 BLAKE2B bcee8aedff118cbceec050
 DIST kodi-peripheral-joystick-1.6.0.tar.gz 117163 BLAKE2B 24e6eb1b4b4310fc3fc452a719094cdaac7caf7ef4825add4a9bcde453044e5a352b859b0c247fa445bde5554a3b82e40c65f185adc524f855140126716a3e27 SHA512 9fd11af0e75a80cfd1086caf29213616a441c0f8c5066ab2d54dac94603240c5f13af9048ae0691f6bd34511ac36c8cf478cdd6cd179ef97f282ae82f932e0fe
 DIST kodi-peripheral-joystick-1.6.1.tar.gz 117588 BLAKE2B c117990d6dc90ff53f4d23e08288df1cfe2fa0f685498a9f9630a07e6ee36207af3c2ed6faf81746e06bdcd94674cd89d97fe6ff75ea5263754c4eba10498605 SHA512 3907fea59d1919f9580e17e01b672aa525b106cb126dc6e7c873fe20b8dd68f395f39fb52ae08a02206a1c301523cd9a2b2f67076cb5e6c4b582d46800a892c7
 DIST kodi-peripheral-joystick-1.7.0.tar.gz 117000 BLAKE2B a13cf86805afc77c6178a69fb735fa4544fbc0befb30c43e92d07a695416d1c0006a2227e46c91784c139e7ea205f9653b4f4802bfd734f36c7db9a69782d4ed SHA512 d6c837b28e907376b88e84b37cb9e2f04d96cd97db33f53165c1771087317682409057457596e007410c4dce0b6442551dd922d8a2c4841187e48457ec7ce340
+DIST kodi-peripheral-joystick-1.7.1.tar.gz 115217 BLAKE2B b349a52fd756cc55d0fd08d78c2a6c81f6a34e1e5bc9d4e02904a904f26cddfae373ba3532505e736300d31a49d344c2a77b06a92da56a2641505dae0296a843 SHA512 38c53ccd9815212eb51154faaa8073507457a6f7c68d4d472f7c4e4e3a5342cfc085a75a2d3022475d57df08ac0e800406d24484106e64316957772f41235d5c
 EBUILD kodi-peripheral-joystick-1.4.6.ebuild 730 BLAKE2B 76309930faf2294995b1df7eef268c6ee8fea244a129bdc2c2a65e30018cd6fa4e9afb32398eb5e17c8a8956cec8439d321a01eb4015058f54e52ad06be52b69 SHA512 6fabf1aae054025f89177e8bf00672ef62679e31238c048bf7598e92391d82b43fc5815356bc083f3986c0256762c40f85c6849bb00ff5ed4442f0ed4d39ce95
 EBUILD kodi-peripheral-joystick-1.4.7.ebuild 730 BLAKE2B 475b3113d4f0edf85c7221641e8253a20d5c571a890a7e88f6e5e0df7d4ce73bbc5863e6938b921191f721d7d88e293ea3040bff8027f8340a47c08992849106 SHA512 2d4b90e94341f6b0435589c62505a02369081557e6fd71c30b90602c1991da05e2c36c8bde04cdd1eb0f0376beced8e9217421d9c0991cbfa34f9e04d83d02c5
 EBUILD kodi-peripheral-joystick-1.4.8.ebuild 770 BLAKE2B 1abec17a88f9daa0bf27aac34a59e7be3aa4bfe9e46b58c1f8eb8f280a882723459945444da1e6291a8769f5582f9a95b4d21a710e8657efd6376033256b8d51 SHA512 4d76e61711b1523c3817c694d34fba20fde4b6a838c43849f9e8dd20120f25a6720ad1695e72ad3c97da2e735e17b594b7469db7ffa9e943ef97f8ef7a4ed7dd
@@ -12,5 +13,6 @@ EBUILD kodi-peripheral-joystick-1.4.9.ebuild 760 BLAKE2B 710419d728e80a52f1fa490
 EBUILD kodi-peripheral-joystick-1.6.0.ebuild 749 BLAKE2B acc30904e3490680ba2a92a482e799972ec5fd26f5c4eaf8aa0cf66188fbf86dc8d070d470d740add8291e49214212121dbaaa01b1f9ae041cba25ffad5085b5 SHA512 9de576166d8da26899f790d4748edbab1c50b1cfa842ac52dd98fdf904f536480b32524103bcb19d464ccd3b0f0320af08bf49e138756e94baa1e2a6d6d7e22e
 EBUILD kodi-peripheral-joystick-1.6.1.ebuild 749 BLAKE2B acc30904e3490680ba2a92a482e799972ec5fd26f5c4eaf8aa0cf66188fbf86dc8d070d470d740add8291e49214212121dbaaa01b1f9ae041cba25ffad5085b5 SHA512 9de576166d8da26899f790d4748edbab1c50b1cfa842ac52dd98fdf904f536480b32524103bcb19d464ccd3b0f0320af08bf49e138756e94baa1e2a6d6d7e22e
 EBUILD kodi-peripheral-joystick-1.7.0.ebuild 749 BLAKE2B acc30904e3490680ba2a92a482e799972ec5fd26f5c4eaf8aa0cf66188fbf86dc8d070d470d740add8291e49214212121dbaaa01b1f9ae041cba25ffad5085b5 SHA512 9de576166d8da26899f790d4748edbab1c50b1cfa842ac52dd98fdf904f536480b32524103bcb19d464ccd3b0f0320af08bf49e138756e94baa1e2a6d6d7e22e
+EBUILD kodi-peripheral-joystick-1.7.1.ebuild 749 BLAKE2B acc30904e3490680ba2a92a482e799972ec5fd26f5c4eaf8aa0cf66188fbf86dc8d070d470d740add8291e49214212121dbaaa01b1f9ae041cba25ffad5085b5 SHA512 9de576166d8da26899f790d4748edbab1c50b1cfa842ac52dd98fdf904f536480b32524103bcb19d464ccd3b0f0320af08bf49e138756e94baa1e2a6d6d7e22e
 EBUILD kodi-peripheral-joystick-9999.ebuild 750 BLAKE2B 45fd88bbb36d359752f0f92e9cc8dbd7138affc0ae6d14375962b81c61f797d287f9734f2258c5226d2eaaeade4de41bb5c16085ca49cd78edef9fd3b50afa01 SHA512 eaf1f44c31bdb530a716c575acb0ca89f121d5c019dbc7e7283d540b3a1a6e30f4c6bf3933b2d65108c97322fb2aad49486faeef72da0a731c4ce98eaa16d9a2
 MISC metadata.xml 367 BLAKE2B a556c441b1cfc23f80c0102c3be53c661337b6c251370cedda3fcf9ba164c48f0710ee4dfe279a211973aaf0a6a1c37e517967f0cda07a3b499340aa5eb06607 SHA512 bf4b891eaaf259a751461bb1186176714b1b9cf107706ed9e5aeefa362afa131f2c3d307769edbc78332e157248183a8282d3a97343b97819952ee3667451f5f
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.1.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.1.ebuild
new file mode 100644
index 000000000000..b29f362fab00
--- /dev/null
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
+HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_BRANCH="Matrix"
+	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/libpcre
+	dev-libs/tinyxml
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 4943e38449cf..39065ec76ee8 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-argustv-3.5.4.tar.gz 149660 BLAKE2B 0afd36f8e7c153bb5d00235664ab40e7fa165d658b0491a271f9cc04c7ccf2f3bf9666c949b43c03b86ab8d6479863c7df9e05d75b8e18676526bb1d30f8b62e SHA512 37ae3fa9d3e0f49ce87429de56f16e875bcbb289f94e019822c9e8661f54cd62d11d6cebe195f29871d7c24241d859e88fde988fc6ed6dd2a3f64cd7e8efe1d3
 DIST kodi-pvr-argustv-3.5.6.tar.gz 150434 BLAKE2B 9cd59c57816ae30912d6410c3a1373fbfe0242a7b60ffd55576c898eac26715e61fbf4bb239e121549b92249b52bc484b1c961eaa3460b36bca0ffa8aa540f76 SHA512 788643e236f0d4e053cb6580ad033dc5f00ed4749138b93631609a203adbcc80d55655cd02634a9f762383fe549f769bd79ad3bbd5023fa74d0748c5a3c9fb71
 DIST kodi-pvr-argustv-6.0.1.tar.gz 153659 BLAKE2B c991b1addcc81e4e07f763b0794f2a4ff998747729d6ea9c8433c9c85872b51c702b0dcdaa92f487ee562fe8d167e54dcbdacb55d8df6ebda5ab6ec6c3b35b10 SHA512 103f17c503c0ef9c0e40c9ad2602bff314bce0b7f7e4dbc1f7eb66082ef5dbf0f55878be012ce4728644ba30a473d6f292c7bdeb3bf72b41928a4c7e528f83e5
+DIST kodi-pvr-argustv-6.0.2.tar.gz 154313 BLAKE2B 54cf2619e1aa3bab0876ac3e5d18e5acbacbf336d8c697cfb5ad1135577e085330b98d89cd25cf551afa44c09acc4433267b799e511e79e8263eb9cfa365fdcb SHA512 dd6b40d274fe2325660865fd9a814baff0a3440d98d076d8636efcd65fbca63972e8ae22f04bd149f2feac1e8334a87c751031fdd1d915089f766e1089590f4e
 EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
 EBUILD kodi-pvr-argustv-3.5.6.ebuild 703 BLAKE2B 5c02b33738a4a47af00343f3379c89b816f7b033653b554971e7287a0fc4264ba17e4678ed57de5d33bd6f226fcb6450fbcd7278986d67be6fa8618ddfa4ef29 SHA512 2dfb679668f2cb382cee0754b1118290a4e49b03df71c4b5a736d4e65b8727665602b767805362eb4ee8ad7cc1b31a0b07bc461582d1a190fe69224f357a1c21
 EBUILD kodi-pvr-argustv-6.0.1.ebuild 694 BLAKE2B 1fd8029faa8e1cddf6bdeabb6e9226c43ca3861fd9cfc5ea4909053698b281991ca6fa097a9d5834c0fb5b23755a027984f42f5920a630b1d52d8ebcd644293a SHA512 86ba51038e6265b422ac94fe135da3d7ad95744114210f7afb429866f27cac56efed011d17b1e4c57eda467a86123849887bbbc53a8797996bf59fe2041707e0
-EBUILD kodi-pvr-argustv-9999.ebuild 695 BLAKE2B 0c1a0530be5dbea1e1812e12e3d3a9003e15b5f1fd5da081cad63b34137ce66e720fe425e520b2cba1a38f6029a9c28a08168e8e4dfe2cc7c715ef3e3c4c8aee SHA512 3e96caf0fdebd538b7de4dc8ec766d22a34250a7266c22c60406b02c3b6e328288741f59d6e17b46253e9d06c5048073a1be23d98240515e31d39e7d782f0bc3
+EBUILD kodi-pvr-argustv-6.0.2.ebuild 668 BLAKE2B a1303104329b47ec058f717af1c47e4383d9694498000a86e4db6902c73b9748a8abb85975401d6b366062cb915eb1fd98944b61454b7cf46840a13ebb70bda4 SHA512 078bf8ff025c0b4131422726df39a7410ba7f2b86e8741d96a5a3964c2e0fd1c3e6b4b9453a4b4857e4cd228905b3b3328bcaaeb3bd276bc7c137095142da659
+EBUILD kodi-pvr-argustv-9999.ebuild 669 BLAKE2B 802dd70801dad6deae7a7e0c840b7fa047195f4c32d28ee21c26d213e01002387deb860d3704af690110f93ef204970af2db8a271d7005d43c194846b58eb9e4 SHA512 ce01f62b84b15a9ca39260ec23a25a18b0cb3a8ae165dfa1845e2e24baf1f14df10d98cbd88ed29f31090afb4bddeda27f48374abc1d77851695a4b76afe1534
 MISC metadata.xml 363 BLAKE2B da6b30af0962fa998c28cc4b8a730c3cb44459c7e0d9f74d1f6a524d78b98c2cef7a8fafff6b89d5965d9fda730e646b154141af90e408e5e7c7b96133d5b4e4 SHA512 b4605de6bcb982cf41261f9b9c4496a0f43fc8d9d7f49a64921a266fd988a2e23352456394c61c1b8e87cbc2e18bf6f5b957b4398763d3bf66ce9525115b5127
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild
new file mode 100644
index 000000000000..7661c01e1ba4
--- /dev/null
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's ARGUS TV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
index 3cd2a5114177..9a4817d669c5 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	=dev-libs/libplatform-2*
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 01302f875f59..2baddd32d250 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -4,11 +4,13 @@ DIST kodi-pvr-iptvsimple-6.3.0.tar.gz 178520 BLAKE2B 9536d15145f009a950d21537d6f
 DIST kodi-pvr-iptvsimple-6.3.1.tar.gz 178767 BLAKE2B 9ce62b099bb1b5bd8038b0b638a7673c8498a128d9901c17263edb17ee6482ad83eb4bd8acd4144eaf8b694e72bc2eecc4cefd3675de82177f185aca18403dfe SHA512 586f404c43e496ee7a12c84ed6f5ae9f373b1197be24b9d34df0c1c226961d0da5642b707f8f4bcf2ca9a5b38a3d5f6a8a17d31173af4e2c8ee6a0582707862d
 DIST kodi-pvr-iptvsimple-6.3.2.tar.gz 192436 BLAKE2B 8d793ed6802a93457f1d1f2c1f08604c1f7e0387f29358ce3f97adf70ae5c05835dfd43bf59787970b8087ee948099d46b2d32ef5a76a04b9e91cfd048f745ea SHA512 20a44e24403575493d3afeb76cf376dfcd31a9f6dbc2e64e43ccc4a007cef517af1287d5b6985d925d523b926642cb79586e296707dd6ada891edf29523bf61c
 DIST kodi-pvr-iptvsimple-6.4.0.tar.gz 179020 BLAKE2B b4dbabc152cdea4c3768a6d74e1d67e2e1686ccc161fef40f25872e58ee07b66f732db1df48a1947103075b9828f11484a0961ede766806f0a27d2271fbc6a66 SHA512 b9a52244ef502c62127658903dddd0c391c5acae34999dd57a4a42fc4ce4d138b96dcd6f485eb08ef346a6d7e173175e5d7954feb8928fb8df097fb1ecbce051
+DIST kodi-pvr-iptvsimple-6.4.1.tar.gz 179019 BLAKE2B eaaa2230d697d2f85b26b3949ecb36b95fc02f57bee740b33f2ad99239b32067a1f89188320dbd874d4e15a2fd6a906f252e52ef619a09b40a2eb348fb30b805 SHA512 048898135ccd08ed2d584c52bfc94bb22865931036173c642606695ed68ffc55478a255e183e347ee9c704225a2af855871f4aaed85b614a42e7dcad040408dc
 EBUILD kodi-pvr-iptvsimple-3.8.8.ebuild 832 BLAKE2B ac2e8e2ca456a4246a6d35f6a91c4ebddcc0d02699e3e24e75a04891ff9f828f9f5429a22ec1798e6a749b2a13680ae14156788db0927a5734b733e64c124650 SHA512 28af2a01df4189ccb4ca5f35be6a5b7e00c93cf9b0dbb457154ec7ee260ca2eb5d0689a3da4e51f33264a34c58923393fac10e1d4598327a9bebebc1d0884439
 EBUILD kodi-pvr-iptvsimple-6.2.4.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
 EBUILD kodi-pvr-iptvsimple-6.3.0.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
 EBUILD kodi-pvr-iptvsimple-6.3.1.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
 EBUILD kodi-pvr-iptvsimple-6.3.2.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
 EBUILD kodi-pvr-iptvsimple-6.4.0.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
+EBUILD kodi-pvr-iptvsimple-6.4.1.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild
new file mode 100644
index 000000000000..d29c62c10d9a
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's IPTVSimple client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/pugixml
+	=media-tv/kodi-19*
+	sys-libs/zlib
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 6388c7b64a3e..207917b8787f 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -5,6 +5,7 @@ DIST kodi-pvr-nextpvr-3.3.20.tar.gz 130242 BLAKE2B 52ed3235b08574d521e7400e441b9
 DIST kodi-pvr-nextpvr-3.3.21.tar.gz 130510 BLAKE2B edbaa2e1910d8f601673c55be264a93749713f893c78400ebbe790c9437dfdfefe8f156dc4ff73b09aa603f0d4bd54bd722d09bf39835720d0e3bb5d32813861 SHA512 6439f29a16d9b85b643c53a49624a2202e83597abd4d770f2caad9adbde4851d1f2f808857b5ab1bb1d1b99c7cc883313fb3a9b668240bd22ef7f4915b9a51a6
 DIST kodi-pvr-nextpvr-7.0.0.tar.gz 145031 BLAKE2B 01d8583d74111dfcb59a139987dc30cc900a41742ea28d4a0fcec11864cb6fc505dd200cf7b61c9dc3d7338ac500d014cc6a312ed8b26be6387604a7969aa9d1 SHA512 b7ede2d9f2a384816c48c19078583aa996f8d08671842444abc93a02e7d3cea9669deb67c26429aa68d3875b6644c29f467bc925768a336916b6b6a7d0894cc9
 DIST kodi-pvr-nextpvr-7.0.2.tar.gz 146987 BLAKE2B 751e08334f29f447b6abd665c782cee9ddc7a1b40a6600296a68d131827feecac3c71622aa1fc61c30d6aafa799b82f7197528c2fdd764a8a66f263493bca2a7 SHA512 8e3d0f127379263b55e565a5eafc062a265a354e23f3c184093e4f6a3ffbccddddf0acddb89321165f7c7242c6c55d22b2a033e4d52bb5cd9e48baef91d15a08
+DIST kodi-pvr-nextpvr-7.1.0.tar.gz 145632 BLAKE2B 048e006df0817390037d79c3c1f4286c8309630c21931842f52b152c389e356fb7297799fcb1eba04a11029ae55e2c88d637acfa933279f9b3b7488fc823256c SHA512 1d4fa70b1ad4988b9b7b6cf04b992c5bf5f6c7ea469dcb4c745e90b6b09d2de52ec1ec785c30dcb7cdf1703aef9fbedc2ad2b43d1bcc7c7480daef4b1fc50e26
 EBUILD kodi-pvr-nextpvr-3.3.17.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.18.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-3.3.19.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
@@ -12,5 +13,6 @@ EBUILD kodi-pvr-nextpvr-3.3.20.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4d
 EBUILD kodi-pvr-nextpvr-3.3.21.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-7.0.0.ebuild 694 BLAKE2B 9b426aec0094895fb33bc0dbb7a669c29f0fcc084a2c3c3eb611f17b2b44e4df6352d7693453ce6b09c0cdf32379b8b8c8aa07f6bd7744dba41ac2f50dbafe57 SHA512 d45bb0e67795ec68e7254a110790b51954795328c1dc92a723306c06bac1268bb6d3ddf4c6a5d89648240f8a4d542d27a0d2a5f5702a509255bab0bfc00f97d4
 EBUILD kodi-pvr-nextpvr-7.0.2.ebuild 694 BLAKE2B 9b426aec0094895fb33bc0dbb7a669c29f0fcc084a2c3c3eb611f17b2b44e4df6352d7693453ce6b09c0cdf32379b8b8c8aa07f6bd7744dba41ac2f50dbafe57 SHA512 d45bb0e67795ec68e7254a110790b51954795328c1dc92a723306c06bac1268bb6d3ddf4c6a5d89648240f8a4d542d27a0d2a5f5702a509255bab0bfc00f97d4
-EBUILD kodi-pvr-nextpvr-9999.ebuild 695 BLAKE2B d4f175b3b246881156e04f46d732b1bfadcace88692edd4f3d96a5b754dea622ed523ade4d3378dde7ddc182405a3f457e5a7e3b0b8cbb972fa708745e50d818 SHA512 f9fe29abedf0284e4e03e8f439a18a751cb4b3899b50b0940b54e63f1b50d6ce47d0b6602a6499c3adb4aaf20f9eb8b22200b4c887d3f43b678b1b160f72551b
+EBUILD kodi-pvr-nextpvr-7.1.0.ebuild 668 BLAKE2B ab018cbba41dd1fe44af666c6b1d993ff02170e76fa5aa607c9b315b08be3072007b5a7151086fe3dcdb1680ae326d0a0322c3644a7a35585ee15334cfab8ed2 SHA512 9b1b43c034b75d252e0a3c3ee1e4cbd894e206cc47882d05be06dbb54b9e1e2547e1a2f984995843f3f4b6472112b0b9dca2b2055b40274dcd12dc640ad4ac23
+EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 363 BLAKE2B 360045b62c00991268efd908e4d47cd2468232ce63afb72b10528ffaf853f5d467d4930415a0fc56360d9a7290a4e2a17225ac40b19f3d92998cfee0f47fafa9 SHA512 db285760307fda62a5e608534a3a5e531ff9a1efb6893450144f5d295b1e66b494f4daaabe41ffaf53da803f5be8ca9dd55dec7a5aa5bd118c37bd93ec2c9b9a
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild
new file mode 100644
index 000000000000..46d49f2ab86f
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
index 6ad239b88a73..0c854282c21c 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	=dev-libs/libplatform-2*
 	dev-libs/tinyxml2
 	"
 
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 5c2862a0ba81..9ea40e360bbd 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -3,10 +3,12 @@ DIST kodi-pvr-stalker-3.4.8.tar.gz 115254 BLAKE2B 865ac0123b54369bbe73e67855d915
 DIST kodi-pvr-stalker-3.4.9.tar.gz 115275 BLAKE2B bd9df715d3f5e630d4a47fe24f24515085f8a6a151545c27d5bc6b3bf4e4876672cddbd7c2d6fbd6a999b285afc6a48a29030ac72b4ed32cf10e8448235ef0b1 SHA512 16107f60529b4ef3730f7a3deb5a7cd9ee645678647248d2fff01dbc94dc7a53029a67a3709955a9be8483a13e13048dadf73a32489725b60b5c07c3a0b6a979
 DIST kodi-pvr-stalker-6.0.0.tar.gz 114838 BLAKE2B 31f567d73dc4851acd748bcfa8187014aad9451e05727cf8b8b705ec936b10b39e62c82f451c6b4049bc70c70708beae2228cb0b5ced71b34de53b497c137076 SHA512 99b9c2a2876023efe510a9970e0520804180e138d63ed1a13fb94e86b346d09c252c8edf12f3c3a7d2610d80d25cc74e938b35ecd925846f6adf648430b0938e
 DIST kodi-pvr-stalker-6.0.1.tar.gz 114575 BLAKE2B cb42fcd4ecc7c65bac75eb12579d0dcdb5827312c275a9db998953366c6a59a1033d7d26cc9db91c909d694340bb0eaf53e9d982604ec45b8cb349c4210565c4 SHA512 e71e37e7b440cb2d4e6f72400cdb457fbcdcc39893cbe70144b9ac1941429f45b00dbf7516b25a8ac874ae471a14335ce74c845239a444446b1fda97361b0757
+DIST kodi-pvr-stalker-6.0.2.tar.gz 114593 BLAKE2B 673a512ba369a85c6b08820bce845ec38d1ad4710767e585fe18f24c73bbf2b589ed3b52e3a0868a468e57094509ec2bbf1a7477c3602aafbac40095e2948bad SHA512 c8d5a2fce823e9dd00af53f12544ef6f5294b736032fc94d53312b018fb9d6ccbb9a2249cf4d41a40c89b0a0e42dbf252c7897e14c33e5f75487620260e493a5
 EBUILD kodi-pvr-stalker-3.4.10.ebuild 793 BLAKE2B f707e953708706a90f0e3fac40e06960be4ef6940787b674b2fba939851023bdb5e104259f62b5ffe341a6944ff99f178c497f421b013bb16bcdf0f95d292d5a SHA512 5b18fd82f1267c93c4e05dabb628ecabc6582b46b7ce3be7c50e89c7ccde70cc715d729cf155a18adac88a76af18f99b77d247a500cd30e09ddc02e8ea1558ca
 EBUILD kodi-pvr-stalker-3.4.8.ebuild 720 BLAKE2B b343088cf996082adfdf0fe0eabdaf2306a1574f47174896aad8da4a0ec8005315d3d764681ef8db07d12b31510c010123f915e9a55b1c4bff57fc6f28066f1a SHA512 d343af5481e62426bd4dac77c778296be9c09561c7ca0789145607b55f47333ad20a79c6dcc5ade746b925eafb9a55afca3c4f0e55dd92a586c35f67ddf8af0f
 EBUILD kodi-pvr-stalker-3.4.9.ebuild 720 BLAKE2B 43b023fbde024a5d62b884936eaff910983d90a3d391226b71a4f7f24903fb554fb7cea228ada1137292779c49a8a55699d96d956ab8c1bac05e9de10778d05d SHA512 327f30ae993028aa4c18c14525999ec9bb8da0bafe8567a6ad1a88b821989d84e8dffe59e8c43c239ab0e67167e3d4b0122e5cc5e033be4e4dfb1c8acca5ccbe
 EBUILD kodi-pvr-stalker-6.0.0.ebuild 790 BLAKE2B a4496feeb3d9c7b45a68ad3446da701dc1a9e89994a6fce095ad350d9ebca8950f8491a52d7260f3a1a1f241462b6afab2e1c3e334e7a34f6da5ce0a7b5bb3dc SHA512 52f717dd999f9ceea6e725b091f0bec8848185af2e217cff13c5f313ff823c932411391d104d399fa6b49f4d74bb2ae484a57d3e3932cd6b038db86f2fdb96d4
 EBUILD kodi-pvr-stalker-6.0.1.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
+EBUILD kodi-pvr-stalker-6.0.2.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
 EBUILD kodi-pvr-stalker-9999.ebuild 765 BLAKE2B 318d9c6605fbed8919332cab9fd6d12e3dc0af107c89666818d26e1325f46e0c4f86d5ba8275daccdf83df6958983fb22abac7f26d4a87e0059694ed15e29a15 SHA512 053da8b2b6eb218e1f33e1fcccb6c12ef7662530acb4cf19b20fef47005db281064167a1d68c6d2d9848f3ffbca13c63a82e4259c31ce732c91737be12acdfa8
 MISC metadata.xml 363 BLAKE2B 441ed938c2873d07448fa182f11a8724189e92b53a818bf5138c469f6d8cc2316b44acc96ea4caedfdb33eb125c66fa1855fdd6680123ac5a2204f2c83030d2e SHA512 9480f6ef8510d5e861be5d595a7dbc80a89099b11d545870f6b41a7a0d89515c41c08e74ed4ee7b7672c217af48e60195956aaf02f11fb81ad0bed474d0522ea
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild
new file mode 100644
index 000000000000..72e70d8feae4
--- /dev/null
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Stalker client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 701b9dc184e1..098ebf259e0f 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -7,6 +7,7 @@ DIST kodi-pvr-vbox-4.7.0.tar.gz 159117 BLAKE2B 626ad92be749bc19531d7cf156e426c00
 DIST kodi-pvr-vbox-7.0.0.tar.gz 159504 BLAKE2B b0046434338d0afbd11b965a58ce292e5c141ab4ea13e07ddba3868e1217e50dc4d266351a6b1b6c08287bf65b7eb736d8efc9074fcfe602d30df49a41141632 SHA512 7e8965422c750e00104c27f6b67d6d14648c840684702bb85cd7350647734848ebcc43bc6cf53e2edd2c432c8e1289908f43eafb87bc7cf70652026abee0177e
 DIST kodi-pvr-vbox-7.0.1.tar.gz 172788 BLAKE2B d9493cee26abd8ff74aca66ea737e81a52b835c885ba94cf120f6a78e1d3132e102af3ce2aa7eb88fa3c1a522e934ce8c0d3ed935478fd3b2092f8b86ea9fb83 SHA512 fd5caada7588d14d5cce84673cccc41831379ff10f67e2b041406f82a1790e7dd46394e5bc2a106ccb3b01261eb09a7bec76111693aa1eb5131d5f275ad8f4bf
 DIST kodi-pvr-vbox-7.0.2.tar.gz 159326 BLAKE2B a4d463e52417ef82d13ca29dae9b6cc4e1b5582994f88ea7175410bc21fd9e0461c8b4908627f06896aaa130c3970be62af7e9652a60df8495a2b84160b73294 SHA512 b8557dd74f3d0e8a25f83cf3ec2230032f6bcfcb24f1ef21f076a7e51d65115dc583f8b8898e9dd426fb81605687c0aba203774567b9d993d5de68ba4af915fe
+DIST kodi-pvr-vbox-7.0.3.tar.gz 159325 BLAKE2B c31b44ec28f6c3f1a0a031f2d435b3a2659913cf2e7a0a00ffb4006c11c5e9298e7d0354645d972b64b76ae40c111693b19cb2b262ae163d01a6d2b67806a70c SHA512 eb46342f63218285a36ca8298a021858517a11752a53af998a73969d267a28f1693d8c6b7132292dfd5e12d8903e8b5a00dda4ebf51363bdec03c6d712239b53
 EBUILD kodi-pvr-vbox-4.4.6.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
 EBUILD kodi-pvr-vbox-4.4.7.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
 EBUILD kodi-pvr-vbox-4.4.8.ebuild 708 BLAKE2B 82da36b12438ffe48516af25339aaca3ec0c6c83ff99abc1cfc167ae407c1d559009a2f0be7f348e6997c76caf98ca789b02dfa25b2a0fe4f56cd33b60e8d781 SHA512 59818b2236c903f2bec98ffd83dbf0c97d370f208adf40154440377f4dabf1286acbb3aacf968915e14c4dad53b6f38e88e8f8e034342366553ec03a93dcbc10
@@ -16,5 +17,6 @@ EBUILD kodi-pvr-vbox-4.7.0.ebuild 702 BLAKE2B 50693d53e28e88c2713b96531ba2f34873
 EBUILD kodi-pvr-vbox-7.0.0.ebuild 699 BLAKE2B 3ca6d54444eeb7e3107e725698ca26ccbc881b4f836ef001099aa38858bfb18d6b9efb2696f76eed9ac4c2068a3c04d361306a65ac4db2f1666494a3b32ec2ac SHA512 d977479ac9890ac3a1fd2206aa27bb27b2fd3a109a3ab9c57c8910d738e517168553891e9e80563493ce855ffab589316cbad3acb9d43abc10173c9fdde719cc
 EBUILD kodi-pvr-vbox-7.0.1.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
 EBUILD kodi-pvr-vbox-7.0.2.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
+EBUILD kodi-pvr-vbox-7.0.3.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
 EBUILD kodi-pvr-vbox-9999.ebuild 674 BLAKE2B b592bbd6fe222c5d78f91cffef013fda2b46bcb9f973f0d28271d176551c00aa4aa17f93af173109243fd0848301fb013adb2243b622a55a58c5fe3c86ac16f3 SHA512 07a6264c0db07e3f8d6bf45c206de39f737ff185548c669d6c84e2b2c1193169027145a2cafdfb37ff72ffeb33ea5f714a8d45f86869bbe9cda53f95aaf4666d
 MISC metadata.xml 360 BLAKE2B 6dd189877e8d7b23ca5520768e4450c561c0a74ef25a60130ad676d95f97762028baaad86d487d7c5def4f715ac1f8b06ff1458d78c1b03ca5e128790bc0f7b6 SHA512 3b81e335f3205bc319e458667e92fde865cedf5a9721793b67d9a61067ba839aa70b9d91ceae8eae6f382d1104b6e42bd5f4f427bd8499810c2f51c3f1ce611d
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild
new file mode 100644
index 000000000000..9ffd4c8c835d
--- /dev/null
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index e4f31cb172c7..f5bd3dee50c5 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -2,5 +2,5 @@ AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3ed
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
 DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
 EBUILD live-2020.03.06.ebuild 3309 BLAKE2B dbdccb12baac1a91f5e3b5935fe1d1a7ca274bb95315e166dd211e90b79483c4ec65a107c51fe0c0c1bef87e31b2a139d71de007a07335d5609baf89f44cc797 SHA512 570363972e35b906f29df0b71289505a49828752d207946a638aec5e6f3cc88350fbc0867e8cc67dd997c9cbe188187b413a928ecc772c28bdbe801ff1235535
-EBUILD live-2020.05.15.ebuild 3171 BLAKE2B b97290749364f82d1f0cf5ceaf9c87ddf3dbe5937bbf76a16c265bb2b5ec2ebdb8eef6861a8d5a14d231af6b59f04aafe5d45d397b92184812abc4201f7edd25 SHA512 dab4a7fc72936be392172a2fe9e020d092939d6943fd60c6a2aa2da03c143fa4ae7700c6b137a2a5f75e6acbe62db1d12ed521d4d743c9ace0ff65c091ed70fb
+EBUILD live-2020.05.15.ebuild 3166 BLAKE2B ecf177c8f36e28c451c2b6e45742bb3a4d308f6b885e63052f2978660a9b6b01f226fa743d32f4a5329c679a45b84b8133727f8fee0c413d970140b82f9be8be SHA512 b6324e8aff1219d6940e2eab0ae6ef006578c01e5b5c57471cd855205a5733991ccafafcb7e3af416ed9ab46b67830a6e6c7b22507419cccd9561e7a57f3bc0f
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
index 4f30941cdf98..49ca6245f945 100644
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index 72e50935e108..c7e9b0203076 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -1,7 +1,4 @@
 AUX swh-plugins-0.4.17-system-gsm.patch 1365 BLAKE2B d1e0d86384f47d0d096b12d4e216b53aa3e9df24a7dc11fe79667cee369b4001ffe0e972ff2bc761b8b892a470d15e631da59a6cf7c2c3254f6548f194745a13 SHA512 57e0f6976cd1d91ce453947f7f013d81b56fb27094f4c653ffd033baaf7d4d77bb52167fc912d84b6eef207e34590edb4cee4bc7d676dea116a4ad34b06436ea
-DIST swh-plugins-0.4.15-patchset.tar.bz2 5208 BLAKE2B 5ed8f49ddec0a8ed34fab05defc9489c6ae563f824f1514845719ee3716847cbeb023152d3ac1522e28712845ecd14ab62b4e4c466e9385a3df6fa3dc9a970ab SHA512 b2d016c52fa3cb90e255f26f1e9f7410b7a44b50e0ede0acc5a3092abbb65fbb455c3c3eb0059083f40556e00f95262a885c8970a8b25c310f73af6913973fc5
-DIST swh-plugins-0.4.15.tar.gz 1051623 BLAKE2B 8b18cd558160b58ad09662b3aea69ce928daa812bb5aa8089423a504a103fa6e29b4663b9bd827230742b1d7c6570c9b671b4a25cdc54e794b465edb36743a07 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03
 DIST swh-plugins-0.4.17.tar.gz 456472 BLAKE2B 827e5c0d6ac692636904df64d1af8d94488f22a26cf09586b0ad32bec9017c9f3cd66074d8f786f5722e4918d32ff27be719561005273f2dcee81ea8690d6274 SHA512 6b566030b43c3929ce8938648abd458efa0fea0b4916410a34b4f4fa788c45e4a6ec3f46ca435f8546179ff0c4674303db22314e1c1f1d09e5f2b71e6c5aecc7
-EBUILD swh-plugins-0.4.15-r3.ebuild 2023 BLAKE2B 36febc87621052eda9e1eb3207a4698f5e7257c1479798877d80660ae9804aca9abd909bda05c606278d2b2648458b1412112ac0db92f593fded89da53ee7689 SHA512 5dd79fffdbd2022108b3283b97c7c1a57b7c7e6aa099520fc81eb25dc1940e03da5c89e9eb89c1f41fc3b4eec4c0c480dd9345f483d24061c46d8bcbb61937ea
-EBUILD swh-plugins-0.4.17.ebuild 1679 BLAKE2B 204e3a2a9d84f32bd2942d7b577eb242734f4202b36395169ad528d5bec0bd9488b0e7d23281e12a8d7af1164d905d49b99d4655d305e21a34ad2648e53091c3 SHA512 c43fe029fe27d77b179f33f1ac16ffa388fbef2bf925f4772de421a96efd897b958812d9c8a1835c7a15406a7e7b61af634ae38c9314e35bf41116508cdec90e
+EBUILD swh-plugins-0.4.17.ebuild 1678 BLAKE2B e2434b96b64435ed4b2bf530b8724ac1dcc564437ede44d46042fd3aeacbb5e6453bc88e528d0128511091ac032ae325f53c8ab7296903677c35ff3d82f245d3 SHA512 3365774353ade054fd47b75c3cdd3c153d86aa540152df2f0612bd4dd73a661c096e57837754f816c43c78a041d39cdd8a32ab521bb716d5fbe3f75cf0b281f6
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
deleted file mode 100644
index 88acf6e44d88..000000000000
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="Large collection of LADSPA audio plugins/effects"
-HOMEPAGE="http://plugin.org.uk"
-SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_3dnow nls cpu_flags_x86_sse"
-
-RDEPEND="
-	>=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}]
-	>=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	media-libs/ladspa-sdk
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-patchset/${P}-pic.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-plugindir.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-riceitdown.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-gettext.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-x86-asm-optional.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-glibc-2.10.patch"
-
-	# Use system libgsm, bug #252890
-	rm -rf gsm
-	epatch "${WORKDIR}/${P}-patchset/${P}-system_gsm.patch"
-
-	# This is to update gettext macros, otherwise they are incompatible with
-	# recent libtools, bug #231767
-	autopoint -f || die
-
-	# it doesn't get updated otherwise
-	rm -f missing
-
-	# old shipped version breaks multilib build #475022
-	rm -f config.h
-
-	# Fix build with automake 1.13
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-
-	eautoreconf
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable nls) \
-		--enable-fast-install
-}
-
-pkg_postinst() {
-	ewarn "WARNING: You have to be careful when using the"
-	ewarn "swh plugins. Be sure to lower your sound volume"
-	ewarn "and then play around a bit with the plugins so"
-	ewarn "you get a feeling for it. Otherwise your speakers"
-	ewarn "won't like that."
-}
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
index 04bb843525ab..aeb2c673ccb7 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/swh/ladspa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="nls cpu_flags_x86_3dnow cpu_flags_x86_sse"
 
 RDEPEND="
diff --git a/media-plugins/tap-plugins/Manifest b/media-plugins/tap-plugins/Manifest
index 3975afc7350d..485cca45fe45 100644
--- a/media-plugins/tap-plugins/Manifest
+++ b/media-plugins/tap-plugins/Manifest
@@ -1,8 +1,5 @@
-AUX tap-plugins-0.7.3-cflags-ldflags.patch 901 BLAKE2B fac21c62373310ec7a9a1ab067cbeaa8d202f4cc54c84c11757122786f24a2a811a3a032b6d7eb37d43261946160f74ab33c58d50d777a45a152dfe9535f9803 SHA512 f345e823400b7ea3dcdc8a880cc16d476dc4f55662eb041d2ec40de6763c52c05019990a762fd623c257c870874940c974b628e7ce315d6e4cc4babc70e28a90
 AUX tap-plugins-1.0.1-makefile.patch 1548 BLAKE2B b718586d51cb7e843c71a41965f08331510214cbb533d6464df5c33520021d818b9943bdb39c526f42611accc4000ff62e0f1175b3ccbccacd7b462312957f27 SHA512 c56af56531b10b6b0ff016813779280ff1c9bd52e6b79208d431ebc4c0e1e3cbf4150005997466492791867a1a8044824f0d3339cb4db567f8823bcf6e2d4ea2
-DIST tap-plugins-0.7.3.tar.gz 70495 BLAKE2B 6e0974be78fa9a8092555282d1d8a3cb5d11731e78119bd0f71e843f6a7557aebd48cc2c8f3cdcc4f90e52eaea357926c0ad2fc9bd9c95bb361ecb7d181f098e SHA512 c4e9c93b9fd8afb82067cf3a48ae665843da775c3af6124147ff1f8651d96734a4b961c4c5ea48877b32770e6d0b5a793af32a5cbb6e3b9afd5b59c8b3cc2621
 DIST tap-plugins-1.0.1.tar.gz 64649 BLAKE2B 2b8ac9a26197f5c980512d33daf4c604d7bb3046fb40e3826d559d4420921a0e124a5577d53d0896bc92111f69765f714d5f55a9da60546e2e6f29e5c851b2a5 SHA512 25f72bba83a5a40d480bc9d4659b64096102281d02e43ad93d5064b0ef7972184db40162d1ef78fd783f431740a4c4d5e03160cdd5f43da3bc1570ff462c863a
-EBUILD tap-plugins-0.7.3.ebuild 675 BLAKE2B c84accc1815f5c1e6bc6752b260236568b382cb6d0d38157452bf8936d86eb64766df99415b5d040b35f109cd22de5b247ffc65dcf9a1ef62e07d117952ce507 SHA512 983f48fa26c940ac111e741e9be49d5e1effcd98122a0dcbbe3a988a3464aaace46f22144e1757cfd15e8cb6e75df04b2e4af1bcf7f6b2875a3f18becb015833
-EBUILD tap-plugins-1.0.1.ebuild 955 BLAKE2B fd0d3e11339ed8b3e8e1e887ac4805b58bc5a568593e4cc6bc8302de49c4a1631e1f8310f5dc83b0341b09fa8515d1acfc639abacc17b0f8221e5e353ebe9fa5 SHA512 22d375119495c70404c0a7255bc1ea3e1b8961b316ea06fe23e7a385c5d07331e46839379880e103f5ef41d3f117499ba4c5921e542251c7d5e9c53140e95ec4
+EBUILD tap-plugins-1.0.1.ebuild 960 BLAKE2B 8152fb944ce70a62affa51456d3fe3185064eb0e68eefda9b5550516c38626849be26541aaeef96518cd931a3a732cb357ad724664bc09a615e4e49431854bd6 SHA512 ed01b69b285a13cadb5e6713356afa8c3dbae10c3d7a0e8066dc4296d98e6210d1cd2379c0d23ec0ad244a51227836b880b99e723136311911342806d6edd3c2
 EBUILD tap-plugins-9999.ebuild 953 BLAKE2B 955ee7aaf2582bd151677301b706876055e9f4149780ddac1da5f122908d5ac911c5e24265a6de4b8643796f58cd2d7ae354e84ab57d59f89ebed747ba4e6381 SHA512 2baa08d658443f9312ff659ed02aa2c26020d8107a86525300c84ebfed9ead1a6e99301a8354e58d4a7f6ab56c80a3211760376f876095d09c68a2c27d489930
 MISC metadata.xml 1616 BLAKE2B 55ad5ec5fb9218329bd3454b553115c4139d71d6d31a182e0e35750e99963b8b83de92b9c82df3928f7a570395b9bfdf8d5a171a1ff33c7c8443875dca7af9e7 SHA512 876598a8cda8a0331c5fd97d04984a222b2e6a9c0aeffe780f5e970dc1914c75c7e56701fcfa42ef318b0aa88183149f498346a23c5990d6bd7383199c875e01
diff --git a/media-plugins/tap-plugins/files/tap-plugins-0.7.3-cflags-ldflags.patch b/media-plugins/tap-plugins/files/tap-plugins-0.7.3-cflags-ldflags.patch
deleted file mode 100644
index 0bfaa5873d23..000000000000
--- a/media-plugins/tap-plugins/files/tap-plugins-0.7.3-cflags-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: tap-plugins-0.7.3/Makefile
-===================================================================
---- tap-plugins-0.7.3.orig/Makefile
-+++ tap-plugins-0.7.3/Makefile
-@@ -35,8 +35,11 @@ INSTALL_LRDF_DIR	=	/usr/local/share/lads
- # GENERAL
- 
- CC	= gcc
--CFLAGS	= -I. -O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC
--LDFLAGS	= -nostartfiles -shared -Wl,-Bsymbolic -lc -lm -lrt
-+OPT_CFLAGS = -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math 
-+CFLAGS	= -I. -Wall $(OPT_CFLAGS) -c -fPIC -DPIC
-+EXTRA_LDFLAGS  = 
-+LDFLAGS	= -nostartfiles -shared -Wl,-Bsymbolic  $(EXTRA_LDFLAGS)
-+LIBADD = -lc -lm -lrt
- MODULES = $(wildcard *.c)
- 
- all: $(MODULES:%.c=%.so)
-@@ -51,7 +54,7 @@ tap_dynamics_st.o: tap_dynamics_presets.
- 	$(CC) $(CFLAGS) $< -o $@
- 
- %.so: %.o
--	$(CC) -o $@ $< $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $@ $< $(LIBADD)
- 
- # OTHER TARGETS
- 
diff --git a/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild b/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
deleted file mode 100644
index 83292e0c71c5..000000000000
--- a/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A bunch of LADSPA plugins for audio processing"
-HOMEPAGE="http://tap-plugins.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.3-cflags-ldflags.patch )
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	einstalldocs
-
-	exeinto /usr/$(get_libdir)/ladspa
-	doexe *.so
-
-	insinto /usr/share/ladspa/rdf
-	doins *.rdf
-}
diff --git a/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild b/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
index 8a6aaa6f9754..353685e11e78 100644
--- a/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
+++ b/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
@@ -6,11 +6,11 @@ inherit eutils toolchain-funcs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 	EGIT_REPO_URI="git://github.com/tomszilagyi/${PN}.git"
 	EGIT_PROJECT="${PN}.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> $P.tar.gz"
 fi
 
diff --git a/media-plugins/vamp-aubio-plugins/Manifest b/media-plugins/vamp-aubio-plugins/Manifest
index c09e1aa63b23..d1718e320fb6 100644
--- a/media-plugins/vamp-aubio-plugins/Manifest
+++ b/media-plugins/vamp-aubio-plugins/Manifest
@@ -2,5 +2,5 @@ DIST vamp-aubio-plugins-0.5.0.tar.bz2 26253 BLAKE2B dc05ef4d642fee389e60dee5ab46
 DIST vamp-aubio-plugins-0.5.1.tar.bz2 234156 BLAKE2B 99b064a2d2372a6c42e1251ac5d29d0cc607543b4e651c3b006106bad888c9ab22fcc2a907acde135d7e663187388a52c2513f8845501908318ff9d1c0b5df9b SHA512 ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e
 DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
 EBUILD vamp-aubio-plugins-0.5.0.ebuild 713 BLAKE2B 5b57027d701cc2ac58eee1ba9c631846308ee5745d2333ba344d51d3df2a405f761bd777512ef95c4b3484ec00ba8d72f3a5a0e6fb024a0536b6ce2dda73d651 SHA512 6f3e282f95a70c6f2cd012a9fd25ea3cd687f41eab1dbb6b661189eab757c754483e830a6d38a174d591af50ba679117f8cc23b3bf8df5e3a14883e1ce2c2b9b
-EBUILD vamp-aubio-plugins-0.5.1-r1.ebuild 820 BLAKE2B 90eaa5175c589aade3cc1785561aabbd74e225e8ae4b688c119d08fe11f92d1e9a75c0c43063cbd5e1f6fab28d000d684ba86decdf7fcd61b93e2b72bcad64d8 SHA512 718cfa1becc72fa25eccc620c9937ece4a06e2e63a6bbcea11088c5d9fbf80911d8f919c3ba0dc0f809940dae43430b8fc68782d6b913b1b510ff386cd941d17
+EBUILD vamp-aubio-plugins-0.5.1-r1.ebuild 819 BLAKE2B de791b5a75fe11442a6272d0efa0bae95a47e31a8de924099b1be1f73d6b61deb2a6f965e26bc911e3754076b4e9050e9cadc67cac19ed8f0fb6cb7f5e861818 SHA512 e21463d2f6a33a4556e354fad48dd6d8753c89f69551c63b3bb7d55d68f9a4557949bff360b8236ec5d839045471af88c817fb61638d5847f58c33594197da59
 MISC metadata.xml 333 BLAKE2B 757b233440a9b77b19c9812c5469814f18f4ef144588f81520a2458aff7cb4b404ec0a9255f12409881593dce35bcc3c9893daec4fb71e24668904f3bcca1d8f SHA512 355bf8dc7fbdba79cd07d3b4754b301d368c055534932400dc46172a1b0f4d800490dee7ecc7187b6bff0e8be618434e5fe3030dbbba55622033e161c58f8fe1
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
index a718fed01412..cc300e026389 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/aubio-0.4.1
diff --git a/media-plugins/xsynth-dssi/Manifest b/media-plugins/xsynth-dssi/Manifest
index ff46ca15213c..8fb892c2bf7f 100644
--- a/media-plugins/xsynth-dssi/Manifest
+++ b/media-plugins/xsynth-dssi/Manifest
@@ -1,5 +1,3 @@
-DIST xsynth-dssi-0.9.2.tar.gz 451758 BLAKE2B e1a60cd3ed8eb5fefad02fc21b1cfd54803f0ab75601ae9bed61142d179802fe30fc99690bf2725e8072fac06aec66eaf016cbadc4fc28d6bbd1561bf89c8da3 SHA512 e8ebb42de0b0b84fa792571eaf3ccc18d0a059396aae547843562f948b9e085e6e229cd3b475cbd5060fa93f8017d36ec92d17822a29bc01c2392519aad006c0
 DIST xsynth-dssi-0.9.4.tar.gz 465783 BLAKE2B 100161f4d7f984d84de7cee5e36afe65e9f3940918b7e945f63c66a615189a2cb10a8e879c549bfa1909e1a099862a1e51ace3ceebd3f60df333c80d387ca30a SHA512 8c67e5fbbc35e6dfd0cc30733d82e1cc6478f3a63a48e080da579fd90ecad22b10b3681ba1e610819a0891f80caabec5350532b9888e6f6044469b2aa92055cd
-EBUILD xsynth-dssi-0.9.2.ebuild 516 BLAKE2B 1741cca8bcddb6ec76da165d42e302442c7d1dc1ea0b53e49337c5e79008a7e1e8ab2eb5792f27b446d0abac9c187f8711eebd77a57e342c7bc13e7c9b335fca SHA512 d30a81634a1f1e9a9639ca75cdfbd68fa4d87cff6f1f817ebcd6b04c7f698cdca665f1659b2ef27d24823412efab0a8251cd93d92832eb5865d832b016743b68
-EBUILD xsynth-dssi-0.9.4.ebuild 517 BLAKE2B f1416b17897ebbbc07eaf47987de4377ce929a99686c4b2df849a23f72e6c47ff28f65bf8f5d1950402f6e74574aaae70ed36ee6bcf70501d6a2e0e13dc61365 SHA512 9f19adb5f892059aeb194d13db1733db5b88cfd6cd1d977575a7383f320888710d6553c2955e83442cb00259a9cb1824de5f810318c5509fcaaea9b4c1189884
+EBUILD xsynth-dssi-0.9.4.ebuild 516 BLAKE2B 4954ae8e319c1313c06dd856029639060c4a6fc52f7883e69bd9f86bb932b2da6ce7fa71e5c23eeb56e7fe2c8c95ec983be0e5ff829afe45340553a1906034c7 SHA512 23aec855936f77f3032bb31ad903be7a678c81a955b42cf9f0c849dd71e12c41886152e9384e497687f136683da21de1b7c67e66cca12c53c4508a9542687228
 MISC metadata.xml 333 BLAKE2B e39f496c64a33bc34c7f8f6401731cad91786984d96c0707e4fa3c8d21157f54a0b4efba3d654a3fb19b51a85422f93962730e28ad1699ed0b2e80f1d8864f1a SHA512 051e33a55f071b13cb45d35abc79ae192a053e55186051f5cf166c126145d222739e16e96e59ee58d119b103568714eae67d149a6861332d19fc0a5a8c8fb83f
diff --git a/media-plugins/xsynth-dssi/xsynth-dssi-0.9.2.ebuild b/media-plugins/xsynth-dssi/xsynth-dssi-0.9.2.ebuild
deleted file mode 100644
index 2422f4f85b80..000000000000
--- a/media-plugins/xsynth-dssi/xsynth-dssi-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A software synthesizer plugin for the DSSI Soft Synth Interface"
-HOMEPAGE="http://dssi.sourceforge.net/download.html#Xsynth-DSSI"
-SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	>=media-libs/dssi-0.9
-	>=media-libs/liblo-0.12
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	media-libs/ladspa-sdk
-	virtual/pkgconfig"
diff --git a/media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild b/media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
index 59ee28e5f92c..3869375ba160 100644
--- a/media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
+++ b/media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b83166b2faf7..f1e8459fb813 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 81b002695c6e..2021d2ea0ebf 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -2,8 +2,6 @@ AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c786
 AUX check-key-before-remove.patch 1888 BLAKE2B d8bee7f8acac213396d18d44740703746653a57d300c8d86967e83c24b73aca7d8ba5e91e38d7c3683d40c2a520cacb29210e2c1d739bf4b0403199beb9bda81 SHA512 e7edf75cdddc94a433ce387853cc59cfa40ef7fbdc955357141f42133bf9bde4e6528078d75c7d58001ab07dcaf209b0437a92445d770f6cd08f9b919e97caa4
 AUX man.patch 1054 BLAKE2B 37228832250f1c1e06edf79d00a4a4d7d5433f2d9b28ebb10eacb54bcfb7478d9ef64459e87f7f43a94be0b194eba024cde60175fc324ef6dad7a4ef9e2c1db3 SHA512 c2b05dd8c42f79994ae3be5df5ac495e95bfbc14355423faa75b23863418bad4bbc33524e2b86abc9e346678256c1ff454c160ebb5e09f48d466ef99cdfa407c
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
-DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf SHA512 366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007
-EBUILD apulse-0.1.12-r4.ebuild 1449 BLAKE2B a906511d311d43c9c45f8f292c02b98add6e3d74d7fc9402a4ec9a6629ce70cdb839a98a5a23179ccdb8e821fc3016cabdb5679f4a2ddb4c0de02efd6202e8a3 SHA512 2b865a68d87ee96c614f92263936c3d9f0a183a603af84b8b46f306173b06ddd86a553b3f1c05fa8a860c2fe3582e0f650c14f29d2530b138e0ace95bf60bccc
 EBUILD apulse-0.1.13.ebuild 1665 BLAKE2B f200dcf1e3ff2829528f20d70d4a4d1d8e9a6b1c5a743c43d4e718f33533de85e022b8b66dabb1098e873994888c52389c8e41dd6df744a69493cfdfb447cebb SHA512 464984d964c6e4615ff6185f8483cd832f5b69427e1aed92b12ec14ef47df023faafeaf0439d3250f9a7ae119bf33bc140f39aff1af2c6e12b672629c2e17d2e
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
deleted file mode 100644
index c91aa5a9d138..000000000000
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug sdk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	sdk? ( !media-sound/pulseaudio ) "
-RDEPEND="${DEPEND}
-	!!media-plugins/alsa-plugins[pulseaudio]"
-
-PATCHES=( "${FILESDIR}/sdk.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use sdk; then
-		# Ensure all relevant libdirs are added, to support all ABIs
-		DIRS=
-		_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-		multilib_foreach_abi _add_dir
-		sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DINSTALL_SDK=$(usex sdk)"
-		"-DLOG_TO_STDERR=$(usex debug)"
-		"-DWITH_TRACE=$(usex debug)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	# Do not use deprecated MULTILIB_CHOST_TOOLS
-	if ! use sdk; then
-		unset BUILD_DIR
-		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
-		multilib_foreach_abi _install_wrapper
-		dobin "${T}/apulse"
-	fi
-	einstalldocs
-}
diff --git a/media-sound/codecgraph/Manifest b/media-sound/codecgraph/Manifest
deleted file mode 100644
index b87240d639aa..000000000000
--- a/media-sound/codecgraph/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 20120114-makefile-prefix.diff 657 BLAKE2B e9d0758a24066e29ba6f55e88dae0c4a351d111dabb1c3d2c914dd4d510f3e7d3cbfe40c78b5766eb11740004ada979edc973c59b0871dff38206d505d81898a SHA512 7d5fab593aefba8175e1e6301a1b47ad78de6efd88f30401a57e3693c022cc1af1073a1fab54f5bafb280a120b458d68f7ae53323d0200ccf66c1ce0f4e48097
-DIST codecgraph-20120114.tar.gz 94168 BLAKE2B 8c7a30d86197f53a8feb39c56257e7ba6b55eddee92963f04c35d8ed018f0369d83885f092c2d4ae040a77c166f65a29fa523018dcf6e29ddc437e6c50420b6b SHA512 85053ea83707c817e5d190a981458b271814602fda36757dd4dd14ded3a992abc613f4023dbb9eac7d10589f32fa1489fc68c98e80b235588fcde5390bdc099c
-EBUILD codecgraph-20120114-r2.ebuild 680 BLAKE2B d6f6783dfd406fce7a75cf15fb8e85055ade9aab3c6b15c699826e4e806d7c39f4f7361d1600858fe3f6e45f344971ae429749bde2511f4bb3c2e00595b0127c SHA512 d0f63d7e5c5ce98c601b102dccc838406b353fd46f7193e655c29ca92849304f1cb4fc5ec808f3eb094f24bdc990c870b02bfb219a410b8b381bb2d31f8d9354
-MISC metadata.xml 355 BLAKE2B 0b4bd7ae8bcc459e4ad681ca7063761fe84a6218ea53cca6c601a2da002c5d90cebb34f1d322cab5c2b3d1810d7a6f192ed8bf5fd0f448c1ed5f2ec07c43155f SHA512 67f7562f4f2882838136fa69cfc0927da31bc1f75b0e3226ffc8ae1ae0bb6997160b7de36294bf757b566a79e8937e1aafd74fd59e5978a4ef847fb1e4e876be
diff --git a/media-sound/codecgraph/codecgraph-20120114-r2.ebuild b/media-sound/codecgraph/codecgraph-20120114-r2.ebuild
deleted file mode 100644
index dfe7a09d932a..000000000000
--- a/media-sound/codecgraph/codecgraph-20120114-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Generates a graph based on the ALSA description of an HD Audio codec"
-HOMEPAGE="http://helllabs.org/codecgraph/"
-SRC_URI="http://helllabs.org/codecgraph/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick"
-
-PATCHES=( "${FILESDIR}/${PV}-makefile-prefix.diff" )
-
-src_configure() {
-	python_fix_shebang *.py
-}
-
-src_install() {
-	default
-	dodoc codecs.txt IDEAS
-}
diff --git a/media-sound/codecgraph/files/20120114-makefile-prefix.diff b/media-sound/codecgraph/files/20120114-makefile-prefix.diff
deleted file mode 100644
index 2636fad59e57..000000000000
--- a/media-sound/codecgraph/files/20120114-makefile-prefix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr codecgraph-20120114.ORIG/Makefile codecgraph-20120114/Makefile
---- codecgraph-20120114.ORIG/Makefile	2012-04-20 11:46:16.585852026 +0100
-+++ codecgraph-20120114/Makefile	2012-04-20 11:46:50.730851052 +0100
-@@ -1,4 +1,4 @@
--PREFIX = /usr/local
-+PREFIX = /usr
- DOTTY = dot
- 
- samples = \
-@@ -87,7 +87,7 @@
- install:
- 	install -m755 -D codecgraph $(DESTDIR)$(PREFIX)/bin/codecgraph
- 	install -m755 -D codecgraph.py $(DESTDIR)$(PREFIX)/bin/codecgraph.py
--	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/man/man1/codecgraph.1
-+	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/share/man/man1/codecgraph.1
- 
- thumbs: png
- 	for p in $(pngfiles);do \
diff --git a/media-sound/codecgraph/metadata.xml b/media-sound/codecgraph/metadata.xml
deleted file mode 100644
index 5f92e8882156..000000000000
--- a/media-sound/codecgraph/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 03c469550adb..a1ac4a7db3a2 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
+DIST elisa-20.08.2.tar.xz 1634688 BLAKE2B 6c30d48762a7bed8064da5316070a5df05b72e80166e72adfd76bb0a99f44de48eaee22fa6f22336f0be491df5dee75dc2786a43276d0eef8b1ec087a7776bc3 SHA512 1aae9b8464ee1a6190cbd0d37bfb3c8211eee55c3882efd8bbcf2f9ef481f15212b9e5dfdfd468486e7f6a49fe79722a51767ddc19f1c63864ec45ae2d371ba5
 EBUILD elisa-20.04.3.ebuild 1652 BLAKE2B a9a35dfbe3892ccf19a15195236fc0c26fecc770c5ad0ab9471506bcca11eeb696f6b8670d558b14901c6a01f4d4c054c6930d07f5e57d933479a33ec0acd42f SHA512 1dd4cf67f5fe799e5c60daa24a77510c3172f7e9779ea57d33d5045acbc2b3c6e7006bc850bb105d7e76d65f403c43619b1ca91f12ee2c83203108a62e2d1673
-EBUILD elisa-20.08.1.ebuild 1664 BLAKE2B 1cbb080fa448357801a6d6f8ba0ba3236673b6f2f2e198e21c2966b8080379b6b56f385c6b5bc4df0b1ea33ea0e5b809bd77c05714989bec79a14a43b5c79d46 SHA512 acf9ca4b313fdc6c48023acb8d615570ddaf2e626e4afa8aa9725c089115eb09e135fc42479bdcb57563812b6eba3ca4f062b47996a47433f67ee2bbfacd25c3
+EBUILD elisa-20.08.2.ebuild 1664 BLAKE2B 1cbb080fa448357801a6d6f8ba0ba3236673b6f2f2e198e21c2966b8080379b6b56f385c6b5bc4df0b1ea33ea0e5b809bd77c05714989bec79a14a43b5c79d46 SHA512 acf9ca4b313fdc6c48023acb8d615570ddaf2e626e4afa8aa9725c089115eb09e135fc42479bdcb57563812b6eba3ca4f062b47996a47433f67ee2bbfacd25c3
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.08.1.ebuild b/media-sound/elisa/elisa-20.08.2.ebuild
similarity index 100%
rename from media-sound/elisa/elisa-20.08.1.ebuild
rename to media-sound/elisa/elisa-20.08.2.ebuild
diff --git a/media-sound/freebirth/Manifest b/media-sound/freebirth/Manifest
deleted file mode 100644
index 570f244f3c23..000000000000
--- a/media-sound/freebirth/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX freebirth-0.3.2-gentoo-2.patch 6589 BLAKE2B 44c1b99bd2ca3870a44cd8305e1354ffecd629ffc998bf124d584af40f4b71a97cff017e47e2d498fbf2b5f4f24500e385266c274dbd0e562b14f0ea6400773e SHA512 9ce3c911276b5f732c478b64e343b73aa3d0f0f805a594ba4c26e6d93eda2db2b056261a50fedbce6e27ccd3dd8889c384176c02fb78b70cc90d983696766cc4
-AUX freebirth-0.3.2-segfault.patch 519 BLAKE2B 5ed47d231e49f87052f433aa8b044c67fdd2e89fe7f746688a235ea7993466a4384d27bd81cec7871939f92dece4e71598ab272d025a52e54419c318eb9589f5 SHA512 61bacbeaa5599a88f3f7a446ab2300f3a611c86e8e728b9d847322e9d8cc4b54a6580428342025322e01e0b4a1cf8a3547ce873842704a98f9167f5a3e67d0c2
-DIST freebirth-0.3.2.tar.gz 2456900 BLAKE2B 1000dbf87cb1138c7650e26a5d2c8ff08c986ab86a24742f43d5334c2b02b6e88231a3131ca437fd3bbb6ce024b91a1104cce3e3b369ce0087b4f9cc451f626f SHA512 a532905e687d8ebc415dea3794a4dfc4c55037123c79cc0dd2111fc74e6db1ba367e8210da75e3586c5ee4d2521a21b5cd03a5a0afcfd3a04e678834f140590a
-EBUILD freebirth-0.3.2-r1.ebuild 763 BLAKE2B 74f38e3c8886b821f80081ecaf238ada59f7667615c27763713b5420f075b3200cfae19a79b268ba4dd6300627cad44d4e8b79461c6136cfdbe70c8d658a8c80 SHA512 0f6175f17f99eb7392f99428395fd8231ef428e4e7c36dcdfbc4c59708b148798f85ae1e7e2bd4f9c7dab6a1cc28cb19bbc9d7deaf13850f214f1ad0e66e23b9
-MISC metadata.xml 325 BLAKE2B 3925fb11706ee3f27ebc7c1390c91ae55f2b69d8aa3c694a87869597efb17d4212d99419245ccdafa039c427d01fab40f22df9d0a27c3c25a69e28ef5c89bfca SHA512 633be59eb61315afe57a92345666505b9428cbb0b910ffc550803bbebed0258fd838197b69349e998ba346a1e4703b99f474db977eeef690633956176231b4a2
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch b/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch
deleted file mode 100644
index 52b184b04b2f..000000000000
--- a/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- freebirth.c
-+++ freebirth.c
-@@ -248,15 +248,15 @@
-   //bass_e    = env_new(1025,10000,(sample_producer *)osc_blender);
-   sl = g_slist_append(sl, bass_e);
- 
--  kick   = raw_wave_new("raw/kick.raw");
-+  kick   = raw_wave_new("/usr/share/freebirth/raw/kick.raw");
-   sl = g_slist_append(sl, kick);
--  snare  = raw_wave_new("raw/snare.raw");
-+  snare  = raw_wave_new("/usr/share/freebirth/raw/snare.raw");
-   sl = g_slist_append(sl, snare);
--  cl_hat = raw_wave_new("raw/cl_hat.raw");
-+  cl_hat = raw_wave_new("/usr/share/freebirth/raw/cl_hat.raw");
-   sl = g_slist_append(sl, cl_hat);
--  op_hat = raw_wave_new("raw/op_hat.raw");
-+  op_hat = raw_wave_new("/usr/share/freebirth/raw/op_hat.raw");
-   sl = g_slist_append(sl, op_hat);
--  samp_1 = raw_wave_new("raw/samp_1.raw");
-+  samp_1 = raw_wave_new("/usr/share/freebirth/raw/samp_1.raw");
-   sl = g_slist_append(sl, samp_1);
- 
-   sources = (sample_producer**)
-@@ -1087,7 +1087,7 @@
-   
- 
-   /*effect window */
--  effect_window = gtk_window_new (GTK_WINDOW_DIALOG);
-+  effect_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_window_set_title(GTK_WINDOW (effect_window), "Effects");
-   gtk_widget_set_style(effect_window,window_style);
-   effect_box    = gtk_vbox_new(FALSE,10);
-@@ -1109,7 +1109,7 @@
- 
-   
-   /* sample freq window */
--  sample_freq_window = gtk_window_new (GTK_WINDOW_DIALOG);
-+  sample_freq_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_window_set_title(GTK_WINDOW (sample_freq_window), "Sample Pitch");
-   sample_freq_box    = gtk_vbox_new(TRUE,10);
-   gtk_widget_set_style(sample_freq_window,window_style);
---- fuse_loops.c
-+++ fuse_loops.c
-@@ -122,7 +122,18 @@
-   fprintf(file, "/* generated file -- don't edit */\n");
-   fprintf(file, "#include <unistd.h>\n");
-   fprintf(file, "#include <math.h>\n");
-+  fprintf(file, "#include <endian.h>\n");
-   fprintf(file, "#include \"freebirth.h\"\n");
-+  fprintf(file, "/* borrowed from glib2 */\n");
-+  fprintf(file, "#define SHORT_SWAP_LE_BE(val)  ((short) ( \\\n");
-+  fprintf(file, "    (short) ((short) (val) >> 8) |     \\\n");
-+  fprintf(file, "    (short) ((short) (val) << 8)))\n");
-+  fprintf(file, "static void swap_endian(short *data, int length)\n");
-+  fprintf(file, "{\n");
-+  fprintf(file, "       int i;\n");
-+  fprintf(file, "       for (i = 0; i < length; i += 1, data++)\n");
-+  fprintf(file, "               *data = SHORT_SWAP_LE_BE(*data);\n");
-+  fprintf(file, "}\n");
-   fprintf(file, "\n");
- 
-   fprintf(file, "sample_producer *sp[%d];\n", g_list_length(order));
-@@ -172,6 +183,9 @@
-   fprintf(file, "  }\n");
-   fprintf(file, "\n");
- 
-+  fprintf(file, "#if __BYTE_ORDER == __BIG_ENDIAN\n");
-+  fprintf(file, "  swap_endian(buffer, 2 * TBASS_BUFF_SIZE);\n");
-+  fprintf(file, "#endif\n");
-   fprintf(file, "  write(fd, buffer, 2 * TBASS_BUFF_SIZE * sizeof(short));\n");
-   fprintf(file, "\n");
- 
---- gtkdial.c
-+++ gtkdial.c
-@@ -75,8 +75,6 @@
-               sizeof (GtkDialClass),
-               (GtkClassInitFunc) gtk_dial_class_init,
-               (GtkObjectInitFunc) gtk_dial_init,
--              (GtkArgSetFunc) NULL,
--              (GtkArgGetFunc) NULL,
-             };
- 
-             dial_type = gtk_type_unique (gtk_widget_get_type (), &dial_info);
---- Makefile
-+++ Makefile
-@@ -1,10 +1,9 @@
- # Makefile for Freebirth 
- #
- 
--CC=gcc
--LOADLIBES=-lm $(shell gtk-config --libs)
--CFLAGS=-g  -O6  -Wall $(shell gtk-config --cflags)
--LDFLAGS= 
-+CC?=gcc
-+CFLAGS+=-Wall $(shell pkg-config --cflags gtk+-2.0)
-+LIBS=-lm $(shell pkg-config --libs gtk+-2.0)
- 
- OFILES=\
- oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \
-@@ -22,16 +21,18 @@
- 	-rm -f *.o freebirth fusebirth fused_loop.c Makefile.deps *~ 
- 
- freebirth: $(OFILES) fused_loop.o freebirth.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o freebirth $(OFILES) fused_loop.o freebirth.o $(LIBS)
- 
- fused_loop.c: fusebirth
- 	./fusebirth > fused_loop.c 2>/dev/null
- 
- fusebirth: $(OFILES) fuse_loops.o fusebirth.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o fusebirth $(OFILES) fuse_loops.o fusebirth.o $(LIBS)
- 
- fusebirth.o: freebirth.c
- 	$(CC) -c $(CFLAGS) -DFUSE_LOOPS -o fusebirth.o freebirth.c
- 
- Makefile.deps:
--	gcc -MM $(CFLAGS) $(CFILES) > Makefile.deps
-+	$(CC) -MM $(CFLAGS) $(CFILES) > Makefile.deps
- 
- include Makefile.deps
---- raw_wave.c
-+++ raw_wave.c
-@@ -21,18 +21,36 @@
- #include "raw_wave.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <math.h>
-+#include <endian.h>
-+
-+/* borrowed from glib2 */
-+#define SHORT_SWAP_LE_BE(val)  ((short) ( \
-+    (short) ((short) (val) >> 8) |      \
-+    (short) ((short) (val) << 8)))
-+static void swap_endian(short *data, int length)
-+{
-+       int i;
-+       for (i = 0; i < length; i += 1, data++)
-+               *data = SHORT_SWAP_LE_BE(*data);
-+}
- 
- static char *get_full_path(char *fn)
- {
-   char *full_fn;
-   char *fb_samples;
- 
--  if (fn == NULL || fn[0] == '/') return fn;
-   fb_samples = getenv("FB_SAMPLES");
-   if (fb_samples == NULL) fb_samples = FB_SAMPLES;
--  sprintf(full_fn = (char *)malloc(strlen(fb_samples) + 1 + strlen(fn) + 1),
--	  "%s/%s", fb_samples, fn);
-+  full_fn = (char *)malloc(strlen(fb_samples) + 1 + strlen(fn) + 1);
-+   
-+  if (fn == NULL || fn[0] == '/') { /* path is valid already */
-+     sprintf(full_fn, "%s", fn); 
-+  } else {
-+     sprintf(full_fn, "%s/%s", fb_samples, fn); /* add path */
-+  }
-+   
-   return full_fn;
- }
- 
-@@ -76,10 +94,13 @@
- 
-   }
-   this->length += count;
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+  swap_endian(tmp, this->length);
-+#endif
-   this->table = (sample *)malloc(sizeof(sample) * this->length);
--  for(i = 0; i < this->length;i++)
-+  for(i = 0; i < this->length;i++) {
-     this->table[i] = (sample)tmp[i];
--  
-+  }
-   fclose(in);
-   free(tmp);
- }
-@@ -126,6 +147,7 @@
- 	
- 	}
-     }
-+
-   return this->buffer;  
- }
-   
-@@ -145,7 +167,7 @@
- void raw_wave_set_sample_file(raw_wave* this, char *filename)
- {
-   FILE *in;
--  if (this->filename != 0) free(this->filename);
-+  if (this->filename != NULL) free(this->filename);
-   this->filename = get_full_path(filename);
-   in = fopen(this->filename,"r");
-   if( in==NULL )
-@@ -243,7 +265,7 @@
-   /* set table to zero here check if it is zero in */
-   /* _fill_table */
-   out->table = 0;
--  out->filename = 0;
-+  out->filename = NULL;
-   raw_wave_set_sample_file(out, filename);
- 
-   out->buffer   = (sample *)malloc(sizeof(sample) * TBASS_BUFF_SIZE);
---- raw_wave.h
-+++ raw_wave.h
-@@ -62,7 +62,7 @@
- event *event_pitch_change_new(int seq_handle, double pitch);
- 
- // #define FB_SAMPLES "/usr/local/lib/freebirth"
--#define FB_SAMPLES "."
-+#define FB_SAMPLES "/usr/share/freebirth"
- 
- /*
-   Local Variables:
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch b/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
deleted file mode 100644
index 2a3a40711f1c..000000000000
--- a/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=320123
-
-Index: freebirth-0.3.2/oscillator.c
-===================================================================
---- freebirth-0.3.2.orig/oscillator.c
-+++ freebirth-0.3.2/oscillator.c
-@@ -237,8 +237,8 @@ event *event_freq_change_new(int seq_han
- 
- static sample_producer **get_children(osc *this)
- {
--  static sample_producer *no_kids[] = { NULL };
--  return no_kids;
-+  static sample_producer no_kids[] = {{ NULL }};
-+  return &no_kids;
- }
- 
- static char **get_header(osc *this)
diff --git a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
deleted file mode 100644
index 271853ab4567..000000000000
--- a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Free software bass synthesizer step sequencer"
-HOMEPAGE="http://freshmeat.net/releases/8834"
-SRC_URI="http://www.bitmechanic.com/projects/freebirth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo-2.patch \
-		"${FILESDIR}"/${P}-segfault.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}/raw
-	doins raw/*.raw
-
-	dodoc CHANGES NEXT_VERSION README
-
-	doicon xpm/${PN}.xpm
-	make_desktop_entry ${PN} ${PN}
-}
diff --git a/media-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml
deleted file mode 100644
index a38ef435258d..000000000000
--- a/media-sound/freebirth/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">8834</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index f6ae86d4b2de..4ab1d4bf0ee8 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -1,9 +1,7 @@
 AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c17048796afe328fb136808c2cb88f8f9a7cada5a4f6cd8a01c0a398e8b93cc0d6158792097cf88e600beebd6105bd9036e9aa3ddf8da16878e7d5f82746ea2 SHA512 539fac802c3e91217f4eb6c5adf456f7e5bc2d53e1103cf54255514b0793e3ed17de84048ea31c5a03ea6121fae01ef712339dcc8e269d678e1272f757976029
 AUX guayadeque-0.4.6-gcc10.patch 2981 BLAKE2B a925446bca10a9f96a0babe889d151cc49792810c95295a0c0dc17796744b7486307c354fb47c07518e0f33b41cb8428feb1cc355678c78fb731cecf378c0068 SHA512 a998f055ef831bbd30c624b157de31ad847d3a8f838586e40ba7f978e184eb22914e036fb927794e61b432352d888cf808a90dde2e29458e203297e11079d144
 AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11cad4af49a3ad615f1f6e53d7cd86c4e9851c8d7d78ba47ed1785cd2eab4017bc43720e9b3dbf4990d06165355c505fba32 SHA512 5d3d861eebaa629031de6186846353798b7178801d6b7c07344bf75d952891d17f90237986949bc4b12984b8635ae4d1f9fc8a319d2199bd6f22cc7669dcc564
-DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 BLAKE2B a8783a61df636e3ddf1473ba20450c89eeb977e06491e840743e7b8a7aa1a7515138ecf8f6c92a27f0c762363ef12c094927192b254ae238196ac6d967fd84d1 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518
 DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
-EBUILD guayadeque-0.4.5_p20170110.ebuild 2184 BLAKE2B e02a617872ba5b769eeff72398dcae731cd59c6751452ad04fe814125177287625f331f3d843c4a20a756721155d8b37216db1e14895e2021f21c987585d1029 SHA512 714a5a08df3e418aa14b188fc6108b940f93259cc3a5197517c5726de51fa9a940ef6ed93e69a4f88bafd074e75e1ea1c4939faa720c831978e5eea611104f55
-EBUILD guayadeque-0.4.6.ebuild 2357 BLAKE2B 4fc15565e432ad45b037e7a0bba8cf5cf0e6b1c1ef1c2285fdcb1083b3e388e6ba6d1c6dce3e530c94dbe2b49bb09b352d38dd39b7cc67670429744ca669f9f9 SHA512 3bdc44e8f85eccb64f0ddfb9751b5602672ceb24d0817412dd2e284f96997676c15ac5664308c7106f99527919285a84c85d60f36404308613d69ef463099132
+EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266
 EBUILD guayadeque-9999.ebuild 2282 BLAKE2B f785e50bc117afb1baa8076399c26d12a8afd75564745c966e87ad8b5d1696b4b0eb56f881c932b9680871aa60104b5bcb86d6ad2c8b9bd90b7389b1b3d1d77b SHA512 f9b444bef5266a22cef7bc802a1ef36317b2ad21a0a9801ef63f8a477c573cf5788fb0c8f89fd3dc765129f7c714bf1d55733ad0270f4d93996901c24e549bb0
 MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
diff --git a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
deleted file mode 100644
index 5becf50651c6..000000000000
--- a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.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
-
-WX_GTK_VER=3.0
-
-inherit cmake-utils vcs-snapshot wxwidgets
-
-DESCRIPTION="Music management program designed for all music enthusiasts"
-HOMEPAGE="https://guayadeque.org/"
-SRC_URI="https://github.com/anonbeat/${PN}/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator ipod +minimal"
-
-# No test available, Making src_test fail
-RESTRICT="test"
-
-GST_DEPS="
-	media-libs/gnonlin:1.0
-	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
-"
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-db/wxsqlite3-3.2.1
-	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-1.6.4
-	net-misc/curl
-	sys-apps/dbus
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	appindicator? ( >=dev-libs/libindicate-0.7 )
-	ipod? ( media-libs/libgpod )
-	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PF}-missing-aui-component.patch"
-)
-
-# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
-LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled libs
-	rm -rf src/wx/wxsql* src/wxsqlite3 || die
-
-	# comment out unused languages
-	cd po || die
-	local l
-	for l in "${LANGS[@]}"; do
-		! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex appindicator)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use minimal; then
-		elog "If you are missing functionalities consider setting USE=-minimal"
-		elog "or install any of the following packages:"
-
-		local pkg
-		for pkg in ${GST_DEPS}; do
-			elog "\t ${pkg}"
-		done
-	fi
-}
diff --git a/media-sound/guayadeque/guayadeque-0.4.6.ebuild b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
index 68c32ae03209..02eecd472933 100644
--- a/media-sound/guayadeque/guayadeque-0.4.6.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://guayadeque.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator ipod +minimal"
 
 # No test available, Making src_test fail
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 175871ddc567..d189ee6a865e 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,5 +1,5 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2171 BLAKE2B c3238a3c2a359ca8197a98e261fc31904f2abdce2c0820471d39f8d57d98521074d536920799b25c0e82a9eb31ce6239cc046883fcc4ca8ddf349ed0cacadb83 SHA512 9f87a2f8fec6c8d1c556a2c2b8ba251e25a18e56424a753ef9fcf8a18305695b136c9fa6d2d980b730b7a17f4ec9221f2e4b6f3ac1abe61ff151c4a73d17b4b2
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2170 BLAKE2B 74ce1268c6c37e705aba8bc4934d8a434761a38aa3bea2acd133666ab8182acee1dda5dc52ad0b05f033e95ab30e33b749b9b3870b74b1a7e14955f9232bef9a SHA512 237ded91cebae386ca8f697bc6bf08675d3c000b37916882e37fda77ee3f3b335dda2217a4a4581fae9c6b4ae6f3045da8fef94e018ed4593b9e8fb128fb5b0c
 EBUILD jack-audio-connection-kit-0.125.0.ebuild 1947 BLAKE2B 54ad16c5a76b562c2a9cff2bb545463121870f2414171f0b7cd46bae55a52a4e431fed51527eace5244cabd35130964fb031916d4a5028d2965c85448ef92889 SHA512 e4407c136e6a24006cbb0ae3597493d862eccd5b60e04dcc4f0418defbd10fe3d98f687d90db33f89fbada2dbe556ae86e1d1df9a7e56d222f7dc8780eb0d5b5
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index 9038e6318d5e..b53cf5201545 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest
index 2dc307aa89f2..b73afdfc5671 100644
--- a/media-sound/lltag/Manifest
+++ b/media-sound/lltag/Manifest
@@ -1,5 +1,3 @@
-DIST lltag-0.14.5.tar.bz2 48035 BLAKE2B 15352a388fd96882d78803905c12074288b6084b72c46a5ea15a2dbe504bd416201315c0047492329f06413100ca432040a974dbe56869772dd0a36d3d18a927 SHA512 64d16ae1bfb920f2e10add6728bdbe261662688b5c99e4cc92ffa5d7dd5fe596c6c3ccbe61b432a4594e49003fc981b20588def9523a65ee934418afb512bedd
 DIST lltag-0.14.6.tar.gz 57162 BLAKE2B 9b21fa026644722bdb0cbb91e3a5f27247c4e8470273823aca71b71253e5ee50703e3cb14b1c4e8e6079e9d5d46dccc03d7a4892782c1c53189d5a13992ddd11 SHA512 9eb488ac1444ec11b02ca9c396903b5c6ef1e2f19558a6ef9d5e8d3fadb639fad902b4d6cdde8f4374768fdea553cfd6550c4151df9a755c9ae4a5652128a836
-EBUILD lltag-0.14.5.ebuild 1006 BLAKE2B fa19a939185695aeedf84ca9bf13b98a206f8a3615df7148a3d010bdb88622ae10d7096c2a91d77ea012b8839f5697c53f284b1431c8c5d0fed375474a2000c3 SHA512 730621ff84e758482e0afe16f5ffe786988140ec4593e5bbf8722e37b2c9f15d757c5bd390c13e63732d14a2be4902fd842b56e47de4a9c1bd1976f9501e5563
 EBUILD lltag-0.14.6.ebuild 1076 BLAKE2B 49f65836acf36cee3cf7419c1880468447fcbe1d33bdb2edad0636d62614c9f5ce9ee1aa23a4ab9d31eff0004d62391ef735737a4929f3d7956690de6c131f01 SHA512 efc874f98817d443b1d502669321afcf7526e450253d3c0320f2ac11fac32b40443db8bce08680f24ce9513eba069df65dfb547b2839730b744fb8e761e47a54
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/lltag/lltag-0.14.5.ebuild b/media-sound/lltag/lltag-0.14.5.ebuild
deleted file mode 100644
index 3f3775797d97..000000000000
--- a/media-sound/lltag/lltag-0.14.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer"
-HOMEPAGE="http://home.gna.org/lltag"
-SRC_URI="http://download.gna.org/lltag/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac mp3 ogg readline"
-
-RDEPEND="dev-perl/libwww-perl
-	mp3? ( media-sound/mp3info dev-perl/MP3-Tag )
-	ogg? ( media-sound/vorbis-tools )
-	flac? ( media-libs/flac )
-	readline? ( dev-perl/Term-ReadLine-Perl )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	mylltagopts=(
-		"DESTDIR=${D}"
-		"PREFIX=/usr"
-		"SYSCONFDIR=/etc"
-		"MANDIR=/usr/share/man"
-		"PERL_INSTALLDIRS=vendor"
-		"DOCDIR=/usr/share/doc/${PF}"
-		)
-}
-
-src_compile() {
-	emake "${mylltagopts[@]}"
-}
-
-src_install() {
-	emake "${mylltagopts[@]}" install{,-doc,-man}
-	dodoc Changes
-	perl_delete_localpod
-	# Move config to recommended location
-	mv "${D}usr/share/doc/${PF}"/config "${D}"etc/lltag/ || die
-}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index fdbabf21abc8..8e0157328031 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-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 1576 BLAKE2B 530f5650644056918559c1d7bd017447c7e88c81906c223c1a1dee5a32232820c0629300f9f1f0570b154039732b6546b3b6bc5fbe213d6594d5133e6d328cb4 SHA512 c7d0ed462bb8f99b1ee6f68c42c537e3583bfc2e9f7600d4cf3dcf2568e4c7e0f4c2da1872de794d9276389c085d2da25d575234c683864087ccb3e3217c3821
+EBUILD picard-2.4.2.ebuild 1575 BLAKE2B 8800306017fcb9d675bc1d8ee67bc844e9bfb8541fef28fe5053a72a3c963a47efa3adac4444ccb4a3bd870bd21954e16287b0f635da3436b8614da8f5e4a844 SHA512 d994e8ce751f06dca006dd6442b31029909a40457831870c35df7649c1e0da428445f2fa6cd951d74b6891a495908ea5b13f9b18a9981200d7b98e069e8da187
 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.3.1.ebuild b/media-sound/picard/picard-2.3.1.ebuild
deleted file mode 100644
index 6d0e749dc698..000000000000
--- a/media-sound/picard/picard-2.3.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="discid nls"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[dbus,declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
-"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 9e90f652f615..18c76e92214a 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/qastools/Manifest b/media-sound/qastools/Manifest
index ff919af44a7b..e137d3a1007c 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1,8 +1,4 @@
-AUX qastools-0.22.0-nomancompress.patch 4667 BLAKE2B e9d11e1aeae8eba81ca60dbfb37da0c5e8efcc30d62899806b9415898a2484ed833caa42dfab2f5532f551486f3ce592e260c9b8396289d27eb488be00a06344 SHA512 ee10a90d8c92eeb124bef8ae6edc023cf452585679380c4e7cb406ed41cd4d04db3b8075f89c2925d2d020fc9a0d035d8e3762e2af92085418e5eb94064c604c
-AUX qastools-0.22.0-qt-5.15.patch 2047 BLAKE2B 01a473dce7c070b47e611ea7f05d1a16b07a6c7c692f8a98bde7dd12b286cdea04fe79fdf62ab99e1b5cd5c678181fb4f266ec35627291674475918505a59dbf SHA512 9fdd644cbb100df9ef2d593a4ba24f9fa4cda242e41e4f909e57f3e23adde566763b50b82c7e756b40623038c3df88df49d59da3efec9509c6fc0b1101bfae5d
 AUX qastools-0.23.0-nomancompress.patch 4753 BLAKE2B 62755c3381455e89afc2c9de5fdb1668a93936c5f238b938cbddd608a3b4e7421982f5bcf4cae027e005db1db9c19e870f28aaffc098d421cb245a080b4c70ab SHA512 a3b54f0313e1c0019d6a25009befecb2e48b022fddf78ce38e1c52194ef8711160e9d72bc637bf3c55223a043e091550cfdb8582c1cfd1044bb5a96bbaa76dce
-DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712
 DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9
-EBUILD qastools-0.22.0.ebuild 827 BLAKE2B 313456cebd163c4ecb5d9a73f41a2c7d246d37597a61d8904074b8d9fe4b13465bdde4cab980e9ac80fa8803ef5d324789ba73f0bc8845ef84ab55ec6433f340 SHA512 ddc5f654b3f99831537df6f76a40852f0d098729aad24e4131bb310463ea37281801409693ed55009936325d80831469032f697d58f2719ba15bf37d7d0d637e
-EBUILD qastools-0.23.0.ebuild 793 BLAKE2B fd642388cb0b6904ef6d3c4bffe60e2e8af1ac56215a66a4f801087c0104b111a595fd6a586befcfebebf19e128bc10aec46f0f5bdfde1b4f8b6cfa619d3e5a5 SHA512 7d7aa8f6556d48cef12d5a3c5613c4d338814e54cf8cdf1caf273c57b8fdab520db69f267c28a1cc6562553574e347c3c69ec827ed1ff963716d7594ab0b63f4
+EBUILD qastools-0.23.0.ebuild 792 BLAKE2B 4e369718024cfb3cb4c564b8fc1630168f38fa73a5ff89683d7b43dd92283d2e9bb045ba729cb64b412fd9f547bdf3412ec1348b54423923efbc7ca520b08175 SHA512 0708e92db81091cef8de8a579eb70ccf441a9069ad122f39c50e7f98e2abac1607c795f7b791b610f5ec715fe3a02e03fea051de34dc9ac4e59f243799120ea0
 MISC metadata.xml 325 BLAKE2B 1568315a082d0a94f0dc43ae932dce5ca93e9cbced0c7cf7f518900b594281f012809f729e62501271606bfd0f31ec04870f3849e47730fb196689f16088b73c SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276
diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
deleted file mode 100644
index 49756a91b4c0..000000000000
--- a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 58649d44b4f1362c8fe5f88828be97e10b4fc00b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 8 Jun 2020 11:45:09 +0200
-Subject: [PATCH] Compress manpages optionally
-
----
- qasconfig/share/man/CMakeLists.txt | 24 ++++++++++++------------
- qashctl/share/man/CMakeLists.txt   | 26 +++++++++++++-------------
- qasmixer/share/man/CMakeLists.txt  | 24 ++++++++++++------------
- 3 files changed, 37 insertions(+), 37 deletions(-)
-
-diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt
-index 083ca91..628be1b 100644
---- a/qasconfig/share/man/CMakeLists.txt
-+++ b/qasconfig/share/man/CMakeLists.txt
-@@ -1,27 +1,27 @@
- # Find gzip
--FIND_PACKAGE ( UnixCommands REQUIRED )
--
--IF ( NOT GZIP )
--	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
--ENDIF ( NOT GZIP )
--
-+FIND_PACKAGE ( UnixCommands )
- 
- # Configure manpages
- 
- SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
- SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
--SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
-+SET ( man_gz .gz )
- 
- CONFIGURE_FILE ( ${man_src} ${man_plain} )
- 
- 
- # Compress manpages
- 
-+IF ( NOT GZIP )
-+	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
-+	SET ( man_gz "" )
-+ELSE()
- ADD_CUSTOM_COMMAND (
--	OUTPUT ${man_gz}
--	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
-+	OUTPUT ${man_plain}${man_gz}
-+	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
- 	DEPENDS ${man_plain}
--	COMMENT "Building ${man_gz}" )
-+	COMMENT "Building ${man_plain}${man_gz}" )
-+ENDIF()
- 
- ADD_CUSTOM_TARGET (
- 	qasconfig_manpage ALL
-@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
- 
- # Installation of the manpage
- 
--INSTALL ( FILES ${man_gz}
-+INSTALL ( FILES ${man_plain}${man_gz}
- 	DESTINATION ${INSTALL_DIR_MAN}
--	RENAME ${PROGRAM_NAME}.1.gz )
-+	RENAME ${PROGRAM_NAME}.1${man_gz} )
-diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt
-index 911ea43..5f6ba15 100644
---- a/qashctl/share/man/CMakeLists.txt
-+++ b/qashctl/share/man/CMakeLists.txt
-@@ -1,35 +1,35 @@
- # Find gzip
--FIND_PACKAGE ( UnixCommands REQUIRED )
--
--IF ( NOT GZIP )
--	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
--ENDIF ( NOT GZIP )
--
-+FIND_PACKAGE ( UnixCommands )
- 
- # Configure manpages
- 
- SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
- SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
--SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
-+SET ( man_gz .gz )
- 
- CONFIGURE_FILE ( ${man_src} ${man_plain} )
- 
- 
- # Compress manpages
- 
-+IF ( NOT GZIP )
-+	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
-+	SET ( man_gz "" )
-+ELSE()
- ADD_CUSTOM_COMMAND (
--	OUTPUT ${man_gz}
--	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
-+	OUTPUT ${man_plain}${man_gz}
-+	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
- 	DEPENDS ${man_plain}
--	COMMENT "Building ${man_gz}" )
-+	COMMENT "Building ${man_plain}${man_gz}" )
-+ENDIF()
- 
- ADD_CUSTOM_TARGET (
- 	qashctl_manpage ALL
--	DEPENDS ${man_gz} )
-+	DEPENDS ${man_plain}${man_gz} )
- 
- 
- # Installation of the manpage
- 
--INSTALL ( FILES ${man_gz}
-+INSTALL ( FILES ${man_plain}${man_gz}
- 	DESTINATION ${INSTALL_DIR_MAN}
--	RENAME ${PROGRAM_NAME}.1.gz )
-+	RENAME ${PROGRAM_NAME}.1${man_gz} )
-diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt
-index 5aea9af..c2bd872 100644
---- a/qasmixer/share/man/CMakeLists.txt
-+++ b/qasmixer/share/man/CMakeLists.txt
-@@ -1,27 +1,27 @@
- # Find gzip
--FIND_PACKAGE ( UnixCommands REQUIRED )
--
--IF ( NOT GZIP )
--	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
--ENDIF ( NOT GZIP )
--
-+FIND_PACKAGE ( UnixCommands )
- 
- # Configure manpages
- 
- SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
- SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
--SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
-+SET ( man_gz .gz )
- 
- CONFIGURE_FILE ( ${man_src} ${man_plain} )
- 
- 
- # Compress manpages
- 
-+IF ( NOT GZIP )
-+	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
-+	SET ( man_gz "" )
-+ELSE()
- ADD_CUSTOM_COMMAND (
--	OUTPUT ${man_gz}
--	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
-+	OUTPUT ${man_plain}${man_gz}
-+	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
- 	DEPENDS ${man_plain}
--	COMMENT "Building ${man_gz}" )
-+	COMMENT "Building ${man_plain}${man_gz}" )
-+ENDIF()
- 
- ADD_CUSTOM_TARGET (
- 	qasmixer_manpage ALL
-@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
- 
- # Installation of the manpage
- 
--INSTALL ( FILES ${man_gz}
-+INSTALL ( FILES ${man_plain}${man_gz}
- 	DESTINATION ${INSTALL_DIR_MAN}
--	RENAME ${PROGRAM_NAME}.1.gz )
-+	RENAME ${PROGRAM_NAME}.1${man_gz} )
--- 
-2.27.0
-
diff --git a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
deleted file mode 100644
index 606630d7eebb..000000000000
--- a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9975fe653c8159504807ca6288bd974b4f6057b7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 8 Jun 2020 11:01:33 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes)
-
-Fixes https://gitlab.com/sebholt/qastools/-/issues/1
----
- shared/src/wdg/ds_slider_painter_bevelled.cpp | 1 +
- shared/src/wdg/ds_switch_painter_circle.cpp   | 1 +
- shared/src/wdg/ds_switch_painter_close.cpp    | 1 +
- shared/src/wdg/sliders_pad_style.hpp          | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/shared/src/wdg/ds_slider_painter_bevelled.cpp b/shared/src/wdg/ds_slider_painter_bevelled.cpp
-index 3c90143..1748c6e 100644
---- a/shared/src/wdg/ds_slider_painter_bevelled.cpp
-+++ b/shared/src/wdg/ds_slider_painter_bevelled.cpp
-@@ -15,6 +15,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QRadialGradient>
- #include <QScopedPointer>
-diff --git a/shared/src/wdg/ds_switch_painter_circle.cpp b/shared/src/wdg/ds_switch_painter_circle.cpp
-index 32fa8f1..36933af 100644
---- a/shared/src/wdg/ds_switch_painter_circle.cpp
-+++ b/shared/src/wdg/ds_switch_painter_circle.cpp
-@@ -13,6 +13,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
- 
-diff --git a/shared/src/wdg/ds_switch_painter_close.cpp b/shared/src/wdg/ds_switch_painter_close.cpp
-index ef058a3..76932cc 100644
---- a/shared/src/wdg/ds_switch_painter_close.cpp
-+++ b/shared/src/wdg/ds_switch_painter_close.cpp
-@@ -13,6 +13,7 @@
- 
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QScopedPointer>
- 
-diff --git a/shared/src/wdg/sliders_pad_style.hpp b/shared/src/wdg/sliders_pad_style.hpp
-index 3108f92..81a9075 100644
---- a/shared/src/wdg/sliders_pad_style.hpp
-+++ b/shared/src/wdg/sliders_pad_style.hpp
-@@ -5,6 +5,7 @@
- #define __INC_sliders_pad_style_hpp__
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPicture>
- #include <QPen>
- 
--- 
-2.27.0
-
diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild
deleted file mode 100644
index 579642b937f1..000000000000
--- a/media-sound/qastools/qastools-0.22.0.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
-
-inherit cmake
-
-DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser"
-HOMEPAGE="https://gitlab.com/sebholt/qastools"
-SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-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:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.15.patch"
-	"${FILESDIR}/${P}-nomancompress.patch"
-)
-
-S="${WORKDIR}"/${PN}-v${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_LICENSE_INSTALL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qastools/qastools-0.23.0.ebuild b/media-sound/qastools/qastools-0.23.0.ebuild
index db2a0d9e48a4..739a04e7b390 100644
--- a/media-sound/qastools/qastools-0.23.0.ebuild
+++ b/media-sound/qastools/qastools-0.23.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 69a4d5595934..f00905a8d91c 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,8 @@
 DIST strawberry-0.6.13.tar.xz 10156576 BLAKE2B 04d27d8a96a8664348623c11f393324b410f8224b22089e200947cfd90eaafe04c3aa13cc5345a7c95d83d24ed04ec9221a8badfb2e3dc42922739b568fc2e90 SHA512 b3db58a30d50f74b313c0af5a492ea809d631c4152f856b19debb5f811688eb21d97ba35b58f3f1d00779fcd76220d88b4dafc32520416f7e749c6680257ad49
 DIST strawberry-0.7.2.tar.xz 10123596 BLAKE2B cfd3384ded94bc5e638d79e4dea8e4a04a42abcc36d1d34da5d39150c2f20e785fd5f199c91ca515d02391e90acd23d1a5d90602ec07f52fdfa711d3ec88bc0e SHA512 d664ce81c2eef2e1bbbbdda40e420142c6c0bf6df42a785cc1c7f572f9b7521e44161f93c4694434db8752d7056df946e6e2aa064a62f45b143da6860f007483
+DIST strawberry-0.8.1.tar.xz 10278268 BLAKE2B 41b278449d4a2e6efcf9b369b28cf4705cc21daaadd106dbd94668a3aeffbeba8d3c31f50107248a40983e368ddb0e4cc4a05362dc10fc41ca8a138e4e652436 SHA512 99c4c11cdb540ec36285b7e6e7fba65d69aa8eb125fba2cf8a053c61adf9e987d415a35fa4dbf76a580a73296cfe2e4072a2872f821810d826292cdae47941b3
 EBUILD strawberry-0.6.13.ebuild 2864 BLAKE2B 1b35982666541292b3c1a38e53aca7c5c14d84f96d6a9da6f0660b1e7b9e00b260d3862663b30c7cbf6ca4b9dde3cc7832cb7403be34ecef6daba4f2e40de162 SHA512 8554f8920f8bf96d3790c85413a0b16dfcf74b91c0e0d0fffa99c9ce2e5a9f6d8ce07bc5f127da62cec3049d95d25f275e7a5a420b62bce2f98de444b0837eb0
 EBUILD strawberry-0.7.2.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
+EBUILD strawberry-0.8.1.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
 EBUILD strawberry-9999.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
 MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7
diff --git a/media-sound/strawberry/strawberry-0.8.1.ebuild b/media-sound/strawberry/strawberry-0.8.1.ebuild
new file mode 100644
index 000000000000..92c336d58feb
--- /dev/null
+++ b/media-sound/strawberry/strawberry-0.8.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	media-video/vlc
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+	rm -r 3rdparty/taglib || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DUSE_SYSTEM_TAGLIB=ON
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 045cc13ffcbc..2d4d60a05f9f 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6
 DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
-DIST teamspeak-client-5.0.0_beta24.tar.gz 98415731 BLAKE2B 47589e828a71037910df2164152e63afef5606cc296f93e50f38e89a357b6fce266dcc219f7edeb4ac2ed664c3cf9f4847fd4a0a6b6c1327b63d328656a09359 SHA512 7ee9d088cf4f2e5b6fddba10f8586ffe4309dcf346f5b44dde89ceb9203746f7191247a3a0e3eb48cf7f21728734be3445c44dd025dd93f14b0bfce62d7e3623
+DIST teamspeak-client-5.0.0_beta27.tar.gz 106013392 BLAKE2B 6d591cd2f79601bfb561adcfe9c118393eea9add8ac113bc4e5ebcfe6a154aa9ff0a0f951bda8c55747b9ceaea4cdbcbc65bc23082968709d12b239948b2e1a7 SHA512 4b141e63495bd0e4c4c6f02fb36153c35c4b86c999a682bd12f6f29110ce972ec8c72a99b1fd6a1b7584b8db63012cab9942bd85ae1c67636e5b3e3024fe2b98
 EBUILD teamspeak-client-3.5.3.ebuild 2889 BLAKE2B 0b35da3a0914574bbad363e0546f49af1a3d8518e0605767caea4d114718e9657968b6c1a5e498fea6e94cca60925222e5837e83211b8092c0466558eb190acc SHA512 62d27eb4da0f1a16de6ab1164e4dcb2c45b3a4b1f85ba667b556f6b2d6e642499b259395543e5d4167a8f74702820f69089cfe11d11a33467274f81d7a059982
-EBUILD teamspeak-client-5.0.0_beta24.ebuild 2153 BLAKE2B 2666978068ace8e28e3f336f648c4a6fa4dc6bcf5c587eb18cab0ffbadb849fab098eae1c30e8b4864235dbb3e6de68694f6317854b6d217c2b7338f62c176bb SHA512 57c875f227777fa96dad32aa0074dbd453253d9d854a1607425579576fe25ca74a35fff8023b4ded0f8a2009ce9c9a852317955ce7ba9ca85d4660c804afa823
+EBUILD teamspeak-client-5.0.0_beta27.ebuild 1920 BLAKE2B e1588b9160f0e8e004061ef68bfe829160c073819230d43a8468bf388c185eadc5f2941cd9e12869889504fd2b8a9b055eec743da1e2596f0101c62e3d12a08e SHA512 c10024992932b6d183b47b790980117b03b33132e5842822ca87d5a56606c7f339a8f15a138e0ea91c328c61567340ad5f3589de8a41504c18ecc0a62475a37b
 MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta24.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta24.ebuild
deleted file mode 100644
index f35eafbb741c..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta24.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 desktop xdg-utils
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="teamspeak-client.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS=""
-LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )"
-SLOT="5"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig:1.0
-	media-sound/pulseaudio
-	net-print/cups
-	sys-power/upower
-	sys-apps/dbus
-	x11-libs/cairo[glib]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	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
-	x11-libs/pango
-"
-
-RESTRICT="bindist fetch mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak5-client/chrome-sandbox
-	opt/teamspeak5-client/hotkey_helper
-	opt/teamspeak5-client/libcef.so
-	opt/teamspeak5-client/patcher
-	opt/teamspeak5-client/TeamSpeak
-	opt/teamspeak5-client/soundbackends/libalsa_linux_amd64.so
-	opt/teamspeak5-client/soundbackends/libpulseaudio_linux_amd64.so
-"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://beta.teamspeak.com"
-	elog "and place it in your DISTDIR directory."
-	elog ""
-	elog "Please keep in mind, that this is a closed beta!"
-	elog "If you are not participating, you won't be able to download it!"
-}
-
-src_install() {
-	exeinto /opt/teamspeak5-client
-	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so
-
-	insinto /opt/teamspeak5-client
-	doins *.bin *.dat *.pak
-	doins -r html licenses locales soundbackends
-
-	dodir /opt/bin
-	dosym ../teamspeak5-client/TeamSpeak /opt/bin/ts5client
-
-	make_desktop_entry /opt/bin/ts5client "Teamspeak 5 Client" /opt/teamspeak5-client/html/client_ui/images/icons/teamspea "Audio;AudioVideo;Network"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild
new file mode 100644
index 000000000000..bbb81414064b
--- /dev/null
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A client software for quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS=""
+LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )"
+SLOT="5"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig:1.0
+	media-sound/pulseaudio
+	net-print/cups
+	sys-power/upower
+	sys-apps/dbus
+	x11-libs/cairo[glib]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	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
+	x11-libs/pango
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/teamspeak5-client/chrome-sandbox
+	opt/teamspeak5-client/hotkey_helper
+	opt/teamspeak5-client/libcef.so
+	opt/teamspeak5-client/patcher
+	opt/teamspeak5-client/TeamSpeak
+	opt/teamspeak5-client/soundbackends/libalsa_linux_amd64.so
+	opt/teamspeak5-client/soundbackends/libpulseaudio_linux_amd64.so
+"
+
+src_install() {
+	exeinto /opt/teamspeak5-client
+	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so
+
+	insinto /opt/teamspeak5-client
+	doins *.bin *.dat *.pak
+	doins -r html licenses locales soundbackends
+
+	dodir /opt/bin
+	dosym ../teamspeak5-client/TeamSpeak /opt/bin/ts5client
+
+	make_desktop_entry /opt/bin/ts5client "Teamspeak 5 Client" /opt/teamspeak5-client/html/client_ui/images/icons/teamspea "Audio;AudioVideo;Network"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5f3debc34b9c..f499935766a3 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index 256244a6bcbd..b4753125278f 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -2,7 +2,7 @@ AUX baka-mplayer-2.0.4-gcc5.patch 1251 BLAKE2B 9f514f754499f5b44ae4a077c2025dfa0
 AUX baka-mplayer-2.0.4-mpv23.patch 782 BLAKE2B de90ac31fcbdd1cb9fb00eae1e282c6ff7e5ee14dd81bc2d8e07bd36250dcffa5de74dd83f2558bb15cae54ca83279c20f2776f315eea7f5b7a946e53a2e3f82 SHA512 9fda60f3569b88eb71d42562ef1650bfd125bf69f80b25ff1c123fb7efda524b7c14ae1f782d1786e9e68263f66db5af95a30c4e2e87468782da750eacbe456f
 AUX baka-mplayer-2.0.4-playlist-regression.patch 886 BLAKE2B b2c0edba4a2a0da89494dec05b78e7768a24af94f06fcda7fa4c4066800e673d551ed82f6b45d14f3f7f2d6d855d3e0be8535b5a6d3093fce90a9627e9f3c5c5 SHA512 3905ce72374c59edb09ed5a311ff257da3010386de9b076de516bd008c23d7e757d7c63151ac350bdc281a575b6387a96a44d1ac5e2229a1a325a3dfc5e6ace4
 DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab7758a924805ca8356c6fa94d25df9acbfd53d7e997b58e5c85b68e033f83ce89d6e3b0c3e30ecc23d7d75b4bf74ae0911 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a
-EBUILD baka-mplayer-2.0.4-r1.ebuild 1386 BLAKE2B bff10b72885f754032984406c8ec9265e24046184a019aed9d993cb4bc8b3f60b75953a2bbfe041301d67bfd9c6d1b7ecd3aa8a2d1307e99a0a20ab53175ae62 SHA512 da5f264567e9f5f576833b1e9a452350a0f1dc62f1edfef09a2465f89b4ed9e3a243c48ca52cc738e4361b409a9d692285be3564e24e34bffb868b04851af742
+EBUILD baka-mplayer-2.0.4-r1.ebuild 1393 BLAKE2B ba613bc4a7a2739f6ab9dba43865f8dc8f002809eb9058339f2659c32a1f6f37ed4fc10174dfec7662d50577aef27ff1779037cda3e6abeca787cc20c07e1e5b SHA512 0b06a8ccfb022400166c77fde48f8114f4d7a53adeb9916e4508b8dd90e7e3eb927e3e3303fd18dc0de6ef369fe1cac7814b3d72c1ffc2a0debf042a1d3d323d
 EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3
 EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46
 MISC metadata.xml 710 BLAKE2B 14de96f0e5bc84ecbd15d2d0518e6332fdf022a850464a1e56eb1338384ebe7eafb1d1ac016779eb95717b03331c6c9eb2592b7db5efe9ab9202c33a07db3e42 SHA512 17f1484753f6610e64013d76077e0963a6475861aec91af9f3b16638d49886038c8d40852eabc6eacf6a9f0429d5290700d9a19e1e69ff63049fe8fe50131a30
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
index 480cd44a4484..bb1a0715a863 100644
--- a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 0c33fdc6df40..3d0c2929c174 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,6 +6,6 @@ DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18213 BLAKE2B cf75ed63f4d4850efb1d2faa355f684a1030f4e8a5621a2fd58db3f6e7cdc1538110d6591a85486f2501af39c0ae808e447c7d32db399038b7a09cb13a0ce98e SHA512 af1b069d72297a681090a949de71ac382d7de587bf1cd22eabb68bff719bb0639bc4a8845311ff890d785c7d1a2680c66bd2e0f56d0172a8c7a8bcae65aedeae
+EBUILD ffmpeg-4.3.1.ebuild 18212 BLAKE2B b4ed0b43602885d1d3b728f77350282af5bf96897e7d900d038f8ba18b0ebd2972f585a8b01f51d21c51bdff47785991a1df56767886abc201c40cd1914849dc SHA512 12b5ffe8ea6fdf5dfb4d4f73086f1d0ea5b6d41ec327b45d1077f2113ee31a5437dc1805b417aefbe14a50e25a303604d93ac2ab1b69d2eb33eedcaad2dc3c99
 EBUILD ffmpeg-9999.ebuild 18036 BLAKE2B a240c17b2b3920cba29e3d63060baa6fcda069416469c2d088fdeb10bed1b8d0ca75df58285caf138272cdf60265f4faee6036cf357bb8f8b7e645f02aeceffb SHA512 033d323e2fa77246be8b8a1e79ef07dee5113f58e2a925c9be21438b62d47537d98e0dbbbd7eb870472ffda8d7fb90205da3aa7b1db9618d47087a5815ca438e
 MISC metadata.xml 5868 BLAKE2B afe06c266a6dce5dc2b13a1dcaae85c4288a4f45ef493d9b865bf476a624fb188ebab686708049149f1eac94e434b926b185d1bf0467f26f62f641a0f832dd22 SHA512 8b85ed0ba2d98135b3b2f7f4e13b7fcff52cd4238fa429e355c4e2033e51d945d8363ecf2bf73c0569e5a071a793bb01cd716113e4672603867a01d258d4aa77
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index 38f0b02a308c..da8caf3ad3da 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 4905065fb4ef..50e15f3c46b7 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -4,6 +4,6 @@ AUX gpac-1.0.1-configure.patch 3414 BLAKE2B 30ab11d0e215429ea5fae9664817b3a0bac2
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
 DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
 EBUILD gpac-0.8.1.ebuild 3307 BLAKE2B c3e648d567676021dd9410d0a9b3d155b46df03672fce0c20979d0ed49bc331c32e3c897d70a97b373636be062995a682fa7cb39452bdafa26927bec1c4b767b SHA512 e82f9528bb74a55059118839cefb2e3af0ded030d9e99184a639f5cfa5f47ec880c1e3ca3f997db800c3eb8cf051548dad9d2ba82e93a61f6631c66414c40560
-EBUILD gpac-1.0.1.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be
+EBUILD gpac-1.0.1.ebuild 3162 BLAKE2B 439dcd92d6e41edb06deed96dd42f11b4d294223e70f5a734abeae1a9265945fa62d65644816ad8b16c097917978c2295396c0c5dcdb23ee5fad6e715fb49bf4 SHA512 eb3a801f9ae7be225bb7ecd9218ea40396b62735e35447a4796d78b533cf8552fb25938ad3f44bf1e2a68852b7dcbca0be1dff484bf5d0131d9ae8b830aae516
 EBUILD gpac-9999.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild
index e5828cfed456..4a927bb8ae01 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 243abb807a1b..1b259ced6915 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,8 @@
 AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
 DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
+DIST pipewire-0.3.13.tar.gz 1176949 BLAKE2B 5a4c7f211c1ac3c823cc34cede2f42204a2a7c6d583237465e702936926fad924c37f0638c8bbdedc55ad70d59cc2796e64b2b3dea2c64f199383d4ed9c1c84a SHA512 38ce7d8808e69935db0148c077340cfbc1b85f5a016a0a57eff2c076560c42f0695cfe681c9f16ebf15796d773dd113c9a84631eb50ac44dfb09f91ed3fc61f0
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
 EBUILD pipewire-0.3.10.ebuild 3386 BLAKE2B 4567234b2ff098c6fdb853fa7df9922d1712de2b50845f84d411ca73b46b38e601dc29589edcd7b181e175964101a8b182ab42e9333ba9de5dcc3ad0abaa7a5f SHA512 75714d9c10a79464cd017531900fb4100b83dae4a2858669444c25badeef4bcdbbe685ef7f73c817f102d3b776b55fdbcb64e3a7578a82d073d5f3cabfa2ece6
+EBUILD pipewire-0.3.13.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.13.ebuild b/media-video/pipewire/pipewire-0.3.13.ebuild
new file mode 100644
index 000000000000..7396ae3ab65d
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.13.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	media-libs/libsdl2
+	>=media-libs/libsndfile-1.0.20
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-11.1
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index c47e81cf373c..6a2bb4cc197f 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -162,6 +162,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97bf967d5fe5b908b234552aac0fe96cc359f12aad7018af8b47b34b6219e0d87d036c8b4df1c1bcf1a27 SHA512 2d414d178c4bc16db7f5804987494629d12b85b409327012db2e9e868a7bb952cb630a86190fb455228ae40776b2c30c042eca65a1d3730e8425daf53f034991
-EBUILD rav1e-0.3.3.ebuild 4154 BLAKE2B 6d7bc7d6cfa59a3deb50f0ac2f8c7306d44fbbf781bf5ddbcf7fb3a3c973c967df54e74d86c0ed1f795cea296de308726169154d1181ba292145d0380325db6a SHA512 467b136602404df3b86efb1d4044fecd0618425e229ad70da9493bc7804bf364b39bff41a7c6fcdab5aa4798cac444796ff6a4f43f6af467909581cace66f6b3
+EBUILD rav1e-0.3.3.ebuild 4153 BLAKE2B 96f69c97721839eb9eaf7249780a50c95f3eaf7acc59d405cc618a8502bcfc480f93faa7518fb38a4e75fbeb1a1b09f910917dd1123de0b1cd8b7f2ec972f194 SHA512 dfdeccc66fba51e839cacc73c6c6502b86c30d6e7e771e186f7803cc5e82633858b2dba88b7baf73fa144ede00e1dc96a7f02314d286b05be11c9a92bf0efbf7
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.3.3.ebuild b/media-video/rav1e/rav1e-0.3.3.ebuild
index 60e89eda3d92..418db920dfd2 100644
--- a/media-video/rav1e/rav1e-0.3.3.ebuild
+++ b/media-video/rav1e/rav1e-0.3.3.ebuild
@@ -179,7 +179,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index bbbca5935181..9db3836dce39 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 197a7573e11a..f1baf1c687c4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 08 Oct 2020 13:38:36 +0000
+Mon, 12 Oct 2020 05:08:37 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4b1da69eaa50..a5afb9bd6860 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 486217 BLAKE2B a2e8388c21e11622400955df84cf5750d3dc1ed97260561adcf8593401f8ff3776aefdf5d04f851eb00ee9174b5b2687221348810862c270d26525ad93d576a6 SHA512 b61762e35911592950f03484850ed8e6736359d874b45a8dc2f8c3e462bef78fc8623da4842eeba0a994b89218e6ced81235ec4b0d1cee904aa59dd83fa038b1
-TIMESTAMP 2020-10-08T13:38:39Z
+TIMESTAMP 2020-10-12T05:08:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9/Fl9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+D5NlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBV2xAAidlfxNlPkJWpsT+XiOGNSG0WMXPG3+rpgjlN5rmDUGXjSGIpl2MqVaOS
-050iA4W1W1aKywr+hVgS0g8q0Vwk0iLcGUCBXGQrM1TwfR10mNaw5rvu84GHKtxe
-yzh/iKtUKHuHbJFGaZlpqrGz1jBP2qm6mkhX3EkeL9DxuT6FxpaAAF8hWcoVaO0g
-wYa8FQjbnCC01xFJherezZfadLrkx9kdVfibBLVQVxgHK9oOedhvfmTWEFj4J+iI
-LB3ArHL31fKgnL03jJQvG9koLVQHNHM03uu+ZQoYTBQRPUqTbBfc4PZ5UWQ/ryuM
-aeT5IRxUv/wF4gvFC4/XgriTtYV7DmzcpnDPC7pWVvHzAgPks+DNhaxWQqFJwkm2
-TN3H4JhKmAWK3pyeheuBqEg6vmsEonwZKnfCgY0Lbd/a9O4HbGYen2+7PRaC8kXH
-cx11qouHfSwV4BF4K5ZJuWCW3j/kcqqUI4kvAwb1gkht53NXTD8VUnmB0dug2h1c
-CRUkbdtUg+guvWRWrC3J7Vl52OabjRdjl9sGfxPSqxU1GP5XJKiTb9IER6EIcvXL
-GxkVTSkevHW3zQbbB2Icc8kXZ2FX1TLgRyQdzqrKzQlte+MGuoHuT9rUimVhh0Ta
-wAYOt91HL6gDAf3oOylXHxdQp9i7S6XTTjj/JR5Sh1YVJALEcnE=
-=Vmu+
+klDTNg//Qyldl/bZdHbOuYeJeqtXkW03V9w1RVfGDjpnckDyi3CEHY2qKHLP/t2M
+T+eX+xVxsef5X96KJFFdoPG6eQGSZNE4Bh7JJWNK2xy5ibMKHZl82k1yNYLFfQB3
+npkNTpZ/9iJTeNePfkq6eMfdFQ7KlbYoLs9wqH5DSt3az7Wp/mbok67szpLLATwB
+BRYoOobW7UStbgnCdrU7R3fxTqHjdeqVbwEd0W1iFsnnXul+vbrG+BsaYme+2g2P
+9H+7nenVAkad6NsywmXt1c7X2yvE7Cd+7ndAfRV/CXgcgknSrx/pELY2DKjBkp0J
+U5jLzIuwj0D0A9AZRspTPr3n5+DU0CBLmM+mcS3BmeHC289B6OQ6zKhnsUgHBsQs
+hZ9uNefg9Z0WBxMsxeSi67mlWVk0PTzvV5BKwtdfTZbSWQwEB8mjA64dw8h9JHge
+5OYtNOIfT2mdACrUQfcg//NNb1dmttlQhpKcmCoH+s2uNrGpUgqLHmEjm58Q9ZT9
+uPtwuKa9rDs+CdevkvVaYwQ3OrlEUFFoO1EkoYCsjgSIXSL/Dnyq+8GOewFk6TVE
+ejhiGLGM/nwtS0MmfQTpdQovpNcHBkrSOpjJ6CYuTn1EXz+CaVK4wQPxFqZ0MJfz
+UJOnsBhDDHY0ZpS30K6vc0bUPYEK33Yfo8c5U9dZQvQSmlGE9xQ=
+=j7Q1
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 197a7573e11a..f1baf1c687c4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 08 Oct 2020 13:38:36 +0000
+Mon, 12 Oct 2020 05:08:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index dc4504a04b55..050f6363a981 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index ea188dd06c09..f3bd9f7fa4a1 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/jabber-0 b/metadata/md5-cache/acct-group/jabber-0
new file mode 100644
index 000000000000..3f01037e7e48
--- /dev/null
+++ b/metadata/md5-cache/acct-group/jabber-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for various jabber services
+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_=451f9db031d76450e9c11d81b333b660
diff --git a/metadata/md5-cache/acct-group/sks-0 b/metadata/md5-cache/acct-group/sks-0
new file mode 100644
index 000000000000..0f7c1acb2e41
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sks-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for SKS OpenPGP keyserver
+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_=815b171407bae45f6793dddd56fbd294
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index a9cd8d522d1d..0d083d90c8d8 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/jabber-0 b/metadata/md5-cache/acct-user/jabber-0
new file mode 100644
index 000000000000..fceab1b00fee
--- /dev/null
+++ b/metadata/md5-cache/acct-user/jabber-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for various jabber services
+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/jabber
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=76228d4ad3a779ef15dcad9356e3e965
diff --git a/metadata/md5-cache/acct-user/sks-0 b/metadata/md5-cache/acct-user/sks-0
new file mode 100644
index 000000000000..05c19df3c695
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sks-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the SKS OpenPGP keyserver
+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/sks
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=620f64bcae4bb42a2e74103ef824ff18
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 94303ad94149..27d32464373f 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/kontrast-1.0.2 b/metadata/md5-cache/app-accessibility/kontrast-1.0.2
index 16a685e2c6e5..989a39655fc7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c173e096fd496aab5580b11a4adb6048
diff --git a/metadata/md5-cache/app-accessibility/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999
index d578e1b021f5..83296a59e5f6 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 9d94baf90f5c..59562cb08040 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/exo-1.18.0 b/metadata/md5-cache/app-admin/exo-1.18.0
deleted file mode 100644
index bbfbaf154be8..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.18.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.18.0.tar.gz -> exo-1.18.0.tar.gz
-_md5_=78bbf1316eed84adfc74ed1fd5e2b81c
diff --git a/metadata/md5-cache/app-admin/exo-1.19.0 b/metadata/md5-cache/app-admin/exo-1.19.0
new file mode 100644
index 000000000000..b58b5aca2da0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.19.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.19.0.tar.gz -> exo-1.19.0.tar.gz
+_md5_=78bbf1316eed84adfc74ed1fd5e2b81c
diff --git a/metadata/md5-cache/app-admin/selint-1.1.0 b/metadata/md5-cache/app-admin/selint-1.1.0
new file mode 100644
index 000000000000..fb99b0fd47e6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/selint-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/confuse dev-libs/uthash test? ( dev-libs/check )
+DESCRIPTION=Policy Analysis Tools for SELinux
+EAPI=7
+HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/confuse dev-libs/uthash
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.1.0/selint-1.1.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=62f58c55d819b2b6928213451bb76745
diff --git a/metadata/md5-cache/app-admin/selint-9999 b/metadata/md5-cache/app-admin/selint-9999
new file mode 100644
index 000000000000..c1386fcea0a7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/selint-9999
@@ -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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare unpack
+DEPEND=dev-libs/confuse dev-libs/uthash test? ( dev-libs/check )
+DESCRIPTION=Policy Analysis Tools for SELinux
+EAPI=7
+HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
+IUSE=test
+LICENSE=Apache-2.0
+PROPERTIES=live
+RDEPEND=dev-libs/confuse dev-libs/uthash
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=62f58c55d819b2b6928213451bb76745
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index 250be3a741e1..0f0d4ef86a9f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-admin/vault-1.4.5 b/metadata/md5-cache/app-admin/vault-1.4.5
index 1993e158a5dc..1e5ab5cb99f0 100644
--- a/metadata/md5-cache/app-admin/vault-1.4.5
+++ b/metadata/md5-cache/app-admin/vault-1.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=A tool for managing secrets
 EAPI=7
 HOMEPAGE=https://vaultproject.io/
 IUSE=+webui +filecaps
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
 RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v1.4.5.tar.gz -> vault-1.4.5.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.4.5-webui.tar.xz )
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3cc0fdd45a4bf7f11f29d9f68e124ed
+_md5_=a3463ad518e43c62c5e4caea85e6f2a2
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 36385e66e276..dff3456d7224 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.14 b/metadata/md5-cache/app-backup/borgbackup-1.1.14
new file mode 100644
index 000000000000..32d387210dac
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.14
@@ -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_scm[python_targets_python3_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(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=7
+HOMEPAGE=https://borgbackup.readthedocs.io/
+IUSE=libressl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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/b/borgbackup/borgbackup-1.1.14.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a98a7e280702578f12dd09b21886a36a
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index 473c246734b8..fabea768476a 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -11,4 +11,4 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 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_=1f92e53e7a34ab6483c98cba0e8a9866
+_md5_=a98a7e280702578f12dd09b21886a36a
diff --git a/metadata/md5-cache/app-backup/kup-0.8.0 b/metadata/md5-cache/app-backup/kup-0.8.0
index fee638b62439..73a9bc120ecf 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/restic-0.10.0 b/metadata/md5-cache/app-backup/restic-0.10.0
new file mode 100644
index 000000000000..535ac7c7c7ae
--- /dev/null
+++ b/metadata/md5-cache/app-backup/restic-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=sys-fs/fuse:0
+DESCRIPTION=A backup program that is fast, efficient and secure
+EAPI=7
+HOMEPAGE=https://restic.github.io/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
+RDEPEND=sys-fs/fuse:0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/restic/restic/archive/v0.10.0.tar.gz -> restic-0.10.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod 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//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.66.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.66.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.66.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.66.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v46.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v46.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.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/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 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/!one!of!one/xxhash/@v/v1.2.8.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.8.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.8.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.8.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/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/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 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/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.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/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.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-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/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 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/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.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/dchest/siphash/@v/v1.2.1.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.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/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elithrar/simple-scrypt/@v/v1.3.0.zip -> github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elithrar/simple-scrypt/@v/v1.3.0.mod -> github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.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/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.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-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/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 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-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.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/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 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.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 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/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.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/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.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/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.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/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200905233945-acf8798be1f7.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200905233945-acf8798be1f7.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.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/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.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/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.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 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/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.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/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.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/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/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.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/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.zip -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.mod -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.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/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.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/fs/@v/v0.1.0.zip -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.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.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/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/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kurin/blazer/@v/v0.5.3.zip -> github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/kurin/blazer/@v/v0.5.3.mod -> github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.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/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/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.57.zip -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.zip mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.57.mod -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 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.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 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-20180701023420-4b7aa43c6742.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 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/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/ncw/swift/@v/v1.0.52.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.52.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.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/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.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/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.5.0.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/pkg/profile/@v/v1.5.0.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.12.0.zip -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/pkg/sftp/@v/v1.12.0.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/pkg/xattr/@v/v0.4.1.zip -> github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/pkg/xattr/@v/v0.4.1.mod -> github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.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/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.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/restic/chunker/@v/v0.4.0.zip -> github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/restic/chunker/@v/v0.4.0.mod -> github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.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/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 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/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 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/sirupsen/logrus/@v/v1.5.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.2.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.2.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.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.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 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/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.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/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.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/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 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.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/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/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 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.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.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/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.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/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//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.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.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.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-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-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.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/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.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/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.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-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-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.zip 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-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 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/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 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.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 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-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.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/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.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-20181021155630-eda9bb28ed51.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181021155630-eda9bb28ed51.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-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-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.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-20190422165155-953cdadca894.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.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-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.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/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200918174421-af09f7315aff.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200918174421-af09f7315aff.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200918174421-af09f7315aff.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200918174421-af09f7315aff.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 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.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip 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.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.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.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-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-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.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/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200828161849-5deb26317202.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200828161849-5deb26317202.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200915173823-2db8f0ff891c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200915173823-2db8f0ff891c.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.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//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.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/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.31.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.31.0.mod mirror://goproxy//google.golang.org/api/@v/v0.32.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.32.0.zip mirror://goproxy//google.golang.org/api/@v/v0.32.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.32.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 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/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.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.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.zip 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/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200831141814-d751682dd103.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200831141814-d751682dd103.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200914193844-75d14daec038.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200914193844-75d14daec038.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200918140846-d0d605568037.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200918140846-d0d605568037.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200918140846-d0d605568037.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200918140846-d0d605568037.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.20.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.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.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 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/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.61.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.61.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.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.v2/@v/v2.0.0-20161208151619-d5d1b5820637.zip -> gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.zip mirror://goproxy//gopkg.in/tomb.v2/@v/v2.0.0-20161208151619-d5d1b5820637.mod -> gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.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.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip 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.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 mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.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//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=517e46f455b7ad6a46e183f9d8ac570a
diff --git a/metadata/md5-cache/app-backup/restic-0.9.4 b/metadata/md5-cache/app-backup/restic-0.9.4
deleted file mode 100644
index 6abaa986551d..000000000000
--- a/metadata/md5-cache/app-backup/restic-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=sys-fs/fuse:0 >=dev-lang/go-1.10
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
-RDEPEND=sys-fs/fuse:0
-RESTRICT=strip !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.9.4.tar.gz -> restic-0.9.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c3aaca3966ae07c682c90d63e789db4b
diff --git a/metadata/md5-cache/app-backup/restic-0.9.5 b/metadata/md5-cache/app-backup/restic-0.9.5
deleted file mode 100644
index 67c8c9c726c6..000000000000
--- a/metadata/md5-cache/app-backup/restic-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DEPEND=sys-fs/fuse:0
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=7
-HOMEPAGE=https://restic.github.io/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
-RDEPEND=sys-fs/fuse:0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.9.5.tar.gz -> restic-0.9.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df8519e6b32064cfa4e2b16bc0adf4d5
diff --git a/metadata/md5-cache/app-backup/tsm-7.1.8.0-r1 b/metadata/md5-cache/app-backup/tsm-7.1.8.0-r1
deleted file mode 100644
index 4e81cd84c435..000000000000
--- a/metadata/md5-cache/app-backup/tsm-7.1.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=acct-group/tsm >=app-arch/rpm2targz-9.0.0.3g virtual/pkgconfig
-DESCRIPTION=IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API
-EAPI=6
-HOMEPAGE=https://www.ibm.com/us-en/marketplace/data-protection-and-recovery
-IUSE=acl java +tsm-cit +tsm-hw
-KEYWORDS=-* ~amd64
-LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
-RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v7r1/Linux/LinuxX86/BA/v718/7.1.8.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7d7d257adf3b857569f0fd4ddb354bd
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0 b/metadata/md5-cache/app-backup/tsm-8.1.6.0
index 8f5f734c170a..40c133a31b82 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive
 EAPI=6
 HOMEPAGE=https://www.ibm.com/us-en/marketplace/data-protection-and-recovery
 IUSE=acl java +tsm-cit +tsm-hw
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
 RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cbe2e40f2414000868cb6c3901804ebd
+_md5_=010614669d0bd4924b637ff59a99ea4b
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1 b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
new file mode 100644
index 000000000000..e1369198ba36
--- /dev/null
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=acct-group/tsm >=app-arch/rpm2targz-9.0.0.3g virtual/pkgconfig
+DESCRIPTION=IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API
+EAPI=6
+HOMEPAGE=https://www.ibm.com/us-en/marketplace/data-protection-and-recovery
+IUSE=acl java +tsm-cit +tsm-hw
+KEYWORDS=-* ~amd64
+LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
+RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b8ff17d07353975a0ad2226b58b5cb09
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 24baa9135dd4..ac234ae9d2ef 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
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
deleted file mode 100644
index 5d3e5b346b4c..000000000000
--- a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for ISO loopback device mounting
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/dolphin-plugins-mountiso-20.08.2 b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.2
new file mode 100644
index 000000000000..1832d38b12c5
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for ISO loopback device mounting
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~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 >=kde-apps/dolphin-20.08.2: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.2/src/dolphin-plugins-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/isoimagewriter-0.8 b/metadata/md5-cache/app-cdr/isoimagewriter-0.8
index dcc07cace43f..fe9c40dfd3bc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index bbbf8e0075f9..6fea22fb6617 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-1.7.0 b/metadata/md5-cache/app-crypt/acme-1.7.0
deleted file mode 100644
index 7eebcec5dae2..000000000000
--- a/metadata/md5-cache/app-crypt/acme-1.7.0
+++ /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 ) 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=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/sphinx_rtd_theme[python_targets_python3_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/cryptography-1.3.4[python_targets_python3_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/idna-2.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/josepy-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(-)] >=dev-python/pyopenssl-0.15.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/pyrfc3339[python_targets_python3_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/pytz[python_targets_python3_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-2.10[python_targets_python3_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-toolbelt-0.3.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-1.9.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/nose[python_targets_python3_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(-)] dev-python/pytest-xdist[python_targets_python3_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=An implementation of the ACME protocol
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_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/idna-2.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/josepy-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(-)] >=dev-python/pyopenssl-0.15.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/pyrfc3339[python_targets_python3_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/pytz[python_targets_python3_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-2.10[python_targets_python3_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-toolbelt-0.3.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-1.9.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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.7.0.tar.gz -> certbot-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_=88e11433e83b95232ba4c978a828f0dc
diff --git a/metadata/md5-cache/app-crypt/acme-1.8.0 b/metadata/md5-cache/app-crypt/acme-1.8.0
index cdd07c73624e..1da264e13009 100644
--- a/metadata/md5-cache/app-crypt/acme-1.8.0
+++ b/metadata/md5-cache/app-crypt/acme-1.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_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/idna-2.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/josepy-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(-)] >=dev-python/pyopenssl-0.15.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/pyrfc3339[python_targets_python3_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/pytz[python_targets_python3_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-2.10[python_targets_python3_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-toolbelt-0.3.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-1.9.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(-)]
 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=https://github.com/certbot/certbot/archive/v1.8.0.tar.gz -> certbot-1.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_=3c79f4dbd37b6a53cde8718c29a419df
+_md5_=88e11433e83b95232ba4c978a828f0dc
diff --git a/metadata/md5-cache/app-crypt/acmebot-2.3.0-r1 b/metadata/md5-cache/app-crypt/acmebot-2.3.0-r1
deleted file mode 100644
index 99be2dbd7d72..000000000000
--- a/metadata/md5-cache/app-crypt/acmebot-2.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Certificate manager bot using ACME protocol
-EAPI=7
-HOMEPAGE=https://github.com/plinss/acmebot
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pydns-3.1.0:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.24.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/plinss/acmebot/archive/v2.3.0.tar.gz -> acmebot-2.3.0.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a497065b26a7eb7c99e7526a5fa87881
diff --git a/metadata/md5-cache/app-crypt/acmebot-2.7.0 b/metadata/md5-cache/app-crypt/acmebot-2.7.0
deleted file mode 100644
index 908b490e90e1..000000000000
--- a/metadata/md5-cache/app-crypt/acmebot-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=Certificate manager bot using ACME protocol
-EAPI=7
-HOMEPAGE=https://github.com/plinss/acmebot
-IUSE=python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-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-python/appdirs-1.4.3[python_targets_python3_7(-)] >=dev-python/pyparsing-2.2.0[python_targets_python3_7(-)] >=dev-python/packaging-16.8[python_targets_python3_7(-)] >=dev-python/pyopenssl-17.5.0[python_targets_python3_7(-)] >=dev-python/pydns-3.1.0:3[python_targets_python3_7(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_7(-)] >=dev-python/asn1crypto-0.24.0[python_targets_python3_7(-)] >=app-crypt/acme-0.25.1[python_targets_python3_7(-)] >=dev-python/pyyaml-3.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/appdirs-1.4.3[python_targets_python3_8(-)] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)] >=dev-python/pydns-3.1.0:3[python_targets_python3_8(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)] >=dev-python/asn1crypto-0.24.0[python_targets_python3_8(-)] >=app-crypt/acme-0.25.1[python_targets_python3_8(-)] >=dev-python/pyyaml-3.1[python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/plinss/acmebot/archive/v2.7.0.tar.gz -> acmebot-2.7.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0144cb529913c33794e06331f21d1fb8
diff --git a/metadata/md5-cache/app-crypt/acmebot-9999 b/metadata/md5-cache/app-crypt/acmebot-9999
deleted file mode 100644
index 6a2b5a48aab5..000000000000
--- a/metadata/md5-cache/app-crypt/acmebot-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install unpack
-DESCRIPTION=Certificate manager bot using ACME protocol
-EAPI=7
-HOMEPAGE=https://github.com/plinss/acmebot
-IUSE=python_targets_python3_6
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pydns-3.1.0:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.24.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a497065b26a7eb7c99e7526a5fa87881
diff --git a/metadata/md5-cache/app-crypt/certbot-1.7.0 b/metadata/md5-cache/app-crypt/certbot-1.7.0
deleted file mode 100644
index dac415973072..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-1.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=app-crypt/acme-1.6.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/configargparse-0.9.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/configobj[python_targets_python3_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/cryptography-2.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/distro-1.0.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/josepy-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(-)] >=dev-python/parsedatetime-1.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/pyrfc3339[python_targets_python3_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/pytz[python_targets_python3_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/zope-component[python_targets_python3_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/zope-interface[python_targets_python3_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=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.6.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/configargparse-0.9.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/configobj[python_targets_python3_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/cryptography-2.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/distro-1.0.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/josepy-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(-)] >=dev-python/parsedatetime-1.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/pyrfc3339[python_targets_python3_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/pytz[python_targets_python3_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/zope-component[python_targets_python3_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/zope-interface[python_targets_python3_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 ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.7.0.tar.gz -> certbot-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_=246aaa125b1639f3ac98ed07d81b9041
diff --git a/metadata/md5-cache/app-crypt/certbot-1.8.0 b/metadata/md5-cache/app-crypt/certbot-1.8.0
index cc570f1ee847..839d6d346d3c 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.8.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.6.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/configargparse-0.9.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/configobj[python_targets_python3_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/cryptography-2.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/distro-1.0.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/josepy-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(-)] >=dev-python/parsedatetime-1.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/pyrfc3339[python_targets_python3_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/pytz[python_targets_python3_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/zope-component[python_targets_python3_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/zope-interface[python_targets_python3_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.8.0.tar.gz -> certbot-1.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_=195b52483a663108f44aaf2cc4e2c70b
+_md5_=246aaa125b1639f3ac98ed07d81b9041
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.7.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.7.0
deleted file mode 100644
index 9f35c0edbef7..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.7.0
+++ /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 ) 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? ( >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-1.6.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/python-augeas[python_targets_python3_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/zope-component[python_targets_python3_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/zope-interface[python_targets_python3_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=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-1.6.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/python-augeas[python_targets_python3_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/zope-component[python_targets_python3_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/zope-interface[python_targets_python3_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/certbot/certbot/archive/v1.7.0.tar.gz -> certbot-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_=adce19a321958ae6be109de56ab985ab
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.8.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.8.0
index 5f9581e93f1c..e71c49d63e5e 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.8.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-1.6.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/python-augeas[python_targets_python3_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/zope-component[python_targets_python3_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/zope-interface[python_targets_python3_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=https://github.com/certbot/certbot/archive/v1.8.0.tar.gz -> certbot-1.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_=75c1497632e433274d382a925688bda2
+_md5_=adce19a321958ae6be109de56ab985ab
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.7.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.7.0
deleted file mode 100644
index 679ac4e7ef82..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.7.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 ) 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=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.4.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(-)] >=app-crypt/certbot-1.6.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/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/pyparsing-1.5.5[python_targets_python3_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/zope-interface[python_targets_python3_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 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.7.0.tar.gz -> certbot-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_=e49869848dd670bc5783bb3bc1391f9c
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.8.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.8.0
index 7b75ed530565..2e3a856cc249 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.8.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.4.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(-)] >=app-crypt/certbot-1.6.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/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/pyparsing-1.5.5[python_targets_python3_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/zope-interface[python_targets_python3_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 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.8.0.tar.gz -> certbot-1.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_=b1d125567354906c41ba169406610d5e
+_md5_=e49869848dd670bc5783bb3bc1391f9c
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-miniupnp-20201006 b/metadata/md5-cache/app-crypt/openpgp-keys-miniupnp-20201006
new file mode 100644
index 000000000000..8635d8f053ad
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-miniupnp-20201006
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used to sign miniupnp* packages
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/files/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/A31ACAAF.asc http://miniupnp.free.fr/A5C0863C.asc
+_md5_=2d2850a464222d2d864e013ee421bcc5
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.1 b/metadata/md5-cache/app-crypt/qca-2.3.1
index 040fdc6866ea..9c4810bf8071 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/scrypt-1.3.1 b/metadata/md5-cache/app-crypt/scrypt-1.3.1
index 78264acdc54e..2d33d248e343 100644
--- a/metadata/md5-cache/app-crypt/scrypt-1.3.1
+++ b/metadata/md5-cache/app-crypt/scrypt-1.3.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=test
 DESCRIPTION=A simple password-based encryption utility using scrypt key derivation function
 EAPI=7
 HOMEPAGE=http://www.tarsnap.com/scrypt.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.tarsnap.com/scrypt/scrypt-1.3.1.tgz
-_md5_=0ebb0a0cbd4568220348ae419f1feda7
+_md5_=f8dd25369467760b0b598d5f658f3b5b
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.2 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.2
deleted file mode 100644
index 1502811a2919..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) test? ( dev-util/cmocka )
-DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
-IUSE=doc +fapi gcrypt +openssl static-libs test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
-REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.2/tpm2-tss-2.4.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=2fcca3e7cf7d5dac10c41de408740bc5
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.3 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.3
new file mode 100644
index 000000000000..2c9c407a8921
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
+IUSE=doc +fapi gcrypt +openssl static-libs test kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
+REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.3/tpm2-tss-2.4.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=f260af529f333f0585f630b23fb7b832
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-3.0.0 b/metadata/md5-cache/app-crypt/tpm2-tss-3.0.0
deleted file mode 100644
index 79e0a102b936..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tss-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= ) test? ( dev-util/cmocka )
-DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
-IUSE=doc +fapi +openssl mbedtls static-libs test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= ) virtual/tmpfiles
-REQUIRED_USE=^^ ( mbedtls openssl ) fapi? ( openssl !mbedtls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/3.0.0/tpm2-tss-3.0.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=757d4be0c0c1e4e9cc2ea110a79dbca7
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-3.0.1 b/metadata/md5-cache/app-crypt/tpm2-tss-3.0.1
new file mode 100644
index 000000000000..3e2c63f470e4
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-3.0.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= ) test? ( dev-util/cmocka )
+DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
+IUSE=doc +fapi +openssl mbedtls static-libs test kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= ) virtual/tmpfiles
+REQUIRED_USE=^^ ( mbedtls openssl ) fapi? ( openssl !mbedtls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/3.0.1/tpm2-tss-3.0.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=f945f87ed37ca0d4fa8a7bdaddd6fd00
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index fe6d4775c2ee..eb1d010b6847 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/kicad-doc-4.0.7 b/metadata/md5-cache/app-doc/kicad-doc-4.0.7
deleted file mode 100644
index 5f98205277f1..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-4.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_en? ( dev-texlive/texlive-langenglish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_nl? ( dev-texlive/texlive-langeuropean ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=6
-HOMEPAGE=http://www.kicad-pcb.org/
-IUSE=html +pdf l10n_en l10n_fr l10n_it l10n_ja l10n_nl l10n_pl
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
-REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_en l10n_fr l10n_it l10n_ja l10n_nl l10n_pl )
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-doc/archive/4.0.7.tar.gz -> kicad-doc-4.0.7.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_=0301da89dee3296f18d051ef99ce1480
diff --git a/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1 b/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1
deleted file mode 100644
index 694f2c87666e..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=6
-HOMEPAGE=http://www.kicad-pcb.org/
-IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-doc/archive/4.0.7.tar.gz -> kicad-doc-4.0.7.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_=4ee0eca7fca97f27f7c20635645fd2bf
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.5 b/metadata/md5-cache/app-doc/kicad-doc-5.1.5
deleted file mode 100644
index 52875a602264..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=7
-HOMEPAGE=http://www.kicad-pcb.org/
-IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
-KEYWORDS=~amd64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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 3110ac360ea7..a2244acb0af5 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.6
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.1.6
@@ -2,7 +2,7 @@ BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools manuals
 EAPI=7
-HOMEPAGE=http://docs.kicad-pcb.org/
+HOMEPAGE=https://docs.kicad-pcb.org/
 IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_i
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.6/kicad-doc-5.1.6.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-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fadc109da0e2a9cdfc44a586de7216f
+_md5_=f68e7bc3a96c1796fe49e1ff820c5ae1
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.7 b/metadata/md5-cache/app-doc/kicad-doc-5.1.7
new file mode 100644
index 000000000000..a3a924175c23
--- /dev/null
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.1.7
@@ -0,0 +1,13 @@
+BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools manuals
+EAPI=7
+HOMEPAGE=https://docs.kicad-pcb.org/
+IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
+KEYWORDS=~amd64 ~x86
+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.7/kicad-doc-5.1.7.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-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f68e7bc3a96c1796fe49e1ff820c5ae1
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 509e8274d4a5..94d4c935eb5b 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/kile-2.9.93 b/metadata/md5-cache/app-editors/kile-2.9.93
index 80c68b06fa7b..f3db4db3dc14 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/okteta-0.26.4 b/metadata/md5-cache/app-editors/okteta-0.26.4
index e3abb5fa73fb..68d315b95eae 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index c9d4f9819bfe..4050026fd0f2 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513 b/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513
deleted file mode 100644
index 63fb7b1885cc..000000000000
--- a/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=An Emacs major mode for editing Lua scripts
-EAPI=7
-HOMEPAGE=http://lua-users.org/wiki/LuaEditorSupport http://immerrr.github.io/lua-mode/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-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	34cc2b6f6d8914019a353fe39cff43ce
-_md5_=314b0d0c0afde5f6659a3d02e5bab6ad
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20201010 b/metadata/md5-cache/app-emacs/lua-mode-20201010
new file mode 100644
index 000000000000..0d245f5fa027
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/lua-mode-20201010
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Emacs major mode for editing Lua scripts
+EAPI=7
+HOMEPAGE=http://lua-users.org/wiki/LuaEditorSupport http://immerrr.github.io/lua-mode/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.3:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/immerrr/lua-mode/archive/v20201010.tar.gz -> lua-mode-20201010.tar.gz
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
+_md5_=7ca3c1a388719b38217fc84f93fc4bca
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 71db592c23eb..146f6cbd9b5e 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/fuse-1.5.6 b/metadata/md5-cache/app-emulation/fuse-1.5.6
deleted file mode 100644
index 2db29d438b8b..000000000000
--- a/metadata/md5-cache/app-emulation/fuse-1.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 ) backend-fbcon? ( virtual/linux-sources ) dev-lang/perl 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=Free Unix Spectrum Emulator by Philip Kendall
-EAPI=6
-HOMEPAGE=http://fuse-emulator.sourceforge.net
-IUSE=alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )
-REQUIRED_USE=?? ( backend-fbcon backend-sdl backend-svga backend-X )
-SLOT=0
-SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.5.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b8f8cf5435445680306938e5628bf9a1
diff --git a/metadata/md5-cache/app-emulation/fuse-1.5.7 b/metadata/md5-cache/app-emulation/fuse-1.5.7
index 60e3ee85692e..6abd1b7b5d8c 100644
--- a/metadata/md5-cache/app-emulation/fuse-1.5.7
+++ b/metadata/md5-cache/app-emulation/fuse-1.5.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure prepare test
-DEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 ) backend-fbcon? ( virtual/linux-sources ) dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 ) backend-fbcon? ( virtual/linux-sources ) dev-lang/perl 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=Free Unix Spectrum Emulator by Philip Kendall
 EAPI=6
 HOMEPAGE=http://fuse-emulator.sourceforge.net
 IUSE=alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )
+RDEPEND=>=app-emulation/libspectrum-1.4.4 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-sdl? ( media-libs/libsdl ) backend-svga? ( media-libs/svgalib ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )
 REQUIRED_USE=?? ( backend-fbcon backend-sdl backend-svga backend-X )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.5.7.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b8f8cf5435445680306938e5628bf9a1
+_md5_=73274ec6f9409db706923839bd498d71
diff --git a/metadata/md5-cache/app-emulation/pcem-16 b/metadata/md5-cache/app-emulation/pcem-16
deleted file mode 100644
index 1ec6bed20ee3..000000000000
--- a/metadata/md5-cache/app-emulation/pcem-16
+++ /dev/null
@@ -1,13 +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 postinst prepare
-DESCRIPTION=A PC emulator that specializes in running old operating systems and software
-EAPI=7
-HOMEPAGE=https://pcem-emulator.co.uk/ https://github.com/sarah-walker-pcem/pcem/
-IUSE=alsa networking
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=alsa? ( media-libs/alsa-lib ) media-libs/libsdl2 media-libs/openal x11-libs/wxGTK:3.0[tiff,X]
-SLOT=0
-SRC_URI=https://pcem-emulator.co.uk/files/PCemV16Linux.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=e68a215d3f62ad4e8d8ccf1166e9e89c
diff --git a/metadata/md5-cache/app-emulation/pcem-16-r1 b/metadata/md5-cache/app-emulation/pcem-16-r1
new file mode 100644
index 000000000000..e14ae1fbd3c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/pcem-16-r1
@@ -0,0 +1,13 @@
+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 postinst prepare
+DESCRIPTION=A PC emulator that specializes in running old operating systems and software
+EAPI=7
+HOMEPAGE=https://pcem-emulator.co.uk/ https://github.com/sarah-walker-pcem/pcem/
+IUSE=alsa networking
+KEYWORDS=amd64
+LICENSE=GPL-2+
+RDEPEND=alsa? ( media-libs/alsa-lib ) media-libs/libsdl2 media-libs/openal x11-libs/wxGTK:3.0-gtk3[tiff,X]
+SLOT=0
+SRC_URI=https://pcem-emulator.co.uk/files/PCemV16Linux.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=2df3ce08f2cd136d8004455d20d3b8d0
diff --git a/metadata/md5-cache/app-emulation/wine-mono-5.1.1 b/metadata/md5-cache/app-emulation/wine-mono-5.1.1
new file mode 100644
index 000000000000..5d3ac1f09331
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-mono-5.1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=!!app-emulation/wine:0
+DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
+EAPI=7
+HOMEPAGE=https://www.winehq.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
+SLOT=5.1.1
+SRC_URI=https://dl.winehq.org/wine/wine-mono/5.1.1/wine-mono-5.1.1-x86.msi
+_md5_=f5a4cd479af3d8284e56bc5b9c26028e
diff --git a/metadata/md5-cache/app-emulation/wine-staging-5.15 b/metadata/md5-cache/app-emulation/wine-staging-5.15
deleted file mode 100644
index b447162448db..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-5.15
+++ /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.15
-SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.15.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/150ce22fa21ffa040816e725ead34ed1de516bd8.tar.gz -> wine-staging-150ce22fa21ffa040816e725ead34ed1de516bd8.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_=312ccb5bfa688482af04e658891a69da
diff --git a/metadata/md5-cache/app-emulation/wine-staging-5.19 b/metadata/md5-cache/app-emulation/wine-staging-5.19
new file mode 100644
index 000000000000..40ceeddd3e91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-5.19
@@ -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.1 ) 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.19
+SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.19.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.19.tar.gz -> wine-staging-5.19.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_=6eebfddd281810791edb7f823d86c1c5
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 367e5f7858a7..c06aed2f565f 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -6,10 +6,10 @@ 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-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 )
+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.1 ) 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_=aeb9d782fb311da09a864a1aafbf5670
+_md5_=0039a3db01cad48d240cf8790c6d1cbd
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.15 b/metadata/md5-cache/app-emulation/wine-vanilla-5.15
deleted file mode 100644
index 22847c02fd47..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.15
+++ /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.15
-SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.15.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.19 b/metadata/md5-cache/app-emulation/wine-vanilla-5.19
new file mode 100644
index 000000000000..efc3ba207144
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-5.19
@@ -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.1 ) 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.19
+SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.19.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_=d1d65fb3c1ef6b59d61c6862ae6884a9
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index bd7d17a9eb99..5b7d464f756e 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -6,10 +6,10 @@ 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-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 )
+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.1 ) 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_=36645eeb9c894391a04c36775e21572e
+_md5_=d1d65fb3c1ef6b59d61c6862ae6884a9
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.1-r4 b/metadata/md5-cache/app-emulation/xen-4.13.1-r4
index dbfe67e6d471..db03f5831e0c 100644
--- a/metadata/md5-cache/app-emulation/xen-4.13.1-r4
+++ b/metadata/md5-cache/app-emulation/xen-4.13.1-r4
@@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
 EAPI=7
 HOMEPAGE=https://www.xenproject.org
 IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.13.1
 REQUIRED_USE=arm? ( debug )
@@ -12,4 +12,4 @@ 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
+_md5_=c86edeb8b3cea1660c2baa540a32f164
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
index 9b1e0716823f..b3f2f09c121f 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4
@@ -4,7 +4,7 @@ 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
+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 )
@@ -12,4 +12,4 @@ 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_=6f3fdf83705929aa8d796425ed0d38a9
+_md5_=4c744047633c9e18a04ee94deb7940df
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 63a1e840b27f..2e746748222a 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.22 b/metadata/md5-cache/app-i18n/ibus-1.5.22
index 9e0cd5ca7e4e..b395abff3585 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.22
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.22
@@ -1,6 +1,6 @@
 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=configure install postinst postrm prepare test
-DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( python_targets_python3_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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( 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/glib-utils virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data )
+DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( python_targets_python3_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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( 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/glib-utils virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.22/ibus-1.5.22.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63e229ca6f9ad24ba0acd25b39c180f9
+_md5_=42f2d8eef909185609a6bdbec957137a
diff --git a/metadata/md5-cache/app-i18n/pology-0.12-r2 b/metadata/md5-cache/app-i18n/pology-0.12-r2
index 906371fb2a40..d1b4f0a93aa6 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	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
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
index 95219e14c1ea..34a2f02cfa4b 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
@@ -4,10 +4,10 @@ DEPEND=dev-db/sqlite:3
 DESCRIPTION=Statistical Language Model (SLM) based Chinese input method library
 EAPI=7
 HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=|| ( CDDL LGPL-2.1 )
 RDEPEND=dev-db/sqlite:3
 SLOT=0/3
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a019241e69014e6660680a25e90355a
+_md5_=f75d5349e9dab8cff1e325aaeb6a52d7
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 8ef09cac5c64..e7a6cce4de64 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/dtach-0.9 b/metadata/md5-cache/app-misc/dtach-0.9
index f0cb99c66b5e..088d473c8817 100644
--- a/metadata/md5-cache/app-misc/dtach-0.9
+++ b/metadata/md5-cache/app-misc/dtach-0.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Emulates the detach feature of screen
 EAPI=6
 HOMEPAGE=http://dtach.sourceforge.net/ https://github.com/crigler/dtach
-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=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dtach/dtach-0.9.tar.gz
-_md5_=b9b56b2352c48ed9ac44622a35360cc7
+_md5_=dbb45d22abb9bd47f903341c479c3df1
diff --git a/metadata/md5-cache/app-misc/fr24feed-1.0.24_p5 b/metadata/md5-cache/app-misc/fr24feed-1.0.24_p5
deleted file mode 100644
index d8c39d269d1a..000000000000
--- a/metadata/md5-cache/app-misc/fr24feed-1.0.24_p5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Flightradar24 data sharing software
-EAPI=7
-HOMEPAGE=https://www.flightradar24.com/share-your-data
-KEYWORDS=-* amd64 x86
-LICENSE=Flightradar24
-RDEPEND=net-wireless/dump1090 virtual/libusb:1
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_1.0.24-5_amd64.tgz ) x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/fr24feed_1.0.24-5_i386.tgz )
-_md5_=29e4267aabffddfa84fc1f5d01b28224
diff --git a/metadata/md5-cache/app-misc/fr24feed-1.0.25_p3 b/metadata/md5-cache/app-misc/fr24feed-1.0.25_p3
index 2223d1945457..4b0b924a9ca5 100644
--- a/metadata/md5-cache/app-misc/fr24feed-1.0.25_p3
+++ b/metadata/md5-cache/app-misc/fr24feed-1.0.25_p3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Flightradar24 data sharing software
 EAPI=7
 HOMEPAGE=https://www.flightradar24.com/share-your-data
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=Flightradar24
 RDEPEND=net-wireless/dump1090 virtual/libusb:1
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_1.0.25-3_amd64.tgz ) x86? ( https://repo-feed.flightradar24.com/linux_x86_binaries/fr24feed_1.0.25-3_i386.tgz )
-_md5_=beef215c7e168f31c62b2efbed04d520
+_md5_=29e4267aabffddfa84fc1f5d01b28224
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
deleted file mode 100644
index 5237914730f0..000000000000
--- a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r2
+++ /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[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-r1 b/metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
index f0ed05b3f191..a9024011cb94 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
+++ b/metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
@@ -5,11 +5,11 @@ 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
+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_=66d3d1169f718fd2f0b7a5e6d0ec5fa5
+_md5_=bdc915986a7167445737b70ba3cd56c6
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.9-r1 b/metadata/md5-cache/app-misc/lcdproc-0.5.9-r1
deleted file mode 100644
index feee520c1619..000000000000
--- a/metadata/md5-cache/app-misc/lcdproc-0.5.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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:= ) doc? ( app-doc/doxygen[dot] app-text/xmlto ) freetype? ( media-libs/freetype:2= ) nfs? ( net-fs/nfs-utils ) png? ( media-libs/libpng:0= ) samba? ( net-fs/samba ) >=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=Displays real-time system information from your Linux/*BSD box on a LCD
-EAPI=6
-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_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
-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_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/releases/download/v0.5.9/lcdproc-0.5.9.tar.gz https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fec199db2aa152e1e2cf824555d1b48d
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 1679b46bfe17..c41d797b1c8e 100644
--- a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
+++ b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
@@ -4,12 +4,12 @@ DEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev
 DESCRIPTION=Displays real-time system information from your Linux/*BSD box on a LCD
 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
+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
 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_=810cf334a25c19bfcfeeb0e5080ceb2d
+_md5_=a06d16d0ed158d272e7519f56b24cb28
diff --git a/metadata/md5-cache/app-misc/mswinurl_launcher-1.0 b/metadata/md5-cache/app-misc/mswinurl_launcher-1.0
deleted file mode 100644
index de286c1111b5..000000000000
--- a/metadata/md5-cache/app-misc/mswinurl_launcher-1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils
-DESCRIPTION=Launcher and desktop association for MS Windows *.URL (text/x-uri) files
-EAPI=6
-HOMEPAGE=https://gist.github.com/endolith/77635
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://gist.github.com/endolith/77635/archive/a46707715aa2e112d2ea5ec26771030ff5e7eb64.tar.gz -> mswinurl_launcher-1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	l10n	8cdd85e169b835d518bc2fd59f780d8e	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_=5054b87e5d98b679efd2275352de7d0f
diff --git a/metadata/md5-cache/app-misc/mtail-1.1.1-r3 b/metadata/md5-cache/app-misc/mtail-1.1.1-r3
deleted file mode 100644
index b92557786291..000000000000
--- a/metadata/md5-cache/app-misc/mtail-1.1.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Tail workalike, that performs output colourising
-EAPI=5
-HOMEPAGE=http://matt.immute.net/src/mtail/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=HPND
-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://matt.immute.net/src/mtail/mtail-1.1.1.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
-_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_=7d0e9d18ab58c43f07625d752824663e
diff --git a/metadata/md5-cache/app-misc/mtail-1.2.0 b/metadata/md5-cache/app-misc/mtail-1.2.0
deleted file mode 100644
index ee164cc6176c..000000000000
--- a/metadata/md5-cache/app-misc/mtail-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Tail workalike, that performs output colourising
-EAPI=7
-HOMEPAGE=http://matt.immute.net/src/mtail/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=HPND
-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://matt.immute.net/src/mtail/mtail-1.2.0.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab4ccd23532f1317d85f5024c7a77e11
diff --git a/metadata/md5-cache/app-misc/rioutil-1.5.4 b/metadata/md5-cache/app-misc/rioutil-1.5.4
index 6142a0dde0a4..d9793a557df8 100644
--- a/metadata/md5-cache/app-misc/rioutil-1.5.4
+++ b/metadata/md5-cache/app-misc/rioutil-1.5.4
@@ -4,10 +4,10 @@ DEPEND=virtual/libusb:1
 DESCRIPTION=A utility for accessing various Rio media players
 EAPI=7
 HOMEPAGE=https://github.com/hjelmn/rioutil
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/hjelmn/rioutil/archive/v1.5.4.tar.gz -> rioutil-1.5.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=7059b48e2fd9017c512614dc84b92238
+_md5_=044851e355e679b6808d5244ca1ea4e8
diff --git a/metadata/md5-cache/app-misc/todo-2.12.0 b/metadata/md5-cache/app-misc/todo-2.12.0
deleted file mode 100644
index 095241b233f6..000000000000
--- a/metadata/md5-cache/app-misc/todo-2.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=A CLI-based TODO list manager
-EAPI=7
-HOMEPAGE=http://todotxt.org
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-shells/bash
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/todotxt/todo.txt-cli/archive/v2.12.0.tar.gz -> todo-2.12.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f701fc4d814f70c939874d0e6b5fb885
diff --git a/metadata/md5-cache/app-misc/todo-2.12.0-r1 b/metadata/md5-cache/app-misc/todo-2.12.0-r1
new file mode 100644
index 000000000000..9d6c0a104243
--- /dev/null
+++ b/metadata/md5-cache/app-misc/todo-2.12.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare test
+DESCRIPTION=A CLI-based TODO list manager
+EAPI=7
+HOMEPAGE=http://todotxt.org
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-shells/bash
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/todotxt/todo.txt-cli/archive/v2.12.0.tar.gz -> todo-2.12.0.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6dfb3c4584040f12fe5dd986a7adee35
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 3b45d3f3f671..82365d5a6beb 100644
Binary files a/metadata/md5-cache/app-mobilephone/Manifest.gz and b/metadata/md5-cache/app-mobilephone/Manifest.gz differ
diff --git a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2 b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2
deleted file mode 100644
index 68931446aa50..000000000000
--- a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez gtk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
-EAPI=6
-HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
-IUSE=gtk +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez gtk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) gtk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.2 )
-REQUIRED_USE=gtk? ( ^^ ( python_single_target_python2_7 ) )
-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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=99a62d89e50343556bc1ae594a84474b
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index ed079f692a62..30b2abc72204 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/calligra-3.2.1 b/metadata/md5-cache/app-office/calligra-3.2.1
index f78f0084b95a..a5beb90fd8ea 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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	16ab706e1b049cfaa65425a0c0e28cac	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 b2ee798c7b67..6a9084cb1bcc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kexi-3.2.0-r1 b/metadata/md5-cache/app-office/kexi-3.2.0-r1
index 09cddc4280af..a4412c7c7e95 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b31e282e3a40..ca2969f99f74 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/ktimetracker-5.0.1 b/metadata/md5-cache/app-office/ktimetracker-5.0.1
index 5239e7b83ecf..a3b5e96bb1c9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/libalkimia-8.0.3 b/metadata/md5-cache/app-office/libalkimia-8.0.3
index 25a14ad5edb7..e79f7518cf1e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/moneydance-2017.10 b/metadata/md5-cache/app-office/moneydance-2017.10
deleted file mode 100644
index d97ffe2fa915..000000000000
--- a/metadata/md5-cache/app-office/moneydance-2017.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A cross-platform personal finance application
-EAPI=6
-HOMEPAGE=https://moneydance.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=amd64? ( https://infinitekind.com/stabledl/2017/Moneydance_linux_amd64.tar.gz -> moneydance-2017.10-amd64.tar.gz ) x86? ( https://infinitekind.com/stabledl/2017/Moneydance_linux_x86.tar.gz -> moneydance-2017.10-x86.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e696ab6e211bc9052bf6139c31b29d17
diff --git a/metadata/md5-cache/app-office/moneydance-2020.0.1919 b/metadata/md5-cache/app-office/moneydance-2020.0.1919
deleted file mode 100644
index b274aae055b5..000000000000
--- a/metadata/md5-cache/app-office/moneydance-2020.0.1919
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
-DEPEND=|| ( >=dev-java/openjdk-bin-11.0 >=dev-java/openjdk-11.0 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A cross-platform personal finance application
-EAPI=7
-HOMEPAGE=https://moneydance.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
-RDEPEND=|| ( >=dev-java/openjdk-bin-11.0 >=dev-java/openjdk-11.0 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=https://infinitekind.com/stabledl/2020.0_1919/Moneydance_linux_amd64.tar.gz -> moneydance-2020.0.1919-amd64.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e22d000c9165c3e26ed4e608b161f8f2
diff --git a/metadata/md5-cache/app-office/moneydance-2020.2.1929 b/metadata/md5-cache/app-office/moneydance-2020.2.1929
new file mode 100644
index 000000000000..b17e56bda68f
--- /dev/null
+++ b/metadata/md5-cache/app-office/moneydance-2020.2.1929
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( >=dev-java/openjdk-bin-11.0 >=dev-java/openjdk-11.0 ) >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A cross-platform personal finance application
+EAPI=7
+HOMEPAGE=https://moneydance.com/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
+RDEPEND=|| ( >=dev-java/openjdk-bin-11.0 >=dev-java/openjdk-11.0 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://infinitekind.com/stabledl/2020.2_1929/Moneydance_linux_amd64.tar.gz -> moneydance-2020.2.1929-amd64.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0238fb0c527f453333a98f5e2342b567
diff --git a/metadata/md5-cache/app-office/skrooge-2.23.0 b/metadata/md5-cache/app-office/skrooge-2.23.0
index 5de8ccec0fc1..1f6a6aad1d7e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index c4a21ca94090..171f2af60bcc 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.5 b/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.5
deleted file mode 100644
index 6e16e525d232..000000000000
--- a/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst unpack
-DESCRIPTION=emerge-webrsync using patches to minimize bandwidth
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash >=sys-apps/portage-2.1.10 >=dev-util/diffball-0.6.5
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=b8c070708bbc6d0db544d4b04b530d6d03d39bb5 -> emerge-delta-webrsync-3.7.5
-_md5_=08c308c545a5c0611d5ee938b5d9d4b0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.0 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0
deleted file mode 100644
index 605493ad4119..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/gawk sys-apps/gentoo-functions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+),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 postinst preinst prepare test
-DEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-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=GPL-2
-RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+),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://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.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_=308c53690f1bc86feaf201e0c330fe17
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r1
new file mode 100644
index 000000000000..c3ba46cf87ab
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/gawk sys-apps/gentoo-functions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+),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 postinst preinst prepare test
+DEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=Collection of administration scripts for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+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=GPL-2
+RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+),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://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.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_=10fe88d047280b76675fd54101a3d5eb
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 012fc8fe0817..3d290cc6c9ac 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/loksh-6.7.5 b/metadata/md5-cache/app-shells/loksh-6.7.5
new file mode 100644
index 000000000000..e1ed2c8b43cb
--- /dev/null
+++ b/metadata/md5-cache/app-shells/loksh-6.7.5
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Linux port of OpenBSD's ksh
+EAPI=7
+HOMEPAGE=https://github.com/dimkr/loksh
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0= !app-shells/ksh
+SLOT=0
+SRC_URI=https://github.com/dimkr/loksh/releases/download/6.7.5/src.tar.xz -> loksh-6.7.5.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fef1dac3f0161398c090a10a66b61111
diff --git a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1 b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
deleted file mode 100644
index d0e2a278083c..000000000000
--- a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
-EAPI=6
-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
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/vaeth/quoter/archive/v3.0_p2.tar.gz -> quoter-3.0_p2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=72008ed965322df1a903bcbbc012c6f6
diff --git a/metadata/md5-cache/app-shells/quoter-4.2 b/metadata/md5-cache/app-shells/quoter-4.2
index d4b31cae4cb1..6dcc507ef7f2 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_=cdc02bcb20c18d4a3d03eadcd3385bf8
+_md5_=965caf977b0f9a5fdf6953544f14811b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index f462455ada3a..b1e3cc9f5d01 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/ansifilter-2.17 b/metadata/md5-cache/app-text/ansifilter-2.17
new file mode 100644
index 000000000000..0c93e641d5ed
--- /dev/null
+++ b/metadata/md5-cache/app-text/ansifilter-2.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Handles text files containing ANSI terminal escape codes
+EAPI=7
+HOMEPAGE=http://www.andre-simon.de/
+IUSE=qt5
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.17.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f915c35d11c90f6f25dfc55d8e2863b8
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.0 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.0
deleted file mode 100644
index ceac14303928..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.0
+++ /dev/null
@@ -1,14 +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=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/gs9530/ghostscript-9.53.0.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/ghostscript-gpl-9.53.1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.1
deleted file mode 100644
index 06a46c64a5b2..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.1
+++ /dev/null
@@ -1,14 +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=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/gs9531/ghostscript-9.53.1.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/ghostscript-gpl-9.53.2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.2
deleted file mode 100644
index 79cbd17bb47e..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.2
+++ /dev/null
@@ -1,14 +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=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/ghostscript-gpl-9.53.3 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3
deleted file mode 100644
index 93f46c250459..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3
+++ /dev/null
@@ -1,14 +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=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/gs9533/ghostscript-9.53.3.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/ghostscript-gpl-9.53.3-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r1
new file mode 100644
index 000000000000..857bb67eef2c
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r1
@@ -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/freetype-2.10.3 >=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/freetype-2.10.3 >=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/gs9533/ghostscript-9.53.3.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_=439eeeb5b1e03e075d35af560b8fea03
diff --git a/metadata/md5-cache/app-text/gocr-0.50 b/metadata/md5-cache/app-text/gocr-0.50
index 2b314dee7df9..52202629acc2 100644
--- a/metadata/md5-cache/app-text/gocr-0.50
+++ b/metadata/md5-cache/app-text/gocr-0.50
@@ -4,9 +4,9 @@ DESCRIPTION=An OCR (Optical Character Recognition) reader
 EAPI=7
 HOMEPAGE=http://jocr.sourceforge.net
 IUSE=doc scanner tk
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk ) tk? ( media-gfx/xli scanner? ( media-gfx/xsane ) )
 SLOT=0
 SRC_URI=http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.50.tar.gz
-_md5_=4b93e7c8489f838b0070125c2f345f87
+_md5_=d47150766f9daf0016bdbd26fc6c8eff
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.2 b/metadata/md5-cache/app-text/kbibtex-0.9.2
index 0ef785c69361..b1bb4bace0c8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a29bbfd69f22..03135dd37e71 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 c1d4c1b568c0..dde42789f315 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/krop-0.6.0 b/metadata/md5-cache/app-text/krop-0.6.0
new file mode 100644
index 000000000000..6486201649ab
--- /dev/null
+++ b/metadata/md5-cache/app-text/krop-0.6.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 postinst postrm prepare test
+DESCRIPTION=A tool to crop PDF files
+EAPI=7
+HOMEPAGE=http://arminstraub.com/software/krop
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_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/PyPDF2[python_targets_python3_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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets] python_targets_python3_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=https://github.com/arminstraub/krop/archive/v0.6.0.tar.gz -> krop-0.6.0.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_=964f4982d772330cdb97c90628b5789c
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index 540632d99d84..24daf8496f66 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -6,8 +6,8 @@ HOMEPAGE=http://arminstraub.com/software/krop
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_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/PyPDF2[python_targets_python3_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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets] python_targets_python3_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-python/python-poppler-qt5[python_targets_python3_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/PyPDF2[python_targets_python3_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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets] python_targets_python3_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
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa124d64df29899ab7f538832dba207c
+_md5_=964f4982d772330cdb97c90628b5789c
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index 5e0908c3966d..b27ce1134f2a 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -1,16 +1,16 @@
-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 ) 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_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/readme_renderer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/readme_renderer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/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(-)] )
 DESCRIPTION=reStructuredText viewer
 EAPI=7
 HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
-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=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/readme_renderer[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/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/readme_renderer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=mirror://pypi/r/restview/restview-2.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_=9e109b87fdd2cb34ad609497a101cea6
+_md5_=02d9576e60b3dc7849b44b16be62e1ce
diff --git a/metadata/md5-cache/app-text/silvercity-0.9.7-r1 b/metadata/md5-cache/app-text/silvercity-0.9.7-r1
deleted file mode 100644
index c3face0d6ae1..000000000000
--- a/metadata/md5-cache/app-text/silvercity-0.9.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A lexical analyser for many languages
-EAPI=5
-HOMEPAGE=http://silvercity.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/silvercity/SilverCity-0.9.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4bc738aebe819d573647523d05870edf
diff --git a/metadata/md5-cache/app-text/txt2tags-3.3 b/metadata/md5-cache/app-text/txt2tags-3.3
index 0d50455c18be..ab019cc37bf1 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.3
+++ b/metadata/md5-cache/app-text/txt2tags-3.3
@@ -6,9 +6,9 @@ HOMEPAGE=https://txt2tags.org
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 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(-)]
+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 )
 SLOT=0
 SRC_URI=https://github.com/jendrikseipp/txt2tags/archive/3.3.tar.gz -> txt2tags-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_=4e94005ef29984fde0bfb7ff65d80272
+_md5_=ef825e4bf634c3b685f37b1beb243694
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
new file mode 100644
index 000000000000..9164ab1866b2
--- /dev/null
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -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=Generate marked up documents (HTML, etc.)from a plain text file with markup
+EAPI=7
+HOMEPAGE=https://txt2tags.org
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+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(-)] >=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://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-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_=85d1336740531186ef44af1b58b5ed8e
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.6 b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
index 4a36bdca084f..bc5b4cad32e4 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl 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(-)] >=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-lang/perl 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(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Convert MS Office xlsx files to CSV
 EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=14188aca782f6e43c32651b136c75572
+_md5_=81f52048331e8fecee8db02fbb03c41f
diff --git a/metadata/md5-cache/app-text/xmldiff-2.4 b/metadata/md5-cache/app-text/xmldiff-2.4
new file mode 100644
index 000000000000..adcbb5f5ebf9
--- /dev/null
+++ b/metadata/md5-cache/app-text/xmldiff-2.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[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/six[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool that figures out the differences between two similar XML files
+EAPI=7
+HOMEPAGE=https://github.com/Shoobx/xmldiff
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/lxml[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/six[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Shoobx/xmldiff/archive/2.4.tar.gz -> xmldiff-2.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7617a49aee0afc5ad0398d4506ba71b9
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.18-r1 b/metadata/md5-cache/app-text/xournalpp-1.0.18-r1
index 2d7e3b077aab..4ede8f127cc3 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.0.18-r1
+++ b/metadata/md5-cache/app-text/xournalpp-1.0.18-r1
@@ -4,10 +4,10 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:=
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=7
 HOMEPAGE=https://github.com/xournalpp/xournalpp
-KEYWORDS=~amd64
+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
+_md5_=4ea59681936eeab4847420100fda6845
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index fe74845aefb6..4a5697423c45 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/conque-2.3-r1 b/metadata/md5-cache/app-vim/conque-2.3-r1
deleted file mode 100644
index cce93d363b5c..000000000000
--- a/metadata/md5-cache/app-vim/conque-2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-DESCRIPTION=vim plugin: Run interactive commands inside a Vim buffer
-EAPI=5
-HOMEPAGE=https://code.google.com/p/conque/
-IUSE=+python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[python,python_single_target_python3_6(-)?] app-editors/gvim[python,python_single_target_python3_6(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://conque.googlecode.com/files/conque_2.3.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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab7720365236374396e5ee817ef68d0a
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 50f3e00be1ee..8cbb42d26321 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20200923 b/metadata/md5-cache/dev-cpp/abseil-cpp-20200923
deleted file mode 100644
index 81ce001c1fa5..000000000000
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20200923
+++ /dev/null
@@ -1,13 +0,0 @@
-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/abseil-cpp-20200923.1 b/metadata/md5-cache/dev-cpp/abseil-cpp-20200923.1
new file mode 100644
index 000000000000..99337dfaf8a5
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20200923.1
@@ -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.1.tar.gz -> abseil-cpp-20200923.1.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/eigen-3.3.8 b/metadata/md5-cache/dev-cpp/eigen-3.3.8
new file mode 100644
index 000000000000..934bcc233483
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.8
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl ) test? ( virtual/fortran )
+DESCRIPTION=C++ template library for linear algebra
+EAPI=7
+HOMEPAGE=http://eigen.tuxfamily.org/index.php?title=Main_Page
+IUSE=cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.3.8/eigen-3.3.8.tar.gz
+_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_=d1dccc32386efc30d866c70f28d48fd3
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607 b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
deleted file mode 100644
index 5ec2066fd491..000000000000
--- a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Google C++ Testing Framework
-EAPI=7
-HOMEPAGE=https://github.com/google/googletest
-IUSE=doc examples 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
-LICENSE=BSD
-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	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/nlohmann_json-3.9.1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1
new file mode 100644
index 000000000000..e5aade466947
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=JSON for Modern C++
+EAPI=7
+HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
+IUSE=doc test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nlohmann/json/archive/v3.9.1.tar.gz -> nlohmann_json-3.9.1.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> nlohmann_json-3.9.1-testdata.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_=31b94f0b481ae07d321c9f90841d7533
diff --git a/metadata/md5-cache/dev-cpp/robin-map-0.6.3 b/metadata/md5-cache/dev-cpp/robin-map-0.6.3
new file mode 100644
index 000000000000..554265e78459
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/robin-map-0.6.3
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C++ fast hash map and hash set using robin hood hashing
+EAPI=7
+HOMEPAGE=https://github.com/Tessil/robin-map
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/Tessil/robin-map/archive/v0.6.3.tar.gz -> robin-map-0.6.3.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_=e37c7a3b91e68626bf606c0be0c99504
diff --git a/metadata/md5-cache/dev-cpp/robin-map-9999 b/metadata/md5-cache/dev-cpp/robin-map-9999
new file mode 100644
index 000000000000..c7d328405dfe
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/robin-map-9999
@@ -0,0 +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
+DESCRIPTION=C++ fast hash map and hash set using robin hood hashing
+EAPI=7
+HOMEPAGE=https://github.com/Tessil/robin-map
+LICENSE=MIT
+PROPERTIES=live
+SLOT=0
+_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_=e37c7a3b91e68626bf606c0be0c99504
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 0a74a686424c..5a4025d38cc0 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/kdb-3.2.0 b/metadata/md5-cache/dev-db/kdb-3.2.0
index 2e5490de0ecf..b5fe35c6f431 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/percona-server-8.0.20.11-r1 b/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1
deleted file mode 100644
index 4b81060650a7..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
-DEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
-DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
-IUSE=cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
-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	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-server-8.0.20.11-r2 b/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
new file mode 100644
index 000000000000..fd426a528e45
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
+DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
+DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
+IUSE=cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
+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-02.tar.xz
+_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_=8866aa28bb0f1f034087b5877f02b356
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-20.2.0.175.1842 b/metadata/md5-cache/dev-db/sqldeveloper-20.2.0.175.1842
new file mode 100644
index 000000000000..0be71df545b8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqldeveloper-20.2.0.175.1842
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install nofetch postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Oracle SQL Developer is a graphical tool for database development
+EAPI=7
+HOMEPAGE=https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html
+IUSE=mssql mysql postgres sybase elibc_FreeBSD
+KEYWORDS=-* ~amd64
+LICENSE=OTN
+RDEPEND=mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/openjdk-8:*[javafx] >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=fetch
+SLOT=0
+SRC_URI=sqldeveloper-20.2.0.175.1842-no-jre.zip
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
+_md5_=3b88d0c7ab4da080c9cedda0daad05b3
diff --git a/metadata/md5-cache/dev-db/sqlite-3.33.0 b/metadata/md5-cache/dev-db/sqlite-3.33.0
index 6ebbb97dd600..a8c21309ab85 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_=c3a841c46aa45851d970b36a4a520082
+_md5_=ab4e4b880c437afeb84d13bde7e2021a
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 8b8d5babe2f5..f9632453d788 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.8-r2 b/metadata/md5-cache/dev-embedded/esptool-2.8-r2
new file mode 100644
index 000000000000..5f5056ed36d4
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/esptool-2.8-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[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] ) 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(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=7
+HOMEPAGE=https://github.com/espressif/esptool
+IUSE=test 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=python_single_target_python3_6? ( dev-python/ecdsa[python_targets_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)] >=dev-python/pyserial-3.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/ecdsa[python_targets_python3_7(-)] dev-python/pyaes[python_targets_python3_7(-)] >=dev-python/pyserial-3.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/ecdsa[python_targets_python3_8(-)] dev-python/pyaes[python_targets_python3_8(-)] >=dev-python/pyserial-3.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ecdsa[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pyserial-3.0[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] )
+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/espressif/esptool/archive/v2.8.tar.gz -> esptool-2.8.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=40137d4d2161d820d74e368887ab4369
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index cbe1510758f0..1dfbb4e650f1 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/mygui-3.2.2 b/metadata/md5-cache/dev-games/mygui-3.2.2
index 160e8b3a27f0..003f9316dd75 100644
--- a/metadata/md5-cache/dev-games/mygui-3.2.2
+++ b/metadata/md5-cache/dev-games/mygui-3.2.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MyGUI/mygui/archive/MyGUI3.2.2.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_=4dcf7fce9bfeb738f0674564bc482cb0
+_md5_=e229947e95c196944f6afefbc49d5e31
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index f8a908efcaee..1c7dcfa88a13 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
index fc6b02ae97a0..85e4f1307cdd 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.14.0.7
 SRC_URI=https://hackage.haskell.org/package/dataenc-0.14.0.7/dataenc-0.14.0.7.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_=153ac382ddb425a81209898627daa2f7
+_md5_=3cbe66be25b643bcee937e1eab2c2145
diff --git a/metadata/md5-cache/dev-haskell/easy-file-0.2.1 b/metadata/md5-cache/dev-haskell/easy-file-0.2.1
deleted file mode 100644
index 2057210222e7..000000000000
--- a/metadata/md5-cache/dev-haskell/easy-file-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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=Cross-platform File handling
-EAPI=5
-HOMEPAGE=https://github.com/kazu-yamamoto/easy-file
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/0.2.1
-SRC_URI=https://hackage.haskell.org/package/easy-file-0.2.1/easy-file-0.2.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_=338fe97234528765547fb3438e4a9fbb
diff --git a/metadata/md5-cache/dev-haskell/easy-file-0.2.2 b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
new file mode 100644
index 000000000000..5f55bb0b25fb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=Cross-platform File handling
+EAPI=7
+HOMEPAGE=https://github.com/kazu-yamamoto/easy-file
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2
+SRC_URI=https://hackage.haskell.org/package/easy-file-0.2.2/easy-file-0.2.2.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_=78833690e706c393a373cf0f69e02a45
diff --git a/metadata/md5-cache/dev-haskell/edisoncore-1.3.1.1 b/metadata/md5-cache/dev-haskell/edisoncore-1.3.1.1
deleted file mode 100644
index 9f9b2330e30c..000000000000
--- a/metadata/md5-cache/dev-haskell/edisoncore-1.3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A library of efficent, purely-functional data structures (Core Implementations)
-EAPI=5
-HOMEPAGE=http://rwd.rdockins.name/edison/home/
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/1.3.1.1
-SRC_URI=https://hackage.haskell.org/package/EdisonCore-1.3.1.1/EdisonCore-1.3.1.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_=afa6b00deba7027c44c324380fe7da51
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
index e20f78593c2b..69ad9e20d5e8 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.1.1 dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Levenshtein and restricted Damerau-Levenshtein edit distances
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/phadej/edit-distance
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2.1
 SRC_URI=https://hackage.haskell.org/package/edit-distance-0.2.2.1/edit-distance-0.2.2.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_=b1a304fb2cb307f10981617d24f2c41d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=baf4f6c21d67126314d4382869e0ac18
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.0.1 b/metadata/md5-cache/dev-haskell/email-validate-2.0.1
deleted file mode 100644
index 049269fe6342..000000000000
--- a/metadata/md5-cache/dev-haskell/email-validate-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4.1 dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Validating an email address string against RFC 5322
-EAPI=5
-HOMEPAGE=http://porg.es/blog/email-address-validation-simpler-faster-more-correct
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:=
-RESTRICT=!test? ( test )
-SLOT=0/2.0.1
-SRC_URI=https://hackage.haskell.org/package/email-validate-2.0.1/email-validate-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_=c1367e59b9e366a01f5b687040776182
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13 b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
new file mode 100644
index 000000000000..480a069aef57
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17 >=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Email address validation
+EAPI=7
+HOMEPAGE=https://github.com/Porges/email-validate-hs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.3.2.13
+SRC_URI=https://hackage.haskell.org/package/email-validate-2.3.2.13/email-validate-2.3.2.13.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_=9dfbbb3d91fad6e576650d5c689e05e1
diff --git a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0 b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
index 635199c01701..43f223a2cabf 100644
--- a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An orphan Eq instance for ErrorCall
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/errorcall-eq-instance
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/errorcall-eq-instance-0.3.0/errorcall-eq-instance-0.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_=3d5062c0429d31697e24f166500ead03
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=73a56340d455fb2e2478bc9e6a25eb0b
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index dd619399e442..16794bfa718b 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extensible exceptions
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/extensible-exceptions
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.4
 SRC_URI=https://hackage.haskell.org/package/extensible-exceptions-0.1.1.4/extensible-exceptions-0.1.1.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_=d635c43d2c20d62f70433afa03304e24
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5ab3085c4edd50bc1bb6f233c504648c
diff --git a/metadata/md5-cache/dev-haskell/failure-0.2.0.3 b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
index 1cf3072c400f..57fc4429cc17 100644
--- a/metadata/md5-cache/dev-haskell/failure-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/transformers-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-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=A simple type class for success/failure computations. (deprecated)
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Failure
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.3
 SRC_URI=https://hackage.haskell.org/package/failure-0.2.0.3/failure-0.2.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_=65d12470875d04a291e2af50514c70b4
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8a076caba97d1bbff79cd9e3affeccb8
diff --git a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1 b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
index f54888a3e461..01a251b6d5de 100644
--- a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+++ b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Desktop Notifications client
-EAPI=5
-HOMEPAGE=https://hackage.haskell.org/package/fdo-notify
+EAPI=7
+HOMEPAGE=http://bitbucket.org/taejo/fdo-notify/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/fdo-notify-0.3.1/fdo-notify-0.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_=3912cf00353efb9dccc6b7db6987b73c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=aa211ae0736954ba604ef8f56643f0b1
diff --git a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3 b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
index ccf4fe51219d..4c3d57abb3a3 100644
--- a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
+++ b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[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=Expressive file and directory manipulation for Haskell
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/bos/filemanip
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.3
 SRC_URI=https://hackage.haskell.org/package/filemanip-0.3.6.3/filemanip-0.3.6.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_=07c27e56d5fc734c3137aec5311da8b2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4657f029d3e18fda9ad12d40fb15ad84
diff --git a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1 b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
index 05fc9c759af9..d24606bc8043 100644
--- a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Locate directory of original program
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/audreyt/findbin
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.5
 SRC_URI=https://hackage.haskell.org/package/FindBin-0.0.5/FindBin-0.0.5.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_=ee9ca0748e9ebece149293508da48b4a
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=344950c7b45db7605bd85c75bb7cc4ee
diff --git a/metadata/md5-cache/dev-haskell/fixed-0.2.1.1 b/metadata/md5-cache/dev-haskell/fixed-0.2.1.1
deleted file mode 100644
index 1d014756d950..000000000000
--- a/metadata/md5-cache/dev-haskell/fixed-0.2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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=Signed 15.16 precision fixed point arithmetic
-EAPI=5
-HOMEPAGE=https://github.com/ekmett/fixed
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.2:=
-SLOT=0/0.2.1.1
-SRC_URI=https://hackage.haskell.org/package/fixed-0.2.1.1/fixed-0.2.1.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_=42aa2845f4236deeb518cbb763b1b822
diff --git a/metadata/md5-cache/dev-haskell/fixed-0.3 b/metadata/md5-cache/dev-haskell/fixed-0.3
new file mode 100644
index 000000000000..8f1faf080878
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/fixed-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=Signed 15.16 precision fixed point arithmetic
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/fixed
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3
+SRC_URI=https://hackage.haskell.org/package/fixed-0.3/fixed-0.3.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_=dfbdfdb3aab9c9a4b91b48f126db3d0c
diff --git a/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5 b/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
index c3f84eeeab2d..e2b5220401e4 100644
--- a/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
+++ b/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8 >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[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=Use Template Haskell to generate Uniplate-like functions
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/geniplate
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.0.5
 SRC_URI=https://hackage.haskell.org/package/geniplate-0.6.0.5/geniplate-0.6.0.5.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_=744a5b3c66a0864636118fa77aae4c23
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5bdf0c07e71731418d1570e6ce39ce5d
diff --git a/metadata/md5-cache/dev-haskell/ghc-syb-utils-0.2.3 b/metadata/md5-cache/dev-haskell/ghc-syb-utils-0.2.3
deleted file mode 100644
index 9e1def3ad479..000000000000
--- a/metadata/md5-cache/dev-haskell/ghc-syb-utils-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/syb-0.1.0:=[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=Scrap Your Boilerplate utilities for the GHC API
-EAPI=5
-HOMEPAGE=https://github.com/nominolo/ghc-syb
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/syb-0.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.2.3
-SRC_URI=https://hackage.haskell.org/package/ghc-syb-utils-0.2.3/ghc-syb-utils-0.2.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_=384069fbb6cf5a0d6241f119041ee7ce
diff --git a/metadata/md5-cache/dev-haskell/ghc-syb-utils-0.3.0.0 b/metadata/md5-cache/dev-haskell/ghc-syb-utils-0.3.0.0
new file mode 100644
index 000000000000..be4fdf6717b6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ghc-syb-utils-0.3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/syb-0.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Scrap Your Boilerplate utilities for the GHC API
+EAPI=7
+HOMEPAGE=https://github.com/DanielG/ghc-syb
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/syb-0.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.0
+SRC_URI=https://hackage.haskell.org/package/ghc-syb-utils-0.3.0.0/ghc-syb-utils-0.3.0.0.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_=837e6b156e5c7bc9f7f96f04c178eb50
diff --git a/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1 b/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
index 03daf5b6283b..402d1bd846f2 100644
--- a/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn:0= dev-haskell/c2hs >=dev-haskell/cabal-1.8 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for GNU IDN
-EAPI=5
+EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-gnuidn/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn:0=
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/gnuidn-0.2.2/gnuidn-0.2.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_=fae8ddc6500b17d0d4d6c67f0f587b16
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=074412b2be6595d28d4407e0ecfff680
diff --git a/metadata/md5-cache/dev-haskell/gnutls-0.2 b/metadata/md5-cache/dev-haskell/gnutls-0.2
index c9ab8da53da5..23ce2ba9bdb6 100644
--- a/metadata/md5-cache/dev-haskell/gnutls-0.2
+++ b/metadata/md5-cache/dev-haskell/gnutls-0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= net-libs/gnutls:= >=dev-haskell/cabal-1.6 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= net-libs/gnutls:= >=dev-haskell/cabal-1.18.1.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for GNU libgnutls
-EAPI=5
+EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-gnutls/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= net-libs/gnutls:=
+RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= net-libs/gnutls:=
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/gnutls-0.2/gnutls-0.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_=702d21c3044ea9de0077337167098fe2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=65f43148d65a05b395e9a6a07913fa32
diff --git a/metadata/md5-cache/dev-haskell/groupoids-4.0 b/metadata/md5-cache/dev-haskell/groupoids-4.0
index 73e8b6d50a6e..1e0d544cc577 100644
--- a/metadata/md5-cache/dev-haskell/groupoids-4.0
+++ b/metadata/md5-cache/dev-haskell/groupoids-4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3
+DEPEND=>=dev-haskell/semigroupoids-4.0:=[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=This package has been absorbed into semigroupoids 4.0
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/ekmett/groupoids/
-IUSE=profile
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/groupoids-4.0/groupoids-4.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_=c10e03b50c353d89bc9de12da175fd23
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e1c73041101e9d8fbec8ad2b32d1a89f
diff --git a/metadata/md5-cache/dev-haskell/gsasl-0.3.6 b/metadata/md5-cache/dev-haskell/gsasl-0.3.6
deleted file mode 100644
index c0ccfb672271..000000000000
--- a/metadata/md5-cache/dev-haskell/gsasl-0.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/gsasl >=dev-haskell/cabal-1.6 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Bindings for GNU libgsasl
-EAPI=5
-HOMEPAGE=https://john-millikin.com/software/haskell-gsasl/
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/gsasl
-SLOT=0/0.3.6
-SRC_URI=https://hackage.haskell.org/package/gsasl-0.3.6/gsasl-0.3.6.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_=2e0b761dc826ad1bf4f8450af211db25
diff --git a/metadata/md5-cache/dev-haskell/gsasl-0.3.7 b/metadata/md5-cache/dev-haskell/gsasl-0.3.7
new file mode 100644
index 000000000000..2430709b152e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/gsasl-0.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monad-loops-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/gsasl >=dev-haskell/cabal-1.18.1.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for GNU libgsasl
+EAPI=7
+HOMEPAGE=https://git.sr.ht/~singpolyma/gsasl-haskell
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/monad-loops-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/gsasl
+SLOT=0/0.3.7
+SRC_URI=https://hackage.haskell.org/package/gsasl-0.3.7/gsasl-0.3.7.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_=fd03b00844a438e8bc49d71e98d3a1de
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.2.0.1 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.2.0.1
deleted file mode 100644
index 8171157161e4..000000000000
--- a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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=Character properties and classes for XML and Unicode
-EAPI=5
-HOMEPAGE=https://github.com/UweSchmidt/hxt
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/9.2.0.1
-SRC_URI=https://hackage.haskell.org/package/hxt-charproperties-9.2.0.1/hxt-charproperties-9.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_=cff7665a83498e137a501133431721df
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
new file mode 100644
index 000000000000..6973222e8614
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=Character properties and classes for XML and Unicode
+EAPI=7
+HOMEPAGE=https://github.com/UweSchmidt/hxt
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/9.4.0.0
+SRC_URI=https://hackage.haskell.org/package/hxt-charproperties-9.4.0.0/hxt-charproperties-9.4.0.0.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_=79635efdb23b0621e03874efd023ace6
diff --git a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4 b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
index 815b71eec334..b964ff8c3d3f 100644
--- a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
+++ b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[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=Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/UweSchmidt/hxt
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/9.0.2.4
 SRC_URI=https://hackage.haskell.org/package/hxt-unicode-9.0.2.4/hxt-unicode-9.0.2.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_=edd4b109e2d005cb902c9dc9766cc07d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=079eaf572b20b7ae007692c61346c698
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1875e1a81505..be530c4b67b0 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/bcprov-1.66 b/metadata/md5-cache/dev-java/bcprov-1.66
index b0ff24df6392..a6a9fc3b61f2 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_=19c7420c8ce99a167f11e626cfb5f61b
+_md5_=734bb4a5c7705c4747d3a85ac2261b96
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 1bd9ede90b60..a1c77ffb1029 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/elixir-1.11.0 b/metadata/md5-cache/dev-lang/elixir-1.11.0
new file mode 100644
index 000000000000..c0b684e08d61
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/elixir-1.11.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-lang/erlang-21:0=[ssl] test? ( dev-vcs/git )
+DESCRIPTION=Elixir programming language
+EAPI=7
+HOMEPAGE=https://elixir-lang.org
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-21:0=[ssl] !!sci-biology/phylip
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.11.0.tar.gz -> elixir-1.11.0.tar.gz
+_md5_=fb7c81f64587feae492fc7a17015e3b8
diff --git a/metadata/md5-cache/dev-lang/execline-2.6.1.1 b/metadata/md5-cache/dev-lang/execline-2.6.1.1
new file mode 100644
index 000000000000..8a2a69eac7e2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/execline-2.6.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+DESCRIPTION=A non-interactive scripting language
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/execline/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.6
+SRC_URI=https://www.skarnet.org/software/execline/execline-2.6.1.1.tar.gz
+_md5_=162aa6b132f0ae4a5c9cc32cd45af52a
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18-r4 b/metadata/md5-cache/dev-lang/python-2.7.18-r4
index 82c8a412dd66..7f6f84764e2a 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18-r4
+++ b/metadata/md5-cache/dev-lang/python-2.7.18-r4
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18-r3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72cd2d5d4f341322ebc69ed2673c7458
+_md5_=e6a1ae162f4c61c30ebb192185b7dfba
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2 b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
index 0c0559c24a3e..52be5a5c3fc5 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Python script wrapper
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/python-exec/
 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 ~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=BSD-2
 RDEPEND=!<=dev-lang/python-2.7.18-r3:2.7
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.6/python-exec-2.4.6.tar.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=738b12b41200b9291b07486fc3fdb36d
+_md5_=2c5bb4b3deb35684b965f9f83e2486c2
diff --git a/metadata/md5-cache/dev-lang/rust-1.45.2 b/metadata/md5-cache/dev-lang/rust-1.45.2
index 1e92f4c4e1e1..007246f347b2 100644
--- a/metadata/md5-cache/dev-lang/rust-1.45.2
+++ b/metadata/md5-cache/dev-lang/rust-1.45.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=stable/1.45
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz -> rustc-1.45.2-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.44.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.44.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.44.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.44.1-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	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_=fc54ba8214ff431c295aee160a8a4ac6
+_md5_=63d9a72bd41592ce478ecf3c586c1837
diff --git a/metadata/md5-cache/dev-lang/rust-1.46.0 b/metadata/md5-cache/dev-lang/rust-1.46.0
index 89891b551dc0..4483461b603a 100644
--- a/metadata/md5-cache/dev-lang/rust-1.46.0
+++ b/metadata/md5-cache/dev-lang/rust-1.46.0
@@ -5,7 +5,7 @@ DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 IUSE=clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm 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_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:10[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_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?] 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_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?] ) <sys-devel/llvm-11:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=stable/1.46
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.46.0-src.tar.xz -> rustc-1.46.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.45.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.45.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.45.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.45.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.45.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.45.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.45.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.45.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.45.1-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	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_=e13464907b0b1f61bfabe2d10fe20511
+_md5_=77092b5893a6aa55683162a10fc4bd66
diff --git a/metadata/md5-cache/dev-lang/rust-1.47.0 b/metadata/md5-cache/dev-lang/rust-1.47.0
new file mode 100644
index 000000000000..7e6f119c3b01
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.47.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( >=dev-lang/rust-1.46 >=dev-lang/rust-bin-1.46 ) ) !system-llvm? ( dev-util/cmake dev-util/ninja )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( sys-devel/llvm:11[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?] sys-devel/llvm:10[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?] ) <sys-devel/llvm-12:= wasm? ( sys-devel/lld ) ) !!sys-devel/llvm:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt +system-bootstrap system-llvm test wasm 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 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 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( sys-devel/llvm:11[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?] sys-devel/llvm:10[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?] ) <sys-devel/llvm-12:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust
+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 ) miri? ( nightly ) parallel-compiler? ( nightly ) 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 ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=test
+SLOT=stable/1.47
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.xz -> rustc-1.47.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.46.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.46.0-i686-unknown-linux-gnu.tar.xz ) )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	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_=b80a45a34dc790abc67df1bbd6182eef
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.46.0 b/metadata/md5-cache/dev-lang/rust-bin-1.46.0
index c39b2422d6f6..f1f2c039a30f 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.46.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.46.0
@@ -3,11 +3,11 @@ DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 IUSE=clippy cpu_flags_x86_sse2 doc rls rustfmt 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 ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.46.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.46.0-i686-unknown-linux-gnu.tar.xz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d15cfbf015c958ebab83e96de317f8c9
+_md5_=543c1b237fbca6aa429a2a5eaf5448f6
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.47.0 b/metadata/md5-cache/dev-lang/rust-bin-1.47.0
new file mode 100644
index 000000000000..5003ed25663e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.47.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 doc rls rustfmt 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 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.47.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.47.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.47.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.47.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.47.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.47.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.47.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=010e0b2b0d2a688e0a6cb8dd5c58a089
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2 b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
index a6cd341a9a60..8263af43777a 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 IUSE=debug minimal +system-icu test custom-cflags custom-optimization
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 x86
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= )
 RESTRICT=test
 SLOT=52
 SRC_URI=http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> mozjs-52.9.1pre1.tar.bz2 https://dev.gentoo.org/~whissi/dist/mozilla/spidermonkey-52.0-patches-1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozcoreconf-v5	08cb1fc64e302b97b155e7599b333c5c	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53cbd2f9b132b619261ac14ed49cff99
+_md5_=67d5cab7f71200cc47b79ee798ea5b3d
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.2.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.2.0
deleted file mode 100644
index 42dc8c273674..000000000000
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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.2.0esr/source/firefox-78.2.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-esr-78-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-esr-78-patches-01.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_=dac1694f1346d9d8d82e3f85e9107285
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.3.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.3.0
deleted file mode 100644
index 4582e755d719..000000000000
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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/spidermonkey-78.3.1 b/metadata/md5-cache/dev-lang/spidermonkey-78.3.1
index 53f3468cc18b..1bc32bc89686 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.3.1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.3.1
@@ -10,6 +10,6 @@ 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.1esr/source/firefox-78.3.1esr.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
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/source/firefox-78.3.1esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-esr-78-patches-03.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	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=307f455ce04fd6445f7db18d6ae40d0f
+_md5_=c947c1c65126be617913b5b20df4e756
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.2 b/metadata/md5-cache/dev-lang/swig-4.0.2
index 06563746738f..ec9bb1bd3d34 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.2
+++ b/metadata/md5-cache/dev-lang/swig-4.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=7
 HOMEPAGE=http://www.swig.org/ https://github.com/swig/swig
 IUSE=ccache doc pcre
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ BSD BSD-2
 RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-4.0.2.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d78179151eae7f17926aef120f8f4d57
+_md5_=d680abee7b5f60b1bd51248dd5eab3c9
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.24 b/metadata/md5-cache/dev-lang/vala-0.40.24
new file mode 100644
index 000000000000..8b5e1fb77afc
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.40.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.24 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.24 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
+SLOT=0.40
+SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.24.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	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c82cf5e5afc6a150ddb04b18e663471b
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.11 b/metadata/md5-cache/dev-lang/vala-0.48.11
new file mode 100644
index 000000000000..d22d8c991682
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.48.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.11 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.11 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RESTRICT=!test? ( test )
+SLOT=0.48
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.11.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_=1dd48cd961ee51164de3dcd3e5395232
diff --git a/metadata/md5-cache/dev-lang/vala-0.49.91 b/metadata/md5-cache/dev-lang/vala-0.49.91
deleted file mode 100644
index 97fd90cd2755..000000000000
--- a/metadata/md5-cache/dev-lang/vala-0.49.91
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.49.91 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Compiler for the GObject type system
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.49.91 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
-RESTRICT=!test? ( test )
-SLOT=0.50
-SRC_URI=mirror://gnome/sources/vala/0.49/vala-0.49.91.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_=96998ba428933e19c7fe67b34ea8cc00
diff --git a/metadata/md5-cache/dev-lang/vala-0.50.1 b/metadata/md5-cache/dev-lang/vala-0.50.1
new file mode 100644
index 000000000000..96ed104513e8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.50.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.50.1 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.50.1 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RESTRICT=!test? ( test )
+SLOT=0.50
+SRC_URI=mirror://gnome/sources/vala/0.50/vala-0.50.1.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_=96998ba428933e19c7fe67b34ea8cc00
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e24f1482d79d..fde3cc4a8033 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 51007e89ae1e..879d2038e9ca 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/botan-2.16.0 b/metadata/md5-cache/dev-libs/botan-2.16.0
new file mode 100644
index 000000000000..776b29963534
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/botan-2.16.0
@@ -0,0 +1,15 @@
+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-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 doc? ( dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) )
+DEFINED_PHASES=configure install test
+DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( 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(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+DESCRIPTION=C++ crypto library
+EAPI=7
+HOMEPAGE=https://botan.randombit.net/
+IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( 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(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=2/2.16
+SRC_URI=https://botan.randombit.net/releases/Botan-2.16.0.tar.xz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2e3dab1aa986a0b7cd353154d3e7885b
diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.4 b/metadata/md5-cache/dev-libs/cloog-0.18.4
deleted file mode 100644
index aeed174dc2b7..000000000000
--- a/metadata/md5-cache/dev-libs/cloog-0.18.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A loop generator for scanning polyhedra
-EAPI=5
-HOMEPAGE=http://www.bastoul.net/cloog/
-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 ~s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-6.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(-)?] >=dev-libs/isl-0.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(-)?]
-SLOT=0/4
-SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ce20b952bd8a09033dd788128946b02
diff --git a/metadata/md5-cache/dev-libs/cloog-0.20.0 b/metadata/md5-cache/dev-libs/cloog-0.20.0
new file mode 100644
index 000000000000..72ecbae85a80
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cloog-0.20.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=configure prepare test
+DEPEND=dev-libs/gmp:= dev-libs/isl:=
+DESCRIPTION=A loop generator for scanning polyhedra
+EAPI=7
+HOMEPAGE=http://www.bastoul.net/cloog/ https://github.com/periscop/cloog
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/gmp:= dev-libs/isl:=
+SLOT=0/4
+SRC_URI=https://github.com/periscop/cloog/archive/cloog-0.20.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7ccdaae2b27e883bb7d13351bf21972c
diff --git a/metadata/md5-cache/dev-libs/cloog-9999 b/metadata/md5-cache/dev-libs/cloog-9999
index 49fffd5b8f45..d4f0f9c6c21f 100644
--- a/metadata/md5-cache/dev-libs/cloog-9999
+++ b/metadata/md5-cache/dev-libs/cloog-9999
@@ -1,13 +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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare test unpack
+DEPEND=dev-libs/gmp:= dev-libs/isl:=
 DESCRIPTION=A loop generator for scanning polyhedra
 EAPI=7
-HOMEPAGE=http://www.bastoul.net/cloog/
-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
+HOMEPAGE=http://www.bastoul.net/cloog/ https://github.com/periscop/cloog
+IUSE=static-libs
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=>=dev-libs/gmp-6.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(-)?] >=dev-libs/isl-0.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(-)?]
+RDEPEND=dev-libs/gmp:= dev-libs/isl:=
 SLOT=0/4
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a866b8681b30e1297b381f9b42fa80d
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7ccdaae2b27e883bb7d13351bf21972c
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.181 b/metadata/md5-cache/dev-libs/elfutils-0.181
index 5c00fec3b97b..1fc61f65ea15 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.181
+++ b/metadata/md5-cache/dev-libs/elfutils-0.181
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=7
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind 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=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.181/elfutils-0.181.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72ad0fed4b7b570150bce8528a724fee
+_md5_=c7e8f7e26a8f4a8780cd9b52c3410a3c
diff --git a/metadata/md5-cache/dev-libs/gmime-3.2.7 b/metadata/md5-cache/dev-libs/gmime-3.2.7
index 301f167efc1f..5abc1867947c 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.2.7
+++ b/metadata/md5-cache/dev-libs/gmime-3.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=crypt doc idn static-libs test +vala
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn2:= ) 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-libs/gobject-introspection-1.30.0:= )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gmime/3.2/gmime-3.2.7.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab39148813424e89175b35a8c469358d
+_md5_=71eaaa4a53f32649f1d798f38ce91e5e
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
index 73690e638d1b..e56e327718f7 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=doctool gtk-doc test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.64.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6ca0a453afbb10a4543946d4dc64ca4
+_md5_=213bfa233239d529ca718c2f761a4aeb
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
index 8808b700c971..5b4c20d2c578 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-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
+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=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.64.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=4281533db4e75983d96c4ecca3eda163
+_md5_=ca28c9e93c5692a52f1e4a8f15fa0186
diff --git a/metadata/md5-cache/dev-libs/hiredis-1.0.0 b/metadata/md5-cache/dev-libs/hiredis-1.0.0
new file mode 100644
index 000000000000..8d756e3a2ba7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/hiredis-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=test? ( dev-db/redis )
+DESCRIPTION=Minimalistic C client library for the Redis database
+EAPI=7
+HOMEPAGE=https://github.com/redis/hiredis
+IUSE=examples static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0
+SRC_URI=https://github.com/redis/hiredis/archive/v1.0.0.tar.gz -> hiredis-1.0.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1decf625d4a383900a76c04c155e2df0
diff --git a/metadata/md5-cache/dev-libs/jansson-2.13.1 b/metadata/md5-cache/dev-libs/jansson-2.13.1
index b5330c7a5207..e9b558fd52ef 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_=c65ac23a21805d2e5e963a985527e790
+_md5_=a9e5993811042f2494f6264785e9eef0
diff --git a/metadata/md5-cache/dev-libs/kasync-0.3.0 b/metadata/md5-cache/dev-libs/kasync-0.3.0
index fa49bd1cd8b3..9cd89877b1bb 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d07151089023..a0c5e979990f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kpeoplevcard-0.1 b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
index 84088b9c579b..0b32d05d8e0e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 be01bcacea30..8a4aa17d42ad 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 ebbb614a0865..3cd2e4803374 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 43011d09ef56..97859f132a54 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/libarcus-3.4.1 b/metadata/md5-cache/dev-libs/libarcus-3.4.1
deleted file mode 100644
index 23b5189ea379..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-3.4.1
+++ /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-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.4.1.tar.gz -> libarcus-3.4.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d15a329c5e92317f907fdf5efb36f00
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.6.0 b/metadata/md5-cache/dev-libs/libarcus-3.6.0
deleted file mode 100644
index 904249442ac5..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-3.6.0
+++ /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-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.6.0.tar.gz -> libarcus-3.6.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d15a329c5e92317f907fdf5efb36f00
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.2.0 b/metadata/md5-cache/dev-libs/libarcus-4.2.0
deleted file mode 100644
index f2e09fde52d0..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-4.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-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-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	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
deleted file mode 100644
index 9283006ca748..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-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-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	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/libcharon-3.4.1 b/metadata/md5-cache/dev-libs/libcharon-3.4.1
deleted file mode 100644
index 59c116e56194..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-3.4.1
+++ /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] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-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/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.4.1.tar.gz -> libcharon-3.4.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2c3ec0e7e1e9441932aa858957a3d03
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.6.0-r1 b/metadata/md5-cache/dev-libs/libcharon-3.6.0-r1
deleted file mode 100644
index ae418895832b..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-3.6.0-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] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-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/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.6.0.tar.gz -> libcharon-3.6.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2c3ec0e7e1e9441932aa858957a3d03
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.2.0 b/metadata/md5-cache/dev-libs/libcharon-4.2.0
deleted file mode 100644
index 18d32454e5c2..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-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/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.2.0.tar.gz -> libcharon-4.2.0.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_=c06045330449bb34abf3124d2deef733
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.3.0 b/metadata/md5-cache/dev-libs/libcharon-4.3.0
deleted file mode 100644
index 606e78ab3203..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-4.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-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/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.3.0.tar.gz -> libcharon-4.3.0.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_=3cfbc6d3c4e817415fcf3da912822e4c
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r1 b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
index 0fff7fd9bbce..749e1be28f1f 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r1
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
@@ -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_=69672e78d9a56349e55a8af408e45272
+_md5_=f13335f56eb49140f47fd0ed065dd16a
diff --git a/metadata/md5-cache/dev-libs/libotf-0.9.16 b/metadata/md5-cache/dev-libs/libotf-0.9.16
index a0abe79ec42c..07f99a6f7ef9 100644
--- a/metadata/md5-cache/dev-libs/libotf-0.9.16
+++ b/metadata/md5-cache/dev-libs/libotf-0.9.16
@@ -4,10 +4,10 @@ DESCRIPTION=Library for handling OpenType fonts (OTF)
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/m17n/
 IUSE=static-libs X
-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=LGPL-2.1
 RDEPEND=>=media-libs/freetype-2.4.9 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/libotf-0.9.16.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=555a06c608f32c553a23f48ab78e97c8
+_md5_=6139b137a3dae041bc190bff0cfdb063
diff --git a/metadata/md5-cache/dev-libs/librelp-1.7.0 b/metadata/md5-cache/dev-libs/librelp-1.7.0
index d86eea5f30e6..31cb1e80eaa7 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.7.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.7.0
@@ -5,7 +5,7 @@ DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=7
 HOMEPAGE=https://www.rsyslog.com/librelp/
 IUSE=debug doc +ssl +gnutls libressl openssl static-libs test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 hppa sparc ~x86
 LICENSE=GPL-3+ doc? ( FDL-1.3 )
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.7.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f1f438c87953e0c2fb25fe5f0b17afd
+_md5_=8f9e59817a6842fa2f551dcbb39d53d5
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.4.1 b/metadata/md5-cache/dev-libs/libsavitar-3.4.1
deleted file mode 100644
index 1240d4c6074d..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-3.4.1
+++ /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-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.4.1.tar.gz -> libsavitar-3.4.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91e766f4a1873b9b35dc6f889ed91404
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.6.0 b/metadata/md5-cache/dev-libs/libsavitar-3.6.0
deleted file mode 100644
index 166341fa7f50..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-3.6.0
+++ /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-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.6.0.tar.gz -> libsavitar-3.6.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91e766f4a1873b9b35dc6f889ed91404
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.2.0 b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
deleted file mode 100644
index e0d235c249e7..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-4.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-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-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	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
deleted file mode 100644
index f21d9ba4f609..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-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-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	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/libugpio-0.0.6 b/metadata/md5-cache/dev-libs/libugpio-0.0.6
deleted file mode 100644
index 2c1cb41dfd29..000000000000
--- a/metadata/md5-cache/dev-libs/libugpio-0.0.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install setup
-DESCRIPTION=Lib for the use of linux kernel's sysfs gpio interface from C programs
-EAPI=7
-HOMEPAGE=https://github.com/mhei/libugpio
-IUSE=kernel_linux
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3+ LGPL-2.1+
-SLOT=0
-SRC_URI=https://github.com/mhei/libugpio/releases/download/v0.0.6/libugpio-0.0.6.tar.bz2
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b2a28c5282623f95995aa8ecf2acbf0c
diff --git a/metadata/md5-cache/dev-libs/libugpio-0.0.7 b/metadata/md5-cache/dev-libs/libugpio-0.0.7
index e5cf4d035da2..3de991565009 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_=ad5fb07c02625f9572bd37eaf78180b0
+_md5_=d66d723ee954b5a39192fa8cd7541898
diff --git a/metadata/md5-cache/dev-libs/mxml-3.2 b/metadata/md5-cache/dev-libs/mxml-3.2
new file mode 100644
index 000000000000..d6cb8a4d4e05
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mxml-3.2
@@ -0,0 +1,12 @@
+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
+DESCRIPTION=A small XML parsing library that you can use to read XML data files or strings
+EAPI=7
+HOMEPAGE=https://github.com/michaelrsweet/mxml https://www.msweet.org/mxml/
+IUSE=static-libs threads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Mini-XML
+SLOT=0
+SRC_URI=https://github.com/michaelrsweet/mxml/archive/v3.2.tar.gz -> mxml-3.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=76114566a6e081b728db564ee0235516
diff --git a/metadata/md5-cache/dev-libs/nettle-3.6-r2 b/metadata/md5-cache/dev-libs/nettle-3.6-r2
index a6bf1b91211d..bcf81c4ede7f 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.6-r2
+++ b/metadata/md5-cache/dev-libs/nettle-3.6-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Low-level cryptographic library
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[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/8-6
 SRC_URI=mirror://gnu/nettle/nettle-3.6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15a34bfac6090e7f69a0272cc1dee64e
+_md5_=d4bd698e10e06a71acd55c054b8da002
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 6eaae1f059c4..758521f45f51 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b79ee1a6a9f965bf5373c0d1f2b35a2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.2 b/metadata/md5-cache/dev-libs/protobuf-3.12.2
index 6bcb816f4fef..3977b9e14d13 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	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_=24cb3ef21656b1f371c77c989a363bcd
+_md5_=6f7f397ec8ed597c0ff4820ad0fcb754
diff --git a/metadata/md5-cache/dev-libs/qrosspython-0.3.2 b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
deleted file mode 100644
index 5c2719203089..000000000000
--- a/metadata/md5-cache/dev-libs/qrosspython-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-qt/qttest:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Python scripting backend for Qross
-EAPI=6
-HOMEPAGE=https://github.com/0xd34df00d/Qross
-IUSE=debug +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 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=https://github.com/0xd34df00d/Qross/archive/0.3.2.tar.gz -> qrosscore-0.3.2.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0751df3b00a09b9baa4e671043d90a68
diff --git a/metadata/md5-cache/dev-libs/qrosspython-9999 b/metadata/md5-cache/dev-libs/qrosspython-9999
deleted file mode 100644
index 2b06396fc8a6..000000000000
--- a/metadata/md5-cache/dev-libs/qrosspython-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~dev-libs/qrosscore-9999 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-qt/qttest:5 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Python scripting backend for Qross
-EAPI=6
-HOMEPAGE=https://github.com/0xd34df00d/Qross
-IUSE=debug +python_single_target_python2_7
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=~dev-libs/qrosscore-9999 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 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
-_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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f30c93c5f6882654f959acc55e17bc9
diff --git a/metadata/md5-cache/dev-libs/qtcompress-0_p20180513 b/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
new file mode 100644
index 000000000000..14a60fc867a5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/qtcompress-0_p20180513
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-qt/qtcore:5 sys-libs/zlib test? ( dev-qt/qttest:5 )
+DESCRIPTION=A public API for QZip in an easy to use module
+EAPI=7
+HOMEPAGE=https://github.com/nezticle/qtcompress
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 GPL-3 ) FDL-1.3
+RDEPEND=dev-qt/qtcore:5 sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=0/5.11.0
+SRC_URI=https://github.com/nezticle/qtcompress/archive/23f8831826cd72aedf99fc3699148b6c994fd677.tar.gz -> qtcompress-0_p20180513.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=013a040eafd7c9bca87defc44537d6ec
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.2 b/metadata/md5-cache/dev-libs/serd-0.30.2
deleted file mode 100644
index d11bb750439c..000000000000
--- a/metadata/md5-cache/dev-libs/serd-0.30.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen )
-DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
-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
-LICENSE=ISC
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.drobilla.net/serd-0.30.2.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_=5dbc79aa2fb1c41afca7d0367fcc4f6d
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.4 b/metadata/md5-cache/dev-libs/serd-0.30.4
index a48cc847da01..c4c1799ff502 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_=d637d7bfd9ca7184362a1caa07de45ef
+_md5_=5dbc79aa2fb1c41afca7d0367fcc4f6d
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.02 b/metadata/md5-cache/dev-libs/serdisplib-2.02
deleted file mode 100644
index 2bdcf1042266..000000000000
--- a/metadata/md5-cache/dev-libs/serdisplib-2.02
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1 ) lcd_devices_directgfx? ( media-libs/libsdl ) lcd_devices_displaylink? ( x11-libs/libdlo ) lcd_devices_glcd2usb? ( virtual/libusb:1 )
-DESCRIPTION=Library to drive several displays with built-in controllers or display modules
-EAPI=7
-HOMEPAGE=http://serdisplib.sourceforge.net
-IUSE=threads tools lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1 ) lcd_devices_directgfx? ( media-libs/libsdl ) lcd_devices_displaylink? ( x11-libs/libdlo ) lcd_devices_glcd2usb? ( virtual/libusb:1 )
-REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 ) lcd_devices_framebuffer? ( threads )
-SLOT=0
-SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.02.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=d618fe1458f39107f3058f1b5e6d1de8
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.02-r1 b/metadata/md5-cache/dev-libs/serdisplib-2.02-r1
new file mode 100644
index 000000000000..d32f171dc624
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/serdisplib-2.02-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1 ) lcd_devices_directgfx? ( media-libs/libsdl ) lcd_devices_displaylink? ( x11-libs/libdlo ) lcd_devices_dpfax? ( virtual/libusb:1 ) lcd_devices_glcd2usb? ( virtual/libusb:1 )
+DESCRIPTION=Library to drive several displays with built-in controllers or display modules
+EAPI=7
+HOMEPAGE=http://serdisplib.sourceforge.net
+IUSE=threads tools lcd_devices_acoolsdcm lcd_devices_ddusbt +lcd_devices_directgfx lcd_devices_displaylink lcd_devices_dpfax lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 lcd_devices_vssdcp
+KEYWORDS=amd64 ppc ~ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1 ) lcd_devices_directgfx? ( media-libs/libsdl ) lcd_devices_displaylink? ( x11-libs/libdlo ) lcd_devices_dpfax? ( virtual/libusb:1 ) lcd_devices_glcd2usb? ( virtual/libusb:1 )
+REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_dpfax lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 lcd_devices_vssdcp ) lcd_devices_framebuffer? ( threads )
+SLOT=0
+SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.02.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c39dbfa678534c10c1a85babad32b154
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.9.3.0 b/metadata/md5-cache/dev-libs/skalibs-2.9.3.0
new file mode 100644
index 000000000000..50f2c92d4c31
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/skalibs-2.9.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare
+DESCRIPTION=General-purpose libraries from skarnet.org
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/skalibs/
+IUSE=doc ipv6 static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+SLOT=0/2.9
+SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.9.3.0.tar.gz
+_md5_=454358c33dbd12d558b091bf86afcd24
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 0a49b093facf..d8556167f35e 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
@@ -10,4 +10,4 @@ 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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
+_md5_=3fac75017a2a28c4f880d65dbd0192c1
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.11 b/metadata/md5-cache/dev-libs/vala-common-0.48.11
new file mode 100644
index 000000000000..026757ed6cb9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.11
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.11.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
+_md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.49.91 b/metadata/md5-cache/dev-libs/vala-common-0.49.91
deleted file mode 100644
index 12b7d4c19df0..000000000000
--- a/metadata/md5-cache/dev-libs/vala-common-0.49.91
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for packages that use Vala
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.49/vala-0.49.91.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.50.1 b/metadata/md5-cache/dev-libs/vala-common-0.50.1
new file mode 100644
index 000000000000..b7b3ca798ed8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.50.1
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.50/vala-0.50.1.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
+_md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 41cfd1673c72..b5779ffdf060 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49.92 b/metadata/md5-cache/dev-lisp/clisp-2.49.92
index 89d2bb55490b..c2bfd22eee79 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49.92
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.92
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 ) X? ( x11-base/xorg-proto x11-misc/imake )
+DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm:0= ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 ) X? ( x11-base/xorg-proto x11-misc/imake )
 DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
 EAPI=6
 HOMEPAGE=https://clisp.sourceforge.io/
 IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib
 KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
+RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm:0= ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
 SLOT=2/8
 SRC_URI=mirror://gentoo/clisp-2.49.92.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5eb5b2cda10b399651556213dc701267
+_md5_=6ec5b7626aea34d3ed145812e797a546
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 672f64398592..7f97c7a7ec79 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5 b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5
deleted file mode 100644
index 165298deadca..000000000000
--- a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/lua:0=
-DESCRIPTION=Backported Lua bit manipulation library
-EAPI=7
-HOMEPAGE=https://github.com/keplerproject/lua-compat-5.3
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-lang/lua:0=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/keplerproject/lua-compat-5.3/archive/v0.9.tar.gz -> lua-compat53-0.9.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=04e56d17ddd1b70e7df194824019ce52
diff --git a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r1 b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r1
new file mode 100644
index 000000000000..e031c83e49cd
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/lua:0=
+DESCRIPTION=Backported Lua bit manipulation library
+EAPI=7
+HOMEPAGE=https://github.com/keplerproject/lua-compat-5.3
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-lang/lua:0=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/keplerproject/lua-compat-5.3/archive/v0.9.tar.gz -> lua-compat53-0.9.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c8c3fefba5abf3f1c266e4cb9b42eb31
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-1.1 b/metadata/md5-cache/dev-lua/lua-zlib-1.1
index 6f450a794d22..2266b9779a00 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-1.1
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/lua:0 sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/
 DESCRIPTION=Lua bindings to zlib
 EAPI=6
 HOMEPAGE=https://github.com/brimworks/lua-zlib
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-lang/lua:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/brimworks/lua-zlib/archive/v1.1.tar.gz -> lua-zlib-1.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_=fd56baf79523afdb3f58745fc5a413c8
+_md5_=4b6aede7803ae31f7d5382871f9944d7
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-1.2 b/metadata/md5-cache/dev-lua/lua-zlib-1.2
index 0bb04c21dd24..05df710ac24b 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-1.2
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/lua:0 sys-libs/zlib
 DESCRIPTION=Lua bindings to zlib
 EAPI=7
 HOMEPAGE=https://github.com/brimworks/lua-zlib
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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
+_md5_=9b596a727b9f2e6410e08502eb56c28a
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.5-r5 b/metadata/md5-cache/dev-lua/luadbi-0.5-r5
index 8cfc137fb0c0..47899c41600c 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.5-r5
+++ b/metadata/md5-cache/dev-lua/luadbi-0.5-r5
@@ -4,11 +4,11 @@ DESCRIPTION=DBI module for Lua
 EAPI=5
 HOMEPAGE=https://code.google.com/p/luadbi/
 IUSE=mysql postgres +sqlite
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3 )
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=https://luadbi.googlecode.com/files/luadbi.0.5.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_=5168e221e332e61657537a4872e033d4
+_md5_=5419b71191b581d98b38f12df46038d5
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.5-r6 b/metadata/md5-cache/dev-lua/luadbi-0.5-r6
index 46d15eef4d9a..2c046b4e055a 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.5-r6
+++ b/metadata/md5-cache/dev-lua/luadbi-0.5-r6
@@ -4,11 +4,11 @@ DESCRIPTION=DBI module for Lua
 EAPI=6
 HOMEPAGE=https://code.google.com/p/luadbi/
 IUSE=mysql postgres +sqlite
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3 )
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=https://luadbi.googlecode.com/files/luadbi.0.5.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_=adb3e367f93d73567e7d635046611820
+_md5_=8500e25dd6adc396b34261fced10dce9
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.4 b/metadata/md5-cache/dev-lua/luaevent-0.4.4
index 3c7a8312f745..2cd7f7ad9e00 100644
--- a/metadata/md5-cache/dev-lua/luaevent-0.4.4
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/lua:0 dev-libs/libevent:0= virtual/pkgconfig
 DESCRIPTION=libevent bindings for Lua
 EAPI=5
 HOMEPAGE=http://luaforge.net/projects/luaevent
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/lua:0 dev-libs/libevent:0=
 SLOT=0
 SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.4.tar.gz -> luaevent-0.4.4.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b3770f47fa9e1350ee7d089254acac43
+_md5_=04fc44a6ae7a0bbf12581f5bfde5c62f
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.6 b/metadata/md5-cache/dev-lua/luaevent-0.4.6
index c26b469f3a33..d1b89bfe7c06 100644
--- a/metadata/md5-cache/dev-lua/luaevent-0.4.6
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.6
@@ -3,10 +3,10 @@ DEPEND=dev-lang/lua:0 dev-libs/libevent:0= virtual/pkgconfig
 DESCRIPTION=libevent bindings for Lua
 EAPI=7
 HOMEPAGE=http://luaforge.net/projects/luaevent
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/lua:0 dev-libs/libevent:0=
 SLOT=0
 SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz -> luaevent-0.4.6.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af08e529d39f381761a06612957d9ae2
+_md5_=0b065189557c99460e38d5452c32a093
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
index 0bb8789244a7..7f3c809aabb7 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] virtual/pkgconfig
+DEPEND=>=dev-lang/lua-5.1.5-r2:0[deprecated,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/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(-)?] virtual/pkgconfig
 DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
 EAPI=5
 HOMEPAGE=http://www.keplerproject.org/luaexpat/
 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 arm ~arm64 hppa ~mips ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?]
+RDEPEND=>=dev-lang/lua-5.1.5-r2:0[deprecated,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/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(-)?]
 SLOT=0
 SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
 _eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18f12e4b46393dcbdc2d077e3794cc1b
+_md5_=745bdd3fd94179574c74dcd30c56fd86
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r2 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r2
new file mode 100644
index 000000000000..76f195866990
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/lua-5.1.5-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(-)?] >=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(-)?]
+DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
+EAPI=7
+HOMEPAGE=http://www.keplerproject.org/luaexpat/
+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 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/lua-5.1.5-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(-)?] >=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(-)?]
+SLOT=0
+SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=675f34a11a318b57acf5c4deda875f5e
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r2 b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r2
new file mode 100644
index 000000000000..af8c90b2eb81
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/lua-5.1.5-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(-)?] >=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(-)?]
+DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
+EAPI=7
+HOMEPAGE=https://matthewwild.co.uk/projects/luaexpat/ https://github.com/tomasguisasola/luaexpat
+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 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/lua-5.1.5-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(-)?] >=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(-)?]
+SLOT=0
+SRC_URI=https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz -> luaexpat-1.3.3.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dc1704d5cab734ccc0c9ca1e7726759c
diff --git a/metadata/md5-cache/dev-lua/luasec-0.7 b/metadata/md5-cache/dev-lua/luasec-0.7
index 293a1c98a021..e2e2342e976b 100644
--- a/metadata/md5-cache/dev-lua/luasec-0.7
+++ b/metadata/md5-cache/dev-lua/luasec-0.7
@@ -5,10 +5,10 @@ DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
 EAPI=7
 HOMEPAGE=https://github.com/brunoos/luasec
 IUSE=libressl
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/luasec-0.7.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62c674468d80762dd2c10c7e6bcfdeb3
+_md5_=2de1518d5999399a4ab2dca6d9ba320d
diff --git a/metadata/md5-cache/dev-lua/luasec-0.9 b/metadata/md5-cache/dev-lua/luasec-0.9
index d9186aa62a96..371dc42dafa7 100644
--- a/metadata/md5-cache/dev-lua/luasec-0.9
+++ b/metadata/md5-cache/dev-lua/luasec-0.9
@@ -5,10 +5,10 @@ DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
 EAPI=7
 HOMEPAGE=https://github.com/brunoos/luasec
 IUSE=libressl
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v0.9.tar.gz -> luasec-0.9.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9b529bc2b4055c5f01ee81507a445757
+_md5_=c05ae18d450dda829d8d7b4ddca07675
diff --git a/metadata/md5-cache/dev-lua/luasec-9999 b/metadata/md5-cache/dev-lua/luasec-9999
index 1d83bceedd67..8e473f7f7bfa 100644
--- a/metadata/md5-cache/dev-lua/luasec-9999
+++ b/metadata/md5-cache/dev-lua/luasec-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=dev-lang/lua-5.1:0[deprecated] dev-lua/luasocket !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8fbad171cce7f1631a40fb3896b36523
+_md5_=d3d5255c5d54b37a5159c4d89e50c178
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 58335d09ee1c..1431e10ad22a 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.08_p1 b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
index 2ffaffe8f05e..a0481c11d1d5 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 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 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_=53fa7b389bb53bdf84ff6e70ee28b836
+_md5_=5b6097c600f93231448ad2b369515760
diff --git a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r2 b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r2
index 386681306abb..aa6ffc0449ef 100644
--- a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r2
+++ b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=An NTLM authentication module
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/NTLM
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 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 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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-3.00 dev-perl/Digest-HMAC dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f67ec378ec9bd46d40b8e464d8b18479
+_md5_=e9367697fe3c423283deeaf63f462927
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
index 03389a792f3f..99e56ad9a8f7 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight IPv4 and IPv6 validation module
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Data-Validate-IP
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1cffdcf19d8c09bb541c4cca406b9c1e
+_md5_=ec16b418cdfdd39897e14e15f3d520bb
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.570.0 b/metadata/md5-cache/dev-perl/File-Remove-1.570.0
index a331745619c6..3da80ee51658 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.570.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.570.0
@@ -4,11 +4,11 @@ DESCRIPTION=Remove files and directories
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/File-Remove
 IUSE=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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.57.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=be12ac33e3d9afcdc6b3d9c7da174155
+_md5_=7e8340427770225f1d5d845bdec29a19
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-2.130.0 b/metadata/md5-cache/dev-perl/MIME-Types-2.130.0
index 101800a0384f..741a0e1e0c98 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-2.130.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-2.130.0
@@ -4,11 +4,11 @@ DESCRIPTION=Definition of MIME types
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MIME-Types
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=286ed039590f45fafbec36b0a7525934
+_md5_=8530ecc2d932db2071c42836c48cc6a7
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-3.3.0 b/metadata/md5-cache/dev-perl/Mail-Box-3.3.0
index 5252c347c560..7594dc86e31b 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-3.3.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Mail folder manager and MUA backend
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mail-Box
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Mail-Box-IMAP4 dev-perl/Mail-Box-POP3
 RDEPEND=virtual/perl-Carp dev-perl/TimeDate >=dev-perl/Devel-GlobalDestruction-0.90.0 >=dev-perl/File-Remove-0.200.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Transport-3 >=dev-perl/Object-Realize-Later-0.190.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Test-Simple-0.470.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=15e5b0ac4d5d9941c11388891522bbb5
+_md5_=1775a4dacbfac43fb6d112c50133736a
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0 b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
index 9760936bf529..34607e53f0be 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Mail::Box connector via IMAP4
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mail-Box-IMAP4
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Mail-Box-3 dev-perl/Mail-IMAPClient >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Transport-3 virtual/perl-Scalar-List-Utils !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-IMAP4-3.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=30e07250d9fecafedba2fb28bcbb80ce
+_md5_=6c419adc981d6a9068ec2da9c666992d
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0 b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
index 38d1eb0fac96..6c5fa3172ff5 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Mail::Box connector via POP3
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mail-Box-POP3
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Box-3 virtual/perl-Scalar-List-Utils virtual/perl-Socket !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-POP3-3.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6f0c372b4851ae5a4ed38cdeabb9e6a1
+_md5_=db92d2e0ff43458264c0a633d420dfc9
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
index a21f77bff475..686c688a08d3 100644
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
+++ b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
@@ -4,11 +4,11 @@ DESCRIPTION=IMAP client module for Perl
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mail-IMAPClient
 IUSE=test ntlm md5 ssl zlib examples
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp >=virtual/perl-IO-1.260.0 virtual/perl-Scalar-List-Utils virtual/perl-MIME-Base64 >=dev-perl/Parse-RecDescent-1.967.9 ntlm? ( dev-perl/Authen-NTLM ) md5? ( dev-perl/Authen-SASL dev-perl/Digest-HMAC virtual/perl-Digest-MD5 ) ssl? ( dev-perl/IO-Socket-SSL ) zlib? ( virtual/perl-IO-Compress ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.39.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bd3ced79791fe89a92b65dd7212fd16e
+_md5_=957fad23c9500a5836361023154b0c14
diff --git a/metadata/md5-cache/dev-perl/Mail-Message-3.2.0 b/metadata/md5-cache/dev-perl/Mail-Message-3.2.0
index 7c6c79917087..81330626e9a1 100644
--- a/metadata/md5-cache/dev-perl/Mail-Message-3.2.0
+++ b/metadata/md5-cache/dev-perl/Mail-Message-3.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=General Message Object for MIME Messsage Handling
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mail-Message
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-0.940.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=43e654e88eb436a1c0b236160ea77527
+_md5_=e1b5761e0235d64d902a18f3a5d184c5
diff --git a/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0 b/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
index 38c17c2c2a9f..bf9b3b4bbea0 100644
--- a/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
+++ b/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Base class for Email Message Exchange
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mail-Transport
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Spec-0.700.0 virtual/perl-IO >=dev-perl/Mail-Message-3 virtual/perl-Scalar-List-Utils virtual/perl-libnet !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=963e9b1ef21de3bb84619fa0c7299ac8
+_md5_=310ce6372aac82fc1c1670ac15e656c5
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 964d7a538083..39e4bf16deff 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
index b7a1c076add8..df6b4baa733e 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
@@ -4,11 +4,11 @@ DESCRIPTION=Delayed creation of objects
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Object-Realize-Later
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.19.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_=ea23b60837e2167855c12965588d06cd
+_md5_=2cf3c9959fdffd89a2bd77e94fa74bcd
diff --git a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1 b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
index 439a81071bcf..55d6561c93f6 100644
--- a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Quote strings for passing through the shell
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/String-ShellQuote
-KEYWORDS=~alpha amd64 ~arm64 hppa ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm64 hppa ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.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_=3f87114321f6a3558512f6e10d956b15
+_md5_=4d2c52b1943089bd5d540f0ae34b38ba
diff --git a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
index 0a0dccc05c71..6e5dadc9e6f1 100644
--- a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to test taintedness
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Test-Taint
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Taint-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_=be025975c763194138613c97754cd45f
+_md5_=13ab6ae249b54f7672a61505734c8aaf
diff --git a/metadata/md5-cache/dev-perl/User-Identity-0.990.0 b/metadata/md5-cache/dev-perl/User-Identity-0.990.0
index 3324bc4c842b..f495319a8d7b 100644
--- a/metadata/md5-cache/dev-perl/User-Identity-0.990.0
+++ b/metadata/md5-cache/dev-perl/User-Identity-0.990.0
@@ -4,11 +4,11 @@ DESCRIPTION=Maintains info about a physical person
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/User-Identity
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Geography-Countries-1.400.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c56e7b9f2ec95e510fb11b74a9c71e49
+_md5_=7797d697e3b17343af9d9e0495fedaf5
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 5f4103576e97..729a13f5a721 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/igbinary-3.1.6 b/metadata/md5-cache/dev-php/igbinary-3.1.6
new file mode 100644
index 000000000000..c8fda1af16ef
--- /dev/null
+++ b/metadata/md5-cache/dev-php/igbinary-3.1.6
@@ -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-1? ( dev-lang/php:7.1 ) 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=php_targets_php7-1? ( dev-lang/php:7.1 ) 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=A fast drop-in replacement for the standard PHP serialize
+EAPI=7
+HOMEPAGE=https://github.com/igbinary/igbinary
+IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) 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-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+SLOT=0
+SRC_URI=https://github.com/igbinary/igbinary/archive/3.1.6.tar.gz -> igbinary-3.1.6.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2992155ca4436f204c32961b1425b7e5
diff --git a/metadata/md5-cache/dev-php/pecl-uuid-1.2.0 b/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
new file mode 100644
index 000000000000..48abfb120961
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
@@ -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-1? ( dev-lang/php:7.1 ) 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=sys-apps/util-linux php_targets_php7-1? ( dev-lang/php:7.1 ) 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=A wrapper around libuuid
+EAPI=7
+HOMEPAGE=https://pecl.php.net/uuid
+IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=sys-apps/util-linux php_targets_php7-1? ( dev-lang/php:7.1 ) 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-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/uuid-1.2.0.tgz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=623e005129b32c6734ffeeb81e401c24
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d17424bff832..4a4e9876d923 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/SchemaObject-0.5.8 b/metadata/md5-cache/dev-python/SchemaObject-0.5.8
deleted file mode 100644
index e1b2dbe31bdc..000000000000
--- a/metadata/md5-cache/dev-python/SchemaObject-0.5.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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 simple Python object interface to a MySQL database schema
-EAPI=6
-HOMEPAGE=https://github.com/mmatuson/SchemaObject
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/S/SchemaObject/SchemaObject-0.5.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_=3cb9d492d3d0c6e4b5a143a2299bc7b1
diff --git a/metadata/md5-cache/dev-python/asgiref-3.3.0 b/metadata/md5-cache/dev-python/asgiref-3.3.0
new file mode 100644
index 000000000000..f78a6068f9a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asgiref-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=ASGI utilities (successor to WSGI)
+EAPI=7
+HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
+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=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/a/asgiref/asgiref-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_=7f7eedf2ad627edd9d7af25cb3eb0c91
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
deleted file mode 100644
index 23fb779d2049..000000000000
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/backports[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(-)] >=dev-python/pytest-2.8[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(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[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/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[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/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[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(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[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 ) >=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
-DESCRIPTION=Backport of unittest.mock
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
-IUSE=test doc python_targets_pypy3 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
-LICENSE=MIT
-RDEPEND=dev-python/backports[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(-)] 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=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=00ea2a3e3b28a632723c1511edd4c6b2
diff --git a/metadata/md5-cache/dev-python/bleach-3.2.1 b/metadata/md5-cache/dev-python/bleach-3.2.1
index 6fe9677815c2..1dc8a056424a 100644
--- a/metadata/md5-cache/dev-python/bleach-3.2.1
+++ b/metadata/md5-cache/dev-python/bleach-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
 EAPI=7
 HOMEPAGE=https://github.com/mozilla/bleach https://pypi.org/project/bleach/
 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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(-)] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/b/bleach/bleach-3.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_=3f1d85cda3136fa4381d8204e8a6f578
+_md5_=be0052f7060ed4b7aa75df2defe7a9a0
diff --git a/metadata/md5-cache/dev-python/blockdiag-2.0.1 b/metadata/md5-cache/dev-python/blockdiag-2.0.1
index d0ba61db2412..f04197e2f326 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=~alpha ~amd64 arm arm64 ~hppa ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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_=f73436c99569b10acf9f3619bdb786fc
+_md5_=ed5ec73755f046eeaa847622780f5ed0
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.15 b/metadata/md5-cache/dev-python/boto3-1.15.15
new file mode 100644
index 000000000000..1eb6aa6aab92
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.15
@@ -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.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.15.tar.gz -> boto3-1.15.15.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.16 b/metadata/md5-cache/dev-python/boto3-1.15.16
new file mode 100644
index 000000000000..a22944a9a304
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.16
@@ -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.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.16.tar.gz -> boto3-1.15.16.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.15 b/metadata/md5-cache/dev-python/botocore-1.18.15
new file mode 100644
index 000000000000..425312ee8b5e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.15
@@ -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.15.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.16 b/metadata/md5-cache/dev-python/botocore-1.18.16
new file mode 100644
index 000000000000..45b4c234e654
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.16
@@ -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.16.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/cbor2-5.1.0 b/metadata/md5-cache/dev-python/cbor2-5.1.0
deleted file mode 100644
index 815bd12ef9e3..000000000000
--- a/metadata/md5-cache/dev-python/cbor2-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)] ) test? ( dev-python/setuptools_scm[python_targets_python3_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-python/setuptools_scm[python_targets_python3_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=Pure Python CBOR (de)serializer with extensive tag support
-EAPI=7
-HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools_scm[python_targets_python3_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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cbor2/cbor2-5.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_=6073c39296eedd58b12ff5b2e20bd086
diff --git a/metadata/md5-cache/dev-python/cbor2-5.1.2 b/metadata/md5-cache/dev-python/cbor2-5.1.2
index 74ab3e8721e5..5c67e430c5b2 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.1.2
+++ b/metadata/md5-cache/dev-python/cbor2-5.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 arm arm64 x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools_scm[python_targets_python3_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 ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.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_=abfa7859652999996213d2f09c2352c7
+_md5_=6073c39296eedd58b12ff5b2e20bd086
diff --git a/metadata/md5-cache/dev-python/debtcollector-2.2.0 b/metadata/md5-cache/dev-python/debtcollector-2.2.0
new file mode 100644
index 000000000000..891072f3791d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/debtcollector-2.2.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/pbr-2.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/pbr-2.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(-)]
+DESCRIPTION=Python deprecation patterns and strategies that collect technical debt
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.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(-)] >=dev-python/six-1.10.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/wrapt-1.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(-)] python_targets_python3_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/d/debtcollector/debtcollector-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_=3cfee45e433c9503b1a240d32b1222ad
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5 b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
new file mode 100644
index 000000000000..5665881bda5b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast JSON schema validator for Python
+EAPI=7
+HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/horejsek/python-fastjsonschema/archive/v2.14.5.tar.gz -> python-fastjsonschema-2.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_=40eca01b7ff99e86a5305b019ca8a504
diff --git a/metadata/md5-cache/dev-python/flake8-3.8.3-r1 b/metadata/md5-cache/dev-python/flake8-3.8.3-r1
index 923aab58833a..b6a6cfe41b67 100644
--- a/metadata/md5-cache/dev-python/flake8-3.8.3-r1
+++ b/metadata/md5-cache/dev-python/flake8-3.8.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=7
 HOMEPAGE=https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/
 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 ~hppa ~ia64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.6.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/mccabe-0.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(-)]
 RDEPEND=>=dev-python/pyflakes-2.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/pyflakes-2.3.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/pycodestyle-2.6.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/pycodestyle-2.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/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(-)] ) 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(-)]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.8.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c6c872aee22ecb1acb17e7c688d5abec
+_md5_=acaf8d23f8e6ea55ef8408c850a34b84
diff --git a/metadata/md5-cache/dev-python/grpcio-1.32.0 b/metadata/md5-cache/dev-python/grpcio-1.32.0
deleted file mode 100644
index 078c3f39f9ca..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.32.0
+++ /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 ) python_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-1.32.0-r1 b/metadata/md5-cache/dev-python/grpcio-1.32.0-r1
new file mode 100644
index 000000000000..85c8a175dd3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-1.32.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-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_=3b1cd3a6647bc5cbb9140ae728cc7b44
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0.1-r2 b/metadata/md5-cache/dev-python/html5lib-1.0.1-r2
deleted file mode 100644
index 1d39e47f27ed..000000000000
--- a/metadata/md5-cache/dev-python/html5lib-1.0.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-expect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/six-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=[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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=HTML parser based on the HTML5 specification
-EAPI=7
-HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
-IUSE=test 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 s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=[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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/html5lib/html5lib-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_=d1e35c4b6fe9a9eb15e50f0ec7e49fa6
diff --git a/metadata/md5-cache/dev-python/html5lib-1.1 b/metadata/md5-cache/dev-python/html5lib-1.1
index 60aa4d525efb..e81bb1eb3486 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.1
@@ -4,7 +4,7 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=7
 HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
 IUSE=test 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-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=[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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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 ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-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_=44ee3a26b96d78068ecf176cd3a0bde7
+_md5_=b7bc4b353a4c205120a9cc90bd18711b
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.0.0 b/metadata/md5-cache/dev-python/iniconfig-1.0.0
index 572943e8d976..91653ce51faa 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=~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=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_=9d572957a426837021a710acc93f0ee4
+_md5_=5439969bf1d29744b0e40601945bd46f
diff --git a/metadata/md5-cache/dev-python/iniparse-0.5 b/metadata/md5-cache/dev-python/iniparse-0.5
new file mode 100644
index 000000000000..6b2e0ddd2074
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iniparse-0.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.10.0[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(-)]
+DESCRIPTION=Better INI parser for Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/iniparse/
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT PSF-2
+RDEPEND=>=dev-python/six-1.10.0[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/i/iniparse/iniparse-0.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b15b7523d8147c185afb05ee99e1f972
diff --git a/metadata/md5-cache/dev-python/isort-5.6.3 b/metadata/md5-cache/dev-python/isort-5.6.3
new file mode 100644
index 000000000000..bde7d8dcab2a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/isort-5.6.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/black[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/colorama[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/hypothesis[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/pylama[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/pytest-mock[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(-)] ) test? ( >=dev-python/pytest-4.5.0[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A python utility/library to sort imports
+EAPI=7
+HOMEPAGE=https://pypi.org/project/isort/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/isort/isort-5.6.3.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f08ee090f8ddc9d98e55bbfe160019b
diff --git a/metadata/md5-cache/dev-python/joblib-0.17.0 b/metadata/md5-cache/dev-python/joblib-0.17.0
new file mode 100644
index 000000000000..e2d0c5bfc221
--- /dev/null
+++ b/metadata/md5-cache/dev-python/joblib-0.17.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/threadpoolctl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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=Tools to provide lightweight pipelining in Python
+EAPI=7
+HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/joblib/joblib/archive/0.17.0.tar.gz -> joblib-0.17.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fa0a46e8ebf43e75140fefc31407a14b
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.2.1 b/metadata/md5-cache/dev-python/keystoneauth-4.2.1
new file mode 100644
index 000000000000..2b07c9cbac28
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.2.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/keystoneauth
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/iso8601-0.1.11[python_targets_python3_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-2.14.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/six-1.10.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/stevedore-1.20.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/os-service-types-1.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_targets_python3_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/k/keystoneauth1/keystoneauth1-4.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_=58c60073351c37bafdb965868f2af7f4
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1 b/metadata/md5-cache/dev-python/lit-10.0.1
index 2c2fde0263d1..74ed3503bfec 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1
@@ -4,7 +4,7 @@ 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
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.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_=d24fb8657848f9fb57b4872f1bf991dc
+_md5_=710831df34a60390ae4cf1ebf4bbfe99
diff --git a/metadata/md5-cache/dev-python/lmdb-1.0.0 b/metadata/md5-cache/dev-python/lmdb-1.0.0
index f470bd014349..2e8ac99e5386 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.0.0
+++ b/metadata/md5-cache/dev-python/lmdb-1.0.0
@@ -1,16 +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(+)] ) ) ) test? ( dev-db/lmdb:= >=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(-)]
+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-db/lmdb:= >=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=dev-db/lmdb:=
 DESCRIPTION=Python bindings for the Lightning Database
 EAPI=7
 HOMEPAGE=https://github.com/jnwatson/py-lmdb/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+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 ~x86 ~amd64-linux ~x86-linux
 LICENSE=OPENLDAP
-RDEPEND=dev-db/lmdb:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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 )
+RDEPEND=dev-db/lmdb:= 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/l/lmdb/lmdb-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_=7c7b831ec1ff82eed41ae00a01d545ff
+_md5_=e4d7e69939f150b03ef2295e4ed14d8b
diff --git a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2 b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
deleted file mode 100644
index 7fc79816881c..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cycler[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-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/python-dateutil:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) >=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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pure python plotting library with matlab like syntax (py2 version)
-EAPI=6
-HOMEPAGE=https://matplotlib.org/
-IUSE=cairo excel gtk3 latex test tk wxwidgets python_targets_python2_7 test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cycler[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-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/python-dateutil:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !<dev-python/matplotlib-3 >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=test? ( cairo gtk3 latex tk wxwidgets ) || ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ade90d7a1742690f2abeceafe9e76fc
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1-r2 b/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
index 71f8bbe96928..5dbed85ab976 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=flake8 plugin: McCabe complexity checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/mccabe
 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 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/m/mccabe/mccabe-0.6.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d17fb715db6ebac30cbd4c72e32fa91
+_md5_=8d5a34aa56d96fad61ea027730bd2200
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
index cdb658736833..e213b982bcf7 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
@@ -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 ) 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=>=net-libs/miniupnpc-2.1.20191224:0= 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(-)]
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) 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(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=net-libs/miniupnpc-2.1.20191224:0=
 DESCRIPTION=Python bindings for UPnP client library
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 verify-sig
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=net-libs/miniupnpc-2.1.20191224: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 ) >=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 )
 SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c550b81e87306959aa989cf13ec2681
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz.sig )
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_md5_=6a2912e0ef3ff11f066cecabdce1d425
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 d12e737fd645..1ca7e338d7d1 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_=5ac578724729eb95af095fec410081ad
+_md5_=5cb98bdf6c92d3e447dd7e81e003a383
diff --git a/metadata/md5-cache/dev-python/nbformat-5.0.8 b/metadata/md5-cache/dev-python/nbformat-5.0.8
new file mode 100644
index 000000000000..4124d83f3e13
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbformat-5.0.8
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/numpydoc[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/numpydoc[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/numpydoc[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) ) test? ( >=dev-python/jsonschema-2.4.0[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/ipython_genutils[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/traitlets-4.1[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/jupyter_core[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/pytest-4.5.0[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[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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/fastjsonschema[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/testpath[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(-)] )
+DESCRIPTION=Reference implementation of the Jupyter Notebook format
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/jsonschema-2.4.0[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/ipython_genutils[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/traitlets-4.1[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/jupyter_core[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[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_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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jupyter/nbformat/archive/5.0.8.tar.gz -> nbformat-5.0.8.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3e8a55e8f3c0c589284eaea277edb95
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.9.1 b/metadata/md5-cache/dev-python/nuitka-0.6.9.1
new file mode 100644
index 000000000000..ff8b7761b31b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.9.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/scons[python_targets_python3_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 postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=7
+HOMEPAGE=https://www.nuitka.net
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_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/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(-)] python_targets_python3_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=https://nuitka.net/releases/Nuitka-0.6.9.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_=c8606dae39057dd69e4e08446ba9611f
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.1 b/metadata/md5-cache/dev-python/numexpr-2.7.1
deleted file mode 100644
index fee2d4b7a178..000000000000
--- a/metadata/md5-cache/dev-python/numexpr-2.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/numpy-1.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(-)] mkl? ( sci-libs/mkl ) 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[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(-)]
-DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
-EAPI=6
-HOMEPAGE=https://github.com/pydata/numexpr
-IUSE=mkl 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=MIT
-RDEPEND=>=dev-python/numpy-1.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(-)] mkl? ( sci-libs/mkl ) 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numexpr/numexpr-2.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df8d05fed788e9913206157f64f32251
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.2 b/metadata/md5-cache/dev-python/numexpr-2.7.2
index 2611dc0706a1..45e23240dafe 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.7.2
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
 EAPI=7
 HOMEPAGE=https://github.com/pydata/numexpr
 IUSE=mkl 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
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.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(-)] mkl? ( sci-libs/mkl ) 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(-)]
 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/pydata/numexpr/archive/v2.7.2.tar.gz -> numexpr-2.7.2.gh.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	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f2b7e252479865d7bd2aa6dcae597bf
+_md5_=d1cb1546d37c79f207025305bb2942c5
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.1 b/metadata/md5-cache/dev-python/numpy-1.19.1
index bc9b9ea5c22d..6f119cbda4cc 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_=2f63b90c846c8d356dbcc5f231ab4426
+_md5_=60cadf3298ccb79d75840231f3e30b5d
diff --git a/metadata/md5-cache/dev-python/oauth-1.0.1-r1 b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
deleted file mode 100644
index 58d89bfa880a..000000000000
--- a/metadata/md5-cache/dev-python/oauth-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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=Python OAuth module
-EAPI=5
-HOMEPAGE=https://pypi.org/project/oauth/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oauth/oauth-1.0.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e132a86ab1886eb7ac5a16be717a181f
diff --git a/metadata/md5-cache/dev-python/objgraph-3.5.0 b/metadata/md5-cache/dev-python/objgraph-3.5.0
new file mode 100644
index 000000000000..821c5505cd56
--- /dev/null
+++ b/metadata/md5-cache/dev-python/objgraph-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( media-gfx/xdot ) test? ( media-gfx/graphviz ) 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=Draws Python object reference graphs with graphviz
+EAPI=7
+HOMEPAGE=https://mg.pov.lt/objgraph/
+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 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=media-gfx/graphviz 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/o/objgraph/objgraph-3.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_=146f03e918cb10f43f2190db5305df2f
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.50.0 b/metadata/md5-cache/dev-python/openstacksdk-0.50.0
new file mode 100644
index 000000000000..f93e147c0670
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.50.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=A collection of libraries for building applications to work with OpenStack.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-openstacksdk
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/pyyaml-3.13[python_targets_python3_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/appdirs-1.3.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/requestsexceptions-1.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/jsonpatch-1.16[python_targets_python3_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/jsonpatch-1.20[python_targets_python3_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/os-service-types-1.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/keystoneauth-3.18.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/munch-2.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(-)] >=dev-python/decorator-4.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/jmespath-0.9.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/iso8601-0.1.11[python_targets_python3_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/netifaces-0.10.4[python_targets_python3_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/dogpile-cache-0.6.5[python_targets_python3_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/cryptography-2.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/importlib_metadata[python_targets_python3_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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.50.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fe088d0310dd5cafbd3bf7e6de8afa95
diff --git a/metadata/md5-cache/dev-python/os-client-config-2.1.0 b/metadata/md5-cache/dev-python/os-client-config-2.1.0
new file mode 100644
index 000000000000..e74128a7e2fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/os-client-config-2.1.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/pbr-1.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(-)]
+DESCRIPTION=OpenStack Client Configuation Library
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.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/openstacksdk-0.13.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/o/os-client-config/os-client-config-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_=6c7e29a3ccf7589fd0c741508ec25016
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.2.1 b/metadata/md5-cache/dev-python/osc-lib-2.2.1
new file mode 100644
index 000000000000..603dd663d7e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osc-lib-2.2.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=A package of common support modules for writing OSC plugins.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/osc-lib
+IUSE=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=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/cliff-3.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/keystoneauth-3.14.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/openstacksdk-0.15.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/os-client-config-1.29.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/oslo-i18n-3.15.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/oslo-utils-3.33.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/simplejson-3.5.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/stevedore-1.20.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/o/osc-lib/osc-lib-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_=a40dbd1f30ba443dfc36de7c0ba1510f
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.2 b/metadata/md5-cache/dev-python/oslo-config-8.3.2
new file mode 100644
index 000000000000..b52f7c4800b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-config-8.3.2
@@ -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/pbr-1.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(-)]
+DESCRIPTION=Oslo Configuration API
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=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=>=dev-python/pbr-1.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/debtcollector-1.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/netaddr-0.7.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/stevedore-1.20.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/oslo-i18n-3.15.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/rfc3986-1.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/pyyaml-3.12.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/requests-2.18.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/importlib_metadata[python_targets_python3_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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.2.tar.gz -> oslo-config-8.3.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a2f42acd80faacca74700eb5fbe70341
diff --git a/metadata/md5-cache/dev-python/oslo-context-3.1.1 b/metadata/md5-cache/dev-python/oslo-context-3.1.1
new file mode 100644
index 000000000000..5c2c9d1fc84a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-context-3.1.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/pbr-2.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/pbr-2.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(-)]
+DESCRIPTION=Helpers to maintain useful information about a request context
+EAPI=7
+HOMEPAGE=https://pypi.org/project/oslo.context/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.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(-)] >=dev-python/debtcollector-1.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_targets_python3_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/oslo.context/oslo.context-3.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_=15cd04a4622345dd651cabcd6c697f26
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1 b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
new file mode 100644
index 000000000000..551eecf05a2b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-i18n-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 unpack
+DEPEND=>=dev-python/pbr-2.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/pbr-2.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(-)]
+DESCRIPTION=Oslo i18n library
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.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(-)] >=dev-python/six-1.9.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.0.1.tar.gz -> oslo-i18n-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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=91c8cd7141251570a5e94919a88f17b7
diff --git a/metadata/md5-cache/dev-python/oslo-log-4.4.0 b/metadata/md5-cache/dev-python/oslo-log-4.4.0
new file mode 100644
index 000000000000..4a5129d0fdc8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-log-4.4.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/pbr-3.1.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(-)]
+DESCRIPTION=OpenStack logging config library, configuration for all openstack projects.
+EAPI=7
+HOMEPAGE=https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-3.1.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/oslo-config-5.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/oslo-context-2.20.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/oslo-i18n-3.20.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/oslo-utils-3.36.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/oslo-serialization-1.25.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/debtcollector-1.19.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/pyinotify-0.9.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/python-dateutil-2.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(-)] python_targets_python3_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/o/oslo.log/oslo.log-4.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_=038f9ef098013e4611d75c0f9f29f6a6
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-4.0.1 b/metadata/md5-cache/dev-python/oslo-serialization-4.0.1
new file mode 100644
index 000000000000..f2bf2c41bc74
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-serialization-4.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/pbr-2.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/pbr-2.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(-)]
+DESCRIPTION=Oslo Serialization library
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.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(-)] >=dev-python/msgpack-0.5.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/oslo-utils-3.33.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/pytz-2013.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(-)] python_targets_python3_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/oslo.serialization/oslo.serialization-4.0.1.tar.gz -> oslo-serialization-4.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_=da7585757e13980f647701b0b93d0b88
diff --git a/metadata/md5-cache/dev-python/oslo-utils-4.6.0 b/metadata/md5-cache/dev-python/oslo-utils-4.6.0
new file mode 100644
index 000000000000..063f2fa9522b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-utils-4.6.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/pbr-2.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/pbr-2.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(-)]
+DESCRIPTION=Oslo Utility library
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.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(-)] >=dev-python/six-1.10.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/iso8601-0.1.11[python_targets_python3_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/oslo-i18n-3.15.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/pytz-2013.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/netaddr-0.7.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/netifaces-0.10.4[python_targets_python3_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/debtcollector-1.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/pyparsing-2.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(-)] >=dev-python/packaging-20.4[python_targets_python3_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/o/oslo.utils/oslo.utils-4.6.0.tar.gz -> oslo-utils-4.6.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9c15322db1d3fc2da5bbbaa57aca2e0c
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
new file mode 100644
index 000000000000..461eef38daed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/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/scrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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? ( bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) totp? ( 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(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=Password hashing framework supporting over 20 schemes
+EAPI=7
+HOMEPAGE=https://foss.heptapod.net/python-libs/passlib/wikis/home
+IUSE=+bcrypt doc +scrypt +totp 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 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) totp? ( 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(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/passlib/passlib-1.7.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=25fb0d5c1d101e1d36ec71e5cc510e6a
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.11 b/metadata/md5-cache/dev-python/phonenumbers-8.12.11
new file mode 100644
index 000000000000..c54db1574b35
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.11
@@ -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.11.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/plyvel-1.3.0 b/metadata/md5-cache/dev-python/plyvel-1.3.0
new file mode 100644
index 000000000000..8975f6174af6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/plyvel-1.3.0
@@ -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(+)] ) ) ) test? ( >=dev-libs/leveldb-1.20:= >=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=>=dev-libs/leveldb-1.20:=
+DESCRIPTION=Python interface to LevelDB
+EAPI=7
+HOMEPAGE=https://github.com/wbolster/plyvel
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/leveldb-1.20:= 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/plyvel/plyvel-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_=15b70993e5bef750dc059d14d0773dd1
diff --git a/metadata/md5-cache/dev-python/process-tests-2.0.2 b/metadata/md5-cache/dev-python/process-tests-2.0.2
deleted file mode 100644
index fe394c15a19b..000000000000
--- a/metadata/md5-cache/dev-python/process-tests-2.0.2
+++ /dev/null
@@ -1,15 +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=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 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/process-tests/process-tests-2.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_=95e4b1ace77c6541f281e2ba329f7a28
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 8b653da1a519..874dc251a37d 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_=0fcf7f1b9671b5277cb00ac1b091a052
+_md5_=46e6b1abd2ca3f72e4e726992b275f4d
diff --git a/metadata/md5-cache/dev-python/progress-1.5 b/metadata/md5-cache/dev-python/progress-1.5
new file mode 100644
index 000000000000..fa036ed9d833
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progress-1.5
@@ -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 progress bars
+EAPI=7
+HOMEPAGE=https://pypi.org/project/progress/ https://github.com/verigak/progress/
+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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+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/p/progress/progress-1.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2e37af22a032be5bf4a803ad05ecb62e
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
index f97e807428a8..c17308a9eb6d 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
@@ -5,11 +5,11 @@ 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
+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_=fae02eb36f7da09258f2741e8d54bc4f
+_md5_=cca2cec87fdb78adcd367e88d5260464
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.0 b/metadata/md5-cache/dev-python/pyacoustid-1.2.0
new file mode 100644
index 000000000000..506868e8dcf5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.2.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=Python bindings for Chromaprint and the AcoustID web service
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pyacoustid/
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/audioread[python_targets_python3_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(-)] media-libs/chromaprint python_targets_python3_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/p/pyacoustid/pyacoustid-1.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_=de55af8474d643182b60526be522fe91
diff --git a/metadata/md5-cache/dev-python/pydantic-1.6.1 b/metadata/md5-cache/dev-python/pydantic-1.6.1
new file mode 100644
index 000000000000..903398ade417
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydantic-1.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[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(-)] test? ( >=dev-python/pytest-4.5.0[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Data parsing and validation using Python type hints
+EAPI=7
+HOMEPAGE=https://github.com/samuelcolvin/pydantic
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/samuelcolvin/pydantic/archive/v1.6.1.tar.gz -> pydantic-1.6.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=653ff0de7691fccfe914438e249f8489
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.1.1 b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
index 5e1b3135fbb8..31f43123a413 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-5.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python docstring style checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/pydocstyle/
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_7? ( dev-lang/python:3.7 ) python_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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 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/PyCQA/pydocstyle/archive/5.1.1.tar.gz -> pydocstyle-5.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_=ddf7f2f1d1edda744cccb7adb8ef4614
+_md5_=d8308e98b0543517d097833037081c6e
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.0_pre10 b/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
index fa265b6e5162..0065d17a4ca5 100644
--- a/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
+++ b/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for SDL multimedia library
 EAPI=7
 HOMEPAGE=https://www.pygame.org/
 IUSE=doc examples midi opengl test X 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 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(-)] >=media-libs/sdl2-image-1.2.2 >=media-libs/sdl2-mixer-1.2.4 >=media-libs/sdl2-ttf-2.0.6 >=media-libs/smpeg2-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl2-1.2.5[opengl?,video,X] ) !X? ( >=media-libs/libsdl2-1.2.5 ) media-libs/fontconfig python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/pygame/pygame/releases/download/2.0.0.dev10/pygame-2.0.0.dev10.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8dfea67b7e7de2565f2433ad47daa5d4
+_md5_=00cfde6d8a319f68c17da61524de4bc7
diff --git a/metadata/md5-cache/dev-python/pygobject-3.36.1-r1 b/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
index 3ebccb5f0b62..d929992c7f2d 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
@@ -1,6 +1,6 @@
 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
+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? ( dev-libs/atk[introspection] 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(-)] 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/
@@ -13,4 +13,4 @@ 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
+_md5_=bce30ce153cb04fb393f29d72c42b554
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.5 b/metadata/md5-cache/dev-python/pygraphviz-1.5
deleted file mode 100644
index 2bfc425e1d33..000000000000
--- a/metadata/md5-cache/dev-python/pygraphviz-1.5
+++ /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 ) 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=media-gfx/graphviz dev-lang/swig:0 test? ( dev-python/doctest-ignore-unicode[python_targets_python3_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/nose[python_targets_python3_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=Python wrapper for the Graphviz Agraph data structure
-EAPI=7
-HOMEPAGE=https://pygraphviz.github.io/
-IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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 ) >=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/pygraphviz/pygraphviz-1.5.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4d34444ad6c71b6195ba169fc1297f04
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.6 b/metadata/md5-cache/dev-python/pygraphviz-1.6
index e33ee18a0758..595ff9314416 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_=4987f189a1e72ac141dd79f9e8556a06
+_md5_=0a6ac923bf49a0ce16368c12c037ee06
diff --git a/metadata/md5-cache/dev-python/pylama-7.7.1-r1 b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
index 193291fd26b6..75ff97dc34a2 100644
--- a/metadata/md5-cache/dev-python/pylama-7.7.1-r1
+++ b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Code audit tool for python
 EAPI=7
 HOMEPAGE=https://github.com/klen/pylama
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/mccabe-0.5.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/pycodestyle[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/pydocstyle[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/pyflakes[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
 SRC_URI=https://github.com/klen/pylama/archive/7.7.1.tar.gz -> pylama-7.7.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6710d015f276063336271ff94646a45
+_md5_=256c8065c2e7c2b9e330b136261bdb78
diff --git a/metadata/md5-cache/dev-python/pymysql-0.10.0 b/metadata/md5-cache/dev-python/pymysql-0.10.0
deleted file mode 100644
index 527d234c3a96..000000000000
--- a/metadata/md5-cache/dev-python/pymysql-0.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-db/mariadb[server] ) 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=Pure-Python MySQL Driver
-EAPI=7
-HOMEPAGE=https://github.com/PyMySQL/PyMySQL
-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 ~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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.10.0.tar.gz -> pymysql-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_=da5684bac2b3743842d435d22695ada6
diff --git a/metadata/md5-cache/dev-python/pymysql-0.10.1 b/metadata/md5-cache/dev-python/pymysql-0.10.1
index f394e6c110ae..3a8da9a8d509 100644
--- a/metadata/md5-cache/dev-python/pymysql-0.10.1
+++ b/metadata/md5-cache/dev-python/pymysql-0.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure-Python MySQL Driver
 EAPI=7
 HOMEPAGE=https://github.com/PyMySQL/PyMySQL
 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 ~x86
+KEYWORDS=amd64 ~arm ~arm64 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 ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.10.1.tar.gz -> pymysql-0.10.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e18ad517fff25561c1f957f9a769d9f7
+_md5_=1ff0b306ddc0f754b7ab7e0f99306537
diff --git a/metadata/md5-cache/dev-python/pymysql-0.9.3 b/metadata/md5-cache/dev-python/pymysql-0.9.3
deleted file mode 100644
index d4102fa0c3c7..000000000000
--- a/metadata/md5-cache/dev-python/pymysql-0.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-db/mariadb[server] ) 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 MySQL Driver
-EAPI=7
-HOMEPAGE=https://github.com/PyMySQL/PyMySQL
-IUSE=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=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=https://github.com/PyMySQL/PyMySQL/archive/v0.9.3.tar.gz -> pymysql-0.9.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8bf948315cc336d649198e19175150b6
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.4.2 b/metadata/md5-cache/dev-python/pypiserver-1.4.2
new file mode 100644
index 000000000000..b0f3ad46081d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypiserver-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools-git[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-0.25.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/passlib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-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/twine[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/webtest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-0.25.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(-)] ) 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=Minimal PyPI server
+EAPI=7
+HOMEPAGE=https://github.com/pypiserver/pypiserver
+IUSE=test 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 ~sparc ~x86
+LICENSE=ZLIB MIT
+RDEPEND=dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-0.25.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=https://github.com/pypiserver/pypiserver/archive/v1.4.2.tar.gz -> pypiserver-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_=460fdf1854809dab3b69111652326b04
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
deleted file mode 100644
index f1ebd25ae749..000000000000
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
+++ /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=A python interface to the sendfile(2) system call
-EAPI=7
-HOMEPAGE=https://github.com/giampaolo/pysendfile
-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 ppc ppc64 ~s390 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 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pysendfile/pysendfile-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_=baec55db7fd31208e86464496d455d44
diff --git a/metadata/md5-cache/dev-python/pytest-6.0.1 b/metadata/md5-cache/dev-python/pytest-6.0.1
index 8b87361f79ce..6317600f1868 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_=b9af1441f5880c515f187a6fe9cd7fcd
+_md5_=d40476daacb125b1bd586f196be27e2b
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0 b/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
index d6b082b14f6a..67ed5f784703 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[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(-)]
+BDEPEND=test? ( <dev-python/pytest-6.1.0 >=dev-python/pytest-4.5.0[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
 DESCRIPTION=pytest plugin to re-run tests to eliminate flaky failures
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://pypi.org/project/pytest-rerunfailures/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-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 ) >=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/pytest-6.1.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 ) >=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=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-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_=1e31a5e304b7fe7f73745ef9aab04599
+_md5_=46fac74369dc899cfd8ee8bc8f74bb85
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1 b/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
new file mode 100644
index 000000000000..e68e4fbcba7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pytest-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(-)] 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=pytest plugin to re-run tests to eliminate flaky failures
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-rerunfailures/
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-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(-)] >=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-rerunfailures/pytest-rerunfailures-9.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_=257c07dd1f99a0244fca38d3fa5dedd3
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-7.2.0 b/metadata/md5-cache/dev-python/python-cinderclient-7.2.0
new file mode 100644
index 000000000000..d5db9bb2008f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-cinderclient-7.2.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=A client for the OpenStack Cinder API
+EAPI=7
+HOMEPAGE=https://launchpad.net/python-cinderclient
+IUSE=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=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/prettytable-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/prettytable-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(-)] >=dev-python/keystoneauth-3.4.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/simplejson-3.5.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/six-1.10.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/oslo-i18n-3.15.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/oslo-utils-3.33.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/requests-2.14.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/requests-2.20.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/stevedore-1.20.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-7.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_=d6ad190f541c5c25ba64c34e99385385
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1 b/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
new file mode 100644
index 000000000000..ba1ce958e7ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-4.1.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=Client Library for OpenStack Identity
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=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=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/debtcollector-1.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/keystoneauth-3.4.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/oslo-config-5.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/oslo-i18n-3.15.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/oslo-serialization-1.18.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/oslo-serialization-2.19.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/oslo-utils-3.33.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/requests-2.14.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/six-1.10.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/stevedore-1.20.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-4.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_=99458b8f752b9c025851455737a82266
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.3.1 b/metadata/md5-cache/dev-python/python-ldap-3.3.1
new file mode 100644
index 000000000000..cf1349267206
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ldap-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[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/pyasn1-modules-0.1.5[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(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] >=dev-python/pytest-4.5.0[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(-)] ) 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(+)] ) ( >=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 ) >=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
+DESCRIPTION=Various LDAP-related Python modules
+EAPI=7
+HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
+IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+LICENSE=PSF-2
+RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[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/pyasn1-modules-0.1.5[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(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] 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=mirror://pypi/p/python-ldap/python-ldap-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_=2a7fca9a0bd9ad719df9c435d89ae20a
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
index 071492222672..1258a0526de6 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
@@ -1,14 +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-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(-)]
+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(-)]
 DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
-EAPI=6
-HOMEPAGE=https://github.com/ztane/python-Levenshtein/ https://pypi.org/project/python-Levenshtein/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+EAPI=7
+HOMEPAGE=https://pypi.org/project/python-Levenshtein/ https://github.com/ztane/python-Levenshtein/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm64 ~ia64 x86
 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 )
+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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.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_=dce023abab4b9bed3eb9e380d2184853
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=317fa851cb46058e734b85ad3a842d7e
diff --git a/metadata/md5-cache/dev-python/python-novaclient-17.2.1 b/metadata/md5-cache/dev-python/python-novaclient-17.2.1
new file mode 100644
index 000000000000..e06af23cb5f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-novaclient-17.2.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=A client for the OpenStack Nova API
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-novaclient
+IUSE=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=>=dev-python/keystoneauth-3.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/iso8601-0.1.11[python_targets_python3_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/oslo-i18n-3.15.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/oslo-serialization-1.18.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/oslo-serialization-2.19.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/oslo-utils-3.33.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/prettytable-0.7.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/prettytable-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(-)] >=dev-python/requests-2.10.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/requests-2.12.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/simplejson-3.5.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/stevedore-2.0.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(-)] python_targets_python3_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/p/python-novaclient/python-novaclient-17.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_=678e915e1bd09c0bba059df7677abcaf
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-5.4.0 b/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
new file mode 100644
index 000000000000..3f2301dcdd36
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-openstackclient-5.4.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/pbr-2.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/pbr-2.1.0
+DESCRIPTION=A client for the OpenStack APIs
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-openstackclient
+IUSE=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=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/six-1.10.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/cliff-2.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/cliff-2.9.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/openstacksdk-0.48.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/osc-lib-2.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/oslo-i18n-3.15.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/oslo-utils-3.33.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/python-keystoneclient-3.22.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/python-novaclient-15.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(-)] >=dev-python/python-cinderclient-3.3.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/stevedore-2.0.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(-)] python_targets_python3_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/p/python-openstackclient/python-openstackclient-5.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_=d3a8a4be29ef80d78dfe7aee2c35ce66
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.10.1 b/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
new file mode 100644
index 000000000000..29e08285671e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
@@ -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/pbr[python_targets_python3_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/coverage-4.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/coverage-4.4[python_targets_python3_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/keystoneauth-3.4.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/mock-1.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/stestr-2.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/stestr-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/openstacksdk-0.11.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(-)] )
+DESCRIPTION=Python bindings to the OpenStack Object Storage API
+EAPI=7
+HOMEPAGE=https://launchpad.net/python-swiftclient
+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=>=dev-python/requests-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(-)] >=dev-python/six-1.9.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.10.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3696408ac77dffa79e9f67720c8d3c61
diff --git a/metadata/md5-cache/dev-python/python-zunclient-4.1.1 b/metadata/md5-cache/dev-python/python-zunclient-4.1.1
new file mode 100644
index 000000000000..e26596a9fbcf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-zunclient-4.1.1
@@ -0,0 +1,15 @@
+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
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=A client for the OpenStack Zun API
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-zunclient
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osc-lib-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/websocket-client-0.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/docker-py-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13[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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-4.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_=d54c8dd80176737eb76bbf4a661cd1f4
diff --git a/metadata/md5-cache/dev-python/readme_renderer-27.0 b/metadata/md5-cache/dev-python/readme_renderer-27.0
new file mode 100644
index 000000000000..63a2a97f78b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/readme_renderer-27.0
@@ -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(-)] ) test? ( >=dev-python/bleach-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(-)] >=dev-python/docutils-0.13.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/pygments-2.5.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/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/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=a library for rendering "readme" descriptions for Warehouse
+EAPI=7
+HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/
+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 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/bleach-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(-)] >=dev-python/docutils-0.13.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/pygments-2.5.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/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=mirror://pypi/r/readme_renderer/readme_renderer-27.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d172611ee408afc2234a81e349405fa
diff --git a/metadata/md5-cache/dev-python/redlock-py-1.0.8 b/metadata/md5-cache/dev-python/redlock-py-1.0.8
deleted file mode 100644
index c3c6df0ad097..000000000000
--- a/metadata/md5-cache/dev-python/redlock-py-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/redis-py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Redis distributed locks in Python
-EAPI=5
-HOMEPAGE=https://github.com/SPSCommerce/redlock-py https://pypi.org/project/redlock-py/
-IUSE=python_targets_pypy3 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/redis-py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/redlock-py/redlock-py-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_=b87e48df47288bd381569ced72002a97
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.42 b/metadata/md5-cache/dev-python/reportlab-3.5.42
deleted file mode 100644
index af9126fc71ef..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.5.42
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_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-arch/unzip 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 unpack
-DEPEND=media-libs/libart_lgpl:= sys-libs/zlib:=
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=7
-HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/ https://bitbucket.org/rptlab/reportlab/
-IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_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/libart_lgpl:= 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 ) >=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/r/reportlab/reportlab-3.5.42.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_=40f8c09bfd8a4f836cadefae963c307d
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.48 b/metadata/md5-cache/dev-python/reportlab-3.5.48
index 0f94e7eda90e..c442845550eb 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_=1c69ddc7d559fb238a550dab314db369
+_md5_=3c083685053f4955bc707d913d333a09
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 4d83ef1ec027..ac13a7df141f 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -1,14 +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_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.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(-)]
+DEPEND=>=dev-python/pbr-2.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(-)]
 DESCRIPTION=Finds the correct path to exceptions in the requests library.
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.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 )
+RDEPEND=>=dev-python/pbr-2.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(-)] python_targets_python3_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/r/requestsexceptions/requestsexceptions-1.4.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_=9aae683035769dc9a1cb5e03b5868b37
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7dad216888eb0a2ed3b3e7aaf91c2378
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.7.3-r1 b/metadata/md5-cache/dev-python/root_numpy-4.7.3-r1
deleted file mode 100644
index 6a5daf180746..000000000000
--- a/metadata/md5-cache/dev-python/root_numpy-4.7.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) sci-physics/root:=[python,python_single_target_python3_6(-)?] test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] )
-DESCRIPTION=Interface between ROOT and numpy
-EAPI=5
-HOMEPAGE=https://github.com/rootpy/root_numpy
-IUSE=examples test +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) sci-physics/root:=[python,python_single_target_python3_6(-)?] 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.7.3.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_=13831345d1a865cc29382dae21a50a28
diff --git a/metadata/md5-cache/dev-python/rootpy-1.0.1-r1 b/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
deleted file mode 100644
index 4a2a78e279d0..000000000000
--- a/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-physics/root[python_single_target_python3_6(-)?] test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[readline] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] )
-DESCRIPTION=Pythonic layer on top of the ROOT framework's PyROOT bindings
-EAPI=6
-HOMEPAGE=http://rootpy.org
-IUSE=examples test +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-physics/root:=[python_single_target_python3_6(-)?] dev-python/root_numpy[python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/matplotlib[python_targets_python3_6(-)] dev-python/pytables[python_targets_python3_6(-)] dev-python/termcolor[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[readline] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/rootpy/rootpy-1.0.1.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_=598e1101d0b6ff8e024faca21045084e
diff --git a/metadata/md5-cache/dev-python/rq-1.5.2 b/metadata/md5-cache/dev-python/rq-1.5.2
index a9ba1a5f4014..0b72484e3321 100644
--- a/metadata/md5-cache/dev-python/rq-1.5.2
+++ b/metadata/md5-cache/dev-python/rq-1.5.2
@@ -5,7 +5,7 @@ DESCRIPTION=simple, lightweight library for creating and processing background j
 EAPI=7
 HOMEPAGE=https://python-rq.org https://github.com/rq/rq
 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
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-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/redis-py-3.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(-)]
 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/rq/rq/archive/v1.5.2.tar.gz -> rq-1.5.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bc1bd214b49c3ced0e98fc184fb16c8a
+_md5_=209b76502c35d6c087295fe33c9ed309
diff --git a/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0 b/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
index 704d6c0059bf..aa7a1ac3af2e 100644
--- a/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx directive to add unselectable prompt
 EAPI=7
 HOMEPAGE=https://github.com/sbrunner/sphinx-prompt/
 IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_7? ( dev-lang/python:3.7 ) python_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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/sbrunner/sphinx-prompt/archive/1.3.0.tar.gz -> sphinx-prompt-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_=141f4d888a51998c87e216bceeff0f66
+_md5_=f56d9e0513ad42fa52bc9b7933545969
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22 b/metadata/md5-cache/dev-python/spur-0.3.22
new file mode 100644
index 000000000000..4972ddb5d697
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spur-0.3.22
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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/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=Run commands locally or over SSH using the same interface
+EAPI=7
+HOMEPAGE=https://github.com/mwilliamson/spur.py
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.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_=6ddb72a2a72a25bd39b91ca482d0f3f0
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.4.1 b/metadata/md5-cache/dev-python/sqlparse-0.4.1
new file mode 100644
index 000000000000..5015ba6a9c5e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlparse-0.4.1
@@ -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(+)] ) ) ) 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=A non-validating SQL parser module for Python
+EAPI=7
+HOMEPAGE=https://github.com/andialbrecht/sqlparse
+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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-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(-)] >=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=mirror://pypi/s/sqlparse/sqlparse-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_=40c2f605c478d55d1b1a8cf7700b9bd1
diff --git a/metadata/md5-cache/dev-python/sybil-1.4.0 b/metadata/md5-cache/dev-python/sybil-1.4.0
index f592f123e331..2dc354dec141 100644
--- a/metadata/md5-cache/dev-python/sybil-1.4.0
+++ b/metadata/md5-cache/dev-python/sybil-1.4.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_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(-)]
+BDEPEND=test? ( 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(-)] ) 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=Automated testing for the examples in your documentation
 EAPI=7
 HOMEPAGE=https://github.com/cjw296/sybil
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+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 ) 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 )
+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=mirror://pypi/s/sybil/sybil-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_=cda9c8245a46546efd7e1f4bf27c9a13
+_md5_=bfff6a6ce17da54a187b528c5254523f
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.15.0 b/metadata/md5-cache/dev-python/testfixtures-6.15.0
new file mode 100644
index 000000000000..5829646b40df
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testfixtures-6.15.0
@@ -0,0 +1,15 @@
+BDEPEND=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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-django[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sybil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/twisted-18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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(+)] ) ) ) 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=A collection of helpers and mock objects for unit tests and doc tests
+EAPI=7
+HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~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 ) 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/testfixtures/testfixtures-6.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_=f5f209d0b0ebfc79a5959a022729278c
diff --git a/metadata/md5-cache/dev-python/tox-3.20.0 b/metadata/md5-cache/dev-python/tox-3.20.0
deleted file mode 100644
index 467d09d5084b..000000000000
--- a/metadata/md5-cache/dev-python/tox-3.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-1.1[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-1.1[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-1.1[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/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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/virtualenv-16.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/flaky-3.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/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.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/pytest-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/tox-3.20.0-r0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=virtualenv-based automation of test activities
-EAPI=7
-HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
-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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-1.1[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-1.1[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-1.1[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/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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/virtualenv-16.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(-)] 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=https://github.com/tox-dev/tox/archive/3.20.0.tar.gz -> tox-3.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_=1e9d30fbfd2a6816acfd77ee06897649
diff --git a/metadata/md5-cache/dev-python/tox-3.20.0-r1 b/metadata/md5-cache/dev-python/tox-3.20.0-r1
new file mode 100644
index 000000000000..be27d9519d0b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.20.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-1.1[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-1.1[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-1.1[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/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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/virtualenv-16.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/flaky-3.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/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.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/pytest-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/tox-3.20.0-r1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-1.1[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-1.1[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-1.1[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/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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/virtualenv-16.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(-)] 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=https://github.com/tox-dev/tox/archive/3.20.0.tar.gz -> tox-3.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_=e239688401e916d7b8ad978cc0cb0efb
diff --git a/metadata/md5-cache/dev-python/tox-3.20.1 b/metadata/md5-cache/dev-python/tox-3.20.1
new file mode 100644
index 000000000000..9433d134d5ea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.20.1
@@ -0,0 +1,15 @@
+BDEPEND=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/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-1.1[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-1.1[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-1.1[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/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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/virtualenv-16.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/flaky-3.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/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.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/pytest-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/tox-3.20.1-r0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-1.1[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-1.1[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-1.1[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/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/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/virtualenv-16.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(-)] 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=https://github.com/tox-dev/tox/archive/3.20.1.tar.gz -> tox-3.20.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e9d30fbfd2a6816acfd77ee06897649
diff --git a/metadata/md5-cache/dev-python/tqdm-4.50.2 b/metadata/md5-cache/dev-python/tqdm-4.50.2
new file mode 100644
index 000000000000..cbaf214d431e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.50.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=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=Add a progress meter to your loops in a second
+EAPI=7
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=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 ~ppc ~ppc64 ~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(-)] >=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/t/tqdm/tqdm-4.50.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b80c3587d565a909078d4aad9e9373dd
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-2.5.1 b/metadata/md5-cache/dev-python/translate-toolkit-2.5.1
new file mode 100644
index 000000000000..786ad18fa9b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/translate-toolkit-2.5.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( >=dev-python/sphinx-3.0.2 ) 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_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.11.0[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(-)]
+DESCRIPTION=Toolkit to convert between many translation formats
+EAPI=7
+HOMEPAGE=https://github.com/translate/translate
+IUSE=doc +html +ical +ini +subtitles +yaml python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/six-1.11.0[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/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[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/lxml-4.3.1[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/pycountry-19.8.18[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/python-levenshtein-0.12.0[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(-)] sys-devel/gettext html? ( dev-python/utidylib[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(-)] ) ical? ( dev-python/vobject[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(-)] ) ini? ( >=dev-python/iniparse-0.5[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(-)] ) subtitles? ( media-video/gaupol[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(-)] ) yaml? ( dev-python/pyyaml[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[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_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 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/translate/translate/releases/download/2.5.1/translate-toolkit-2.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_=8b746b2c5b2ad560ab26d3090196673d
diff --git a/metadata/md5-cache/dev-python/treq-20.9.0 b/metadata/md5-cache/dev-python/treq-20.9.0
new file mode 100644
index 000000000000..b458033d51a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/treq-20.9.0
@@ -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/incremental[python_targets_python3_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/hyperlink[python_targets_python3_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-python/sphinx dev-python/incremental[python_targets_python3_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/hyperlink[python_targets_python3_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/twisted-18.7.0[crypt,python_targets_python3_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-2.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(-)] dev-python/attrs[python_targets_python3_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/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/httpbin[python_targets_python3_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 requests-like API built on top of twisted.web's Agent
+EAPI=7
+HOMEPAGE=https://github.com/twisted/treq https://pypi.org/project/treq/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/incremental[python_targets_python3_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/hyperlink[python_targets_python3_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/twisted-18.7.0[crypt,python_targets_python3_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-2.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(-)] dev-python/attrs[python_targets_python3_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/t/treq/treq-20.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_=e817972dc3a2f6c6822fd8c2406c83c0
diff --git a/metadata/md5-cache/dev-python/ujson-3.2.0 b/metadata/md5-cache/dev-python/ujson-3.2.0
index e17964f45382..2f1f5c562472 100644
--- a/metadata/md5-cache/dev-python/ujson-3.2.0
+++ b/metadata/md5-cache/dev-python/ujson-3.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
 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 ~x86 ~amd64-linux ~x86-linux
+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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-3.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_=7fae640d1d3f43dc98dec044efdf4fdc
+_md5_=d13017e48deb0d7e4ed15d770e42169d
diff --git a/metadata/md5-cache/dev-python/ujson-4.0.1 b/metadata/md5-cache/dev-python/ujson-4.0.1
new file mode 100644
index 000000000000..1376354992d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ujson-4.0.1
@@ -0,0 +1,16 @@
+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
+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/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(-)] )
+DESCRIPTION=Ultra fast JSON encoder and decoder for Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ujson/
+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 ~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 ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/ujson/ujson-4.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_=7fae640d1d3f43dc98dec044efdf4fdc
diff --git a/metadata/md5-cache/dev-python/utidylib-0.6-r1 b/metadata/md5-cache/dev-python/utidylib-0.6-r1
index c3ee47b301ec..d9f8cd76a6bd 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.6-r1
+++ b/metadata/md5-cache/dev-python/utidylib-0.6-r1
@@ -1,16 +1,16 @@
-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(-)] doc? ( dev-python/sphinx ) 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(-)] ) python_targets_python3_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=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(-)] doc? ( dev-python/sphinx ) 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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)]
+DEPEND=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(-)]
 DESCRIPTION=TidyLib Python wrapper
 EAPI=7
 HOMEPAGE=https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=app-text/tidy-html5 python_targets_python3_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 ) test? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test
+RDEPEND=app-text/tidy-html5 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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 ) || ( 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/u/utidylib/uTidylib-0.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a849b82e2884d0ccee5b9e4223a336ca
+_md5_=4a74d9fdaf681ce84254837636aae7f7
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.1 b/metadata/md5-cache/dev-python/vcrpy-4.1.1
new file mode 100644
index 000000000000..bb7fa0b83968
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vcrpy-4.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/httplib2-0.9.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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-python/six-1.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/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/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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=Automatically mock your HTTP interactions to simplify and speed up testing
+EAPI=7
+HOMEPAGE=https://github.com/kevin1024/vcrpy
+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/httplib2-0.9.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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-python/six-1.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/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/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kevin1024/vcrpy/archive/v4.1.1.tar.gz -> vcrpy-4.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_=c21187d4c1e10019724da808f090ce62
diff --git a/metadata/md5-cache/dev-python/zope-component-4.4.1 b/metadata/md5-cache/dev-python/zope-component-4.4.1
index 8be13930e915..85a3110e1ff0 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.4.1
+++ b/metadata/md5-cache/dev-python/zope-component-4.4.1
@@ -1,16 +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(-)]
+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=test? ( dev-python/namespace-zope[python_targets_python3_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/zope-event[python_targets_python3_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/zope-interface-4.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(-)] dev-python/nose[python_targets_python3_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(-)]
+DEPEND=test? ( dev-python/namespace-zope[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/zope-interface-4.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/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(-)] ) 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(-)]
 DESCRIPTION=Zope Component Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.component https://docs.zope.org/zope.component/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=ZPL
-RDEPEND=dev-python/namespace-zope[python_targets_python3_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/zope-event[python_targets_python3_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/zope-interface-4.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(-)] python_targets_python3_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=dev-python/namespace-zope[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/zope-interface-4.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.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_=b5c6afc03a5bd0d706f3c62b92c0144d
+_md5_=c29662f7b58e45990f042af0195561be
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 244fbbdb700f..5c732828e6de 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1 b/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1
new file mode 100644
index 000000000000..b7f57c7aaeeb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1
@@ -0,0 +1,15 @@
+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.1 )
+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.1
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.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_=d1db4f32b4b415100883ab14c4e89cfe
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.1 b/metadata/md5-cache/dev-qt/qtgui-5.15.1
deleted file mode 100644
index 9d13103aced3..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.1
+++ /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.1: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.1 ) 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.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.1 ) 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.1 )
-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.1 )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.1: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.1 ) 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.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.1 ) 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.1
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-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_=e600983f2b58337102c68aa33f6f4043
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.1 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.1
index 791c9913f57a..6aa133ed93f0 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.15.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1 ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtwebchannel-5.15.1[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.1 ) geolocation? ( ~dev-qt/qtpositioning-5.15.1 ) 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.1[widgets] ~dev-qt/qtwidgets-5.15.1 ) || ( >=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.1 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.15.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1 ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtwebchannel-5.15.1[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.1 ) geolocation? ( ~dev-qt/qtpositioning-5.15.1 ) 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.1[widgets] ~dev-qt/qtwidgets-5.15.1 ) || ( >=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.1 )
 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.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1 ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtwebchannel-5.15.1[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.1 ) geolocation? ( ~dev-qt/qtpositioning-5.15.1 ) 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.1[widgets] ~dev-qt/qtwidgets-5.15.1 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.15.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1 ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtwebchannel-5.15.1[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.1 ) geolocation? ( ~dev-qt/qtpositioning-5.15.1 ) 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.1[widgets] ~dev-qt/qtwidgets-5.15.1 ) 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.1/submodules/qtwebengine-everywhere-src-5.15.1.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_=38152073498087f66af96549ed07199e
+_md5_=833d7b2fa56c4312da897017c477a975
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index b1e5e79ff832..ce43997c4b21 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.13.2 b/metadata/md5-cache/dev-ros/actionlib-1.13.2
index 06e6fae38ce6..1205b92380e7 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.13.2
+++ b/metadata/md5-cache/dev-ros/actionlib-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f8713a2e399b..0bb2e4e55197 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 65989fadae6a..e14743ed32ed 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a9d3aebf783a..68352c69118d 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4bab79246ba4..6e33870d53c7 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tools for dealing with actionlib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d3d5e00e9a33..e085d71762ad 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tools for dealing with actionlib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 233434233e12..3863c6fa3385 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 32f387cb38b5..3b82ee36a689 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9135ebb272b6..2fdc2e75ffb6 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 15ffd55542e3..f8bdadb8e420 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.17.0
+++ b/metadata/md5-cache/dev-ros/amcl-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9f346a0e6029..83b36ce645b5 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=402b9b36331387dd8c11c477ffda2c05
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.13 b/metadata/md5-cache/dev-ros/angles-1.9.13
index 65fdc90a4f45..8b4426db5544 100644
--- a/metadata/md5-cache/dev-ros/angles-1.9.13
+++ b/metadata/md5-cache/dev-ros/angles-1.9.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f885e300c4ec..859b943b5cad 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e31627c28dbf..88d5ed7b82d3 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 af3183aba457..f7114572e96b 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.7
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 01a4de8531d7..a1d8a474e19b 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a96026d4597a..0e645ff7add9 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e87545d5bee7..aa5f7dd7667d 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ba3726a0e9a4..a81925ec7c60 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e529b57b0ab4..4fa35cec4238 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d6e2fdb2f2c4..7225539047e6 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.7
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d7e141e350b5..e1aa2b704c12 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dd50fd0fa2ec..c43e08d8702a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 087ff92c1f81..1fd2464c2f26 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b11ec74464c7..a54bca64fb62 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/bond-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 196821644ff3..a777f8938247 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.6
+++ b/metadata/md5-cache/dev-ros/bond-1.8.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d7304f1585ee..018ab9ce3b64 100644
--- a/metadata/md5-cache/dev-ros/bond-9999
+++ b/metadata/md5-cache/dev-ros/bond-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3f42c4384642..1f030a102e85 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondcpp https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8c10881ff124..6b910b8bfc47 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.6
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondcpp https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a3cd696b07d2..494ab0288999 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-9999
+++ b/metadata/md5-cache/dev-ros/bondcpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondcpp https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 92c24bd0514c..4758563037e3 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smclib sys-apps/util-linux 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondpy https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smclib sys-apps/util-linux 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f42e9ee3f235..fd110591cc39 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.6
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smclib sys-apps/util-linux 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondpy https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smclib sys-apps/util-linux 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 78c51acd6591..ef8ce7628d34 100644
--- a/metadata/md5-cache/dev-ros/bondpy-9999
+++ b/metadata/md5-cache/dev-ros/bondpy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smclib sys-apps/util-linux 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondpy https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smclib sys-apps/util-linux 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e9ce97613777..b37dd4b4886d 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_estimation https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 01b5bac8667d..fc3fb331d938 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_estimation https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1deac7f4df9d..6336ed56a23b 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files for configuring the calibration stack to run on your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_launch https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 233c1e248f76..c551107e02eb 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files for configuring the calibration stack to run on your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_launch https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 00304ed8b056..1b620bea6ea2 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b6ab8141d4cb..b4768ef4d7ee 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-9999
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cb008853b19b..164fb129b20e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_setup_helper https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/calibration_launch 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 815af353a876..8eb04553cc31 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_setup_helper https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/calibration_launch 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2e260a726181..454baa63ca61 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 51d451746f1c..c1f545164812 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2ec8d7e1d14..9c78dd0501e4 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
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosbash ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosbash ) dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4a2503fc680c..3d9e7ab6b57f 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosbash ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosbash ) dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f954c73949b7..40b7df2ea583 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 17e015e558f8..707c0cee3851 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0f8816ddeb52..9ab9faeaa876 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2105123ac38..093cfeb86d42 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1318bf3a806f..293fe43290a1 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.5.0
+++ b/metadata/md5-cache/dev-ros/class_loader-0.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c38cb025e111..b4e53dd9e1ad 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8afaa5259704..bac8ad49b601 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fbfdda012002..820c56aa4714 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 40f859fd960a..7b9aaec68f7d 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=CMake Modules which are commonly used by ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 819506d536c8..e35202a040e4 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=CMake Modules which are commonly used by ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1a5409de6bbe..eb841de41987 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1c3d3856432e..549b23af31a0 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c0eee1da4511..53ff13848003 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f23bcbb1202f..43bb1841794e 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a2800486dee8..a79e9eef3bb8 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ecbfce1b3377..cf11a8ba2407 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8b2b190d9d01..46a3f4bbecfc 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fe79936c5c2a..df1b29251496 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bf878130ad85..f12b7db64189 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 887dfa5b7ab9..bc537c1ee408 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5ea1e5307e4c..05e1780d7972 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugin for transparently sending depth images using PNG compression
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_depth_image_transport https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f7084ae2d0c7..5b6144e6207c 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugin for transparently sending depth images using PNG compression
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_depth_image_transport https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 752d90da0f12..d3325e54f91e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugin for transparently sending images encoded as JPEG or PNG
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_image_transport https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6ced59101c88..393b28f6f7cf 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugin for transparently sending images encoded as JPEG or PNG
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_image_transport https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18865f53abe09f215a18065131bb10cb
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 f2f41be8b87b..5cdca6f0ca74 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.5.2
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 176322d281be..e4232c06b961 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a705aebc11f2..17232eca418b 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fd4bc7247908..8647345df9c0 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 830d3bea4b72..9adb5d7f0fc9 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b2e0f97e6eba..b80f728f8aa9 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0f5c6e35fe38..5faaf0992106 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ae70ae01e990..59e5104caf2d 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0e576e8a2d9e..cb94e8f275a4 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 866451bb8812..4ee278ccde68 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d2d447d7a07c..a718cfe41e19 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 423078664dd3..7219247f3f0f 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0988dc568ea8..4298173e5809 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a0756019f283..9fad200ec12d 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c7ee8519f956..70679c0cdd1a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b4b0d3469cf2..31b413715f4f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 810939d5bbe6..8d42dd1b2253 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=app-arch/unzip 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=app-arch/unzip 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cba468bd5744..9fd66e327b9f 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=app-arch/unzip 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=app-arch/unzip 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b9a770d3bb5d..28c4fefe3e2a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest dev-ros/rosunit ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 31b38902d78b..043ace5c848e 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest dev-ros/rosunit ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a00ff854c386..f2c0a062ca9b 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.7.2
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cpp_common https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 00127a0ee556..8f727edb19a4 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-9999
+++ b/metadata/md5-cache/dev-ros/cpp_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cpp_common https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3a36712f31e6..46c65e53be64 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 607eb2ba018b..fc1f39ccf2a3 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 75bf18f88f6a..55b080fc317d 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depth_image_proc https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 32d773ff4064..1495a5a429f5 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depth_image_proc https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 71c577138622..4983635cee2a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b6ab69299eab..0e8fc522ad8b 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4e7de34f3728..f2fed5ad1a45 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 96fbcb7e98cf..8bd1a4274bcb 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a168eb099a77..22de16cff1a0 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7c943b87dabd..6b28983610b5 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 57275a945443..4bf1aaa3b17d 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8de1cc2061b4..025ab2bfc43a 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3af0c6935763..e05d182d8459 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) app-admin/hddtemp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 873cb5fa1c15..71a435daa18c 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) app-admin/hddtemp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f4a7aa672bba..76cd2ac8ca12 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) app-admin/hddtemp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b87b27800786..2ffd3aa89311 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) app-admin/hddtemp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 85d93f1a4497..262ce3281df3 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 732c369ce73e..e2baf38af3ff 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 437fe46ae960..62473b3b59c4 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5bf9b1161b2f..b91854fa44b9 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eecc8d22998b..c4585a480661 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 160df19ecbf8..5731d85bd4d4 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 41d1a6544e2e..0c84fedcd8bd 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2c667f97d8b8..2bf9b83cc00c 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 81364214f7e9..a8befb4cf0c3 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 27fb0103e665..843ca7a3826b 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a59389ad61cf..b0f4b1b5f345 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest dev-ros/roslaunch ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2a82c42d0951..3bb4d01d3b13 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest dev-ros/roslaunch ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 88a3b0d6aca8..816533a774c3 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_conversions https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-libs/orocos_kdl:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 062ddfb74679..d6107f5e74ea 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-9999
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_conversions https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-libs/orocos_kdl:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ed058615b642..38a57adc6eb0 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-cpp/eigen:3 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 507cd7aa7350..c7d19bea2694 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-cpp/eigen:3 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e0a36f3baccb..8f759c2f9a1a 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.17.0
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/message_filters 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bc3ae5adaee4..1394a132720a 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-9999
+++ b/metadata/md5-cache/dev-ros/fake_localization-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/message_filters 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 816c70e9e4ca..9b1a27390f8a 100644
--- a/metadata/md5-cache/dev-ros/filters-1.9.0
+++ b/metadata/md5-cache/dev-ros/filters-1.9.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4fcf55152f79..14d5d9a07c2b 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e86278739f1b..cbca6e74e7c9 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=sci-electronics/gazebo 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-electronics/gazebo 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a5277edf0d51..91c649c4d9b7 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=sci-electronics/gazebo 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-electronics/gazebo 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 07bc2f965ebf..40b93be45448 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c3e0c75fc31a..5effe89931c9 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 05bc729fa604..db1c7ecc6ef3 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c790316765e3..e278c413a977 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 45f7a3379d0f..e9184b5c7309 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 59e7d496f8b7..912b030db1a7 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4674e50ca68b..046a81eed29e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a3efaeea49a9..c166fdf37943 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e2abb39a692e..77fbeefd6c46 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.6.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gencpp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 39a80defd195..034f9ef4385a 100644
--- a/metadata/md5-cache/dev-ros/gencpp-9999
+++ b/metadata/md5-cache/dev-ros/gencpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gencpp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 354044925a1c..c335adb3128b 100644
--- a/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
+++ b/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geneus https://github.com/jsk-ros-pkg/geneus
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a6f750a3bcf5..613954d8aabf 100644
--- a/metadata/md5-cache/dev-ros/geneus-9999
+++ b/metadata/md5-cache/dev-ros/geneus-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geneus https://github.com/jsk-ros-pkg/geneus
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b6fc39c46260..0a9ccce4a6f3 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.18
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.18
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7a96f4bb13a8..001816df9b51 100644
--- a/metadata/md5-cache/dev-ros/genlisp-9999
+++ b/metadata/md5-cache/dev-ros/genlisp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1c132a52b708..6212f7547ec2 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.16
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.16
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python library for generating ROS message and service data structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0722145adbb7..b60be505bf65 100644
--- a/metadata/md5-cache/dev-ros/genmsg-9999
+++ b/metadata/md5-cache/dev-ros/genmsg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python library for generating ROS message and service data structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2f00888b206f..2514fea58398 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-2.0.1
+++ b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gennodejs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 41bbfb6e3994..31f3ec561e7e 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gennodejs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 43d44549a5de..9e67b62f34e8 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.11
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genpy
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f2ac2de77caf..2c26e4a26397 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.14
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genpy
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dd2f95318cc2..ef9d8a0b9d0d 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genpy
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2fbfbc25c45..d3cfc3f19f58 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.5
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3072209fdf2c..4c0eb78c542e 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c7dac7714ca6..44f9638b8765 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 51b0cd7aca4b..4c6f5ed733dc 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1681f5049044..487a0047626e 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 75271bb2b236..6eb01b6f0198 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2522119cc71..fe1c1d4c097d 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f0aa0ac83eeb..a390ca7eb971 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2c4aa68f1b15..4698da161a5d 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7c1650c380b9..4ef47793302d 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f1971660a3ea..b33558517cfe 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.4.1
+++ b/metadata/md5-cache/dev-ros/gmapping-1.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c041af3d1491..e6edcc81d6c0 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b18ff7e1e7e3..887aa0d16158 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f5d2325ad891..cd403260c053 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1b04e374454d..afc6e1304b6f 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 46f3645442f8..3e80168001e7 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4fe829a4097c..d49b2c80173b 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4181ff696197..8591c3f8d487 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 00e8e3485d53..8f91a064a855 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 69b945ac0161..1c84676aa393 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 146e630b108b..580639462abf 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4070be4baf1b..d7e9626e2be4 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bc1af7bd628b..c7034171cff2 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
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 809108b5a249..16e289cf7948 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for processing IMU messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 810a193610e5..ad6a449b8997 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for processing IMU messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b40cdb25a740..ea49cfa83296 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 828c4a8eaa55..8e8e3cff32e1 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 940365132b8e..d5aaad43af77 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f8c9c8e8f9bb..d7f84a93a438 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b9cc5e1785ef..9e5c82b22fdb 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b67f665a2555..17bde4205c83 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 97b721b76f1a..f79f58919cce 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ce1329a37c01..658e397dfb85 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2e4d5b291290..32e6e0a68adc 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d71e01a897f7..d6c744726ab5 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 141d8e714865..1ed46c07adbb 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b91509a7aefd..6f34c6f3f83b 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3646cb978b16..9a7c8128e1de 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fc9a8e872128..e3922dea6f81 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6962ca382292..dac2bcef9ef1 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5bb4007803f8..2dd0042a6461 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 927d375c643b..749536764447 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4b7dc430f9cb..54c3e7649713 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fe93da4c8f4a..ab27ffde0ec4 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ab63790b92d6..247797599662 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2af6f66e5b22..b18750248525 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.15.0
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1cef0b696f9e..e6e98198a922 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0b942d765ea6..54ac67418e4d 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest dev-ros/camera_calibration_parsers ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest dev-ros/camera_calibration_parsers ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5018cca730bb..f1e190683ff6 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest dev-ros/camera_calibration_parsers ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest dev-ros/camera_calibration_parsers ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8e8c1644a0c7..29db344c563d 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_publisher https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 18fe7148da78..a4d85126b089 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_publisher https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 020f1634fb7a..b2f6a93db013 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Rotates an image minimizing the angle between a vector and the camera frame
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_rotate https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2a34c56eb8a0..23c8a6139af0 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-9999
+++ b/metadata/md5-cache/dev-ros/image_rotate-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Rotates an image minimizing the angle between a vector and the camera frame
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_rotate https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1bd5e27ee02f..d0b4200965b6 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.12.0
+++ b/metadata/md5-cache/dev-ros/image_transport-1.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 672bd33340aa..418f5bc6331d 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2db55ded3221..b14bdbb5f9ad 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
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8a9af75235d8..cc48ceb7d278 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fb2ae46aa011..590e4636949a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_complementary_filter https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 20bf056b0367..59a2d6926a90 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_complementary_filter https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e0ad83738407..1fcb1302c0a2 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 514a441a7f49..3976d8f8dc3c 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1c71e8049b88..68339b991f1a 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 43379ed198b6..a359ab3d6eaf 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fd59ad817176..7544311810f7 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transforms sensor_msgs::Imu data from one frame into another
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0dbed17f601e..12bad2429a76 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transforms sensor_msgs::Imu data from one frame into another
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 790563b8abf2..a96bf602aea0 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interactive marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e5534a4dda76..fe533a33bb4c 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interactive marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3b576718ff5e..b619a2b257c3 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 95a406aa3096..94d31f73902a 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7c173c6375ca..14fd24c76c8e 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tools for calculating the intersection of interval messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a01d0d6de656..45aff20af9f3 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-9999
+++ b/metadata/md5-cache/dev-ros/interval_intersection-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tools for calculating the intersection of interval messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d28d867fec0a..d41d5de2aab5 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.7
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Mesh Conversion Utility
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 40f982fcfcce..6ad5a7400621 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Mesh Conversion Utility
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ae63d51281ed..48c4c3f61202 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8efa19551ead..e7ab429ba42f 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ff0b47c41356..1e8083d3f609 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a0caa01c3387..5a993ad145e1 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 52f410b1d961..5a74dca7b2d2 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 485da24c6f49..23ef27e66f9c 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 00341d5075d1..285d412a7979 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 930eb1d2a383..1725d2e7d3be 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_states_settler https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a4769dcaf9fd..7bb11098d0a8 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-9999
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_states_settler https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7f6c8f919ef6..5bc02c6bf673 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_conversions https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-libs/orocos_kdl:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a56a3653390c..6647df0864a9 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_conversions https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-libs/orocos_kdl:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b07b819edc67..ae6bfb20ce2a 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 aed0c42187cf..7ba578894546 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a8168e0fef13..0b499aa56be0 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6a576b970c8c..64b84edf123a 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9c7ac62554c5..d1ea1c71c362 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/filters 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 91702c520dc0..3913cb4198cf 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/filters 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ecf5c5153ad6..2b2a1d7502e7 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest media-libs/opencv[png] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest media-libs/opencv[png] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eec7b81d8029..580d053eb93a 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest media-libs/opencv[png] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest media-libs/opencv[png] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8a94b09e8cd2..19c960e16c48 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 69ae62d50483..42bf7760d940 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 940ccc73cc48..8c5b3d51dcc9 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 616bde540cdc..24fc5fd39a97 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 83ddc32a5054..2616e22ad02e 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.6
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bf2ac564fb0e..6d9ca3449d95 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 29a0a11ec715..7dd692b2b0e2 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-1.2.0
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fa95c12cddd8..4ccc240b3691 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ead626ac9c4c..6652c567fd40 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tutorial showing how to build a C++ program with RViz displays and features
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/librviz_tutorial https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fc62637eb058..1f38bc9cdf07 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tutorial showing how to build a C++ program with RViz displays and features
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/librviz_tutorial https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 153ddae73563..0160eaf29550 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-1.14.0
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 122148cae93d..e73df357de17 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 09c342c36321..98c4124e7f86 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.17.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7fb0ff48f7c3..807348469fa1 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 324fda7b7128..29ad72ba2d9f 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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_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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=MAVLink message marshaling library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=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_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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fcbd626502bb..fa5d4f87abca 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.2.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.2.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d8e6ec3e161e..5700c6ed9f57 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a5b3893af36d..1499251d3fc7 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 872b568e8995..db5d81b9854b 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 71bddd8dcfd4..8b1b160af7ad 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 facdb3b9a0a0..622296bf2d19 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8678abc7c714..06ac30346fe3 100644
--- a/metadata/md5-cache/dev-ros/media_export-0.3.0
+++ b/metadata/md5-cache/dev-ros/media_export-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Allow ROS packages to export media paths to each other
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3dc32fa2d0ec..bca954f33bc8 100644
--- a/metadata/md5-cache/dev-ros/media_export-9999
+++ b/metadata/md5-cache/dev-ros/media_export-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Allow ROS packages to export media paths to each other
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 aa283eb6827a..b441cbc33f60 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.8
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5b905f524471..03b1971a8b23 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0bf774ebece2..b642e7f63c5e 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.1
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ee890ad099f3..029c0343879d 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fd9656cef4fe..0bd3ae1045a5 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.13
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 88b9f33f1815..9ac2686c91e2 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 281b04f36991..10c774eda909 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Translates pose information from different kind of common message types to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b106022378da..77e46d6f33e2 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Translates pose information from different kind of common message types to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 52fa9479ae88..fa4ba0bdf3f2 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.5
+++ b/metadata/md5-cache/dev-ros/mk-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ff14ac8bc7c5..1a28db09c430 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.6
+++ b/metadata/md5-cache/dev-ros/mk-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 86c56d75a472..1086759d867c 100644
--- a/metadata/md5-cache/dev-ros/mk-9999
+++ b/metadata/md5-cache/dev-ros/mk-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bea8cf0581fc..9278fd4cded6 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/monocam_settler https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b3cacfc36ae2..573f881b44b0 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-9999
+++ b/metadata/md5-cache/dev-ros/monocam_settler-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/monocam_settler https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eb977599bd4b..a3335d854b22 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.17.0
+++ b/metadata/md5-cache/dev-ros/move_base-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0bd645106dc4..90f90cb7b7f5 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 94b411b38c0e..df842c77f52a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8fe927887f0f..21da481e8dc7 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 315279711875..dec624e86584 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f977cb808a88..00cb6552865f 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bba7a8a2f4a5..378c4b6eb263 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d0fffa339220..8db9a378010c 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4391a30e6e17..fe0057dd69ca 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.17.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dfcb87fd0e44..c239d60d071e 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5ddcd7a29226..232a9c3cc172 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 80702723f1b0..cea6034140ef 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c9c5061cfbf6..9e151cdac9a5 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.17.0
+++ b/metadata/md5-cache/dev-ros/navfn-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b0ec2ed578d8..6d5396cc5e9f 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ee84129e61be..96408edcdb03 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages related to data in the NMEA format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 96c3770e3da8..7e27139a9579 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages related to data in the NMEA format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 947e80e55e5e..33878f2be0aa 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
+++ b/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Runs multiple algorithms in the same process with zero copy transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f8697d86e7af..c0d7ea7b148f 100644
--- a/metadata/md5-cache/dev-ros/nodelet-9999
+++ b/metadata/md5-cache/dev-ros/nodelet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Runs multiple algorithms in the same process with zero copy transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dec5584537b4..c3f6de451d29 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_topic_tools https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 67189f0d1dae..25825bb024f1 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_topic_tools https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d2bb3a42bac0..e5af229c720f 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c38e33f5e7e6..e32353fe2e35 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9737e6dfdc32..9574f0cb9232 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3f864b8da7c4..1fe821150eb5 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/object_recognition_msgs https://github.com/wg-perception/object_recognition_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cddfeb0aaef9..12cfc139017f 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/object_recognition_msgs https://github.com/wg-perception/object_recognition_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 76ceb53472ac..6b22ccdf1ad5 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dc2c70ff45f9..cada127dd417 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ada3af7a3aa3..920e8325c3eb 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f829fc0c1209..6e28ba3fc5e2 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e581da80cb12..8bd3da8972ee 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport dev-ros/image_view ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport dev-ros/image_view ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 99c5972e492c..d511510caaf1 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport dev-ros/image_view ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport dev-ros/image_view ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 849ef962a1a9..ca5625faa63d 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a6ebe7181e00..09d8cbccb476 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6f6920bf07e3..dfef0ef19d41 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a45fbd033638..dad5a6c26fc4 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ddbbc8dcf551..c40fa9d406e9 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9723103e3610..ea82242713aa 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a783cac44d4a..a1e315268220 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ca51c05b6b4a..544c1a982c02 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=CC-BY-NC-SA-2.5
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3cd98694d440..dd89e074a33a 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 41e0fad6abcb..d63719630676 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 004c6e52137e..571341aac38a 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4c7651d1ed4f..e10a6eb3d245 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ab53858fd509..816456446d8a 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a5c2deea539acc1691c4251019827f24
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index c4d1782f867f..6522096c35eb 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 de3a9465c0cb..b8bc77e1d51d 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for writing and dynamically loading plugins using the ROS infrastructure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/tinyxml2:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5efc39ab3634..2a5daf752b48 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for writing and dynamically loading plugins using the ROS infrastructure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/tinyxml2:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 869b1439713b..21bffa07ab2e 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fd6525fc9911..1d98051b6335 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 44c971d77be0..61a3ede860ea 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53016e53951fed5a9041fcc620dbcf95
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 50ad880f8991..054f08a204d3 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8d357f3082dd..9af8508d4c53 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ec439096c775..50f1d77f16a0 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.12.0
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=C++ classes for implementing a polled camera driver node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d8f56a1cd6fd..e553fbeffa16 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=C++ classes for implementing a polled camera driver node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d8bae4829797..e39269316887 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9be47cb5cc91..ca73bdf094b5 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f7d5bc021b1b..adc75269e11d 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5b4980b0321d..2dc0a720e60c 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a7488fff28aa..7090138c7e8b 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f0a1d0d40330..a4791bb319e0 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f96599b21d35..4b18b14123b8 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 85f7f91ce9b3..0b727bf9645e 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
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 15b117eb6a71..4468b1813dac 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 28fa58d0ba32..aa1eade9b37b 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bee9caf77e91..e8bb248f4507 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ff6f4db68eeb..b92675ed5b4f 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 458166cb7776..03e76579be34 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-9999
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d6ea6ea4dab5..322dbdb3f89e 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4fd0ee952d49..800b2a20ab75 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 35fe3baa4fa8..2fc7660009c6 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8d6ede6e00b4..0486dbee8529 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Instance of the integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 504767beec24..0b4f7cafc3f1 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Instance of the integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ae103d12b33e..15063cd4a0c0 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Instance of the integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 80aa65e5f67e..427c3df80a3a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 54179e6300bb..35a856468663 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1d4d619095b8..bb7fdec7c053 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7b82c48c3d2e..a712c95e3d14 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 be43bcab0140..fc40fcda0370 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4e513c43b4a8..31de8b774020 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eb22ac3d88f6..afbcc6a324c8 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.2
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Wrappers for generating floating point values, integers and quaternions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/random_numbers https://github.com/ros-planning/random_numbers
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e6e82125f3bd..7333f7322019 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-9999
+++ b/metadata/md5-cache/dev-ros/random_numbers-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Wrappers for generating floating point values, integers and quaternions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/random_numbers https://github.com/ros-planning/random_numbers
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 467c1aba6258..5231ed2aee19 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools that can be used from a hard realtime thread
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/realtime_tools https://github.com/ros-controls/realtime_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5857f7885c18..8726350f674c 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-9999
+++ b/metadata/md5-cache/dev-ros/realtime_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools that can be used from a hard realtime thread
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/realtime_tools https://github.com/ros-controls/realtime_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 133464a62ff3..3d2d02313162 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Retrieves data from url-format files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/resource_retriever https://github.com/ros/resource_retriever
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 89069407e87f..2175ce55c06e 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-9999
+++ b/metadata/md5-cache/dev-ros/resource_retriever-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Retrieves data from url-format files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/resource_retriever https://github.com/ros/resource_retriever
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 08a46d8701cf..26e25317aab7 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rgbd_launch https://github.com/ros-drivers/rgbd_launch
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a2fe7be79da1..18950ad71d50 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-9999
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rgbd_launch https://github.com/ros-drivers/rgbd_launch
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2bc05669218a..de949a0ad0df 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-2.6.8
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.6.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/roslint dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f283e6f8e0d6..06c4fe62f12d 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-9999
+++ b/metadata/md5-cache/dev-ros/robot_localization-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/roslint >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 caccc7b18452..fedc2f52343e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) virtual/pkgconfig 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Estimate the 3D pose of a robot from pose measurements from various sources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_ekf https://github.com/ros-planning/robot_pose_ekf
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d957e7ea2e29..5fd5ba21cd0c 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) virtual/pkgconfig 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Estimate the 3D pose of a robot from pose measurements from various sources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_ekf https://github.com/ros-planning/robot_pose_ekf
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 182cb53e3e4a..b12742d39e00 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A Simple Node to Publish the Robot's Position Relative to the Map using TFs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_publisher https://github.com/GT-RAIL/robot_pose_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 73bd876e3fd9..4f4026ed3358 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A Simple Node to Publish the Robot's Position Relative to the Map using TFs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_publisher https://github.com/GT-RAIL/robot_pose_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/tf 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 261a41aef7a5..2cf0dbfaa2b2 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_state_publisher https://github.com/ros/robot_state_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 319a5643097c..e8a3d42e8036 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_state_publisher https://github.com/ros/robot_state_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 47f4aa736357..762dce850ac5 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-1.3.1
+++ b/metadata/md5-cache/dev-ros/ros_environment-1.3.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=!!<dev-ros/roslib-1.14.3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS environment variables
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_environment https://github.com/ros/ros_environment
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=!!<dev-ros/roslib-1.14.3 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7433058cf735..1670fbea55d1 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-9999
+++ b/metadata/md5-cache/dev-ros/ros_environment-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=!!<dev-ros/roslib-1.14.3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS environment variables
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_environment https://github.com/ros/ros_environment
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=!!<dev-ros/roslib-1.14.3 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bcec80855ad0..0c50a0e3a7d7 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0e563158f5bf..a7f9d71f53ad 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 838a5768a811..abeda129384a 100644
--- a/metadata/md5-cache/dev-ros/rosapi-9999
+++ b/metadata/md5-cache/dev-ros/rosapi-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e8a1e4a0d217..d9a4c78a645e 100644
--- a/metadata/md5-cache/dev-ros/rosauth-1.0.1
+++ b/metadata/md5-cache/dev-ros/rosauth-1.0.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Server Side tools for Authorization and Authentication of ROS Clients
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosauth https://github.com/WPI-RAIL/rosauth
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/openssl:0= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2d1b57207b5d..590439fda6ce 100644
--- a/metadata/md5-cache/dev-ros/rosauth-9999
+++ b/metadata/md5-cache/dev-ros/rosauth-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Server Side tools for Authorization and Authentication of ROS Clients
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosauth https://github.com/WPI-RAIL/rosauth
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-libs/openssl:0= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 43e3cdf3dfea..a198e3113b26 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
-IUSE=lz4 +python_single_target_python3_7 test
+IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 abc944439113..280b7d319f65 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
-IUSE=lz4 +python_single_target_python3_7 test
+IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 39c8f2910c56..ac08a075a3d4 100644
--- a/metadata/md5-cache/dev-ros/rosbag-9999
+++ b/metadata/md5-cache/dev-ros/rosbag-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
-IUSE=lz4 +python_single_target_python3_7 test
+IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1da4c1269adb..df64989ced0e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Allows to export rosbag migration rule files without depending on rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_migration_rule https://github.com/ros/rosbag_migration_rule
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9d08703940a5..792abe33a1c2 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Allows to export rosbag migration rule files without depending on rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_migration_rule https://github.com/ros/rosbag_migration_rule
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6a017b64442b..0390c7d8eab3 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4c06826c8e45..2dcad2b0b3e1 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e865cd5c9f4d..786d0a61712f 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospack 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospack 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ef7589cae718..7f224ed9114a 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospack 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospack 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5696a87d145c..45dce1c4f84f 100644
--- a/metadata/md5-cache/dev-ros/rosbash-9999
+++ b/metadata/md5-cache/dev-ros/rosbash-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospack 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospack 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 85b832281b7b..e74e4e602579 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 29768a7d334a..4f496bec8197 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e12b04952144..dabc00902713 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-9999
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1841db67416e..6868da89bc32 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dfcab1fb5aa9..ec951c788e00 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 698ac032bc29..9a1445a73f3b 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 548c1c903817..7731f3d84e9a 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 78cf2918f6b7..7b5791e9c325 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6aadb11911e2..0f038895360e 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 348a7cc92c15..3003d907fc10 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8230be97a223..b459f3e37d10 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9a192d351e59..f053899eb746 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 77d183824bd5..1877783692d8 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a79b1fd82b34..6bf82df0e911 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d1724f3f3b8b..4058a367ccc7 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-9999
+++ b/metadata/md5-cache/dev-ros/rosbuild-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b2271f701bd1..b6cb18748a39 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 34c10ee2413f..119f08f2d200 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6bbd9055cc60..a20d91e78536 100644
--- a/metadata/md5-cache/dev-ros/rosclean-9999
+++ b/metadata/md5-cache/dev-ros/rosclean-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8a7c5a4149a9..2903ea1e5dbf 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
-IUSE=+log4cxx glog +python_single_target_python3_7 test
+IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f817a8309787..bb1e52fd7a4e 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
-IUSE=+log4cxx glog +python_single_target_python3_7 test
+IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 95b4e2aa026c..3cbab7b1c84a 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
-IUSE=+log4cxx glog +python_single_target_python3_7 test
+IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 937412215acc..99229110dec2 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole_bridge https://github.com/ros/rosconsole_bridge
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6d137d6da292..9a944e0a8cdd 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole_bridge https://github.com/ros/rosconsole_bridge
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 64cf546412ee..ad9ff917a657 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9fbb0c85a6c4..db44f63cd9e0 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f790b356712c..efff861fd988 100644
--- a/metadata/md5-cache/dev-ros/roscpp-9999
+++ b/metadata/md5-cache/dev-ros/roscpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d9c4db8dd9e3..f958db8ae8c4 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Code for serialization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_serialization https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 54aead188f5a..eae67b914c02 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Code for serialization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_serialization https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f225c404bcd5..b8bdd919ae09 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Message traits code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_traits https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b0214fa8e240..0afe84b97740 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Message traits code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_traits https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 add44829719c..59032045b119 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5b286953dbc7..96d519985825 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 67edca23e502..bb3cbd131988 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 136f2b873634..1c5950d028b5 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.15.6
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d963c1fe7a20..9bd597d277f3 100644
--- a/metadata/md5-cache/dev-ros/roscreate-9999
+++ b/metadata/md5-cache/dev-ros/roscreate-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6a9f5303711b..6ddf8516d012 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d1f07641f565..c1dc2adf05e7 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 08c3438b3ea5..73fe411b373e 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 484d194fb966..bd5d68551c2e 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-9999
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f785bd9f4ec4..c9208f9025de 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 231b70eb59ac..cec6c0770999 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 75199c5ba19b..7d3dfbbe80ea 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph_msgs https://github.com/ros/ros_comm_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8a1323cc0930..e717f982e743 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph_msgs https://github.com/ros/ros_comm_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dbd2189b6eb3..9fa3128230f5 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 836f53507da0..3832f6d9533e 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.6
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1998713ac601..362d9506ac6d 100644
--- a/metadata/md5-cache/dev-ros/roslang-9999
+++ b/metadata/md5-cache/dev-ros/roslang-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 065c03ffa1ff..b5e885f0a76c 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/test_rosmaster ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosout 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	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	f68348e9f3005ab486c40c57b2265906	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 4df11e358142..f399146192d5 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/test_rosmaster ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosout 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	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	f68348e9f3005ab486c40c57b2265906	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 dbc733cf6193..2cbb5872519d 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.15.6
+++ b/metadata/md5-cache/dev-ros/roslib-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4b8da9f738d2..63f1c9700a92 100644
--- a/metadata/md5-cache/dev-ros/roslib-9999
+++ b/metadata/md5-cache/dev-ros/roslib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 71b27f99caeb..f948e1a8e63d 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.12.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Static checking of Python or C++ source code for errors and standards compliance
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslint https://github.com/ros/roslint
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 38e1e454e558..e4fdcd9f94b2 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Static checking of Python or C++ source code for errors and standards compliance
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslint https://github.com/ros/roslint
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8ec2df4e1ebc..81949844ee8e 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.24
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.24
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Lisp client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslisp https://github.com/ros/roslisp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5027da5e54b2..8ea74fe44dfb 100644
--- a/metadata/md5-cache/dev-ros/roslisp-9999
+++ b/metadata/md5-cache/dev-ros/roslisp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Lisp client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslisp https://github.com/ros/roslisp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5d0a8f078d80..83d1bbd67c1c 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.8
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=app-arch/lz4 dev-ros/cpp_common 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c4ea47a2624c..b16461d62f86 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=app-arch/lz4 dev-ros/cpp_common 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2e61989e81b9..88ba7ae2302c 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 abcb3bc39522..a524d77c10ea 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 72440a6638f0..102298cdcdb6 100644
--- a/metadata/md5-cache/dev-ros/rosmake-9999
+++ b/metadata/md5-cache/dev-ros/rosmake-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d0cc98292282..602f1b9d6984 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 98d098b255a0..f29eb6e803d5 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a8dcb3fae4d5..acd8a3a062ad 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 af64a29482c0..f91e1f716a1a 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f13884efe6f2..fbcf0f3ff199 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b93494be4178..3e8f9b69c965 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4691d42c3605..7829742858ae 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d93107171f43..906d924f16bd 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 523e39ebeef6..6d0eb85425f7 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6ef0553d32ec..983baac59858 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c75ac91e21ba..d4bc479b1520 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a8405b2eb75c..7400a4ebbde0 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.6.2
+++ b/metadata/md5-cache/dev-ros/rospack-2.6.2
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-ros/cmake_modules-0.4.1 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospack https://github.com/ros/rospack
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bb8fc6b036ae..e9bcf86c6c9f 100644
--- a/metadata/md5-cache/dev-ros/rospack-9999
+++ b/metadata/md5-cache/dev-ros/rospack-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-ros/cmake_modules-0.4.1 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospack https://github.com/ros/rospack
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 140cc9526abb..7455632974fb 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f84c1f62427e..4a6e27be6aea 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f88f767d11bb..1bd4d8f845c4 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8fa9b644b7af..e93b73e98b91 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.7
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 05b2ef735a76..490de7a9b0e7 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.8
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4ba9dfd56333..e53129f6fb25 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 79ee81d7626f..cd55411615fa 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp_tutorials ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b381a9406587..ff0b095c3509 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp_tutorials ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 09dd32ae017c..92495790c3b2 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp_tutorials ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d5ea79388861..bc98954ee5cc 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e4edcd6328df..062cf4c9b1d6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 375d78c472e0..3cdced145e47 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dc4da4169771..468c0e0f4562 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_client-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 33b25b146c0a..529f42d40168 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0f2a0dfb2c2f..64e8dacb421f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a77b60029ace..98dad00185fe 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 314088019c3f..87de484131a3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c9e38367f8ed..14c4ac1d6729 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 26f74639225c..6c8f1019407a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4d47c4b33780..197613af1cb8 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b6c7c6117203..dbe71ce8cfbd 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 28146b6bfa64..69759a6182a4 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 954876edbcce..97272ab70fc6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 66bcd21b7a60..79d293f0c9d8 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 924878114117..83b184506773 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e478e3782520..f506550e4aaa 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2649cc8a5392..4a24a6348e6c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b448e5dae421..53040b815bb5 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e593e403b20d..e74ee4cf3a8c 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 936356dcea04..3f1aa2934df4 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 053d46915783..4696e2fb48db 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.15.8
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4dd23dd6942b..38eb950a5138 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9bd6671a231d..4112dfd77837 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.7.2
+++ b/metadata/md5-cache/dev-ros/rostime-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostime https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7166657fe2b3..148141a83b98 100644
--- a/metadata/md5-cache/dev-ros/rostime-9999
+++ b/metadata/md5-cache/dev-ros/rostime-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostime https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d1cde9862c48..8818043eb99e 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.8
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 877d9d62cd6c..3846b8d7ba72 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9f3c6d721708..92029bb01dc1 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e0aec684bb12..cf20d0384ca9 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8fc3a8c84a51..88767bee62db 100644
--- a/metadata/md5-cache/dev-ros/rosunit-9999
+++ b/metadata/md5-cache/dev-ros/rosunit-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 31b1dea0cf3a..b1796f7106c3 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.8
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=test? ( dev-ros/cmake_modules ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslang[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslang[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 521e2f5cb9a7..361a7a4151fb 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-9999
@@ -1,15 +1,15 @@
 BDEPEND=test? ( dev-ros/cmake_modules ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslang[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslang[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ae63e4c040f5..c07536800102 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 91d579c2f1c9..4b5a36558b58 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 23ade22664c8..08c68fbb8920 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_action https://github.com/ros-visualization/rqt_action
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 129a56ae06c9..dfc181e82e3b 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_action https://github.com/ros-visualization/rqt_action
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 11306a489523..0f457e0d0bc5 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 36dcf4767753..a487053851cc 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 283bc7986e8f..5fa6b0532f05 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 de7486ec89b6..31b86c3d2ae4 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8a0799b9da7b..8289fb7ee423 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_console
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c9879da25737..2acd0b070797 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_console
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4f986e09e853..4bf0c23afc07 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 72e4cf5d8307..186ebea38778 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b3044a03ba0e..286179bc0588 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c737a11e5d16..f30300860bfd 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c035ddf605e6..7d060eb0df42 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a45634c0f2e9..dece7525ead2 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 02d3cdb2ed86..8a7d31fd5aab 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9451428b549d..c33864aacabe 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d31fb154e6a2..5e6e8af7a26d 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9a5977db0a37..da944b908119 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9775dc15a1ed..32ddbd8f8a22 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 48801d517a31..8af7d9ead386 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 985404d6d815..ccf4c035159b 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5e49ecdbcdb7..d845a563db48 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_image_view https://github.com/ros-visualization/rqt_image_view
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a0c57cec1bed..5d5d6b5cad10 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_image_view https://github.com/ros-visualization/rqt_image_view
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 598fe92ad427..c1ea50a6921b 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Easy view of .launch files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 836331ab1376..f54247bbd94e 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Easy view of .launch files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1ec5e09464fd..3cc5d040eca1 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_logger_level
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 94377304345c..788c05d36ef8 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_logger_level
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4915bf389f3a..ee90888f1f03 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7cba25d0ff4a..9fc51bd19760 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5d36a1b4f718..3cffb346381f 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 68b71689ada2..6328f6988569 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0acd60186437..5deb6662150e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_nav_view
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7725be7de4dd..9dc81bc2a3e5 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_nav_view
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 98d9664f9af2..405098e9078b 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_plot https://github.com/ros-visualization/rqt_plot
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 766482aecdf5..b0512d6c9af0 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_plot https://github.com/ros-visualization/rqt_plot
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9544946d8fe0..368a346c09d9 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 06e23b502411..c58ca20e70d2 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7269eb19350d..94404479b1fe 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d7e8f216633b..a22a6146562a 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6c9fc2e832c0..ddd697a1da23 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 90868ca55de5..ce3f330f9c13 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d0b56d756366..2642e72379e2 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 41d3b70998f4..b245e64c94f8 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d965ee6e9c33..2dca36815c6b 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] test? ( dev-ros/roslint[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 87a478b1fb07..e8a726e4b459 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] test? ( dev-ros/roslint[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b3bc42c7a4ed..4d80bf056d3a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_dashboard https://github.com/ros-visualization/rqt_robot_dashboard
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 99fea3d100d5..3d31bff8376c 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_dashboard https://github.com/ros-visualization/rqt_robot_dashboard
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a4d55cc8a6af..313240452846 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Displays messages that are published by diagnostic_aggregator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_monitor https://github.com/ros-visualization/rqt_robot_monitor
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5e0ce86f41b4..5f5c349f8b1e 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Displays messages that are published by diagnostic_aggregator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_monitor https://github.com/ros-visualization/rqt_robot_monitor
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 091dbe3940fa..8b9cfcefa03c 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_steering https://github.com/ros-visualization/rqt_robot_steering
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 79d4312573c9..3f0a1c080e2f 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_steering https://github.com/ros-visualization/rqt_robot_steering
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1ebb4d8dd42a..b3e20dbf5598 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a5ff35f6c96d..8b67ce12c18d 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b6928e181d16..13dffc069c2f 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6b8654d45313..ef1ecc5e7fc3 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-9999
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 610c8ebe1a65..38799fc37978 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_service_caller https://github.com/ros-visualization/rqt_service_caller
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9f72259bbad7..d29c2e94ed58 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-9999
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_service_caller https://github.com/ros-visualization/rqt_service_caller
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d309e583161e..a6157590b37e 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 978efcefa4a7..70e919a97676 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-9999
+++ b/metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ed331e9d8b32..6175bf8a3f6b 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_srv https://github.com/ros-visualization/rqt_srv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 688e3398f4ea..a0194f034fbd 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-9999
+++ b/metadata/md5-cache/dev-ros/rqt_srv-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_srv https://github.com/ros-visualization/rqt_srv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0e333ca4fc0e..026f79a2523b 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_tf_tree https://github.com/ros-visualization/rqt_tf_tree
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1e4d53d775af..899c2dd085e8 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_tf_tree https://github.com/ros-visualization/rqt_tf_tree
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b5fa5fc94da0..b0f6ade86cbe 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5e62346d1001..e600b625ee97 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-9999
+++ b/metadata/md5-cache/dev-ros/rqt_top-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 26e738770d94..7f62e6c6111b 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_topic https://github.com/ros-visualization/rqt_topic
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 189490cfc4d1..f1c38f114c57 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-9999
+++ b/metadata/md5-cache/dev-ros/rqt_topic-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_topic https://github.com/ros-visualization/rqt_topic
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c0a39fbb5d7a..c9058eb715f7 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 54967871e9dd..9a7a8e77c178 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-9999
+++ b/metadata/md5-cache/dev-ros/rqt_web-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c3f24f2148cf..eb186d4ede14 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.14.1
+++ b/metadata/md5-cache/dev-ros/rviz-1.14.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules virtual/pkgconfig sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	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	f68348e9f3005ab486c40c57b2265906	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 bc9c3e223296..15ae7c36daf9 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	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	f68348e9f3005ab486c40c57b2265906	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 3bbe4397a02f..61fef006b36e 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RVIZ plugin for IMU visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e19fad196639..835b521dd55b 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=RVIZ plugin for IMU visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6d9d71fec416..f000627e123b 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tutorials showing how to write plugins for RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_plugin_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5f7364af9ffb..1c4c6e723976 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tutorials showing how to write plugins for RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_plugin_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 12c1909513c1..ba0e8751df0d 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_python_tutorial https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cc3b81d21516..0e33eca54c1c 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_python_tutorial https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3c236d9664e4..1e9c73134b3b 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.10.1
+++ b/metadata/md5-cache/dev-ros/self_test-1.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 17e0e496129a..287cc57145de 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.4
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1f731aa28e49..b4d1ac208585 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.6
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 336d80f35ff8..9a611dc1a933 100644
--- a/metadata/md5-cache/dev-ros/self_test-9999
+++ b/metadata/md5-cache/dev-ros/self_test-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b76a4091f476..a4a9a84835f4 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d9f796ae8f88..c7b758bdd3f2 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b2012c8ddb64..c9e6c4e9c6a3 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-0.10.14
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Helper functions for creating a settler for a specific sensor channel
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/settlerlib https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c8582605bde8..c1def6e641b6 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-9999
+++ b/metadata/md5-cache/dev-ros/settlerlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Helper functions for creating a settler for a specific sensor channel
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/settlerlib https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0524a4e525ad..3b62f88c336e 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e29eb5301a83..abdf2df5c4bd 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7e79aa001509..5fee3f983549 100644
--- a/metadata/md5-cache/dev-ros/smach-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a59659eeddd3..d7f38fde492e 100644
--- a/metadata/md5-cache/dev-ros/smach-9999
+++ b/metadata/md5-cache/dev-ros/smach-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7533e16f82b0..a421002f1ca4 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Set of messages that are used by the introspection interfaces for smach
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_msgs https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f5eebfd163d0..f39b3a2705be 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-9999
+++ b/metadata/md5-cache/dev-ros/smach_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Set of messages that are used by the introspection interfaces for smach
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_msgs https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7fbe0035f2e7..99ae9a15bbe9 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Extensions for the SMACH library to integrate it tightly with ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_ros https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1a8f168055a3..3a7d7bfd217b 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-9999
+++ b/metadata/md5-cache/dev-ros/smach_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Extensions for the SMACH library to integrate it tightly with ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_ros https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 abf6ad14377e..ea47fbf46b65 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.5
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The SMC converts the description of a state machine into source code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smclib https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e2943208f2fc..899ba8c8b532 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.6
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The SMC converts the description of a state machine into source code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smclib https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9493072fe9e0..8139c953275f 100644
--- a/metadata/md5-cache/dev-ros/smclib-9999
+++ b/metadata/md5-cache/dev-ros/smclib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The SMC converts the description of a state machine into source code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smclib https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a4e547a88e72..29f5121ab54d 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.8.0
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS specific hooks and tools for the Stage simulator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stage_ros https://github.com/ros-simulation/stage_ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9c26903cf4ba..8914320f6190 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS specific hooks and tools for the Stage simulator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stage_ros https://github.com/ros-simulation/stage_ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5d1cedb81b67..14ffa4f9831d 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Standard ROS Messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4f2e406d83d0..4752a3cae190 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-9999
+++ b/metadata/md5-cache/dev-ros/std_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Standard ROS Messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 56198f998f46..de863d59b909 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.3
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_srvs https://github.com/ros/ros_comm_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 90fbea071f6f..8a2805098487 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-9999
+++ b/metadata/md5-cache/dev-ros/std_srvs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_srvs https://github.com/ros/ros_comm_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 df81560dd0dd..3f7df4ebae61 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_image_proc https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5089e2470e47..06a1cb320148 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_image_proc https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 30ebbecb2df8..2003c0fd6411 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 821c60be990f..f920c9d185f0 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0eabb0d4098b..64221653cc12 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 259b7ebc083d..48319f038e3c 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.6
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b44005051325..55baaee71798 100644
--- a/metadata/md5-cache/dev-ros/test_bond-9999
+++ b/metadata/md5-cache/dev-ros/test_bond-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eb066d675130..92c7e1f06114 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 896d68d9b814..dfc4eeacc659 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 724b4651f1ae..7dd0fe955521 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 62a4f02960ab..6c9a18ab0444 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ba72ec3ef161..2e19aa5e5237 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c5a141c69b1a..578f174f0733 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8b3a7b96e8cd..cfb98c90a102 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dbae67273246..50fb531a08dd 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 779d4dc7d3a1..8489a7a62759 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/xmlrpcpp 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2cfcac0cb7b4..d20fc7f4c40f 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/xmlrpcpp 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9cd4c653b025..8a82622663cc 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3147b7f13d69..eae52d2af17e 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbag_storage dev-ros/rosbag dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbag_storage dev-ros/rosbag dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 62af2e49c4d3..c61d1c14a4fe 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4312ac93837f..d7f25b430012 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 266e7749e14d..6745139680e0 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8dca0f399753..9de29c6da8df 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 55a9bce62b8d..c0f988096a74 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5cd6ce9c041a..bf353d70c271 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 22bb8f736b67..045595527fad 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6d2d9ad29e08..bf178458a1a5 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5b51f54e9621..5917a18be48a 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b8658e7c438e..e31040d81b1b 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5d2bff93afc2..673f13a0a2ef 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 729f6c890a9a..1bc35249b1ba 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 22d422691f87..8a0c20319bd8 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6478ddacd1b5..b536dd981402 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c8484b91a91b..337312e2bb86 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6b9afd4cd89c..b2ec10ae7301 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 232aeb12160b..c1f65453e1f7 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eaba3e1bae8f..e0764862c427 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2fc24f5eb888..cecb1774ba3b 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3634383556fc..0fb45c1038b7 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e21b540875e5..1409c8b12d33 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.3
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5d4b9add173c..fe06d48c9c4c 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.5
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3cd8c333b110..8e685de219c3 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1eebab382aeb..66f500b07b7c 100644
--- a/metadata/md5-cache/dev-ros/tf-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/tf-1.13.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Maintains the relationship between frames in a tree structure over time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fa9b78984ea8..dd74a458f26f 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Maintains the relationship between frames in a tree structure over time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ba115f6beeb8..58c60cc2c94a 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0d32a1e02f45..0a2eed70796d 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 132bf776d729..6a65cf764f55 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f2b21d264cf4..7b3c3c5dfd9c 100644
--- a/metadata/md5-cache/dev-ros/tf2-9999
+++ b/metadata/md5-cache/dev-ros/tf2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 28c4b23df609..7ef10712a3bf 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 10e12a14fcf7..506f0652fd79 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 95a6f4d7b4d1..c19863a2e750 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 29afc8f785e8..d3bb98398e9b 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-9999
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 717631ad9d57..26986b9adb34 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 65dc3d57d1ea..401536eab4c3 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ec73bd02f27b..b0fec162cf41 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 207b271f79f4..7899a816cc33 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-9999
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 df77f5a88265..0016f7cc47ac 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e746ce9ada9b..27f8c1636f84 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 606caf1afb15..f3578a81dfc2 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7e1a2a7d507d..745ab453c70c 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0fd17896c868..ba16ac48cbfa 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0dfb4539c152..46d5c1527753 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9ee4dd200ef6..8366035b0ff8 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 824148fae2ea..b7813bb74488 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-9999
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2458eff80549..2af14eee9d2b 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dc4c6006742f..a453c6f26e62 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 469281bcc436..23576fdfa566 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d87be29d26c9..50ff57ed4f8e 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 34275f7c59ae..a145de75ed73 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ceaac0e5ead0..f85bfebe5182 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9408587ac414..abe1daec6e9c 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2e449dc32e62..db8aa2533b44 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-9999
+++ b/metadata/md5-cache/dev-ros/tf2_py-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6f9724e4551d..d940babae5ba 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a445737656df..f840883a54f6 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 12ae67e2579e..3729efbbe5c3 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5eeb8ac266ab..df00e36577fe 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 15b71546137d..96241b62adbe 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6266b7462af6..aafb0aef34a1 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2502d9e897c..fe2ab65eb859 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 baf5b35eb4b9..0a823447ee85 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d83f763e3e4e..81df8f952fe2 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cf7dcd219ac6..22790d15f54b 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1899c18cea65..cc28efa54dbd 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 55114427d586..f8416e9d0c4b 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-9999
+++ b/metadata/md5-cache/dev-ros/tf2_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 31762a572840..4c33f18ba9aa 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Functions to convert common tf datatypes into those used by other libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf_conversions https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6cf35edb7812..3c1fb4b053e9 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-9999
+++ b/metadata/md5-cache/dev-ros/tf_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Functions to convert common tf datatypes into those used by other libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf_conversions https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6449ea1feaa1..d3682a44affc 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
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Plugin for transparently sending an image stream encoded with the Theora codec
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/theora_image_transport https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 393f7f183d66..a24067de1778 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Plugin for transparently sending an image stream encoded with the Theora codec
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/theora_image_transport https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bf6b61e9bbcb..c97076b26b18 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/timestamp_tools https://github.com/ros-drivers/driver_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 24eef0e9c2d1..1a41e9ee4d95 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-9999
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/timestamp_tools https://github.com/ros-drivers/driver_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslib dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 56843f9aff4c..66e3c9ead40a 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.15.8
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/rosbash[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbash[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9086bc58295a..5beba5dba1cf 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/rosbash[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosbash[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c3bc15502449..dc52255fd8ce 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 35599bf42ea0..06880f8631df 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6738e9c095ea..55525e6ac734 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dc2a6f2de843..9beaaf41db85 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1cd648e9ae13..224b6bf651c3 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2ac606fe0d11..0da5c1183988 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3fd9570521bf..6fa5831a4cab 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 19a3773381d6..caf3123c8b5b 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ea669b506f23..40d54dd1925c 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1f272aeecf62..466c1a9be509 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 278fea69144b..8118024095d1 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ffc372965b84..f54323e3702d 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b74064311c8c..7ddb8be4c5dc 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c0db8c4a3e15..d8a6a2cf0b8c 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.2
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 47135d0332d7..10a400546cc2 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-9999
+++ b/metadata/md5-cache/dev-ros/turtlesim-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d4cecac49e98..4f0c230d1fb8 100644
--- a/metadata/md5-cache/dev-ros/unique_id-1.0.6
+++ b/metadata/md5-cache/dev-ros/unique_id-1.0.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS Python and C++ interfaces for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/unique_id https://github.com/ros-geographic-info/unique_identifier
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0f488b15aeb1..278a563d976d 100644
--- a/metadata/md5-cache/dev-ros/unique_id-9999
+++ b/metadata/md5-cache/dev-ros/unique_id-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS Python and C++ interfaces for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/unique_id https://github.com/ros-geographic-info/unique_identifier
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9c0cb9b7d68c..cd8eea02476c 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.13.2
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1711dc6ba8cd..8e4615463726 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f668fcfb8000..33897e4b1041 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/urdfdom_headers 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/urdfdom_headers 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cdcc7ebe4619..d50862546295 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/urdfdom_headers 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/urdfdom_headers 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d2722c64a9e8..cc92fc404ff9 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=URDF tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4af360f09e27..19a4046e32bc 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=URDF tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fd8aac89fc53..bb26cf20f495 100644
--- a/metadata/md5-cache/dev-ros/urg_c-1.0.405
+++ b/metadata/md5-cache/dev-ros/urg_c-1.0.405
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=URG Helper / URG Widget / URG Library / urg_c
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_c https://github.com/ros-drivers/urg_c
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7233d75b4c8d..4904ca7e6ef2 100644
--- a/metadata/md5-cache/dev-ros/urg_c-9999
+++ b/metadata/md5-cache/dev-ros/urg_c-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=URG Helper / URG Widget / URG Library / urg_c
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_c https://github.com/ros-drivers/urg_c
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4f2bd50ad98c..b44b0fe47eb8 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.13
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_node https://github.com/ros-drivers/urg_node
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6fd5443b5e87..133b2dec244a 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_node https://github.com/ros-drivers/urg_node
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2174d3ce793..0ed2d3022907 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/uuid_msgs https://github.com/ros-geographic-info/unique_identifier
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a771571d4e1d..c6cba697c8b4 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-9999
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/uuid_msgs https://github.com/ros-geographic-info/unique_identifier
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b0b9233fc1a4..e4fd7a0a42d3 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0950060120e0..f7728f128652 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bc42e3b0f466..2ebb6ec7a6a0 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e8cfdd6b146d..2a77f1e1b74a 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a4ff53fa17fa..b2fa6df4e948 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_camera_calibration https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0940f87f6255..4b4b2a4a9f76 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_camera_calibration https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c1e928a5ecf3..7b1a7fc84454 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Estimates the camera position with respect to its effector using ViSP
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_hand2eye_calibration https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bf59882c1371..e5c31ba556e0 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Estimates the camera position with respect to its effector using ViSP
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_hand2eye_calibration https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 873929995bbc..e429212817dc 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_tracker https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9b790fa0c846..b1fb4e8ad3c5 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_tracker https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 311caf29f07e..63b8216357ea 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Visualization marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 469e9e5270c9..91f14da719b7 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Visualization marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 73fe94b07a89..08fe6bbe3826 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f05d923b5873..49bfe2bc1142 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2471ff7e499..45caa24c7f89 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-9999
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f7b43a848318..b01b493d04a6 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c301fde1452e..ec2913c530de 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 96bf3a32a678..6ec34a1d275c 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-9999
+++ b/metadata/md5-cache/dev-ros/voxel_grid-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 674a34a52ce1..5af78afceec8 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.14.1
+++ b/metadata/md5-cache/dev-ros/xacro-1.14.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=XML macro language
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9afa28808b93..4e1e696b2a7f 100644
--- a/metadata/md5-cache/dev-ros/xacro-9999
+++ b/metadata/md5-cache/dev-ros/xacro-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=XML macro language
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3e625031cd4c..10103a74a2c6 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 910f33f6e427..5777e72d397a 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9a55101dca48..e960c458e2db 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1 b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1
deleted file mode 100644
index fcf6fb9b8382..000000000000
--- a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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/pygments-2.2.0[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[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(-)] ) )
-DESCRIPTION=Pygments syntax highlighting in ruby
-EAPI=6
-HOMEPAGE=https://github.com/tmm1/pygments.rb
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-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/pygments-2.2.0[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/pygments.rb-1.2.1.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3f08e07f8559ac06911980a5c27f3917
diff --git a/metadata/md5-cache/dev-ruby/tins-1.26.0 b/metadata/md5-cache/dev-ruby/tins-1.26.0
new file mode 100644
index 000000000000..9b0f17385a9a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tins-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/sync[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/sync[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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? ( 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=All the stuff that isn't good enough for a real library
+EAPI=7
+HOMEPAGE=https://github.com/flori/tins
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/sync[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/sync[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 )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/tins-1.26.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0b836655dade6ece3b009e95c06c1633
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index b9bb883f0642..1a1316722775 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/dvi2tty-5.3.4-r1 b/metadata/md5-cache/dev-tex/dvi2tty-5.3.4-r1
deleted file mode 100644
index 4ec4c8db22a6..000000000000
--- a/metadata/md5-cache/dev-tex/dvi2tty-5.3.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Preview dvi-files on text-only devices
-EAPI=7
-HOMEPAGE=http://www.ctan.org/tex-archive/dviware/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.mesa.nl/pub/dvi2tty/dvi2tty-5.3.4.tgz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71393c194c6a054e921893cae7b86b27
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 46365beb6d5e..eebe03b756bb 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/boost-build-1.74.0 b/metadata/md5-cache/dev-util/boost-build-1.74.0
index 7057d7088a5c..a6544515e8b9 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.74.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.74.0
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=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	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=34c66055bf458d9c7520391306db08c6
+_md5_=aa655655f078c951f608a6351815caee
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.4 b/metadata/md5-cache/dev-util/buildbot-2.8.4
new file mode 100644
index 000000000000..802b88eeb4f1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.9.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(-),crypt?] >=dev-python/autobahn-0.16.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/sqlalchemy-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(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_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/future[python_targets_python3_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-1.5[python_targets_python3_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/txaio-2.2.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/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/zope-interface-4.1.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-util/buildbot-worker-2.8.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/idna[python_targets_python3_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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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(-)] 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(-)] ) ) virtual/pkgconfig 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] ) >=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 config configure install postinst prepare setup test
+DEPEND=acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.9.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(-),crypt?] >=dev-python/autobahn-0.16.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/sqlalchemy-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(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_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/future[python_targets_python3_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-1.5[python_targets_python3_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/txaio-2.2.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/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/zope-interface-4.1.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-util/buildbot-worker-2.8.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/idna[python_targets_python3_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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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(-)] 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(-)] ) doc? ( >=dev-python/sphinx-1.4.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/sphinx-2.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(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_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/sphinxcontrib-spelling[python_targets_python3_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/sphinxcontrib-websupport[python_targets_python3_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/pyenchant[python_targets_python3_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/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-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/sphinx_rtd_theme[python_targets_python3_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/mock-2.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/moto[python_targets_python3_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/boto3-1.12.48[python_targets_python3_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/parameterized[python_targets_python3_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/pypugjs[python_targets_python3_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/txrequests[python_targets_python3_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/lz4[python_targets_python3_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/treq[python_targets_python3_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_trial[python_targets_python3_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/buildbot-pkg-2.8.4[python_targets_python3_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/buildbot-worker-2.8.4[python_targets_python3_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/buildbot-www-2.8.4[python_targets_python3_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=BuildBot build automation system
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc docker examples irc test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.9.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(-),crypt?] >=dev-python/autobahn-0.16.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/sqlalchemy-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(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_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/future[python_targets_python3_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-1.5[python_targets_python3_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/txaio-2.2.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/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/zope-interface-4.1.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-util/buildbot-worker-2.8.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/idna[python_targets_python3_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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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(-)] 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(-)] ) 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] ) >=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 ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.4.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=006f918f265885ce62eb511467684ecb
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index dbb8268d0984..346f8c94cf16 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -1,6 +1,6 @@
 BDEPEND=test? ( acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.9.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(-),crypt?] >=dev-python/autobahn-0.16.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/sqlalchemy-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(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_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/future[python_targets_python3_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-1.5[python_targets_python3_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/txaio-2.2.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/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/zope-interface-4.1.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-util/buildbot-worker-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/idna[python_targets_python3_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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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(-)] 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-vcs/git-1.8.2.1[curl] virtual/pkgconfig 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] ) >=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 config configure install postinst prepare setup test unpack
-DEPEND=acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.9.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(-),crypt?] >=dev-python/autobahn-0.16.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/sqlalchemy-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(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_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/future[python_targets_python3_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-1.5[python_targets_python3_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/txaio-2.2.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/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/zope-interface-4.1.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-util/buildbot-worker-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/idna[python_targets_python3_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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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(-)] 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(-)] ) doc? ( >=dev-python/sphinx-1.4.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/sphinx-2.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(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_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/sphinxcontrib-spelling[python_targets_python3_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/pyenchant[python_targets_python3_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/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-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/sphinx_rtd_theme[python_targets_python3_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/mock-2.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/moto[python_targets_python3_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/boto3-1.12.48[python_targets_python3_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/parameterized[python_targets_python3_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/pypugjs[python_targets_python3_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/txrequests[python_targets_python3_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/lz4[python_targets_python3_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/treq[python_targets_python3_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_trial[python_targets_python3_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/buildbot-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/buildbot-worker[python_targets_python3_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/buildbot-www[python_targets_python3_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=acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.9.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(-),crypt?] >=dev-python/autobahn-0.16.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/sqlalchemy-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(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_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/future[python_targets_python3_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-1.5[python_targets_python3_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/txaio-2.2.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/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/zope-interface-4.1.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-util/buildbot-worker-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/idna[python_targets_python3_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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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(-)] 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(-)] ) doc? ( >=dev-python/sphinx-3.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/sphinxcontrib-blockdiag[python_targets_python3_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/sphinxcontrib-spelling[python_targets_python3_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/sphinxcontrib-websupport[python_targets_python3_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/pyenchant[python_targets_python3_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/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-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/sphinx_rtd_theme[python_targets_python3_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/mock-2.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/moto[python_targets_python3_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/boto3-1.12.48[python_targets_python3_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/parameterized[python_targets_python3_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/pypugjs[python_targets_python3_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/txrequests[python_targets_python3_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/lz4[python_targets_python3_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/treq[python_targets_python3_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_trial[python_targets_python3_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/buildbot-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/buildbot-worker[python_targets_python3_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/buildbot-www[python_targets_python3_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=BuildBot build automation system
 EAPI=7
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf71dc3ccbf7d40d33c80825a2291f4b
+_md5_=4f392b1c7f380552e3c8b0597f78e60b
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.4 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
new file mode 100644
index 000000000000..9261243898cd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
@@ -0,0 +1,15 @@
+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] ) >=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-util/buildbot-2.8.4[python_targets_python3_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/buildbot-www-2.8.4[python_targets_python3_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/buildbot-pkg-2.8.4[python_targets_python3_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/cairocffi[python_targets_python3_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-gfx/cairosvg[python_targets_python3_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-2.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/klein[python_targets_python3_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=Buildbot badges plugin produces an image in SVG or PNG format...
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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] ) >=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/buildbot-badges/buildbot-badges-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b21310954d34116dfeddc027aa0d8881
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
new file mode 100644
index 000000000000..9e361cc7ffb5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
@@ -0,0 +1,15 @@
+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] ) >=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-util/buildbot-2.8.4[python_targets_python3_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/buildbot-www-2.8.4[python_targets_python3_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=Buildbot console-view plugin
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-2.8.4[python_targets_python3_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/buildbot-www-2.8.4[python_targets_python3_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[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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/buildbot-console-view/buildbot-console-view-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=35fe3f395baa97f44309dd147aa52441
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
new file mode 100644
index 000000000000..aa38ec7edbe8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
@@ -0,0 +1,15 @@
+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] ) >=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-util/buildbot-2.8.4[python_targets_python3_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/buildbot-www-2.8.4[python_targets_python3_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=BuildBot grid view web interface
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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] ) >=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/buildbot-grid-view/buildbot-grid-view-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=842251df93ca7efd0bb76e850c6e23da
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
new file mode 100644
index 000000000000..86f7552b149f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
@@ -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] ) >=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=BuildBot common www build tools for packaging releases
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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] ) >=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/buildbot-pkg/buildbot-pkg-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=836fab1f28e1ef35429d8d88ce4c5c53
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
new file mode 100644
index 000000000000..d07c647d7bd4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
@@ -0,0 +1,15 @@
+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] ) >=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-util/buildbot-2.8.4[python_targets_python3_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/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-util/buildbot-www-2.8.4[python_targets_python3_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=Buildbot waterfall-view plugin
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-2.8.4[python_targets_python3_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/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-util/buildbot-www-2.8.4[python_targets_python3_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[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6432c553a3bc681fb9891ffa1a531eb2
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.4 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
new file mode 100644
index 000000000000..33e22bb7b3bb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.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/future[python_targets_python3_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/buildbot-1.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_python3_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 config configure install postinst prepare setup test
+DEPEND=acct-user/buildbot >=dev-python/twisted-17.9.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/future[python_targets_python3_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/buildbot-1.0.0 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(-)] dev-python/setuptools_trial[python_targets_python3_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=BuildBot Worker (slave) Daemon
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.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/future[python_targets_python3_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/buildbot-1.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_python3_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 ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bd8e27fb22d341376b7060ace3925e8e
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
new file mode 100644
index 000000000000..ddf2c33dc41e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
@@ -0,0 +1,15 @@
+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] ) >=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-21.2.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-util/buildbot-2.8.4[python_targets_python3_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/buildbot-www-2.8.4[python_targets_python3_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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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] ) >=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/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e87af2212874a69cd36ab925966c7457
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.4 b/metadata/md5-cache/dev-util/buildbot-www-2.8.4
new file mode 100644
index 000000000000..c91d808247dc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.4
@@ -0,0 +1,15 @@
+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] ) >=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-util/buildbot-pkg-2.8.4[python_targets_python3_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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-pkg-2.8.4[python_targets_python3_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[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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/buildbot-www/buildbot-www-2.8.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b97203eb2be2f9065d8f3a6a842afcfc
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 1cac7ce331e4..ef90dff51dd8 100644
--- a/metadata/md5-cache/dev-util/cargo-c-0.6.2
+++ b/metadata/md5-cache/dev-util/cargo-c-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Helper program to build and install c-like libraries
 EAPI=7
 HOMEPAGE=https://github.com/lu-zero/cargo-c
 IUSE=libressl debug
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0 MIT
 RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-misc/curl[ssl]
 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	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b29a6cffd0229955c77c278c29e0092
+_md5_=d5a94a46b4e8aa4e216bc0ceb6db08d8
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.12 b/metadata/md5-cache/dev-util/catalyst-3.0.12
deleted file mode 100644
index eadd673959a7..000000000000
--- a/metadata/md5-cache/dev-util/catalyst-3.0.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_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(-)]
-DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
-RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_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/pydecomp-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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.12.tar.bz2
-_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_=fb37762f937a4d4fd3586dbe54aa63a0
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.13 b/metadata/md5-cache/dev-util/catalyst-3.0.13
deleted file mode 100644
index f33c0168a835..000000000000
--- a/metadata/md5-cache/dev-util/catalyst-3.0.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_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(-)]
-DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
-RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_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/pydecomp-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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.13.tar.bz2
-_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_=5b0a7df2295ee568f0cd468075d98201
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.14 b/metadata/md5-cache/dev-util/catalyst-3.0.14
index 2944c0850741..aa648e83d4f2 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.14
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.14
@@ -4,12 +4,12 @@ DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=GPL-2+
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
 RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_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/pydecomp-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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.14.tar.bz2
 _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_=5b0a7df2295ee568f0cd468075d98201
+_md5_=fd7e8bd317b4c18ed656ab35a0a49cf9
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.9 b/metadata/md5-cache/dev-util/catalyst-3.0.9
deleted file mode 100644
index 4e963ad72e04..000000000000
--- a/metadata/md5-cache/dev-util/catalyst-3.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_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(-)]
-DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
-RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_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/pydecomp-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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.9.tar.bz2
-_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_=fb37762f937a4d4fd3586dbe54aa63a0
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index ced56ee9e004..da5b97bd0dfe 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-text/asciidoc 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-vcs/git-1.8.2.1[curl]
+BDEPEND=app-text/asciidoc 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-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_7 python_targets_python3_8
-LICENSE=GPL-2
-PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 sys-boot/shim sys-boot/syslinux amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) )
+IUSE=doc +iso python_targets_python3_7 python_targets_python3_8
+LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-arch/lbzip2 app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools alpha? ( dev-libs/libisoburn ) ia64? ( dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) 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=sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng iso? ( virtual/cdrtools amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) alpha? ( dev-libs/libisoburn ) ia64? ( dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) 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
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	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_=b373fc0b856b33dd5a78741501c365d0
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d1ba0ed1f1dcad40e611fa5670b4601d
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 609827252ddf..cedf4ddb8a8d 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	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_=188b4727c137a3f6028cd1e352970435
+_md5_=ad05cad3a185d9a0711f90febd1abc96
diff --git a/metadata/md5-cache/dev-util/doxy-coverage-151229 b/metadata/md5-cache/dev-util/doxy-coverage-151229
deleted file mode 100644
index 197290bd3d2b..000000000000
--- a/metadata/md5-cache/dev-util/doxy-coverage-151229
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Source Code Documentation Coverage Measurement
-EAPI=6
-HOMEPAGE=https://github.com/alobbs/doxy-coverage
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/alobbs/doxy-coverage/archive/29a0bbf43bfecb6872cdca0e4a11733954d25196.tar.gz -> doxy-coverage-151229.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=598fbf89e98748f2d66fb83248ab66e6
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.64.4 b/metadata/md5-cache/dev-util/gdbus-codegen-2.64.4
index f6ea4f5702bb..10df5718f4cd 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.64.4
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.64.4
@@ -5,11 +5,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 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 arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 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] ) 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.4.tar.xz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8af7246b820e9f885a08b2fbb84660ac
+_md5_=65278d0993e0ac491d08c151f6c2a4b1
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.64.4 b/metadata/md5-cache/dev-util/glib-utils-2.64.4
index e2296f2da9be..403d39762532 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.64.4
+++ b/metadata/md5-cache/dev-util/glib-utils-2.64.4
@@ -5,11 +5,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 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 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 ~x86-winnt
+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 ~x86-winnt
 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] ) !<dev-libs/glib-2.56.2: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/glib/2.64/glib-2.64.4.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f9da20cfc55525ea0225c22fb1fbac4d
+_md5_=71f88eff926607ce8f413c5d0ab698bd
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 67b79017e179..06123987f0fb 100644
--- a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
+++ b/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V gen
 EAPI=7
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
 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 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 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	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_=bd5de649988284472a4f109716b8d06c
+_md5_=5a672ab080a9f273d60d142d22ea31c4
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 f3b6ef857f9b..ef27ca3111e3 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 IUSE=debug doc emacs python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.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] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
@@ -12,4 +12,4 @@ 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	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
+_md5_=fc9f01066f48a2fad26475f592b87a44
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index a6b03909aa15..6d5a1afc9240 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/howdoi-2.0.7 b/metadata/md5-cache/dev-util/howdoi-2.0.7
new file mode 100644
index 000000000000..5f57c5b351c3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A code search tool
+EAPI=7
+HOMEPAGE=https://pypi.org/project/howdoi/
+IUSE=python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/cachelib[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/keep[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] 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=|| ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/howdoi/howdoi-2.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_=cd3c277524b7b4d408a894457e256ec4
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 e2973d2ded71..351bc7fb4f71 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_=f291a3738aa59655a2331ebaa49b2731
+_md5_=adb51f9bf27d87bbf0c34e78bcbc32f3
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-5.5.2
index b77635de24e1..8cdeea9330fa 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 bc9e4cb59815..09f236b9e38c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 c38057e94bd3..78063b54d789 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 7999436939a0..c74a92759d61 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3eab29a72067..208006b1bb5d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a25ef22ca272..101199ead4af 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4fd76b4dbe3b..0806fd3056cf 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/massif-visualizer-0.7.0-r1 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
index d31701c65f44..dbf38a5fab8a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/meson-0.54.3 b/metadata/md5-cache/dev-util/meson-0.54.3
deleted file mode 100644
index 861e2a321c03..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.54.3
+++ /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 ) 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? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=7
-HOMEPAGE=https://mesonbuild.com/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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=python_targets_python3_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=mirror://pypi/m/meson/meson-0.54.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d481a09ffb44d7d9ea3eac5e9941c844
diff --git a/metadata/md5-cache/dev-util/meson-0.55.3 b/metadata/md5-cache/dev-util/meson-0.55.3
index 848a035a59e4..aa3f0881218f 100644
--- a/metadata/md5-cache/dev-util/meson-0.55.3
+++ b/metadata/md5-cache/dev-util/meson-0.55.3
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 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 ~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=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(-)] >=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/m/meson/meson-0.55.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9b4ef97812fdcb04627c4e88604c3534
+_md5_=242347e5b2f250c51f1475b0215969f0
diff --git a/metadata/md5-cache/dev-util/mpatch-0.8-r1 b/metadata/md5-cache/dev-util/mpatch-0.8-r1
deleted file mode 100644
index 11da7cd4a3cc..000000000000
--- a/metadata/md5-cache/dev-util/mpatch-0.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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/setuptools-42.0.2[python_targets_python2_7(-)] )
-DESCRIPTION=Patch-like tool which can resolve common causes of patch rejects when applying
-EAPI=5
-HOMEPAGE=http://oss.oracle.com/~mason/mpatch/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~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://oss.oracle.com/~mason/mpatch/mpatch-0.8.tar.bz2
-_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_=8fa6986df90e8b99c431d282cbec3a9f
diff --git a/metadata/md5-cache/dev-util/re2c-1.3-r1 b/metadata/md5-cache/dev-util/re2c-1.3-r1
deleted file mode 100644
index e0e92ef7a215..000000000000
--- a/metadata/md5-cache/dev-util/re2c-1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-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 ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.3/re2c-1.3.tar.xz
-_md5_=4092e72e20c36a004154ecf5c00ba296
diff --git a/metadata/md5-cache/dev-util/re2c-2.0.3 b/metadata/md5-cache/dev-util/re2c-2.0.3
index 75d0a581da85..cc8c533f2925 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_=c88d47d2c50304e12f1811ec73a388b2
+_md5_=d7297635030d04927d877b2fc42b5890
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-9.2 b/metadata/md5-cache/dev-util/rpmdevtools-9.2
new file mode 100644
index 000000000000..63b5cc1246e4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rpmdevtools-9.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man
+DEFINED_PHASES=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] ) app-arch/rpm[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] dev-lang/perl:* python_single_target_python3_6? ( dev-python/progressbar2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/progressbar2[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-python/requests_download[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/requests_download[python_targets_python3_7(-)] )
+DESCRIPTION=Collection of rpm packaging related utilities
+EAPI=7
+HOMEPAGE=https://pagure.io/rpmdevtools
+IUSE=emacs python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~amd64-linux ~x86-linux
+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] ) app-arch/rpm[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] dev-lang/perl:* python_single_target_python3_6? ( dev-python/progressbar2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/progressbar2[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-python/requests_download[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/requests_download[python_targets_python3_7(-)] ) net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-9.2.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=349c04263cfae6f70bb5680073a37c84
diff --git a/metadata/md5-cache/dev-util/setconf-0.6.6 b/metadata/md5-cache/dev-util/setconf-0.6.6
deleted file mode 100644
index cd4df2ed0d16..000000000000
--- a/metadata/md5-cache/dev-util/setconf-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=A small python based utility used to change configuration files
-EAPI=5
-HOMEPAGE=http://setconf.roboticoverlords.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] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://setconf.roboticoverlords.org/setconf-0.6.6.tar.xz
-_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_=bd037fe8bc85f6ba3a586f2dd85840f3
diff --git a/metadata/md5-cache/dev-util/setconf-0.6.7 b/metadata/md5-cache/dev-util/setconf-0.6.7
deleted file mode 100644
index f4125cf86614..000000000000
--- a/metadata/md5-cache/dev-util/setconf-0.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=A small python based utility used to change configuration files
-EAPI=5
-HOMEPAGE=http://setconf.roboticoverlords.org/
-IUSE=+python_single_target_python3_6
-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] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=http://setconf.roboticoverlords.org/setconf-0.6.7.tar.xz
-_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_=3a13b804a7d61473ada4b57ca01f2940
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.5.3 b/metadata/md5-cache/dev-util/spirv-headers-1.5.3
index a39efc1a1f2f..1a0b071c7c71 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.5.3
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.5.3
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Machine-readable files for the SPIR-V Registry
 EAPI=7
 HOMEPAGE=https://www.khronos.org/registry/spir-v/
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/c0df742ec0b8178ad58c68cff3437ad4b6a06e26.tar.gz -> spirv-headers-1.5.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_=22294ea88bc9d1d30824059059ebdd09
+_md5_=e6850ad97902b05243fcf1a4cb54ea01
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2020.3 b/metadata/md5-cache/dev-util/spirv-tools-2020.3
index 6003d1f7731b..58cb4e3993e4 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2020.3
+++ b/metadata/md5-cache/dev-util/spirv-tools-2020.3
@@ -5,10 +5,10 @@ DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 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 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 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	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_=fffdb0d22c4ce790f72a936db8dd054e
+_md5_=fcc84ec1bc276683bfeeba969abbd9a0
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 00baf147ac47..2b7065d10eae 100644
--- a/metadata/md5-cache/dev-util/statifier-1.7.4-r1
+++ b/metadata/md5-cache/dev-util/statifier-1.7.4-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Statifier is a tool for creating portable, self-containing Linux executables
 EAPI=7
 HOMEPAGE=http://statifier.sourceforge.net
-IUSE=abi_x86_32 abi_x86_64
+IUSE=abi_x86_32 abi_x86_x32 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 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_x32 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_=aa804441775eff034e206cf86cc0ba4b
+_md5_=9ee1e89389880dd05e8ea780d77fe68f
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 66c6ebdf1200..53ddd491b21d 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Vulkan Header files and API registry
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c4e91e14125cac0a6d6239bd8b7e0ce
+_md5_=21206ce536f215683e3d6fe60970450b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 201fa969feb8..7ab6f95ec542 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1 b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
deleted file mode 100644
index 6d71a74de35a..000000000000
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-vcs/subversion-1.0.9 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/setuptools-42.0.2[python_targets_python2_7(-)] )
-DESCRIPTION=Convert a CVS repository to a Subversion repository
-EAPI=6
-HOMEPAGE=http://cvs2svn.tigris.org/
-IUSE=bazaar git test +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13 ) git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49237/cvs2svn-2.4.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_=0729721f637f094672ce38cccce98f80
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0 b/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
deleted file mode 100644
index 05d9c005da54..000000000000
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-vcs/subversion-1.0.9 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/setuptools-42.0.2[python_targets_python2_7(-)] )
-DESCRIPTION=Convert a CVS repository to a Subversion repository
-EAPI=6
-HOMEPAGE=http://cvs2svn.tigris.org/
-IUSE=bazaar git test +python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13 ) git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49543/cvs2svn-2.5.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_=65337311c51e6ec65d592b60ce1221c2
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.1.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.1.0
index c11fadd7987e..e12c7c021c9c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index e8d8eaeef6df..68cbb6c9c84c 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/devilutionx-1.0.0-r1 b/metadata/md5-cache/games-engines/devilutionx-1.0.0-r1
deleted file mode 100644
index 5a68ba587bd3..000000000000
--- a/metadata/md5-cache/games-engines/devilutionx-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libsodium media-fonts/sil-charis media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
-DESCRIPTION=Diablo engine for modern operating systems
-EAPI=7
-HOMEPAGE=https://github.com/diasurgical/devilutionX
-IUSE=debug lto
-KEYWORDS=~amd64 ~x86
-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	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.3 b/metadata/md5-cache/games-engines/devilutionx-1.0.3
new file mode 100644
index 000000000000..d2182c6c7b11
--- /dev/null
+++ b/metadata/md5-cache/games-engines/devilutionx-1.0.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libsodium media-fonts/sil-charis media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
+DESCRIPTION=Diablo engine for modern operating systems
+EAPI=7
+HOMEPAGE=https://github.com/diasurgical/devilutionX
+IUSE=debug lto
+KEYWORDS=~amd64 ~x86
+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.3.tar.gz -> devilutionx-1.0.3.tar.gz
+_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_=1d618e47d7a42477655c69f3586181ee
diff --git a/metadata/md5-cache/games-engines/devilutionx-9999 b/metadata/md5-cache/games-engines/devilutionx-9999
index 63fc621e1eab..f8f689a3a78f 100644
--- a/metadata/md5-cache/games-engines/devilutionx-9999
+++ b/metadata/md5-cache/games-engines/devilutionx-9999
@@ -10,4 +10,4 @@ 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	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
+_md5_=1d618e47d7a42477655c69f3586181ee
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 8ac7d0dc1a41..bafc9036a409 100644
Binary files a/metadata/md5-cache/games-kids/Manifest.gz and b/metadata/md5-cache/games-kids/Manifest.gz differ
diff --git a/metadata/md5-cache/games-kids/gcompris-0.97-r1 b/metadata/md5-cache/games-kids/gcompris-0.97-r1
index f9988e668797..90e5e9fca74a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e520ee58c817..7be48039fc96 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
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 bbfe73090e3b..dc0372b53ecf 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 871a11c4b511..9da08c7a957c 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index f0666b0a7c90..cd1490bdb283 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.23.2 b/metadata/md5-cache/games-roguelike/stone-soup-0.23.2
deleted file mode 100644
index 3f8161bef52d..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.23.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl dev-python/pyyaml sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
-DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
-EAPI=7
-HOMEPAGE=http://crawl.develz.org/wordpress/
-IUSE=debug ncurses sound test +tiles
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
-RDEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crawl.develz.org/release/0.23/stone_soup-0.23.2.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bccb1dc0cf648f524086fd920a938e3a
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.24.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.24.0
deleted file mode 100644
index 70ad1589ebc5..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl dev-python/pyyaml sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
-DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
-EAPI=7
-HOMEPAGE=http://crawl.develz.org/wordpress/
-IUSE=debug ncurses sound test +tiles
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
-RDEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crawl.develz.org/release/0.24/stone_soup-0.24.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=225fc1ffb6a0298da25fd10b6c7f1bb3
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.0
index df2f30ae21f7..1e1e5f8d3eb0 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.0
@@ -4,11 +4,11 @@ DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in d
 EAPI=7
 HOMEPAGE=http://crawl.develz.org/wordpress/
 IUSE=debug ncurses sound test +tiles
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
 RDEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crawl.develz.org/release/0.25/stone_soup-0.25.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e9535c07ed10a748a3b049235e33b5f
+_md5_=8c13218e187d1146f02a26c0ac6bd34e
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1
new file mode 100644
index 000000000000..714398dddc94
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl dev-python/pyyaml sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=7
+HOMEPAGE=http://crawl.develz.org/wordpress/
+IUSE=debug ncurses sound test +tiles
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35016e2c72185c9c8a892783ffef2ad1
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 17d05c9dea67..f1b39314a505 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/steamcmd-1.0-r2 b/metadata/md5-cache/games-server/steamcmd-1.0-r2
deleted file mode 100644
index 30d1caf375ac..000000000000
--- a/metadata/md5-cache/games-server/steamcmd-1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=This is the command-line version of the Steam client for dedicated servers
-EAPI=7
-HOMEPAGE=https://developer.valvesoftware.com/wiki/SteamCMD
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-2.1+ Steam
-RDEPEND=acct-group/steamcmd acct-user/steamcmd app-misc/screen
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> steamcmd-1.0.tar.gz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=a0872072c29aaab4f50f4f1ec2520f60
diff --git a/metadata/md5-cache/games-server/steamcmd-1.0-r3 b/metadata/md5-cache/games-server/steamcmd-1.0-r3
index f6a329f82208..f632d8092464 100644
--- a/metadata/md5-cache/games-server/steamcmd-1.0-r3
+++ b/metadata/md5-cache/games-server/steamcmd-1.0-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=This is the command-line version of the Steam client for dedicated servers
 EAPI=7
 HOMEPAGE=https://developer.valvesoftware.com/wiki/SteamCMD
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1+ Steam
 RDEPEND=acct-group/steamcmd acct-user/steamcmd app-misc/dtach
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> steamcmd-1.0.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=04771d1ff8190cd9675a5009892bf3db
+_md5_=2a32be365bdf992ca6f3c6997664d6af
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index a810e623e968..1fae7ad7649a 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.10.1 b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1
deleted file mode 100644
index bb50d0436f09..000000000000
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_8(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=media-libs/libogg-1.1.3 media-libs/libpng:0= media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet virtual/opengl ) 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] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free turn-based space empire and galactic conquest game
-EAPI=7
-HOMEPAGE=https://www.freeorion.org
-IUSE=dedicated python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
-RDEPEND=python_single_target_python3_6? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_8(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=media-libs/libogg-1.1.3 media-libs/libpng:0= media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet virtual/opengl ) 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.10.1.tar.gz -> freeorion-0.4.10.1.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cc607d0d6ec034ccad7e96350e1c723
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r1 b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r1
new file mode 100644
index 000000000000..03c22185a303
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_8(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=media-libs/libogg-1.1.3 media-libs/libpng:0= media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet virtual/opengl ) 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] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free turn-based space empire and galactic conquest game
+EAPI=7
+HOMEPAGE=https://www.freeorion.org
+IUSE=dedicated python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=python_single_target_python3_6? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.58:=[nls,python,threads,python_targets_python3_8(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=media-libs/libogg-1.1.3 media-libs/libpng:0= media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet virtual/opengl ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.10.1.tar.gz -> freeorion-0.4.10.1.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3254b075eee73bd9e4a9d6372fef9fa
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 11b9416a3255..f9c2459a4a60 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.36.7 b/metadata/md5-cache/gnome-base/gnome-desktop-3.36.7
new file mode 100644
index 000000000000..a3e394549e23
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.36.7
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.14 ) dev-util/itstool >=sys-devel/gettext-0.19.8 x11-base/xorg-proto 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=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes x11-libs/libX11 systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:=[X] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library with common API for various GNOME modules
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
+IUSE=debug gtk-doc +introspection seccomp systemd udev test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
+RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes x11-libs/libX11 systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:=[X] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
+RESTRICT=!test? ( test )
+SLOT=3/19
+SRC_URI=mirror://gnome/sources/gnome-desktop/3.36/gnome-desktop-3.36.7.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	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1ccbf2c135a612292e10111573a450c
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index e1c88fbef6ea..16586bd3af52 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/akonadi-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-20.04.3
index 3854a700dfec..f974fe73b85d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1e53a18dd317..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-20.08.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 ) >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[mysql?,postgres?] >=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/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kitemviews-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 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.1:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.14.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=7
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+kaccounts +mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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/qtsql-5.14.2:5[mysql?,postgres?] >=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/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kitemviews-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 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.1:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.14.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-20.08.2
new file mode 100644
index 000000000000..9ad5a031c214
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-20.08.2
@@ -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 ) >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[mysql?,postgres?] >=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/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kitemviews-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 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.2:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.14.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=7
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+kaccounts +mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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/qtsql-5.14.2:5[mysql?,postgres?] >=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/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kitemviews-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 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.2:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.14.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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.2/src/akonadi-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6448dade40ef3b4770f1078b214fd675
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 8f33ade28aa4..d5f759667866 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 98859343a20a..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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/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-frameworks/kcalendarcore-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/kitemmodels-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-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/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-frameworks/kcalendarcore-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/kitemmodels-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 || ( 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/release-service/20.08.1/src/akonadi-calendar-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83d6066ed949512b2d94c41ac6069f0b
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.2
new file mode 100644
index 000000000000..b2d9a3ca1434
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kitemmodels-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kitemmodels-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 || ( 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/release-service/20.08.2/src/akonadi-calendar-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8addc199041d..6d3d355c4a57 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 28dad1a40a9e..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kmime-20.08.1: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/kiconthemes-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi contact integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~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 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kmime-20.08.1: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/kiconthemes-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0: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=mirror://kde/stable/release-service/20.08.1/src/akonadi-contacts-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c731d2326c2da1910b93a677db35780
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.2
new file mode 100644
index 000000000000..d1588f333558
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kmime-20.08.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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kiconthemes-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi contact integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~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 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kmime-20.08.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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kiconthemes-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0: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=mirror://kde/stable/release-service/20.08.2/src/akonadi-contacts-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4f5d6047c6f7..5373986de982 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 12182d656745..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-import-wizard-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.2
new file mode 100644
index 000000000000..48b96646ad73
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/mailimporter-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/mailimporter-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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.2/src/akonadi-import-wizard-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 707437542a0d..5fc8c09e538f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7ee8536eea30..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kmime-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/kitemmodels-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi mime types
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kmime-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/kitemmodels-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-mime-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-mime-20.08.2
new file mode 100644
index 000000000000..d135ab06283c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kmime-20.08.2: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/kitemmodels-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi mime types
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kmime-20.08.2: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/kitemmodels-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
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/akonadi-mime-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8a8f897059e1..165f93999019 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 9ad09c373fd1..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kmime-20.08.1:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi notes integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kmime-20.08.1: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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-notes-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-notes-20.08.2
new file mode 100644
index 000000000000..7a2206f79965
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi notes integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kmime-20.08.2: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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/akonadi-notes-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 00b7604094e8..4ae17436fbca 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 17677beb1573..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-20.08.1:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-frameworks/kcalendarcore-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/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-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/krunner-5.72.0:5 dev-libs/boost test? ( >=kde-apps/akonadi-20.08.1:5[mysql,postgres,sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=7
-HOMEPAGE=https://invent.kde.org/pim/akonadi-search
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-frameworks/kcalendarcore-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/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-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/krunner-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/akonadi-search-20.08.2 b/metadata/md5-cache/kde-apps/akonadi-search-20.08.2
new file mode 100644
index 000000000000..b34247237508
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-apps/akonadi-20.08.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-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/krunner-5.72.0:5 dev-libs/boost test? ( >=kde-apps/akonadi-20.08.2:5[mysql,postgres,sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=7
+HOMEPAGE=https://invent.kde.org/pim/akonadi-search
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-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/krunner-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/akonadi-search-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d315fa10a2e4..9e9ca7936b53 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4a56fcf8b03c..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/akonadiconsole-20.08.2 b/metadata/md5-cache/kde-apps/akonadiconsole-20.08.2
new file mode 100644
index 000000000000..6fc7b3ba7cf7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=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.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/messagelib-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/messagelib-20.08.2: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.2/src/akonadiconsole-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 bdb710c28976..40b654885df1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 87837a0ab094..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2: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/messagelib-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/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/kjobwidgets-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syndication-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=News feed aggregator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.akregator
-IUSE=telemetry debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/qtwebengine-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2: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/messagelib-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/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/kjobwidgets-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syndication-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akregator-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=310b9f28bb79159c6c6f09b41edc90df
diff --git a/metadata/md5-cache/kde-apps/akregator-20.08.2 b/metadata/md5-cache/kde-apps/akregator-20.08.2
new file mode 100644
index 000000000000..1cba9d2f5409
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/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/kjobwidgets-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syndication-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=News feed aggregator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.akregator
+IUSE=telemetry debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+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/qtwebengine-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/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/kjobwidgets-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syndication-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/akregator-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d0f6434c0756..db7a888c1f1e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e85019f322d0..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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 nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[-gles2-only] >=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 eigen? ( dev-cpp/eigen:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library for mathematical features
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[-gles2-only] >=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 eigen? ( dev-cpp/eigen:3 ) || ( 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.08.1/src/analitza-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3177e2000437665761b5712a4bbf527d
diff --git a/metadata/md5-cache/kde-apps/analitza-20.08.2 b/metadata/md5-cache/kde-apps/analitza-20.08.2
new file mode 100644
index 000000000000..7fbb2bdaed47
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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 nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[-gles2-only] >=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 eigen? ( dev-cpp/eigen:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE library for mathematical features
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[-gles2-only] >=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 eigen? ( dev-cpp/eigen:3 ) || ( 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.08.2/src/analitza-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-r2 b/metadata/md5-cache/kde-apps/ark-20.04.3-r2
index 833086010e5b..3450cbfdc820 100644
--- a/metadata/md5-cache/kde-apps/ark-20.04.3-r2
+++ b/metadata/md5-cache/kde-apps/ark-20.04.3-r2
@@ -11,5 +11,5 @@ RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt
 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af72cff4493b83ec57e16018ec1dc9c7
diff --git a/metadata/md5-cache/kde-apps/ark-20.08.1 b/metadata/md5-cache/kde-apps/ark-20.08.1
deleted file mode 100644
index be9450a0e7fb..000000000000
--- a/metadata/md5-cache/kde-apps/ark-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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=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.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 )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ark-20.08.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	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f2e46b23c03ee92276d809482449c7a
diff --git a/metadata/md5-cache/kde-apps/ark-20.08.2 b/metadata/md5-cache/kde-apps/ark-20.08.2
new file mode 100644
index 000000000000..cc91b1b1a1ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-20.08.2
@@ -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.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=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.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 )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/ark-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 222b2cb0c9da..c29f755ebefc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d39af6528964..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.artikulate
-IUSE=gstreamer debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/artikulate-20.08.2 b/metadata/md5-cache/kde-apps/artikulate-20.08.2
new file mode 100644
index 000000000000..3b05eca9f269
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-r4 ) !gstreamer? ( >=dev-qt/qtmultimedia-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.artikulate
+IUSE=gstreamer debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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-r4 ) !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.2/src/artikulate-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3bb7a6f9497884cef509a19292242fc4
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 cb9bbe8dd4e9..1afbe2454e13 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5cd64c06086c..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/audiocd-kio-20.08.2 b/metadata/md5-cache/kde-apps/audiocd-kio-20.08.2
new file mode 100644
index 000000000000..d9d7040dcb42
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkcddb-20.08.2:5 >=kde-apps/libkcompactdisc-20.08.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/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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkcddb-20.08.2:5 >=kde-apps/libkcompactdisc-20.08.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/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.2/src/audiocd-kio-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4e39b45cbf08..6245b3cd9a47 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 3115e76658f4..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kconfig-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/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Widget library for baloo
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kconfig-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/kwidgetsaddons-5.72.0: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=mirror://kde/stable/release-service/20.08.1/src/baloo-widgets-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8801ab2d3daa8856714bbfd80cec72d
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-20.08.2 b/metadata/md5-cache/kde-apps/baloo-widgets-20.08.2
new file mode 100644
index 000000000000..2a918068f644
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kconfig-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/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Widget library for baloo
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kconfig-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/kwidgetsaddons-5.72.0: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=mirror://kde/stable/release-service/20.08.2/src/baloo-widgets-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 76320c949ff5..5cd56ba5daaa 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5f6d14b5ebd9..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Memory enhancement game based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/blinken-20.08.2 b/metadata/md5-cache/kde-apps/blinken-20.08.2
new file mode 100644
index 000000000000..37e81a1404d1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Memory enhancement game based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/blinken-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f0b7ffc2e7f3..625727d4c568 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a1ce71c52328..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single player arcade bombing game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.bomber
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/bomber-20.08.2 b/metadata/md5-cache/kde-apps/bomber-20.08.2
new file mode 100644
index 000000000000..29933925cc73
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Single player arcade bombing game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.bomber
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/bomber-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b8a0ccd2f210..cc518b660b28 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e5d489a5a2f1..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.bovo
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/bovo-20.08.2 b/metadata/md5-cache/kde-apps/bovo-20.08.2
new file mode 100644
index 000000000000..7d67b9e1d47c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.bovo
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/bovo-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0ce9bc08e88c..8a388d424bcc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 49038c731341..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/calendarjanitor-20.08.2 b/metadata/md5-cache/kde-apps/calendarjanitor-20.08.2
new file mode 100644
index 000000000000..64e5bafda7ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/calendarsupport-20.08.2: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.2/src/akonadi-calendar-tools-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 08db6ad5c12e..6e860b256908 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 029044b9f4c9..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Calendar support library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/calendarsupport-20.08.2 b/metadata/md5-cache/kde-apps/calendarsupport-20.08.2
new file mode 100644
index 000000000000..8a4f567b2e19
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Calendar support library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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.2/src/calendarsupport-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 84ad23b359a6..32717efc1f4a 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 84cf90a234a4..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-20.08.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/make dev-util/cmake 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 pretend setup test unpack
-DEPEND=app-text/poppler[qt5] >=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 >=dev-qt/qtxmlpatterns-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-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-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 analitza? ( >=kde-apps/analitza-20.08.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( 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-qt/qtdbus-5.14.2:5 ) R? ( dev-lang/R ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[qt5] >=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 >=dev-qt/qtxmlpatterns-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-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-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 analitza? ( >=kde-apps/analitza-20.08.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( 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-qt/qtdbus-5.14.2:5 ) R? ( dev-lang/R ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-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	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/cantor-20.08.2 b/metadata/md5-cache/kde-apps/cantor-20.08.2
new file mode 100644
index 000000000000..3b95860442ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-20.08.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/make dev-util/cmake 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-text/poppler[qt5] >=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 >=dev-qt/qtxmlpatterns-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-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-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 analitza? ( >=kde-apps/analitza-20.08.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( 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-qt/qtdbus-5.14.2:5 ) R? ( dev-lang/R ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/poppler[qt5] >=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 >=dev-qt/qtxmlpatterns-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-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-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 analitza? ( >=kde-apps/analitza-20.08.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( 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-qt/qtdbus-5.14.2:5 ) R? ( dev-lang/R ) !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( || ( sci-mathematics/maxima sci-mathematics/octave ) ) ) ) ) ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/cantor-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5141cae6957ae53449aac17c2dffe1a2
diff --git a/metadata/md5-cache/kde-apps/cervisia-20.04.3 b/metadata/md5-cache/kde-apps/cervisia-20.04.3
index debc6afb3208..015d1b30bd3c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1b5d493ea7eb..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=CVS frontend by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/cervisia-20.08.2 b/metadata/md5-cache/kde-apps/cervisia-20.08.2
new file mode 100644
index 000000000000..466aafef7778
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=CVS frontend by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~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 >=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.2/src/cervisia-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 160c30067417..136dbd6a84ea 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 17c7816577ab..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=dev-qt/qtconcurrent-5.14.2:5 >=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/kbookmarks-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/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/kinit-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/knewstuff-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-20.08.1:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin https://userbase.kde.org/Dolphin
-IUSE=activities semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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/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/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/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/kinit-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/knewstuff-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-20.08.1:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) >=kde-apps/kio-extras-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-20.08.2 b/metadata/md5-cache/kde-apps/dolphin-20.08.2
new file mode 100644
index 000000000000..2c9b42295900
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=dev-qt/qtconcurrent-5.14.2:5 >=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/kbookmarks-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/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/kinit-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/knewstuff-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-20.08.2:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin https://userbase.kde.org/Dolphin
+IUSE=activities semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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/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/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/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/kinit-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/knewstuff-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-20.08.2:5 >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) >=kde-apps/kio-extras-20.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/dolphin-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe5bdb63083223fe70818347a80b9dac
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 4f916526e07a..d047674cd322 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index acf099dc9a88..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Dropbox service integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-dropbox-20.08.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.2
new file mode 100644
index 000000000000..44377bd3980d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Dropbox service integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+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.2: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.2/src/dolphin-plugins-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 fff8ef147850..eebaa66c3bd3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e8c93523d4d3..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Git integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-git-20.08.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.2
new file mode 100644
index 000000000000..3a685f06244b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Git integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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.2/src/dolphin-plugins-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 505e50f6a62b..2b1f67a7f1aa 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index da815f289823..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Mercurial integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-mercurial-20.08.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.2
new file mode 100644
index 000000000000..ffe54b8ad0f3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Mercurial integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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.2/src/dolphin-plugins-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 057d314295b1..227b102e5134 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7690df4aaf19..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Subversion integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/dolphin-plugins-subversion-20.08.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.2
new file mode 100644
index 000000000000..f415d9f39285
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Subversion integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.2: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.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.2/src/dolphin-plugins-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 c861a81d69e5..0db7761dac6b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index dd6bf8905580..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple video player
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/dragon-20.08.2 b/metadata/md5-cache/kde-apps/dragon-20.08.2
new file mode 100644
index 000000000000..438cde2e5b26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple video player
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/dragon-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6bdff8e279f3..37fabcb05721 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b94d764bb4ae..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtgui-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/calendarsupport-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/libkdepim-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtgui-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/calendarsupport-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/libkdepim-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/eventviews-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=656556b9527ad19b2c455c8791523bc6
diff --git a/metadata/md5-cache/kde-apps/eventviews-20.08.2 b/metadata/md5-cache/kde-apps/eventviews-20.08.2
new file mode 100644
index 000000000000..f1a053a1fff8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/eventviews-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e30f1edbcf91..8411382dd2d8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 29f1b2bfe032..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ffmpegthumbs-20.08.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.2
new file mode 100644
index 000000000000..b532e64ffb8b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/ffmpegthumbs-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9380d4b82c28..c4d0304e3408 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index dda36e6a77b2..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/ki18n-5.72.0:5 >=kde-frameworks/kio-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.filelight https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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/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/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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/filelight-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20918fd723cb542492388b1594c1e9c9
diff --git a/metadata/md5-cache/kde-apps/filelight-20.08.2 b/metadata/md5-cache/kde-apps/filelight-20.08.2
new file mode 100644
index 000000000000..e5c432f8f7fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/ki18n-5.72.0:5 >=kde-frameworks/kio-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.filelight https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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/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/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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/filelight-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 15b3d1e1b0fb..1cca549aa65f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index eaf077fd4e88..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Bomberman game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.granatier
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/granatier-20.08.2 b/metadata/md5-cache/kde-apps/granatier-20.08.2
new file mode 100644
index 000000000000..75158afdf9b5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Bomberman game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.granatier
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/granatier-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 39fbc3282092..fea4348ebcfa 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b0bfd2b3f2d8..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/grantlee-editor-20.08.2 b/metadata/md5-cache/kde-apps/grantlee-editor-20.08.2
new file mode 100644
index 000000000000..e515129c886e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.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/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.2/src/grantlee-editor-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b46f111baada..304caae86641 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2daad452bfc6..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/grantlee: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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-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 >=dev-qt/qtnetwork-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for Grantlee plugins
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/grantlee: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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/grantleetheme-20.08.2 b/metadata/md5-cache/kde-apps/grantleetheme-20.08.2
new file mode 100644
index 000000000000..1dc8226fbad8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/grantlee: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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-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 >=dev-qt/qtnetwork-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for Grantlee plugins
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/grantlee: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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-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
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/grantleetheme-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 16e3e59bcc89..317bb9051033 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bc351d0bd2f9..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-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/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/kitemmodels-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/kparts-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/solid-5.72.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-20.08.1:5= ) mpris? ( >=dev-qt/qtdbus-5.14.2:5 ) raw? ( >=kde-apps/libkdcraw-20.08.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=dev-qt/qtconcurrent-5.14.2:5 >=kde-frameworks/kwindowsystem-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Image viewer by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.gwenview https://userbase.kde.org/Gwenview
-IUSE=activities fits kipi +mpris raw semantic-desktop share X debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-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/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/kitemmodels-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/kparts-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/solid-5.72.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-20.08.1:5= ) mpris? ( >=dev-qt/qtdbus-5.14.2:5 ) raw? ( >=kde-apps/libkdcraw-20.08.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=dev-qt/qtimageformats-5.14.2:5 >=kde-frameworks/kimageformats-5.72.0:5 kipi? ( >=kde-apps/kipi-plugins-20.08.1: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=mirror://kde/stable/release-service/20.08.1/src/gwenview-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4f23a09caaeb7ba8e6974fa66604d85
diff --git a/metadata/md5-cache/kde-apps/gwenview-20.08.2 b/metadata/md5-cache/kde-apps/gwenview-20.08.2
new file mode 100644
index 000000000000..9d16906caf2d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-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/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/kitemmodels-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/kparts-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/solid-5.72.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-20.08.2:5= ) mpris? ( >=dev-qt/qtdbus-5.14.2:5 ) raw? ( >=kde-apps/libkdcraw-20.08.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=dev-qt/qtconcurrent-5.14.2:5 >=kde-frameworks/kwindowsystem-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Image viewer by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.gwenview https://userbase.kde.org/Gwenview
+IUSE=activities fits kipi +mpris raw semantic-desktop share X debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-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/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/kitemmodels-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/kparts-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/solid-5.72.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-20.08.2:5= ) mpris? ( >=dev-qt/qtdbus-5.14.2:5 ) raw? ( >=kde-apps/libkdcraw-20.08.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=dev-qt/qtimageformats-5.14.2:5 >=kde-frameworks/kimageformats-5.72.0:5 kipi? ( >=kde-apps/kipi-plugins-20.08.2: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=mirror://kde/stable/release-service/20.08.2/src/gwenview-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c92fcf301d6c129e9203160cf21ade34
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-20.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-20.04.3
index 937f05e99545..1d1072730545 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 732b3ab3ff33..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-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-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Incidence editor for korganizer
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-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-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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 || ( 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.08.1/src/incidenceeditor-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d329f99bb744e4794fa0906b28c87830
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-20.08.2 b/metadata/md5-cache/kde-apps/incidenceeditor-20.08.2
new file mode 100644
index 000000000000..7be163a164ec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Incidence editor for korganizer
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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 || ( 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.08.2/src/incidenceeditor-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 af48c64153f5..2c5d0511364d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b6d52599e380..000000000000
--- a/metadata/md5-cache/kde-apps/juk-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 >=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/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/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-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 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.juk
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/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/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/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-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 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/juk-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e20f446ce3f8a2c0c99bef14a829d29c
diff --git a/metadata/md5-cache/kde-apps/juk-20.08.2 b/metadata/md5-cache/kde-apps/juk-20.08.2
new file mode 100644
index 000000000000..36cd00855c79
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 >=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/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/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-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 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.juk
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+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/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/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/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-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 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/juk-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e55fa03a217f..9718107a073c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0fea1bb43cdb..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-20.08.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/qtxml-5.14.2:5 >=kde-apps/libkcddb-20.08.1:5 >=kde-frameworks/karchive-5.72.0: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/kfilemetadata-5.72.0:5[taglib?] >=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/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.k3b https://userbase.kde.org/K3b
-IUSE=dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2 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 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkcddb-20.08.1:5 >=kde-frameworks/karchive-5.72.0: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/kfilemetadata-5.72.0:5[taglib?] >=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/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/k3b-20.08.2 b/metadata/md5-cache/kde-apps/k3b-20.08.2
new file mode 100644
index 000000000000..0f3b7e328e64
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-20.08.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/qtxml-5.14.2:5 >=kde-apps/libkcddb-20.08.2:5 >=kde-frameworks/karchive-5.72.0: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/kfilemetadata-5.72.0:5[taglib?] >=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/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.k3b https://userbase.kde.org/K3b
+IUSE=dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 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 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkcddb-20.08.2:5 >=kde-frameworks/karchive-5.72.0: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/kfilemetadata-5.72.0:5[taglib?] >=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/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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.2/src/k3b-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dabffaa087fda591bfe6920418fd0559
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 0fb039fbeea1..105b347e46e2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d4835f42426a..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-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/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/libaccounts-glib-1.21:= net-libs/signond >=kde-frameworks/kcmutils-5.72.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-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/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/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( 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/release-service/20.08.1/src/kaccounts-integration-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a02ab7f88d3848dedecde39cf466470
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.2
new file mode 100644
index 000000000000..954e16091eb1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-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/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/libaccounts-glib-1.21:= net-libs/signond >=kde-frameworks/kcmutils-5.72.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-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/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/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( 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/release-service/20.08.2/src/kaccounts-integration-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 bbba1f12fa97..168fff17b976 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5091f67bd60f..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0: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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE accounts providers
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kaccounts-providers-20.08.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.2
new file mode 100644
index 000000000000..78a29ee00baa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0: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/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kaccounts-integration-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE accounts providers
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2/src/kaccounts-providers-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 48d08455e318..3b803843a784 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 53602731e562..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kontactinterface-20.08.1:5 >=kde-apps/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/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/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kaddressbook
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kontactinterface-20.08.1:5 >=kde-apps/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/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/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kaddressbook-20.08.2 b/metadata/md5-cache/kde-apps/kaddressbook-20.08.2
new file mode 100644
index 000000000000..0512f611865b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/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/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kaddressbook
+IUSE=telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/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/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-20.08.2:5 || ( 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.08.2/src/kaddressbook-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78357330be4bd66f8bbf5027b773c6da
diff --git a/metadata/md5-cache/kde-apps/kajongg-20.04.3 b/metadata/md5-cache/kde-apps/kajongg-20.04.3
index d04f62251d77..28170f4e2566 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d61030c0bce5..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=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-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/ki18n-5.72.0:5 python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kajongg
-IUSE=python_single_target_python3_7 python_single_target_python3_8 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-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] ) dev-db/sqlite:3 >=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/ki18n-5.72.0:5 python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) >=kde-apps/libkmahjongg-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	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/kajongg-20.08.2 b/metadata/md5-cache/kde-apps/kajongg-20.08.2
new file mode 100644
index 000000000000..b87614623432
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=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-db/sqlite:3 >=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.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_9(-)] >=dev-python/twisted-16.6.0[python_targets_python3_9(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kajongg
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-db/sqlite:3 >=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.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_9(-)] >=dev-python/twisted-16.6.0[python_targets_python3_9(-)] ) >=kde-apps/libkmahjongg-20.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kajongg-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=b3297b178c246925b7722906efe97bc9
diff --git a/metadata/md5-cache/kde-apps/kalarm-20.04.3 b/metadata/md5-cache/kde-apps/kalarm-20.04.3
index 94d23e1daba8..abd3c672ef10 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f46befd7a4f2..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kalarm https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kalarm-20.08.2 b/metadata/md5-cache/kde-apps/kalarm-20.08.2
new file mode 100644
index 000000000000..320b9ffef6ae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake 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=>=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.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kalarmcal-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kalarm https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kalarmcal-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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.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.2/src/kalarm-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6acc42163999..eab3a6920b54 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 933cf8ae406d..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kholidays-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 test? ( >=dev-qt/qtdbus-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kholidays-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kalarmcal-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cea4c5ff1745cf79c147c061fb1190a9
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-20.08.2 b/metadata/md5-cache/kde-apps/kalarmcal-20.08.2
new file mode 100644
index 000000000000..3544c6cba7c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kholidays-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 test? ( >=dev-qt/qtdbus-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kholidays-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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kalarmcal-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 82f8801da99c..091e167beaf0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6e81d0955b64..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=MathML-based 2D and 3D graph calculator by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kalgebra-20.08.2 b/metadata/md5-cache/kde-apps/kalgebra-20.08.2
new file mode 100644
index 000000000000..baf6d4026959
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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 readline? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=MathML-based 2D and 3D graph calculator by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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 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.2/src/kalgebra-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8ff29f0f9168..637b81851f0e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1e1044e1afea..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Periodic table of the elements
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kalzium-20.08.2 b/metadata/md5-cache/kde-apps/kalzium-20.08.2
new file mode 100644
index 000000000000..953f49d8194c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Periodic table of the elements
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kalzium-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8798152c67de..51edc23c22a2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index cf068e3584b9..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=>=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:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kamera
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kamera-20.08.2 b/metadata/md5-cache/kde-apps/kamera-20.08.2
new file mode 100644
index 000000000000..561a543cf6f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=>=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:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kamera
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kamera-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 aa403b229113..4c58d13fced8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 33aeb94d71aa..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=dev-libs/glib:2 >=dev-qt/qtdeclarative-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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/purpose-5.72.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kamoso https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/purpose-5.72.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.72.0:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] || ( 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/release-service/20.08.1/src/kamoso-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a9d87707daf259d604ec3bf7f5d6389
diff --git a/metadata/md5-cache/kde-apps/kamoso-20.08.2 b/metadata/md5-cache/kde-apps/kamoso-20.08.2
new file mode 100644
index 000000000000..041f30196902
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=dev-libs/glib:2 >=dev-qt/qtdeclarative-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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/purpose-5.72.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kamoso https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/purpose-5.72.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.72.0:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] || ( 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/release-service/20.08.2/src/kamoso-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4972e45e77c2..853426fddb5d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 17e139c97391..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game based on anagrams of words
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kanagram-20.08.2 b/metadata/md5-cache/kde-apps/kanagram-20.08.2
new file mode 100644
index 000000000000..10ebcc97660b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game based on anagrams of words
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.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.2/src/kanagram-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 39e9d2a4f70c..f51e24685eae 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f9a28c399c6d..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kapman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kapman-20.08.2 b/metadata/md5-cache/kde-apps/kapman-20.08.2
new file mode 100644
index 000000000000..c6a3e55fe4a1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kapman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kapman-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d9909d50a1bd..09099519ac6c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 85d7801a4ca6..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Shell script to create the necessary framework to develop KDE applications
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kapptemplate-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f032f3f183785482babbfab25354b8d
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-20.08.2 b/metadata/md5-cache/kde-apps/kapptemplate-20.08.2
new file mode 100644
index 000000000000..fa16f545dd85
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Shell script to create the necessary framework to develop KDE applications
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kapptemplate
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+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/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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kapptemplate-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f2f448a880a6..843d6a6409db 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6696a791edc7..000000000000
--- a/metadata/md5-cache/kde-apps/kate-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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/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/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/kio-5.72.0:5 >=kde-frameworks/kitemviews-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.72.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.72.0:5 ) plasma? ( >=kde-frameworks/plasma-5.72.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.72.0:5 ) sql? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kwallet-5.72.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Multi-document editor with network transparency, Plasma integration and more
-EAPI=7
-HOMEPAGE=https://kate-editor.org/ https://kde.org/applications/utilities/org.kde.kate
-IUSE=activities +filebrowser lspclient +projects plasma +snippets sql telemetry test debug +handbook test
-KEYWORDS=~amd64 ~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/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/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/kio-5.72.0:5 >=kde-frameworks/kitemviews-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.72.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.72.0:5 ) plasma? ( >=kde-frameworks/plasma-5.72.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.72.0:5 ) sql? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kwallet-5.72.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) || ( 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.08.1/src/kate-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0936fc88769cc9bbf1e3ca8137dc990b
diff --git a/metadata/md5-cache/kde-apps/kate-20.08.2 b/metadata/md5-cache/kde-apps/kate-20.08.2
new file mode 100644
index 000000000000..a38468859775
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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/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/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/kio-5.72.0:5 >=kde-frameworks/kitemviews-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.72.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.72.0:5 ) plasma? ( >=kde-frameworks/plasma-5.72.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.72.0:5 ) sql? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kwallet-5.72.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Multi-document editor with network transparency, Plasma integration and more
+EAPI=7
+HOMEPAGE=https://kate-editor.org/ https://kde.org/applications/en/kate
+IUSE=activities +filebrowser lspclient +projects plasma +snippets sql telemetry test debug +handbook test
+KEYWORDS=~amd64 ~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/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/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/kio-5.72.0:5 >=kde-frameworks/kitemviews-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/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 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.72.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.72.0:5 ) plasma? ( >=kde-frameworks/plasma-5.72.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.72.0:5 ) sql? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kwallet-5.72.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) || ( 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.08.2/src/kate-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8a88af5ba5677c4369260066c4f775d
diff --git a/metadata/md5-cache/kde-apps/katomic-20.04.3 b/metadata/md5-cache/kde-apps/katomic-20.04.3
index 830d44a6bbe6..a49795ea4701 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 75600c1da2d6..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.katomic https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/katomic-20.08.2 b/metadata/md5-cache/kde-apps/katomic-20.08.2
new file mode 100644
index 000000000000..8743c43f67bd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.katomic https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/katomic-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 7750021a446c..af3ced18049f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index dd2b67df6cf5..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kbackup
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kbackup-20.08.2 b/metadata/md5-cache/kde-apps/kbackup-20.08.2
new file mode 100644
index 000000000000..eaa5abc95f8d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kbackup
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kbackup-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a88be49a2815..afff18307e2c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 26e948f622d7..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game of hide and seek played on a grid of boxes
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kblackbox
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kblackbox-20.08.2 b/metadata/md5-cache/kde-apps/kblackbox-20.08.2
new file mode 100644
index 000000000000..d6831216ed32
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game of hide and seek played on a grid of boxes
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kblackbox
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kblackbox-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 03d3cf1b6dda..8a0da6b64639 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 303efe0ea581..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single-player Tetris-like KDE game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kblocks
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kblocks-20.08.2 b/metadata/md5-cache/kde-apps/kblocks-20.08.2
new file mode 100644
index 000000000000..fbeb8118816c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Single-player Tetris-like KDE game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kblocks
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kblocks-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 81e04429e46a..17e1b09af1db 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 263019af339e..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kbounce https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kbounce-20.08.2 b/metadata/md5-cache/kde-apps/kbounce-20.08.2
new file mode 100644
index 000000000000..e882bfafcf37
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kbounce https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kbounce-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 644735406789..a22a2ea871f5 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 65596075c701..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breakout-like game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kbreakout https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kbreakout-20.08.2 b/metadata/md5-cache/kde-apps/kbreakout-20.08.2
new file mode 100644
index 000000000000..140be1470821
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Breakout-like game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kbreakout https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kbreakout-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 5823a9276344..bc5e12342751 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index fd1815138596..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kbruch https://edu.kde.org/kbruch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kbruch-20.08.2 b/metadata/md5-cache/kde-apps/kbruch-20.08.2
new file mode 100644
index 000000000000..b2143f8ba96c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kbruch https://edu.kde.org/kbruch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kbruch-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 90c7407bd2eb..a79629c0b99b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index de286206255d..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kcachegrind-20.08.2 b/metadata/md5-cache/kde-apps/kcachegrind-20.08.2
new file mode 100644
index 000000000000..c7347f73144d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~arm64 ~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 >=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.2/src/kcachegrind-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 7f96919e69ce..598e42747ac2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 9ea886b34349..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=dev-libs/gmp:0= dev-libs/mpfr:0= >=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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE calculator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcalc-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b91d6a6c443c745c5c805c6c2c84a8e
diff --git a/metadata/md5-cache/kde-apps/kcalc-20.08.2 b/metadata/md5-cache/kde-apps/kcalc-20.08.2
new file mode 100644
index 000000000000..521d7c9f4ee8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=dev-libs/gmp:0= dev-libs/mpfr:0= >=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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE calculator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=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/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kcalc-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 611405d7becc..0693dd338652 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b457c2397833..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-frameworks/kcalendarcore-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/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-frameworks/kcalendarcore-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/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kcalutils-20.08.2 b/metadata/md5-cache/kde-apps/kcalutils-20.08.2
new file mode 100644
index 000000000000..51d97348b292
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kcalutils-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 37f274eb904f..ff05d47e10bf 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b62292f59b31..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE character selection utility
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcharselect https://utils.kde.org/projects/kcharselect/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kcharselect-20.08.2 b/metadata/md5-cache/kde-apps/kcharselect-20.08.2
new file mode 100644
index 000000000000..96981c8e1f97
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE character selection utility
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcharselect https://utils.kde.org/projects/kcharselect/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kcharselect-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e534bc25703d..f5fa7f685ddd 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 51106660c63b..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE color selector/editor
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.kcolorchooser
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kcolorchooser-20.08.2 b/metadata/md5-cache/kde-apps/kcolorchooser-20.08.2
new file mode 100644
index 000000000000..ad7961ecdb04
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE color selector/editor
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.kcolorchooser
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kcolorchooser-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 89e71da56d1b..4068f826515e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index aec9941bf6a2..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Task Scheduler
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcron
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kcron-20.08.2 b/metadata/md5-cache/kde-apps/kcron-20.08.2
new file mode 100644
index 000000000000..c9e414b6fb36
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Task Scheduler
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcron
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kcron-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 23a4f6aed391..59fae952f728 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-apps-meta-20.08.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-20.08.1
deleted file mode 100644
index e3e766e2b7bb..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdeadmin-meta-20.08.1:5 >=kde-apps/kdecore-meta-20.08.1:5 >=kde-apps/kdeedu-meta-20.08.1:5 >=kde-apps/kdegames-meta-20.08.1:5 >=kde-apps/kdegraphics-meta-20.08.1:5 >=kde-apps/kdemultimedia-meta-20.08.1:5 >=kde-apps/kdenetwork-meta-20.08.1:5 >=kde-apps/kdeutils-meta-20.08.1:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-20.08.1:5 ) pim? ( >=kde-apps/kdepim-meta-20.08.1:5 ) sdk? ( >=kde-apps/kdesdk-meta-20.08.1:5 )
-SLOT=5
-_md5_=273fa38a70218b09e2f117bf0c2267e9
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-20.08.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-20.08.2
new file mode 100644
index 000000000000..257948ceefa4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdeadmin-meta-20.08.2:5 >=kde-apps/kdecore-meta-20.08.2:5 >=kde-apps/kdeedu-meta-20.08.2:5 >=kde-apps/kdegames-meta-20.08.2:5 >=kde-apps/kdegraphics-meta-20.08.2:5 >=kde-apps/kdemultimedia-meta-20.08.2:5 >=kde-apps/kdenetwork-meta-20.08.2:5 >=kde-apps/kdeutils-meta-20.08.2:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-20.08.2:5 ) pim? ( >=kde-apps/kdepim-meta-20.08.2:5 ) sdk? ( >=kde-apps/kdesdk-meta-20.08.2:5 )
+SLOT=5
+_md5_=273fa38a70218b09e2f117bf0c2267e9
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 bc3b97de99ae..d5988c487c78 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 8f63695b0055..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kdoctools-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Development Scripts
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-scripts-20.08.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.2
new file mode 100644
index 000000000000..bae3e99c03d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kdoctools-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Development Scripts
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kde-dev-scripts-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4d84a2bc8fe1..e68fcc6f8be1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f773423e12a5..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Development Utilities
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kde-dev-utils-20.08.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.2
new file mode 100644
index 000000000000..c563c48c001e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Development Utilities
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kde-dev-utils-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kde-meta-20.08.1 b/metadata/md5-cache/kde-apps/kde-meta-20.08.1
deleted file mode 100644
index 4fb02028b941..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-20.08.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-20.08.1:5 kde-plasma/plasma-meta:5
-SLOT=5
-_md5_=08772390993209074781ebe8b8ddc33e
diff --git a/metadata/md5-cache/kde-apps/kde-meta-20.08.2 b/metadata/md5-cache/kde-apps/kde-meta-20.08.2
new file mode 100644
index 000000000000..b8959eff15fb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-20.08.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-20.08.2:5 kde-plasma/plasma-meta:5
+SLOT=5
+_md5_=08772390993209074781ebe8b8ddc33e
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.1
deleted file mode 100644
index e4b1b74670fc..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-20.08.1:5 >=kde-apps/kmousetool-20.08.1:5 >=kde-apps/kmouth-20.08.1:5
-SLOT=5
-_md5_=763771959cbd518b51694c3518f6f1f9
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.2
new file mode 100644
index 000000000000..579aef78d975
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-20.08.2:5 >=kde-apps/kmousetool-20.08.2:5 >=kde-apps/kmouth-20.08.2:5
+SLOT=5
+_md5_=763771959cbd518b51694c3518f6f1f9
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.1
deleted file mode 100644
index 5b41eb5a5dc4..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-20.08.1:5 cron? ( >=kde-apps/kcron-20.08.1:5 )
-SLOT=5
-_md5_=5e265c8beb044db24ac09bfe8049048a
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.2
new file mode 100644
index 000000000000..ead5f2b43ce6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-20.08.2:5 cron? ( >=kde-apps/kcron-20.08.2:5 )
+SLOT=5
+_md5_=5e265c8beb044db24ac09bfe8049048a
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdebase-meta-20.08.1
deleted file mode 100644
index 859ae76d7c4e..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-20.08.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-20.08.1:5 kde-plasma/plasma-meta
-SLOT=5
-_md5_=d04f6be9d9a899c0f8766f2e07c3799a
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdebase-meta-20.08.2
new file mode 100644
index 000000000000..1f111d71f07a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-20.08.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-20.08.2:5 kde-plasma/plasma-meta
+SLOT=5
+_md5_=d04f6be9d9a899c0f8766f2e07c3799a
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-20.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-20.04.3
index 2d8df81511a2..da2c74709aff 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 00cadecec1ea..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kdebugsettings
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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/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/kitemviews-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdebugsettings-20.08.2 b/metadata/md5-cache/kde-apps/kdebugsettings-20.08.2
new file mode 100644
index 000000000000..f07b83ec962a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kdebugsettings
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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/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/kitemviews-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
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kdebugsettings-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kdecore-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdecore-meta-20.08.1
deleted file mode 100644
index f784b9700518..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+handbook +share +thumbnail +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-20.08.1:5 >=kde-apps/kdialog-20.08.1:5 >=kde-apps/keditbookmarks-20.08.1:5 >=kde-apps/kfind-20.08.1:5 >=kde-apps/konsole-20.08.1:5 >=kde-apps/kwrite-20.08.1:5 handbook? ( >=kde-apps/khelpcenter-20.08.1:5 ) webengine? ( || ( www-client/falkon >=kde-apps/konqueror-20.08.1:5 ) ) share? ( kde-frameworks/purpose:5 ) thumbnail? ( >=kde-apps/ffmpegthumbs-20.08.1:5 >=kde-apps/thumbnailers-20.08.1:5 )
-SLOT=5
-_md5_=6b7cacd6fdb5ffc4dc0300a084654f5e
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdecore-meta-20.08.2
new file mode 100644
index 000000000000..6d4ed6265d73
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+handbook +share +thumbnail +webengine
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-20.08.2:5 >=kde-apps/kdialog-20.08.2:5 >=kde-apps/keditbookmarks-20.08.2:5 >=kde-apps/kfind-20.08.2:5 >=kde-apps/konsole-20.08.2:5 >=kde-apps/kwrite-20.08.2:5 handbook? ( >=kde-apps/khelpcenter-20.08.2:5 ) webengine? ( || ( www-client/falkon >=kde-apps/konqueror-20.08.2:5 ) ) share? ( kde-frameworks/purpose:5 ) thumbnail? ( >=kde-apps/ffmpegthumbs-20.08.2:5 >=kde-apps/thumbnailers-20.08.2:5 )
+SLOT=5
+_md5_=6b7cacd6fdb5ffc4dc0300a084654f5e
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 beda158b1ea9..557be16cbc8d 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index de474752d1c1..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-20.08.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-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	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/kdeedu-data-20.08.2 b/metadata/md5-cache/kde-apps/kdeedu-data-20.08.2
new file mode 100644
index 000000000000..9152c9c51821
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-20.08.2
@@ -0,0 +1,11 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kdeedu-data-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kdeedu-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-20.08.1
deleted file mode 100644
index 20f09076f4df..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=7
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-20.08.1:5 >=kde-apps/artikulate-20.08.1:5 >=kde-apps/blinken-20.08.1:5 >=kde-apps/cantor-20.08.1:5 >=kde-apps/kalzium-20.08.1:5 >=kde-apps/kanagram-20.08.1:5 >=kde-apps/kbruch-20.08.1:5 >=kde-apps/kdeedu-data-20.08.1:5 >=kde-apps/kgeography-20.08.1:5 >=kde-apps/khangman-20.08.1:5 >=kde-apps/kig-20.08.1:5 >=kde-apps/kiten-20.08.1:5 >=kde-apps/klettres-20.08.1:5 >=kde-apps/kmplot-20.08.1:5 >=kde-apps/kqtquickcharts-20.08.1:5 >=kde-apps/ktouch-20.08.1:5 >=kde-apps/kturtle-20.08.1:5 >=kde-apps/kwordquiz-20.08.1:5 >=kde-apps/libkeduvocdocument-20.08.1:5 >=kde-apps/marble-20.08.1:5 >=kde-apps/minuet-20.08.1:5 >=kde-apps/rocs-20.08.1:5 >=kde-apps/step-20.08.1:5 webengine? ( >=kde-apps/kalgebra-20.08.1:5 >=kde-apps/parley-20.08.1:5 )
-SLOT=5
-_md5_=de3c47b76c05f2290b7779513cc0dc6e
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-20.08.2
new file mode 100644
index 000000000000..5fbeb612c137
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=7
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-20.08.2:5 >=kde-apps/artikulate-20.08.2:5 >=kde-apps/blinken-20.08.2:5 >=kde-apps/cantor-20.08.2:5 >=kde-apps/kalzium-20.08.2:5 >=kde-apps/kanagram-20.08.2:5 >=kde-apps/kbruch-20.08.2:5 >=kde-apps/kdeedu-data-20.08.2:5 >=kde-apps/kgeography-20.08.2:5 >=kde-apps/khangman-20.08.2:5 >=kde-apps/kig-20.08.2:5 >=kde-apps/kiten-20.08.2:5 >=kde-apps/klettres-20.08.2:5 >=kde-apps/kmplot-20.08.2:5 >=kde-apps/kqtquickcharts-20.08.2:5 >=kde-apps/ktouch-20.08.2:5 >=kde-apps/kturtle-20.08.2:5 >=kde-apps/kwordquiz-20.08.2:5 >=kde-apps/libkeduvocdocument-20.08.2:5 >=kde-apps/marble-20.08.2:5 >=kde-apps/minuet-20.08.2:5 >=kde-apps/rocs-20.08.2:5 >=kde-apps/step-20.08.2:5 webengine? ( >=kde-apps/kalgebra-20.08.2:5 >=kde-apps/parley-20.08.2:5 )
+SLOT=5
+_md5_=de3c47b76c05f2290b7779513cc0dc6e
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdegames-meta-20.08.1
deleted file mode 100644
index 75f948269dc4..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=7
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-20.08.1:5 >=kde-apps/bovo-20.08.1:5 >=kde-apps/granatier-20.08.1:5 >=kde-apps/kapman-20.08.1:5 >=kde-apps/katomic-20.08.1:5 >=kde-apps/kblackbox-20.08.1:5 >=kde-apps/kblocks-20.08.1:5 >=kde-apps/kbounce-20.08.1:5 >=kde-apps/kbreakout-20.08.1:5 >=kde-apps/kdiamond-20.08.1:5 >=kde-apps/kfourinline-20.08.1:5 >=kde-apps/kgoldrunner-20.08.1:5 >=kde-apps/kigo-20.08.1:5 >=kde-apps/killbots-20.08.1:5 >=kde-apps/kiriki-20.08.1:5 >=kde-apps/kjumpingcube-20.08.1:5 >=kde-apps/klickety-20.08.1:5 >=kde-apps/klines-20.08.1:5 >=kde-apps/kmahjongg-20.08.1:5 >=kde-apps/kmines-20.08.1:5 >=kde-apps/knavalbattle-20.08.1:5 >=kde-apps/knetwalk-20.08.1:5 >=kde-apps/knights-20.08.1:5 >=kde-apps/kolf-20.08.1:5 >=kde-apps/kollision-20.08.1:5 >=kde-apps/konquest-20.08.1:5 >=kde-apps/kpat-20.08.1:5 >=kde-apps/kreversi-20.08.1:5 >=kde-apps/kshisen-20.08.1:5 >=kde-apps/ksirk-20.08.1:5 >=kde-apps/ksnakeduel-20.08.1:5 >=kde-apps/kspaceduel-20.08.1:5 >=kde-apps/ksquares-20.08.1:5 >=kde-apps/ktuberling-20.08.1:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-apps/libkmahjongg-20.08.1:5 >=kde-apps/lskat-20.08.1:5 >=kde-apps/palapeli-20.08.1:5 >=kde-apps/picmi-20.08.1:5 opengl? ( >=kde-apps/ksudoku-20.08.1:5 >=kde-apps/kubrick-20.08.1:5 ) python? ( >=kde-apps/kajongg-20.08.1:5 )
-SLOT=5
-_md5_=11a9b133139c04a40596bba31adc2dc9
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdegames-meta-20.08.2
new file mode 100644
index 000000000000..d14c76f7018d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=7
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-20.08.2:5 >=kde-apps/bovo-20.08.2:5 >=kde-apps/granatier-20.08.2:5 >=kde-apps/kapman-20.08.2:5 >=kde-apps/katomic-20.08.2:5 >=kde-apps/kblackbox-20.08.2:5 >=kde-apps/kblocks-20.08.2:5 >=kde-apps/kbounce-20.08.2:5 >=kde-apps/kbreakout-20.08.2:5 >=kde-apps/kdiamond-20.08.2:5 >=kde-apps/kfourinline-20.08.2:5 >=kde-apps/kgoldrunner-20.08.2:5 >=kde-apps/kigo-20.08.2:5 >=kde-apps/killbots-20.08.2:5 >=kde-apps/kiriki-20.08.2:5 >=kde-apps/kjumpingcube-20.08.2:5 >=kde-apps/klickety-20.08.2:5 >=kde-apps/klines-20.08.2:5 >=kde-apps/kmahjongg-20.08.2:5 >=kde-apps/kmines-20.08.2:5 >=kde-apps/knavalbattle-20.08.2:5 >=kde-apps/knetwalk-20.08.2:5 >=kde-apps/knights-20.08.2:5 >=kde-apps/kolf-20.08.2:5 >=kde-apps/kollision-20.08.2:5 >=kde-apps/konquest-20.08.2:5 >=kde-apps/kpat-20.08.2:5 >=kde-apps/kreversi-20.08.2:5 >=kde-apps/kshisen-20.08.2:5 >=kde-apps/ksirk-20.08.2:5 >=kde-apps/ksnakeduel-20.08.2:5 >=kde-apps/kspaceduel-20.08.2:5 >=kde-apps/ksquares-20.08.2:5 >=kde-apps/ktuberling-20.08.2:5 >=kde-apps/libkdegames-20.08.2:5 >=kde-apps/libkmahjongg-20.08.2:5 >=kde-apps/lskat-20.08.2:5 >=kde-apps/palapeli-20.08.2:5 >=kde-apps/picmi-20.08.2:5 opengl? ( >=kde-apps/ksudoku-20.08.2:5 >=kde-apps/kubrick-20.08.2:5 ) python? ( >=kde-apps/kajongg-20.08.2:5 )
+SLOT=5
+_md5_=11a9b133139c04a40596bba31adc2dc9
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.1
deleted file mode 100644
index 3b54cc605ced..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics
-IUSE=scanner
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-20.08.1:5 >=kde-apps/kamera-20.08.1:5 >=kde-apps/kcolorchooser-20.08.1:5 >=kde-apps/kdegraphics-mobipocket-20.08.1:5 >=kde-apps/kipi-plugins-20.08.1:5 >=kde-apps/kolourpaint-20.08.1:5 >=kde-apps/kruler-20.08.1:5 >=kde-apps/libkdcraw-20.08.1:5 >=kde-apps/libkexiv2-20.08.1:5 >=kde-apps/libkipi-20.08.1:5 >=kde-apps/okular-20.08.1:5 >=kde-apps/spectacle-20.08.1:5 >=kde-apps/svgpart-20.08.1:5 >=kde-apps/thumbnailers-20.08.1:5 scanner? ( >=kde-apps/libksane-20.08.1:5 )
-SLOT=5
-_md5_=e791782e46f48c8d614c533751b714f2
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.2
new file mode 100644
index 000000000000..af8d4aacb6db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics
+IUSE=scanner
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-20.08.2:5 >=kde-apps/kamera-20.08.2:5 >=kde-apps/kcolorchooser-20.08.2:5 >=kde-apps/kdegraphics-mobipocket-20.08.2:5 >=kde-apps/kipi-plugins-20.08.2:5 >=kde-apps/kolourpaint-20.08.2:5 >=kde-apps/kruler-20.08.2:5 >=kde-apps/libkdcraw-20.08.2:5 >=kde-apps/libkexiv2-20.08.2:5 >=kde-apps/libkipi-20.08.2:5 >=kde-apps/okular-20.08.2:5 >=kde-apps/spectacle-20.08.2:5 >=kde-apps/svgpart-20.08.2:5 >=kde-apps/thumbnailers-20.08.2:5 scanner? ( >=kde-apps/libksane-20.08.2:5 )
+SLOT=5
+_md5_=e791782e46f48c8d614c533751b714f2
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 113de11c9451..ef97e4969de6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 9f7d68988e91..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 thumbnail? ( >=kde-frameworks/kio-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdegraphics-mobipocket-20.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.2
new file mode 100644
index 000000000000..22f5e65460c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 thumbnail? ( >=kde-frameworks/kio-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kdegraphics-mobipocket-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kdemultimedia-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.1
deleted file mode 100644
index 6af339a38219..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-20.08.1:5 >=kde-apps/juk-20.08.1:5 >=kde-apps/kdenlive-20.08.1:5 >=kde-apps/kmix-20.08.1:5 >=kde-apps/kwave-20.08.1:5 >=media-sound/elisa-20.08.1:5 cdrom? ( >=kde-apps/audiocd-kio-20.08.1:5 >=kde-apps/k3b-20.08.1:5 >=kde-apps/libkcddb-20.08.1:5 >=kde-apps/libkcompactdisc-20.08.1:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-20.08.1:5 ) gstreamer? ( >=kde-apps/kamoso-20.08.1:5 )
-SLOT=5
-_md5_=668947870605e84e699f5b19b6a84024
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.2
new file mode 100644
index 000000000000..03a7d5ccaae9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg gstreamer
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-20.08.2:5 >=kde-apps/juk-20.08.2:5 >=kde-apps/kdenlive-20.08.2:5 >=kde-apps/kmix-20.08.2:5 >=kde-apps/kwave-20.08.2:5 >=media-sound/elisa-20.08.2:5 cdrom? ( >=kde-apps/audiocd-kio-20.08.2:5 >=kde-apps/k3b-20.08.2:5 >=kde-apps/libkcddb-20.08.2:5 >=kde-apps/libkcompactdisc-20.08.2:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-20.08.2:5 ) gstreamer? ( >=kde-apps/kamoso-20.08.2:5 )
+SLOT=5
+_md5_=668947870605e84e699f5b19b6a84024
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 ce276275547d..2adf56ef548e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1a113b3a7bad..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=SMB filesharing config module for systemsettings
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.kdenetwork_filesharing
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdenetwork-filesharing-20.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.2
new file mode 100644
index 000000000000..08c7910deb10
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=SMB filesharing config module for systemsettings
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.kdenetwork_filesharing
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kdenetwork-filesharing-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kdenetwork-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.1
deleted file mode 100644
index 90b0daf9f72a..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=dropbox +webengine
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-20.08.1:5 >=kde-apps/kget-20.08.1:5 >=kde-apps/krdc-20.08.1:5 >=kde-apps/kopete-20.08.1:5 >=kde-apps/krfb-20.08.1:5 >=kde-apps/zeroconf-ioslave-20.08.1:5 >=kde-misc/kdeconnect-20.08.1:5 >=kde-misc/kio-gdrive-20.08.1:5 dropbox? ( >=kde-apps/dolphin-plugins-dropbox-20.08.1:5 ) webengine? ( >=kde-apps/plasma-telepathy-meta-20.08.1:5 )
-SLOT=5
-_md5_=469a75dc563dbbce04cce41669c34fa0
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.2
new file mode 100644
index 000000000000..911c36faacb7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=dropbox +webengine
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-20.08.2:5 >=kde-apps/kget-20.08.2:5 >=kde-apps/krdc-20.08.2:5 >=kde-apps/kopete-20.08.2:5 >=kde-apps/krfb-20.08.2:5 >=kde-apps/zeroconf-ioslave-20.08.2:5 >=kde-misc/kdeconnect-20.08.2:5 >=kde-misc/kio-gdrive-20.08.2:5 dropbox? ( >=kde-apps/dolphin-plugins-dropbox-20.08.2:5 ) webengine? ( >=kde-apps/plasma-telepathy-meta-20.08.2:5 )
+SLOT=5
+_md5_=469a75dc563dbbce04cce41669c34fa0
diff --git a/metadata/md5-cache/kde-apps/kdenlive-20.04.3 b/metadata/md5-cache/kde-apps/kdenlive-20.04.3
index ffe44a5e21c1..4ca7e177a8f0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b4baa6c08d02..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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=dev-cpp/rttr >=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[gles2-only=] >=dev-qt/qtmultimedia-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/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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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/solid-5.72.0:5 >=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=7
-HOMEPAGE=https://kdenlive.org/en/
-IUSE=freesound gles2-only semantic-desktop share v4l test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/rttr >=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[gles2-only=] >=dev-qt/qtmultimedia-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/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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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/solid-5.72.0:5 >=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.14.2:5 media-video/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdenlive-20.08.2 b/metadata/md5-cache/kde-apps/kdenlive-20.08.2
new file mode 100644
index 000000000000..8d4135c41ef0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-20.08.2
@@ -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.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=dev-cpp/rttr >=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[gles2-only=] >=dev-qt/qtmultimedia-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/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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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/solid-5.72.0:5 >=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=7
+HOMEPAGE=https://kdenlive.org/en/
+IUSE=freesound gles2-only semantic-desktop share v4l test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/rttr >=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[gles2-only=] >=dev-qt/qtmultimedia-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/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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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/solid-5.72.0:5 >=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.72.0:5 ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.14.2:5 media-video/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kdenlive-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 901c2111762d..89799f30dfc7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 96d9a49a5bed..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/incidenceeditor-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kimap-20.08.1:5 >=kde-apps/kitinerary-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/kpkpass-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/libktnef-20.08.1:5 >=kde-apps/mailcommon-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-20.08.1:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=importwizard markdown test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/incidenceeditor-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kimap-20.08.1:5 >=kde-apps/kitinerary-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/kpkpass-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/libktnef-20.08.1:5 >=kde-apps/mailcommon-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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-20.08.1:5 ) markdown? ( app-text/discount ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-addons-20.08.2 b/metadata/md5-cache/kde-apps/kdepim-addons-20.08.2
new file mode 100644
index 000000000000..4d805928fa95
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kitinerary-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpkpass-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/libktnef-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.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/kcontacts-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/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-20.08.2:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=importwizard markdown test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kitinerary-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpkpass-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/libktnef-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.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/kcontacts-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/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-20.08.2:5 ) markdown? ( app-text/discount ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kdepim-addons-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6ada614a3959060c7e7a60880cdcd74
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 7ffe94958a6b..87bd2a531ede 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2312d48f3331..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-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/grantleetheme-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-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/grantleetheme-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 || ( 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.08.1/src/kdepim-apps-libs-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7950bd32b5ca1b9e7d40020061d47296
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.2
new file mode 100644
index 000000000000..048c28981071
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/prison-5.72.0:5 || ( 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.08.2/src/kdepim-apps-libs-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdepim-meta-20.08.1
deleted file mode 100644
index 3ef6d42a3a16..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=bogofilter clamav spamassassin
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadiconsole-20.08.1:5 >=kde-apps/akonadi-calendar-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-import-wizard-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/akregator-20.08.1:5 >=kde-apps/calendarjanitor-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/grantlee-editor-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/incidenceeditor-20.08.1:5 >=kde-apps/kaddressbook-20.08.1:5 >=kde-apps/kalarm-20.08.1:5 >=kde-apps/kalarmcal-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kdepim-addons-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kdepim-runtime-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kimap-20.08.1:5 >=kde-apps/kitinerary-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kleopatra-20.08.1:5 >=kde-apps/kmail-20.08.1:5 >=kde-apps/kmail-account-wizard-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmbox-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/knotes-20.08.1:5 >=kde-apps/konsolekalendar-20.08.1:5 >=kde-apps/kontact-20.08.1:5 >=kde-apps/kontactinterface-20.08.1:5 >=kde-apps/korganizer-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/kpkpass-20.08.1:5 >=kde-apps/ksmtp-20.08.1:5 >=kde-apps/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkgapi-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/libktnef-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/mailimporter-20.08.1:5 >=kde-apps/mbox-importer-20.08.1:5 >=kde-apps/messagelib-20.08.1:5 >=kde-apps/pim-data-exporter-20.08.1:5 >=kde-apps/pim-sieve-editor-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
-SLOT=5
-_md5_=2bafaf99d8496e54ec2f0bb0b37e662f
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdepim-meta-20.08.2
new file mode 100644
index 000000000000..b0e4ee8e928c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=bogofilter clamav spamassassin
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadiconsole-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-import-wizard-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/akregator-20.08.2:5 >=kde-apps/calendarjanitor-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/grantlee-editor-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kaddressbook-20.08.2:5 >=kde-apps/kalarm-20.08.2:5 >=kde-apps/kalarmcal-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kdepim-addons-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kdepim-runtime-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kitinerary-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kleopatra-20.08.2:5 >=kde-apps/kmail-20.08.2:5 >=kde-apps/kmail-account-wizard-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmbox-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/knotes-20.08.2:5 >=kde-apps/konsolekalendar-20.08.2:5 >=kde-apps/kontact-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/korganizer-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/kpkpass-20.08.2:5 >=kde-apps/ksmtp-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkgapi-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/libktnef-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/mailimporter-20.08.2:5 >=kde-apps/mbox-importer-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pim-data-exporter-20.08.2:5 >=kde-apps/pim-sieve-editor-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
+SLOT=5
+_md5_=2bafaf99d8496e54ec2f0bb0b37e662f
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 d8e2fdc2922b..ed522dc1dc1d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6a91d2a7d8ed..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt 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-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtnetworkauth-5.14.2:5 >=dev-qt/qtspeech-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/akonadi-20.08.1:5 >=kde-apps/akonadi-calendar-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-notes-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/kimap-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmbox-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkgapi-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/kdav-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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 >=dev-qt/qtxmlpatterns-5.14.2:5 test? ( >=kde-apps/kimap-20.08.1:5[test] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtnetworkauth-5.14.2:5 >=dev-qt/qtspeech-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/akonadi-20.08.1:5 >=kde-apps/akonadi-calendar-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-notes-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/kimap-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmbox-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkgapi-20.08.1:5 >=kde-apps/pimcommon-20.08.1: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/kdav-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdepim-runtime-20.08.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.2
new file mode 100644
index 000000000000..ba7ab6ce32ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt 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-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtnetworkauth-5.14.2:5 >=dev-qt/qtspeech-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/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/kalarmcal-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmbox-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkgapi-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/kdav-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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 >=dev-qt/qtxmlpatterns-5.14.2:5 test? ( >=kde-apps/kimap-20.08.2:5[test] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtnetworkauth-5.14.2:5 >=dev-qt/qtspeech-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/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/kalarmcal-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmbox-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkgapi-20.08.2:5 >=kde-apps/pimcommon-20.08.2: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/kdav-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kdepim-runtime-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 251012a7a93a..5994141a1508 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 69be05455b53..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-kioslaves-20.08.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.2
new file mode 100644
index 000000000000..8d38a9d576c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kdesdk-kioslaves-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-20.08.1
deleted file mode 100644
index d53b6ceb0eb6..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development
-IUSE=cvs git mercurial python subversion +webkit
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kapptemplate-20.08.1:5 >=kde-apps/kcachegrind-20.08.1:5 >=kde-apps/kde-dev-scripts-20.08.1:5 >=kde-apps/kde-dev-utils-20.08.1:5 >=kde-apps/kdesdk-kioslaves-20.08.1:5 >=kde-apps/kdesdk-thumbnailers-20.08.1:5 >=kde-apps/kompare-20.08.1:5 >=kde-apps/kross-interpreters-20.08.1:5 >=kde-apps/libkomparediff2-20.08.1:5 >=kde-apps/poxml-20.08.1:5 cvs? ( >=kde-apps/cervisia-20.08.1:5 ) git? ( >=kde-apps/dolphin-plugins-git-20.08.1:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-20.08.1:5 ) python? ( >=kde-apps/lokalize-20.08.1:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-20.08.1:5 ) webkit? ( >=kde-apps/umbrello-20.08.1:5 )
-SLOT=5
-_md5_=9d8b3a1606c06ccae8749971af3a44de
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-20.08.2
new file mode 100644
index 000000000000..bc7a98f71b11
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development
+IUSE=cvs git mercurial python subversion +webkit
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kapptemplate-20.08.2:5 >=kde-apps/kcachegrind-20.08.2:5 >=kde-apps/kde-dev-scripts-20.08.2:5 >=kde-apps/kde-dev-utils-20.08.2:5 >=kde-apps/kdesdk-kioslaves-20.08.2:5 >=kde-apps/kdesdk-thumbnailers-20.08.2:5 >=kde-apps/kompare-20.08.2:5 >=kde-apps/kross-interpreters-20.08.2:5 >=kde-apps/libkomparediff2-20.08.2:5 >=kde-apps/poxml-20.08.2:5 cvs? ( >=kde-apps/cervisia-20.08.2:5 ) git? ( >=kde-apps/dolphin-plugins-git-20.08.2:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-20.08.2:5 ) python? ( >=kde-apps/lokalize-20.08.2:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-20.08.2:5 ) webkit? ( >=kde-apps/umbrello-20.08.2:5 )
+SLOT=5
+_md5_=9d8b3a1606c06ccae8749971af3a44de
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 3bb4c37a5f4c..4eb354ea55d6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 71e38e8c88e5..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdesdk-thumbnailers-20.08.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.2
new file mode 100644
index 000000000000..4ec2171e9ce1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kdesdk-thumbnailers-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kdeutils-meta-20.08.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-20.08.1
deleted file mode 100644
index 4f5abb50ab7e..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities https://utils.kde.org
-IUSE=7zip cups floppy gpg lrz rar +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=app-cdr/dolphin-plugins-mountiso-20.08.1:5 >=kde-apps/ark-20.08.1:5 >=kde-apps/filelight-20.08.1:5 >=kde-apps/kate-20.08.1:5 >=kde-apps/kbackup-20.08.1:5 >=kde-apps/kcalc-20.08.1:5 >=kde-apps/kcharselect-20.08.1:5 >=kde-apps/kdebugsettings-20.08.1:5 >=kde-apps/kdf-20.08.1:5 >=kde-apps/kteatime-20.08.1:5 >=kde-apps/ktimer-20.08.1:5 >=kde-apps/kwalletmanager-20.08.1:5 >=kde-apps/sweeper-20.08.1:5 >=kde-apps/yakuake-20.08.1:5 cups? ( >=kde-apps/print-manager-20.08.1:5 ) floppy? ( >=kde-apps/kfloppy-20.08.1:5 ) gpg? ( >=kde-apps/kgpg-20.08.1:5 ) webengine? ( >=kde-apps/kimagemapeditor-20.08.1:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
-SLOT=5
-_md5_=88dbb15e4cb9a809e26548c79ca53338
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-20.08.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-20.08.2
new file mode 100644
index 000000000000..40ab58b9687d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities https://utils.kde.org
+IUSE=7zip cups floppy gpg lrz rar +webengine
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=app-cdr/dolphin-plugins-mountiso-20.08.2:5 >=kde-apps/ark-20.08.2:5 >=kde-apps/filelight-20.08.2:5 >=kde-apps/kate-20.08.2:5 >=kde-apps/kbackup-20.08.2:5 >=kde-apps/kcalc-20.08.2:5 >=kde-apps/kcharselect-20.08.2:5 >=kde-apps/kdebugsettings-20.08.2:5 >=kde-apps/kdf-20.08.2:5 >=kde-apps/kteatime-20.08.2:5 >=kde-apps/ktimer-20.08.2:5 >=kde-apps/kwalletmanager-20.08.2:5 >=kde-apps/sweeper-20.08.2:5 >=kde-apps/yakuake-20.08.2:5 cups? ( >=kde-apps/print-manager-20.08.2:5 ) floppy? ( >=kde-apps/kfloppy-20.08.2:5 ) gpg? ( >=kde-apps/kgpg-20.08.2:5 ) webengine? ( >=kde-apps/kimagemapeditor-20.08.2:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
+SLOT=5
+_md5_=88dbb15e4cb9a809e26548c79ca53338
diff --git a/metadata/md5-cache/kde-apps/kdf-20.04.3 b/metadata/md5-cache/kde-apps/kdf-20.04.3
index 63c4115253f2..f966ce9906ba 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 9c3ca1907cff..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE free disk space utility
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.kdf https://utils.kde.org/projects/kdf/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdf-20.08.2 b/metadata/md5-cache/kde-apps/kdf-20.08.2
new file mode 100644
index 000000000000..8d2a3d766826
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE free disk space utility
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.kdf https://utils.kde.org/projects/kdf/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kdf-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 258dcb2131f6..e17942811321 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 9871c622867c..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kdialog
-IUSE=X debug
-KEYWORDS=~amd64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdialog-20.08.2 b/metadata/md5-cache/kde-apps/kdialog-20.08.2
new file mode 100644
index 000000000000..ec7c6fec426a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kdialog
+IUSE=X debug
+KEYWORDS=~amd64 ~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 >=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.2/src/kdialog-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f0ba2c1e9db2..b23d7a0bcb52 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 35ec2eeaab59..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single player three-in-a-row game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kdiamond https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kdiamond-20.08.2 b/metadata/md5-cache/kde-apps/kdiamond-20.08.2
new file mode 100644
index 000000000000..7b3a79041ab6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Single player three-in-a-row game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kdiamond https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/kdiamond-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 60aecb3cca02..cf5a605e0a61 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 85a38654f2ad..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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/kbookmarks-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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~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/kbookmarks-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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/keditbookmarks-20.08.2 b/metadata/md5-cache/kde-apps/keditbookmarks-20.08.2
new file mode 100644
index 000000000000..044057adce66
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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/kbookmarks-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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~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/kbookmarks-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/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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/keditbookmarks-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9ffc3d8e5ea2..e3ee80e8af88 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7cc489acad12..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfind
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kfind-20.08.2 b/metadata/md5-cache/kde-apps/kfind-20.08.2
new file mode 100644
index 000000000000..885f40969cd7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfind
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kfind-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d51adf3e8ec9..e36215e05f55 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ba9df1c94abe..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfloppy https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kfloppy-20.08.2 b/metadata/md5-cache/kde-apps/kfloppy-20.08.2
new file mode 100644
index 000000000000..e1daa9c8e4c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfloppy https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~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 >=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.2/src/kfloppy-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a29691017c69..5a2b12410cf9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e661ef8d76f1..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE four-in-a-row game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kfourinline https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kfourinline-20.08.2 b/metadata/md5-cache/kde-apps/kfourinline-20.08.2
new file mode 100644
index 000000000000..3d2b0c0cc8d8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE four-in-a-row game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kfourinline https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kfourinline-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6da1377d9274..8d5aa645b1d3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 3c815096d098..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Geography learning tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kgeography-20.08.2 b/metadata/md5-cache/kde-apps/kgeography-20.08.2
new file mode 100644
index 000000000000..32d09187a634
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Geography learning tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kgeography-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 fbd68ce7ab01..90fcc6f6fab0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 92455f742167..000000000000
--- a/metadata/md5-cache/kde-apps/kget-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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-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/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-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/kparts-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/solid-5.72.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.16.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced download manager by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.kget
-IUSE=bittorrent gpg kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-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/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-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/kparts-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/solid-5.72.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.16.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kget-20.08.2 b/metadata/md5-cache/kde-apps/kget-20.08.2
new file mode 100644
index 000000000000..bce073846c9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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-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/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-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/kparts-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/solid-5.72.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( kde-plasma/libkworkspace:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced download manager by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/en/kget
+IUSE=bittorrent gpg kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+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/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-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/kparts-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/solid-5.72.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( kde-plasma/libkworkspace:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kget-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=260d0653c46b14d3535e7cb15a721e06
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-20.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-20.04.3
index 39bc1509c8b4..8434d69d7914 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7dc38ac296c1..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kgoldrunner https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kgoldrunner-20.08.2 b/metadata/md5-cache/kde-apps/kgoldrunner-20.08.2
new file mode 100644
index 000000000000..f1e03b8b4a0c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kgoldrunner https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/kgoldrunner-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0002a01e9b0e..565e06d7d8de 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d6529c6a0f46..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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/gpgme dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kgpg https://utils.kde.org/projects/kgpg/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kgpg-20.08.2 b/metadata/md5-cache/kde-apps/kgpg-20.08.2
new file mode 100644
index 000000000000..44c48412901b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2:5 >=kde-apps/akonadi-contacts-20.08.2: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/gpgme dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kgpg https://utils.kde.org/projects/kgpg/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2:5 >=kde-apps/akonadi-contacts-20.08.2: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.2/src/kgpg-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a28b3108a63e..fca6f63f5a2b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f0c4bae4532d..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical hangman game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.khangman https://edu.kde.org/khangman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/khangman-20.08.2 b/metadata/md5-cache/kde-apps/khangman-20.08.2
new file mode 100644
index 000000000000..8367da3f0f22
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classical hangman game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.khangman https://edu.kde.org/khangman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.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.2/src/khangman-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 1eb50c1f29e5..7eb53938019a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 73f31e74f0c4..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to read documentation for KDE Plasma, Applications, Utilities
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.Help https://userbase.kde.org/KHelpCenter
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/khelpcenter-20.08.2 b/metadata/md5-cache/kde-apps/khelpcenter-20.08.2
new file mode 100644
index 000000000000..486dd7cca440
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application to read documentation for KDE Plasma, Applications, Utilities
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.Help https://userbase.kde.org/KHelpCenter
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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.2/src/khelpcenter-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0c1c23db17bf..4a0f3208003e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 88391f61f7e4..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.1
+++ /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.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kpimtextedit-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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for managing identitites
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ 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/kpimtextedit-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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kidentitymanagement-20.08.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.2
new file mode 100644
index 000000000000..04a18f48b136
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.2
@@ -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.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kpimtextedit-20.08.2: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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for managing identitites
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ 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/kpimtextedit-20.08.2: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/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
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kidentitymanagement-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 853925af1e4c..28a1039f65e4 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 432b5c703ab6..000000000000
--- a/metadata/md5-cache/kde-apps/kig-20.08.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=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-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/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/kiconthemes-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/kxmlgui-5.72.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.14.2:5 ) scripting? ( python_single_target_python3_7? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) ) >=kde-frameworks/ktexteditor-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
-IUSE=geogebra scripting python_single_target_python3_7 python_single_target_python3_8 debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-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] ) >=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/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/kiconthemes-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/kxmlgui-5.72.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.14.2:5 ) scripting? ( python_single_target_python3_7? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	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/kig-20.08.2 b/metadata/md5-cache/kde-apps/kig-20.08.2
new file mode 100644
index 000000000000..c1d63553bbfe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-20.08.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=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-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/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/kiconthemes-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/kxmlgui-5.72.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.14.2:5 ) scripting? ( python_single_target_python3_7? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) >=kde-frameworks/ktexteditor-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
+IUSE=geogebra scripting python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=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/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/kiconthemes-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/kxmlgui-5.72.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.14.2:5 ) scripting? ( python_single_target_python3_7? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kig-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=6a134471b00678c87e845b543af37e3d
diff --git a/metadata/md5-cache/kde-apps/kigo-20.04.3 b/metadata/md5-cache/kde-apps/kigo-20.04.3
index d11f653fd1e8..9a9845730e02 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 8fb85f88f7ea..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Go game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kigo
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kigo-20.08.2 b/metadata/md5-cache/kde-apps/kigo-20.08.2
new file mode 100644
index 000000000000..f02c8f78771f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Go game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kigo
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kigo-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8b53bf751430..924966642bfe 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7bc139b936fa..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.killbots
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/killbots-20.08.2 b/metadata/md5-cache/kde-apps/killbots-20.08.2
new file mode 100644
index 000000000000..8802b622a7aa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.killbots
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/killbots-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 512651797f56..df36329899a0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a45c1e7fca4e..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Generator of HTML image maps
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kimagemapeditor
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kimagemapeditor-20.08.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.2
new file mode 100644
index 000000000000..39b02dec43ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Generator of HTML image maps
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kimagemapeditor
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kimagemapeditor-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 07dbe3813d41..51a93373d9b4 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 57e3f97e4b19..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.1:5 >=kde-frameworks/kcodecs-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 test? ( >=dev-qt/qtnetwork-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kimap/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.1:5 >=kde-frameworks/kcodecs-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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kimap-20.08.2 b/metadata/md5-cache/kde-apps/kimap-20.08.2
new file mode 100644
index 000000000000..0746808a897f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/kcodecs-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 test? ( >=dev-qt/qtnetwork-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kimap/html/index.html
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-frameworks/kcodecs-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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kimap-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f6fc9a56b524..27f921195d98 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 8212d9e98983..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( dev-util/gperf ) 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=>=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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5[bzip2(+),lzma(+)] >=kde-frameworks/kbookmarks-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/kdnssd-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/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 activities? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kactivities-5.72.0:5 >=kde-frameworks/kactivities-stats-5.72.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=7
-HOMEPAGE=https://invent.kde.org/network/kio-extras
-IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
-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/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-frameworks/karchive-5.72.0:5[bzip2(+),lzma(+)] >=kde-frameworks/kbookmarks-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/kdnssd-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/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 activities? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kactivities-5.72.0:5 >=kde-frameworks/kactivities-stats-5.72.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kio-extras-20.08.2 b/metadata/md5-cache/kde-apps/kio-extras-20.08.2
new file mode 100644
index 000000000000..0155ad496483
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=man? ( dev-util/gperf ) 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=>=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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5[bzip2(+),lzma(+)] >=kde-frameworks/kbookmarks-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/kdnssd-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/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 activities? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kactivities-5.72.0:5 >=kde-frameworks/kactivities-stats-5.72.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=7
+HOMEPAGE=https://invent.kde.org/network/kio-extras
+IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
+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/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-frameworks/karchive-5.72.0:5[bzip2(+),lzma(+)] >=kde-frameworks/kbookmarks-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/kdnssd-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/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 activities? ( >=dev-qt/qtsql-5.14.2:5 >=kde-frameworks/kactivities-5.72.0:5 >=kde-frameworks/kactivities-stats-5.72.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kio-extras-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 046acfe13093..2ad50fc0857e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c80c3a3582d2..000000000000
--- a/metadata/md5-cache/kde-apps/kipi-plugins-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-apps/libkipi-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/ki18n-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 flashexport? ( >=kde-frameworks/karchive-5.72.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.72.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=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=Plugins for the KDE Image Plugin Interface
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins
-IUSE=flashexport mediawiki +remotestorage vkontakte debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-apps/libkipi-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/ki18n-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 flashexport? ( >=kde-frameworks/karchive-5.72.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.72.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kipi-plugins-20.08.2 b/metadata/md5-cache/kde-apps/kipi-plugins-20.08.2
new file mode 100644
index 000000000000..9020b6dc01ae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kipi-plugins-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-apps/libkipi-20.08.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/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 flashexport? ( >=kde-frameworks/karchive-5.72.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.72.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=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=Plugins for the KDE Image Plugin Interface
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins
+IUSE=flashexport mediawiki +remotestorage vkontakte debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-apps/libkipi-20.08.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/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 flashexport? ( >=kde-frameworks/karchive-5.72.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.72.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kipi-plugins-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 ec564a97753d..7c56b6a90820 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 221aa20b5d51..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=An addictive and fun dice game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kiriki https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kiriki-20.08.2 b/metadata/md5-cache/kde-apps/kiriki-20.08.2
new file mode 100644
index 000000000000..dddde0842aba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kiconthemes-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=An addictive and fun dice game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kiriki https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kiriki-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8e654738159c..11571b61eca1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 023869777019..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kiten https://edu.kde.org/kiten/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kiten-20.08.2 b/metadata/md5-cache/kde-apps/kiten-20.08.2
new file mode 100644
index 000000000000..34ef0a38de76
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kiten https://edu.kde.org/kiten/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~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 >=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.2/src/kiten-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3f6022dcf915..d87c6ea7ea72 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 36b549b0a818..000000000000
--- a/metadata/md5-cache/kde-apps/kitinerary-20.08.1
+++ /dev/null
@@ -1,16 +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.72.0: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 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpkpass-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Data Model and Extraction System for Travel Reservation information
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=+barcode pdf test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpkpass-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kitinerary-20.08.2 b/metadata/md5-cache/kde-apps/kitinerary-20.08.2
new file mode 100644
index 000000000000..0959fbd6c50c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kitinerary-20.08.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.72.0: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 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpkpass-20.08.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Data Model and Extraction System for Travel Reservation information
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=+barcode pdf test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpkpass-20.08.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=test? ( pdf )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kitinerary-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9c369d9bc2a5..3ebf7dbd086e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d36a94f6e628..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tactical one or two player game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kjumpingcube https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kjumpingcube-20.08.2 b/metadata/md5-cache/kde-apps/kjumpingcube-20.08.2
new file mode 100644
index 000000000000..7bfda0304879
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tactical one or two player game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kjumpingcube https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kjumpingcube-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 71d33d6b76e9..bdd284252f8d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 34dac2a6cef0..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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-nds/openldap dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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-nds/openldap || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kldap-20.08.2 b/metadata/md5-cache/kde-apps/kldap-20.08.2
new file mode 100644
index 000000000000..857af335d159
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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-nds/openldap dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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-nds/openldap || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kldap-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 95946ec84d1d..b4e1b116d00a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 80e1a66bbd07..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=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/kmime-20.08.1:5 >=kde-apps/libkleo-20.08.1: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/kitemmodels-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 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=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/kmime-20.08.1:5 >=kde-apps/libkleo-20.08.1: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/kitemmodels-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 >=kde-frameworks/kxmlgui-5.72.0:5 >=app-crypt/gnupg-2.1 app-crypt/paperkey || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kleopatra-20.08.2 b/metadata/md5-cache/kde-apps/kleopatra-20.08.2
new file mode 100644
index 000000000000..9d37c7164a0a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=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/kmime-20.08.2:5 >=kde-apps/libkleo-20.08.2: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/kitemmodels-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 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=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/kmime-20.08.2:5 >=kde-apps/libkleo-20.08.2: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/kitemmodels-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 >=kde-frameworks/kxmlgui-5.72.0:5 >=app-crypt/gnupg-2.1 app-crypt/paperkey || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kleopatra-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3b90595370c1..6f71324ff843 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e42bf910bbf0..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Alphabet learning application
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.klettres https://edu.kde.org/klettres/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/klettres-20.08.2 b/metadata/md5-cache/kde-apps/klettres-20.08.2
new file mode 100644
index 000000000000..6b01faa596c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Alphabet learning application
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.klettres https://edu.kde.org/klettres/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/klettres-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 56e3c760fafd..d710af7bc0fb 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 66dacb81a0fe..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=An adaptation of the Clickomania game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.klickety https://games.kde.org/game.php?game=klickety
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/klickety-20.08.2 b/metadata/md5-cache/kde-apps/klickety-20.08.2
new file mode 100644
index 000000000000..83ddd90c6175
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=An adaptation of the Clickomania game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.klickety https://games.kde.org/game.php?game=klickety
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/klickety-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e21b8264fb2a..a360912d95a6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7333f1746d00..000000000000
--- a/metadata/md5-cache/kde-apps/klines-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.klines https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/klines-20.08.2 b/metadata/md5-cache/kde-apps/klines-20.08.2
new file mode 100644
index 000000000000..9588de97a095
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.klines https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/klines-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 5c0620267f29..ce1c49f5d3fe 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 44da99e7c8d1..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE screen magnifier
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmag
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmag-20.08.2 b/metadata/md5-cache/kde-apps/kmag-20.08.2
new file mode 100644
index 000000000000..9b423d89c020
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE screen magnifier
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmag
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kmag-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a39e9f3a9bd2..404d1da14772 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index fd838a11fbf1..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A tile matching game for one or two players
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kmahjongg https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmahjongg-20.08.2 b/metadata/md5-cache/kde-apps/kmahjongg-20.08.2
new file mode 100644
index 000000000000..69b279c924ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2:5 >=kde-apps/libkmahjongg-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A tile matching game for one or two players
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kmahjongg https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/libkmahjongg-20.08.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/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.2/src/kmahjongg-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6320aef94910..04e52d19dcf1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 62d37425c1d8..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt test? ( >=kde-apps/akonadi-20.08.1:5[tools] ) 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-crypt/gpgme-1.11.1[cxx,qt5] >=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 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=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/akonadi-search-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/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/libktnef-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/messagelib-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kbookmarks-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/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/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kldap-20.08.1:5 test? ( >=kde-apps/akonadi-20.08.1:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kmail2 https://kontact.kde.org/components/kmail.html
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=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 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=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/akonadi-search-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/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/libktnef-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/messagelib-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kbookmarks-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/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/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-20.08.1:5 >=kde-apps/kmail-account-wizard-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-20.08.2 b/metadata/md5-cache/kde-apps/kmail-20.08.2
new file mode 100644
index 000000000000..d0b4b6d3a1ea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt test? ( >=kde-apps/akonadi-20.08.2:5[tools] ) 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-crypt/gpgme-1.11.1[cxx,qt5] >=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 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/libktnef-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kbookmarks-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/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/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kldap-20.08.2:5 test? ( >=kde-apps/akonadi-20.08.2:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kmail2 https://kontact.kde.org/components/kmail.html
+IUSE=telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=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 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/libktnef-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kbookmarks-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/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/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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/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 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-20.08.2:5 >=kde-apps/kmail-account-wizard-20.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kmail-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d616083fa1f10976d929135fb0498b15
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 e9f634718f98..5162433d7bef 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 29bef7a2f45a..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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-apps/akonadi-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcodecs-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/ki18n-5.72.0:5 >=kde-frameworks/kio-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/kross-5.72.0:5 >=kde-frameworks/kservice-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ 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 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcodecs-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/ki18n-5.72.0:5 >=kde-frameworks/kio-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/kross-5.72.0:5 >=kde-frameworks/kservice-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmail-account-wizard-20.08.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.2
new file mode 100644
index 000000000000..dfa43ea5a405
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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-apps/akonadi-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcodecs-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/ki18n-5.72.0:5 >=kde-frameworks/kio-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/kross-5.72.0:5 >=kde-frameworks/kservice-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ 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 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcodecs-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/ki18n-5.72.0:5 >=kde-frameworks/kio-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/kross-5.72.0:5 >=kde-frameworks/kservice-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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kmail-account-wizard-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f7f974301596..65b67ca4d64d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index affc392b4c81..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/ksmtp-20.08.1:5 >=kde-apps/libkgapi-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/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 test? ( >=kde-frameworks/ktextwidgets-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Mail transport service
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/akonadi-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/ksmtp-20.08.1:5 >=kde-apps/libkgapi-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/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 || ( 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/release-service/20.08.1/src/kmailtransport-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1458f72395b4e97af5d56e457ccc27a
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-20.08.2 b/metadata/md5-cache/kde-apps/kmailtransport-20.08.2
new file mode 100644
index 000000000000..2fd420d26c16
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/ksmtp-20.08.2:5 >=kde-apps/libkgapi-20.08.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/kio-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 test? ( >=kde-frameworks/ktextwidgets-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Mail transport service
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+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/akonadi-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/ksmtp-20.08.2:5 >=kde-apps/libkgapi-20.08.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/kio-5.72.0:5 >=kde-frameworks/kwallet-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
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kmailtransport-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6eb2879e1a41..38844bc5fc8e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 3a0ed5a54090..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-20.08.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmbox-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c81e97d34c5eed3e592c4f0a0048d5c
diff --git a/metadata/md5-cache/kde-apps/kmbox-20.08.2 b/metadata/md5-cache/kde-apps/kmbox-20.08.2
new file mode 100644
index 000000000000..5300a4144885
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-20.08.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-20.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kmbox-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e42842de23a6..ef6040d531de 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 31722ef35eae..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmime-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4832c0ad3a9ef36a56a8f138964ca0ff
diff --git a/metadata/md5-cache/kde-apps/kmime-20.08.2 b/metadata/md5-cache/kde-apps/kmime-20.08.2
new file mode 100644
index 000000000000..c145f5dd1a14
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kmime-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 03b844cb068f..0050bc986b98 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 52c1f9f98201..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classic mine sweeper game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kmines https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmines-20.08.2 b/metadata/md5-cache/kde-apps/kmines-20.08.2
new file mode 100644
index 000000000000..e171d05a56f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classic mine sweeper game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kmines https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/kmines-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b8bad78df3e1..fef9e0447697 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7fce92649be3..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Volume control gui based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kmix
-IUSE=alsa plasma pulseaudio debug +handbook
-KEYWORDS=~amd64 ~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/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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmix-20.08.2 b/metadata/md5-cache/kde-apps/kmix-20.08.2
new file mode 100644
index 000000000000..d1b018a30efd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Volume control gui based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kmix
+IUSE=alsa plasma pulseaudio debug +handbook
+KEYWORDS=~amd64 ~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/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.2/src/kmix-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 73335aa5d5f0..68a8fb49e40b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 22a2a7f2aa44..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 x11-base/xorg-proto x11-libs/libXext x11-libs/libXt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmousetool
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmousetool-20.08.2 b/metadata/md5-cache/kde-apps/kmousetool-20.08.2
new file mode 100644
index 000000000000..5ff292061bf3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 x11-base/xorg-proto x11-libs/libXext x11-libs/libXt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmousetool
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kmousetool-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 33a074eb334a..989d5653b9c6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2fb6f31e800e..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmouth
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmouth-20.08.2 b/metadata/md5-cache/kde-apps/kmouth-20.08.2
new file mode 100644
index 000000000000..4967e264e6f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmouth
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kmouth-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 1263122f7bac..cc9c8699b67b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2f55fe218363..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Mathematical function plotter
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kmplot https://edu.kde.org/kmplot/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kmplot-20.08.2 b/metadata/md5-cache/kde-apps/kmplot-20.08.2
new file mode 100644
index 000000000000..6fafc1748ad5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Mathematical function plotter
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kmplot https://edu.kde.org/kmplot/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kmplot-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 99e3626a5be9..a3104fc0b096 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 135bcf5e5f4d..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Battleship clone by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.knavalbattle https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/knavalbattle-20.08.2 b/metadata/md5-cache/kde-apps/knavalbattle-20.08.2
new file mode 100644
index 000000000000..ecec7722f43c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Battleship clone by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.knavalbattle https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2/src/knavalbattle-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 5efcbf6cdeed..12bab4a88b47 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b2e1cc714109..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=dev-qt/qtdeclarative-5.14.2:5 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.knetwalk https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/knetwalk-20.08.2 b/metadata/md5-cache/kde-apps/knetwalk-20.08.2
new file mode 100644
index 000000000000..f808a9c0dfdc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.knetwalk https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+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/libkdegames-20.08.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/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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/knetwalk-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6a69365c11ff..2127d36e3096 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 97d28ba77636..000000000000
--- a/metadata/md5-cache/kde-apps/knights-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple chess board based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.knights
-IUSE=speech debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/knights-20.08.2 b/metadata/md5-cache/kde-apps/knights-20.08.2
new file mode 100644
index 000000000000..801d54202d67
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knights-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple chess board based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.knights
+IUSE=speech debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/knights-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 2a2c25456ec8..19388fa9c655 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index fe0d22b0c15b..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=dev-libs/grantlee:5 dev-libs/libxslt >=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 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kontactinterface-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/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/kcontacts-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/kglobalaccel-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-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/kparts-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 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Note taking application
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.knotes https://kontact.kde.org/components/knotes.html
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=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 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kontactinterface-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/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/kcontacts-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/kglobalaccel-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-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/kparts-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 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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/knotes-20.08.2 b/metadata/md5-cache/kde-apps/knotes-20.08.2
new file mode 100644
index 000000000000..53094d6a97ff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=dev-libs/grantlee:5 dev-libs/libxslt >=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 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kcontacts-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/kglobalaccel-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-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/kparts-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 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Note taking application
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.knotes https://kontact.kde.org/components/knotes.html
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=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 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kcalendarcore-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/kcontacts-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/kglobalaccel-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemmodels-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/kparts-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 x11-libs/libX11 >=kde-apps/kdepim-runtime-20.08.2:5 || ( 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.08.2/src/knotes-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e65c64b10b4c..b3d27987c1cc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c59b79a9d939..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Minigolf game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kolf https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kolf-20.08.2 b/metadata/md5-cache/kde-apps/kolf-20.08.2
new file mode 100644
index 000000000000..f020f6ba419f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Minigolf game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kolf https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/kolf-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 36991ccca318..34410553dca4 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a18e0bcc2cc3..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple ball dodging game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kollision https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kollision-20.08.2 b/metadata/md5-cache/kde-apps/kollision-20.08.2
new file mode 100644
index 000000000000..702c050e3e54
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple ball dodging game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kollision https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/kollision-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a3b5d305ae7a..e418c1b47a01 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2dedcbfda4db..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Paint Program by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.kolourpaint
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kolourpaint-20.08.2 b/metadata/md5-cache/kde-apps/kolourpaint-20.08.2
new file mode 100644
index 000000000000..eef2c86fcc2f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Paint Program by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.kolourpaint
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.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.2/src/kolourpaint-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 101a754699cb..b931588ea7bf 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 40057908a9b0..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A program to view the differences between files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kompare-20.08.2 b/metadata/md5-cache/kde-apps/kompare-20.08.2
new file mode 100644
index 000000000000..7d9c7067e2b9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A program to view the differences between files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2/src/kompare-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 ec75aba2575c..ecf5e55bb671 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c02a852bc937..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kdesu-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/kitemviews-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/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 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.konqueror
-IUSE=activities speech X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kdesu-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/kitemviews-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/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 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/konqueror-20.08.2 b/metadata/md5-cache/kde-apps/konqueror-20.08.2
new file mode 100644
index 000000000000..f2f7dc0783cc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kdesu-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/kitemviews-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/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 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.konqueror
+IUSE=activities speech X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kdesu-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/kitemviews-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/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 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/konqueror-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=81b542235fafd08bbb54b8c4804e87fb
diff --git a/metadata/md5-cache/kde-apps/konquest-20.04.3 b/metadata/md5-cache/kde-apps/konquest-20.04.3
index 0c5a423cadc0..f72401744521 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 80ef0178e1ca..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.konquest https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/konquest-20.08.2 b/metadata/md5-cache/kde-apps/konquest-20.08.2
new file mode 100644
index 000000000000..b4ed1b8c20fb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.konquest https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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 >=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.2/src/konquest-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b35fb8294918..d52f952a7e2d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6f0a55a9f1ef..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kbookmarks-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/kguiaddons-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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/kpty-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 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE's terminal emulator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kbookmarks-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/kguiaddons-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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/kpty-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 X? ( x11-libs/libX11 ) || ( 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.08.1/src/konsole-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f308d1122af7c6a5a246034ced63b20e
diff --git a/metadata/md5-cache/kde-apps/konsole-20.08.2 b/metadata/md5-cache/kde-apps/konsole-20.08.2
new file mode 100644
index 000000000000..d2bc1026a584
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kbookmarks-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/kguiaddons-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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/kpty-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 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE's terminal emulator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kbookmarks-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/kguiaddons-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-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/kpty-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 X? ( x11-libs/libX11 ) || ( 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.08.2/src/konsole-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f971ff85c949..4dae12d46657 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2048e966571c..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/konsolekalendar-20.08.2 b/metadata/md5-cache/kde-apps/konsolekalendar-20.08.2
new file mode 100644
index 000000000000..40403aada654
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kcalutils-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kcalutils-20.08.2: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.2/src/akonadi-calendar-tools-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9d227fad1e21..4813fc63c75f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 60d8a73654ec..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=7
-HOMEPAGE=https://kontact.kde.org/ https://kde.org/applications/en/office/org.kde.kontact
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kontact-20.08.2 b/metadata/md5-cache/kde-apps/kontact-20.08.2
new file mode 100644
index 000000000000..9fedca029555
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/pimcommon-20.08.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=7
+HOMEPAGE=https://kontact.kde.org/ https://kde.org/applications/en/office/org.kde.kontact
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/pimcommon-20.08.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/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.2/src/kontact-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 556772fe14cc..998658bd5231 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 04ee2863728b..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kontactinterface-20.08.2 b/metadata/md5-cache/kde-apps/kontactinterface-20.08.2
new file mode 100644
index 000000000000..740d34773366
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kontactinterface-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9d01f1d95637..4d3f2cac1ef2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ee263d18aa98..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=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 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kemoticons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-frameworks/kdnssd-5.72.0:5 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.kopete https://userbase.kde.org/Kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=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 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kemoticons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-frameworks/kdnssd-5.72.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( >=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kopete-20.08.2 b/metadata/md5-cache/kde-apps/kopete-20.08.2
new file mode 100644
index 000000000000..88615871f615
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=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 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kemoticons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-frameworks/kdnssd-5.72.0:5 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.kopete https://userbase.kde.org/Kopete
+IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=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 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdelibs4support-5.72.0:5 >=kde-frameworks/kemoticons-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-frameworks/kdnssd-5.72.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( >=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
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kopete-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 930d858a0b4b..fd7088d264f1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c1d1746adb70..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-20.08.1:5[tools] ) 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=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/incidenceeditor-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/libkdepim-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcalendarcore-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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 telemetry? ( dev-libs/kuserfeedback:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=dev-qt/designer-5.14.2:5 >=kde-apps/kldap-20.08.1:5 test? ( >=kde-apps/akonadi-20.08.1:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.korganizer
-IUSE=telemetry X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/eventviews-20.08.1:5 >=kde-apps/incidenceeditor-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/libkdepim-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcalendarcore-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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 telemetry? ( dev-libs/kuserfeedback:5 ) 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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/korganizer-20.08.2 b/metadata/md5-cache/kde-apps/korganizer-20.08.2
new file mode 100644
index 000000000000..c6bc699a5ee4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-apps/akonadi-20.08.2:5[tools] ) 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=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kcalendarcore-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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 telemetry? ( dev-libs/kuserfeedback:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=dev-qt/designer-5.14.2:5 >=kde-apps/kldap-20.08.2:5 test? ( >=kde-apps/akonadi-20.08.2:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.korganizer
+IUSE=telemetry X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-calendar-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-notes-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/eventviews-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kontactinterface-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kcalendarcore-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/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/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/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 telemetry? ( dev-libs/kuserfeedback:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-20.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/korganizer-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9d514c7c6039..2b8eb66bd321 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 85738d7bb352..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE patience game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kpat https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kpat-20.08.2 b/metadata/md5-cache/kde-apps/kpat-20.08.2
new file mode 100644
index 000000000000..7d88c80f773c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE patience game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kpat https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kpat-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f9add207cb0a..bfc28e2cecc5 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 086b31479494..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-20.08.1
+++ /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 ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtspeech-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/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 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 test? ( >=kde-frameworks/ktextwidgets-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Extended text editor for PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtspeech-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/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 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kpimtextedit-20.08.2 b/metadata/md5-cache/kde-apps/kpimtextedit-20.08.2
new file mode 100644
index 000000000000..3220a309f62c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-20.08.2
@@ -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 ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtspeech-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/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 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 test? ( >=kde-frameworks/ktextwidgets-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Extended text editor for PIM applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtspeech-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/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 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kpimtextedit-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4cb4cbd53080..9af07063eecf 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 84cbde907606..000000000000
--- a/metadata/md5-cache/kde-apps/kpkpass-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to deal with Apple Wallet pass files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/kontact/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 !<kde-apps/kdepim-addons-18.07.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/release-service/20.08.1/src/kpkpass-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=867b3ecff6e00c16d4e9ccf867a63d09
diff --git a/metadata/md5-cache/kde-apps/kpkpass-20.08.2 b/metadata/md5-cache/kde-apps/kpkpass-20.08.2
new file mode 100644
index 000000000000..081b042961c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpkpass-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to deal with Apple Wallet pass files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/kontact/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 !<kde-apps/kdepim-addons-18.07.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/release-service/20.08.2/src/kpkpass-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 35ddad4c062d..ebc4ca9fd132 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 98172cc7c9c9..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0: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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kqtquickcharts-20.08.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.2
new file mode 100644
index 000000000000..fc7116be48da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0: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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kqtquickcharts-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 ed4af0535081..b66c096d23e7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b5643afe2849..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.krdc
-IUSE=+rdp +vnc debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/krdc-20.08.2 b/metadata/md5-cache/kde-apps/krdc-20.08.2
new file mode 100644
index 000000000000..36fdce28b424
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.krdc
+IUSE=+rdp +vnc debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/krdc-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 413d590e8c18..2e8c196ae581 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index dac864878895..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Board game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kreversi https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kreversi-20.08.2 b/metadata/md5-cache/kde-apps/kreversi-20.08.2
new file mode 100644
index 000000000000..2c8a4a2ae1e9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Board game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kreversi https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kreversi-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 697ecf731471..08e4d4a81d61 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 8b0e4f922e27..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.krfb
-IUSE=wayland debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/krfb-20.08.2 b/metadata/md5-cache/kde-apps/krfb-20.08.2
new file mode 100644
index 000000000000..0d7dc24cdbd6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.krfb
+IUSE=wayland debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/krfb-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 162576a446e4..05ceb59e0fdd 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 484a9d5c9152..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kross-5.72.0:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+python ruby debug +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kross-5.72.0:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	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/kross-interpreters-20.08.2 b/metadata/md5-cache/kde-apps/kross-interpreters-20.08.2
new file mode 100644
index 000000000000..922ee697f38f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kross-5.72.0:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+python ruby debug +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kross-5.72.0:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kross-interpreters-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 bb6e757c2406..3efd00ccbc2b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 01f946d63da8..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen ruler for Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.kruler
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kruler-20.08.2 b/metadata/md5-cache/kde-apps/kruler-20.08.2
new file mode 100644
index 000000000000..2f6ceef15b24
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Screen ruler for Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.kruler
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kruler-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e8a7171ba357..8951b9e6c4b1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 94064bc3efff..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Solitaire-like game played using the standard set of Mahjong tiles
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kshisen https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kshisen-20.08.2 b/metadata/md5-cache/kde-apps/kshisen-20.08.2
new file mode 100644
index 000000000000..7887f2b6dd94
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.2:5 >=kde-apps/libkmahjongg-20.08.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Solitaire-like game played using the standard set of Mahjong tiles
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kshisen https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.2:5 >=kde-apps/libkmahjongg-20.08.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/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.2/src/kshisen-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 92b81133af6f..0cc52f0b7361 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 40523371406a..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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-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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Port of the board game risk
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksirk https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ksirk-20.08.2 b/metadata/md5-cache/kde-apps/ksirk-20.08.2
new file mode 100644
index 000000000000..f81b8ba0727b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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-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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Port of the board game risk
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksirk https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/ksirk-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d524e3adb06f..8b3f0f8d94bb 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d37dd8858f36..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.14.2:5 >=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ksmtp-20.08.2 b/metadata/md5-cache/kde-apps/ksmtp-20.08.2
new file mode 100644
index 000000000000..1cd326a5c116
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.14.2:5 >=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
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/ksmtp-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 fbd5a060e333..63e04981651d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index baa5a26040dc..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Tron game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksnakeduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ksnakeduel-20.08.2 b/metadata/md5-cache/kde-apps/ksnakeduel-20.08.2
new file mode 100644
index 000000000000..0f15923c2ca8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Tron game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksnakeduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/ksnakeduel-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0da8d6fa06f1..019e5af13d87 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 02a3eb6b122d..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Space Game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kspaceduel https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kspaceduel-20.08.2 b/metadata/md5-cache/kde-apps/kspaceduel-20.08.2
new file mode 100644
index 000000000000..656571fb949b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Space Game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kspaceduel https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kspaceduel-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6d83386863d7..6ffd08faf156 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 30b554691a15..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE clone of the game squares
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksquares https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ksquares-20.08.2 b/metadata/md5-cache/kde-apps/ksquares-20.08.2
new file mode 100644
index 000000000000..442874d4fe51
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE clone of the game squares
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksquares https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.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/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.2/src/ksquares-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 44988bbcbf94..0753727f7704 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0907d39dd6a9..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksudoku https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ksudoku-20.08.2 b/metadata/md5-cache/kde-apps/ksudoku-20.08.2
new file mode 100644
index 000000000000..345d8779175f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksudoku https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/ksudoku-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 c24ab259e7d2..9e0f0e4736ed 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0f1c1b4210c1..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-20.08.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-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/kio-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 systemd? ( sys-apps/systemd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=System log viewer by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.ksystemlog
-IUSE=kdesu systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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/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/kio-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 systemd? ( sys-apps/systemd ) || ( 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.08.1/src/ksystemlog-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13259c30dc3ea042d564c28b47a6b439
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-20.08.2 b/metadata/md5-cache/kde-apps/ksystemlog-20.08.2
new file mode 100644
index 000000000000..950f150160f3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-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/kio-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 systemd? ( sys-apps/systemd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=System log viewer by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.ksystemlog
+IUSE=kdesu systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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/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/kio-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 systemd? ( sys-apps/systemd ) || ( 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.08.2/src/ksystemlog-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 77f9525dc985..ca6eea0747c3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 75e993b3387b..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kteatime-20.08.2 b/metadata/md5-cache/kde-apps/kteatime-20.08.2
new file mode 100644
index 000000000000..beab631364ce
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kteatime-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 06e665a6130f..5551b5d8bc4f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b1b9de6fe31f..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Little tool to execute programs after some time
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.ktimer https://utils.kde.org/projects/ktimer/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ktimer-20.08.2 b/metadata/md5-cache/kde-apps/ktimer-20.08.2
new file mode 100644
index 000000000000..9821d42d3a2d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Little tool to execute programs after some time
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.ktimer https://utils.kde.org/projects/ktimer/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/ktimer-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6bb5b6031c18..c8024cc49922 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5c6d289f72eb..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) >=kde-frameworks/kwindowsystem-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.ktouch
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ktouch-20.08.2 b/metadata/md5-cache/kde-apps/ktouch-20.08.2
new file mode 100644
index 000000000000..0dd233e74768
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) >=kde-frameworks/kwindowsystem-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.ktouch
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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.2/src/ktouch-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e44d5d570fa2..cc0cc5952797 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e228f270070c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 net-libs/libaccounts-glib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=experimental debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-accounts-kcm-20.08.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.2
new file mode 100644
index 000000000000..f9018f3a6021
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kaccounts-integration-20.08.2: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-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 net-libs/libaccounts-glib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=experimental debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2: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.2/src/ktp-accounts-kcm-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f93870558b14..c07d3170d622 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6743b34b536e..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-approver-20.08.2 b/metadata/md5-cache/kde-apps/ktp-approver-20.08.2
new file mode 100644
index 000000000000..f712a4544ab1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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.2/src/ktp-approver-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 cab64ad79117..581add12e081 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bf24826af8dc..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-auth-handler-20.08.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.2
new file mode 100644
index 000000000000..511d0e8d87e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.2:5 >=kde-apps/ktp-common-internals-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/ktp-common-internals-20.08.2: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.2/src/ktp-auth-handler-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4f00562a9122..6e082239e3a9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 77aec0714edd..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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/kcmutils-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy audio/video conferencing UI
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-call-ui-20.08.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.2
new file mode 100644
index 000000000000..338e31598a37
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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.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/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-1.2.0-r4 net-libs/farstream:0.2 net-libs/telepathy-farstream >=net-libs/telepathy-qt-0.9.8[farstream] >=kde-frameworks/kcmutils-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy audio/video conferencing UI
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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-1.2.0-r4 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.2/src/ktp-call-ui-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5762da2e9a449d8607392cb82c7dbcba
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 d3c2a4cdd74a..bd2613fe3857 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index efddbc23a96c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/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/kparts-5.72.0:5 >=kde-frameworks/kpeople-5.72.0:5 >=kde-frameworks/kservice-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 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-20.08.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kio-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy common library
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=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 >=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/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/kparts-5.72.0:5 >=kde-frameworks/kpeople-5.72.0:5 >=kde-frameworks/kservice-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 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-20.08.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-common-internals-20.08.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.2
new file mode 100644
index 000000000000..e080b8e8f819
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/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/kparts-5.72.0:5 >=kde-frameworks/kpeople-5.72.0:5 >=kde-frameworks/kservice-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 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-20.08.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kio-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy common library
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=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 >=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/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/kparts-5.72.0:5 >=kde-frameworks/kpeople-5.72.0:5 >=kde-frameworks/kservice-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 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-20.08.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/ktp-common-internals-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 730f03490e4f..e8897df6326c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0a012a90a732..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy contact list
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~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 >=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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-list-20.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.2
new file mode 100644
index 000000000000..d349a0d6295c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.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/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 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy contact list
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~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 >=kde-apps/ktp-common-internals-20.08.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/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.2/src/ktp-contact-list-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d44f3d7d51db..c57d6aa93d12 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 426601bd30be..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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/kservice-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-contact-runner-20.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.2
new file mode 100644
index 000000000000..791b2e5c6df0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.2: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/kservice-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2/src/ktp-contact-runner-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 bd6dda0ca4e4..f862a60a4584 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 8c39bda315e4..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/plasma-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-desktop-applets-20.08.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.2
new file mode 100644
index 000000000000..b9fa54c2d271
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/plasma-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/ktp-desktop-applets-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 967f3422f0db..ba31aa28a6b3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index edff09915c02..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-filetransfer-handler-20.08.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.2
new file mode 100644
index 000000000000..8bff47f704fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.2: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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2/src/ktp-filetransfer-handler-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0f81178ef192..a4819a61f50e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0249e0677bc9..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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/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-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-kded-module-20.08.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.2
new file mode 100644
index 000000000000..8b3acaba0883
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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/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.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/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-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.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.2/src/ktp-kded-module-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 74fcaae6eb06..508f01dc3463 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b8bb45419d81..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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-frameworks/kcmutils-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-send-file-20.08.2 b/metadata/md5-cache/kde-apps/ktp-send-file-20.08.2
new file mode 100644
index 000000000000..9771aee8c3f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.2: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-frameworks/kcmutils-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.2:5 >=kde-apps/ktp-filetransfer-handler-20.08.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.2/src/ktp-send-file-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e9181ce9527d..19a83c717c14 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2cb838475128..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=speech debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ktp-text-ui-20.08.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.2
new file mode 100644
index 000000000000..8ab6aa85104b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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.2: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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=speech debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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.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.2/src/ktp-text-ui-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 91a553604838..6a6e7d2b7359 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 00320eb594e7..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Potato game for kids by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ktuberling https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/ktuberling-20.08.2 b/metadata/md5-cache/kde-apps/ktuberling-20.08.2
new file mode 100644
index 000000000000..b4ce353407e4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Potato game for kids by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ktuberling https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/ktuberling-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0a7f028dc77e..9b36499aff19 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6b62380a4763..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kturtle https://edu.kde.org/kturtle/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kturtle-20.08.2 b/metadata/md5-cache/kde-apps/kturtle-20.08.2
new file mode 100644
index 000000000000..d242c467f96f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kturtle https://edu.kde.org/kturtle/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kturtle-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 fee6b74a60ac..b2511762c128 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1b17fd406081..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kubrick
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kubrick-20.08.2 b/metadata/md5-cache/kde-apps/kubrick-20.08.2
new file mode 100644
index 000000000000..576739a94faa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 virtual/glu virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kubrick
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kubrick-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 71b08608e4e0..3e58d7d7dae5 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 78ac04601708..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~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/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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kwalletmanager-20.08.2 b/metadata/md5-cache/kde-apps/kwalletmanager-20.08.2
new file mode 100644
index 000000000000..e0d015beb7e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~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/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.2/src/kwalletmanager-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 2667faa4cb5e..5424fce862b8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index dbe7dbfee0fd..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) dev-util/ninja dev-util/cmake 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=>=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 ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kwave
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kwave-20.08.2 b/metadata/md5-cache/kde-apps/kwave-20.08.2
new file mode 100644
index 000000000000..01cee6eb70aa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) dev-util/ninja dev-util/cmake 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=>=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 ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kwave
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/kwave-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b9bfb561a97b..1be55813ea5e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 127b7481007b..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Powerful flashcard and vocabulary learning program
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kwordquiz https://edu.kde.org/kwordquiz/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kwordquiz-20.08.2 b/metadata/md5-cache/kde-apps/kwordquiz-20.08.2
new file mode 100644
index 000000000000..a6716f0d1d94
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Powerful flashcard and vocabulary learning program
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kwordquiz https://edu.kde.org/kwordquiz/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/kwordquiz-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e2c748f3e65b..f5466a809055 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6210a7867f21..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple text editor based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kwrite
-IUSE=activities debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/kwrite-20.08.2 b/metadata/md5-cache/kde-apps/kwrite-20.08.2
new file mode 100644
index 000000000000..e03765ed21f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple text editor based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kwrite
+IUSE=activities debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/kate-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d44b5cbea7db..03a39b196bc6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d1ed699d0553..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kconfig-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for gravatar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/pimcommon-20.08.1:5 >=kde-frameworks/kconfig-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/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.08.1/src/libgravatar-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79e38eba8fbac78e1faad50581aa628a
diff --git a/metadata/md5-cache/kde-apps/libgravatar-20.08.2 b/metadata/md5-cache/kde-apps/libgravatar-20.08.2
new file mode 100644
index 000000000000..b4770e0474bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/pimcommon-20.08.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/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for gravatar integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+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/pimcommon-20.08.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/ktextwidgets-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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/libgravatar-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 315c84315e57..e2446231f7d8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 332c01712e19..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 musicbrainz? ( media-libs/musicbrainz:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library for CDDB
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 musicbrainz? ( media-libs/musicbrainz: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=mirror://kde/stable/release-service/20.08.1/src/libkcddb-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=660392e43f231faa08ddd08421551265
diff --git a/metadata/md5-cache/kde-apps/libkcddb-20.08.2 b/metadata/md5-cache/kde-apps/libkcddb-20.08.2
new file mode 100644
index 000000000000..a3f36dedd37d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 musicbrainz? ( media-libs/musicbrainz:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE library for CDDB
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 musicbrainz? ( media-libs/musicbrainz: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=mirror://kde/stable/release-service/20.08.2/src/libkcddb-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3dff4ccf06a6..a0cfe8427cd7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bfdf2cf1ec10..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=alsa debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkcompactdisc-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2081f32c3efc743d4e895564896b4d90
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.2
new file mode 100644
index 000000000000..a87fe0c5b55e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=alsa debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/libkcompactdisc-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 04c2947ee2c4..03b6d28e939c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index eb61369366fa..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-libs/libraw-0.16:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libkdcraw-20.08.2 b/metadata/md5-cache/kde-apps/libkdcraw-20.08.2
new file mode 100644
index 000000000000..dfc45e1384ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-libs/libraw-0.16:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/libkdcraw-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 71dad98ef05d..c1ae6cd569c2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index df5b3280a7ff..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtsvg-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/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Base library common to many KDE games
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtsvg-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/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 media-libs/libsndfile media-libs/openal || ( 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.08.1/src/libkdegames-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=184b8921d36c286838a668bd522cd50d
diff --git a/metadata/md5-cache/kde-apps/libkdegames-20.08.2 b/metadata/md5-cache/kde-apps/libkdegames-20.08.2
new file mode 100644
index 000000000000..e9ea341614ee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtsvg-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/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Base library common to many KDE games
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtsvg-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/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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 media-libs/libsndfile media-libs/openal || ( 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.08.2/src/libkdegames-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b4f508d563c2..334566e8b5d8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index fd5e493450aa..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-20.08.1
+++ /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 ) >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/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/kjobwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ 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-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/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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libkdepim-20.08.2 b/metadata/md5-cache/kde-apps/libkdepim-20.08.2
new file mode 100644
index 000000000000..330c529ffc9d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-20.08.2
@@ -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 ) >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/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/kjobwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common PIM libraries
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ 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-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/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/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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/libkdepim-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 77e703e1cbc9..418993b96df3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bd6858532e1b..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0abb388fdac536c0bc56525f7b24e79c
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.2
new file mode 100644
index 000000000000..0184ca0da03a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/libkeduvocdocument-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 344abe5fdaa2..d63d0d4ba9e9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 25d1f8b9ca10..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-gfx/exiv2-0.25:=[xmp=] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Wrapper around exiv2 library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libkexiv2-20.08.2 b/metadata/md5-cache/kde-apps/libkexiv2-20.08.2
new file mode 100644
index 000000000000..2ca4f43d335d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-gfx/exiv2-0.25:=[xmp=] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Wrapper around exiv2 library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/libkexiv2-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 c4b3889dec33..7d98dd06a543 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 441c1a3513bc..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 !<kde-apps/kdepim-runtime-18.07.80:5 || ( 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.08.1/src/libkgapi-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4268b5f0abb5000d1405d9b23fd2040
diff --git a/metadata/md5-cache/kde-apps/libkgapi-20.08.2 b/metadata/md5-cache/kde-apps/libkgapi-20.08.2
new file mode 100644
index 000000000000..29adec6336b6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 !<kde-apps/kdepim-runtime-18.07.80:5 || ( 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.08.2/src/libkgapi-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/libkipi-20.04.3 b/metadata/md5-cache/kde-apps/libkipi-20.04.3
index 758ac1f3d48c..c91a8302ed84 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c5e48f8e3e3e..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libkipi-20.08.2 b/metadata/md5-cache/kde-apps/libkipi-20.08.2
new file mode 100644
index 000000000000..cb3cbff60c87
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/libkipi-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e9aa43ce1bc7..9cfff8bf2930 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4614b1922d83..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for encryption handling
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+fancyviewer debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libkleo-20.08.2 b/metadata/md5-cache/kde-apps/libkleo-20.08.2
new file mode 100644
index 000000000000..9bbbf2793536
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.2:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library for encryption handling
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+fancyviewer debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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.2/src/libkleo-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0d7c57244bda..6c94c9c12855 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c59402bfa369..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libkmahjongg-20.08.2 b/metadata/md5-cache/kde-apps/libkmahjongg-20.08.2
new file mode 100644
index 000000000000..a3d61ff40169
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/libkmahjongg-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4388f595aaa0..625083007285 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 174ac70fe6db..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library to compare files and strings
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkomparediff2-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e543e98dee6a4adf28211db85ae3e5fb
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-20.08.2 b/metadata/md5-cache/kde-apps/libkomparediff2-20.08.2
new file mode 100644
index 000000000000..1eeec7983299
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE library to compare files and strings
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2: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/kio-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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/libkomparediff2-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 786e9abc6948..19bd7a6701a3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f80e956f1d05..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=kwallet debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libksane-20.08.2 b/metadata/md5-cache/kde-apps/libksane-20.08.2
new file mode 100644
index 000000000000..1b0fa1ab9c46
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=kwallet debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/libksane-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 cb01716cab34..6f3f3382d0f8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 851615f892e2..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=dev-libs/cyrus-sasl >=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/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-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/kcoreaddons-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/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 >=kde-apps/kimap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/cyrus-sasl >=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/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-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/kcoreaddons-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/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/libksieve-20.08.2 b/metadata/md5-cache/kde-apps/libksieve-20.08.2
new file mode 100644
index 000000000000..44c13ea45f6d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=dev-libs/cyrus-sasl >=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/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.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/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common PIM libraries
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/cyrus-sasl >=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/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/pimcommon-20.08.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/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/libksieve-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 2ca90d342f3a..04c7b1519d17 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 72b872bcd6c1..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for handling TNEF data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktnef-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e378f7891b513c3445079689ac78328
diff --git a/metadata/md5-cache/kde-apps/libktnef-20.08.2 b/metadata/md5-cache/kde-apps/libktnef-20.08.2
new file mode 100644
index 000000000000..a8e81901b5a6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for handling TNEF data
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kcalutils-20.08.2:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcontacts-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
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/ktnef-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b04e3f158c5d..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-20.04.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=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-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.70.0:5 >=kde-frameworks/kross-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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.lokalize https://l10n.kde.org/tools/
-IUSE=python_single_target_python3_7 python_single_target_python3_8 debug +handbook
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-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] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.70.0:5 >=kde-frameworks/kross-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 python_single_target_python3_7? ( dev-python/translate-toolkit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) >=kde-apps/kross-interpreters-20.04.3:5[python] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	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.04.3-r1 b/metadata/md5-cache/kde-apps/lokalize-20.04.3-r1
new file mode 100644
index 000000000000..d0d0015cab5f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-20.04.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=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=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] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.70.0:5 >=kde-frameworks/kross-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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Localization tool for KDE software and other free and open source software
+EAPI=7
+HOMEPAGE=https://kde.org/applications/en/lokalize https://l10n.kde.org/tools/
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 debug +handbook
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.70.0:5 >=kde-frameworks/kross-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 python_single_target_python3_7? ( dev-python/translate-toolkit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/translate-toolkit[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35460568cc427d397ad0a8273514f3e0
diff --git a/metadata/md5-cache/kde-apps/lokalize-20.08.1 b/metadata/md5-cache/kde-apps/lokalize-20.08.1
deleted file mode 100644
index d3e0bb526424..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-20.08.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=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-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.72.0:5 >=kde-frameworks/kross-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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.lokalize https://l10n.kde.org/tools/
-IUSE=python_single_target_python3_7 python_single_target_python3_8 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-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] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.72.0:5 >=kde-frameworks/kross-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 python_single_target_python3_7? ( dev-python/translate-toolkit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) >=kde-apps/kross-interpreters-20.08.1:5[python] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	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/lokalize-20.08.2 b/metadata/md5-cache/kde-apps/lokalize-20.08.2
new file mode 100644
index 000000000000..063ab8f9d1a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-20.08.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=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] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.72.0:5 >=kde-frameworks/kross-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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Localization tool for KDE software and other free and open source software
+EAPI=7
+HOMEPAGE=https://kde.org/applications/en/lokalize https://l10n.kde.org/tools/
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=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/kdbusaddons-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/kparts-5.72.0:5 >=kde-frameworks/kross-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 python_single_target_python3_7? ( dev-python/translate-toolkit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/translate-toolkit[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/lokalize-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cf9fc4216b34b40b573086c05fa4a24d
diff --git a/metadata/md5-cache/kde-apps/lskat-20.04.3 b/metadata/md5-cache/kde-apps/lskat-20.04.3
index f7a0e97d2d41..33935fce1664 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a44240365725..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Skat game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.lskat https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/lskat-20.08.2 b/metadata/md5-cache/kde-apps/lskat-20.08.2
new file mode 100644
index 000000000000..c11e91411518
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Skat game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.lskat https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/lskat-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6b60622def2e..0a2107d8a830 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d5b863b30421..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.72.0: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/qtmultimedia-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/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-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/karchive-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/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/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/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common mail library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-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/karchive-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/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/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/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/mailcommon-20.08.2 b/metadata/md5-cache/kde-apps/mailcommon-20.08.2
new file mode 100644
index 000000000000..1f86b0b96171
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.72.0: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/qtmultimedia-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/mailimporter-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/karchive-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/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/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/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-5.72.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common mail library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/mailimporter-20.08.2:5 >=kde-apps/messagelib-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/karchive-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/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/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/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/syntax-highlighting-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
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/mailcommon-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 99637634a2d9..04cfbacbc322 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 478424c61257..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/akonadi-mime-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/karchive-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to import mail from various sources
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-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/akonadi-mime-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/karchive-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/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.08.1/src/mailimporter-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b165966338b5c535f213566ce2d76d42
diff --git a/metadata/md5-cache/kde-apps/mailimporter-20.08.2 b/metadata/md5-cache/kde-apps/mailimporter-20.08.2
new file mode 100644
index 000000000000..421d20a3f07b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/karchive-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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to import mail from various sources
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+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.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/karchive-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/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.08.2/src/mailimporter-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d7cf7a9ba061..f83379cb9339 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4390b3614e8b..000000000000
--- a/metadata/md5-cache/kde-apps/marble-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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=>=dev-qt/qtconcurrent-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/qtxml-5.14.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.14.2:5 ) dbus? ( >=dev-qt/qtdbus-5.14.2:5 ) designer? ( >=dev-qt/designer-5.14.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.14.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=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/kparts-5.72.0:5 >=kde-frameworks/krunner-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=7
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-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/qtxml-5.14.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.14.2:5 ) dbus? ( >=dev-qt/qtdbus-5.14.2:5 ) designer? ( >=dev-qt/designer-5.14.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.14.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=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/kparts-5.72.0:5 >=kde-frameworks/krunner-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/marble-20.08.2 b/metadata/md5-cache/kde-apps/marble-20.08.2
new file mode 100644
index 000000000000..38289cdc738d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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=>=dev-qt/qtconcurrent-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/qtxml-5.14.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.14.2:5 ) dbus? ( >=dev-qt/qtdbus-5.14.2:5 ) designer? ( >=dev-qt/designer-5.14.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.14.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=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/kparts-5.72.0:5 >=kde-frameworks/krunner-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=7
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-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/qtxml-5.14.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.14.2:5 ) dbus? ( >=dev-qt/qtdbus-5.14.2:5 ) designer? ( >=dev-qt/designer-5.14.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.14.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=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/kparts-5.72.0:5 >=kde-frameworks/krunner-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/20.08
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/marble-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 eb324340a04c..5d2005fdc9ca 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 3e4b3de36550..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/mbox-importer-20.08.2 b/metadata/md5-cache/kde-apps/mbox-importer-20.08.2
new file mode 100644
index 000000000000..b6a49baa7e9c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/mailimporter-20.08.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/ki18n-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/mailimporter-20.08.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/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.2/src/mbox-importer-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 ee1ddb996228..b271778efbb2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5f35c566b596..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-20.08.1
+++ /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.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.1.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/incidenceeditor-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmbox-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-frameworks/karchive-5.72.0: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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/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 >=kde-frameworks/syntax-highlighting-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries for messaging functions
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.1.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/incidenceeditor-20.08.1:5 >=kde-apps/kdepim-apps-libs-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmbox-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libgravatar-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/libkleo-20.08.1:5 >=kde-frameworks/karchive-5.72.0: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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/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 >=kde-frameworks/syntax-highlighting-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/messagelib-20.08.2 b/metadata/md5-cache/kde-apps/messagelib-20.08.2
new file mode 100644
index 000000000000..5b0925cb814b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-20.08.2
@@ -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.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.1.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmbox-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-frameworks/karchive-5.72.0: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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/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 >=kde-frameworks/syntax-highlighting-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libraries for messaging functions
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.1.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/grantleetheme-20.08.2:5 >=kde-apps/incidenceeditor-20.08.2:5 >=kde-apps/kdepim-apps-libs-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmbox-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libgravatar-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/libkleo-20.08.2:5 >=kde-frameworks/karchive-5.72.0: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/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-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/kitemmodels-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/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 >=kde-frameworks/syntax-highlighting-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/messagelib-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4d61584543f0..810f2682ad76 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 32453ca88dcf..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake 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=>=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:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Music Education software by KDE
-EAPI=7
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/minuet-20.08.2 b/metadata/md5-cache/kde-apps/minuet-20.08.2
new file mode 100644
index 000000000000..4593e3430af6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake 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=>=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:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Music Education software by KDE
+EAPI=7
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/minuet-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 1b1b593bfaa6..77a4575e56ec 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f6f702d5112c..000000000000
--- a/metadata/md5-cache/kde-apps/okular-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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/kactivities-5.72.0:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kio-5.72.0:5 >=kde-frameworks/kjs-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib >=kde-frameworks/khtml-5.72.0:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.14.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-20.08.1:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-20.08.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) speech? ( >=dev-qt/qtspeech-5.14.2:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://okular.kde.org https://kde.org/applications/office/org.kde.okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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/kactivities-5.72.0:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kio-5.72.0:5 >=kde-frameworks/kjs-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib >=kde-frameworks/khtml-5.72.0:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.14.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-20.08.1:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-20.08.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) speech? ( >=dev-qt/qtspeech-5.14.2:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.72.0:5 ) mobile? ( >=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/okular-20.08.2 b/metadata/md5-cache/kde-apps/okular-20.08.2
new file mode 100644
index 000000000000..11a345f539da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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/kactivities-5.72.0:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kio-5.72.0:5 >=kde-frameworks/kjs-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib >=kde-frameworks/khtml-5.72.0:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.14.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-20.08.2:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-20.08.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) speech? ( >=dev-qt/qtspeech-5.14.2:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://okular.kde.org https://kde.org/applications/office/org.kde.okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi +pdf plucker +postscript qml share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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/kactivities-5.72.0:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-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/kio-5.72.0:5 >=kde-frameworks/kjs-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/threadweaver-5.72.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib >=kde-frameworks/khtml-5.72.0:5 ) crypt? ( >=app-crypt/qca-2.3.0:2 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.14.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-20.08.2:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-20.08.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) speech? ( >=dev-qt/qtspeech-5.14.2:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.72.0:5 ) qml? ( >=dev-qt/qtquickcontrols2-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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/okular-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a701f2abe6866351bbd682069c76a103
diff --git a/metadata/md5-cache/kde-apps/palapeli-20.04.3 b/metadata/md5-cache/kde-apps/palapeli-20.04.3
index b3a010060782..7f24b7d83741 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index e469a4a67a2f..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.palapeli
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/palapeli-20.08.2 b/metadata/md5-cache/kde-apps/palapeli-20.08.2
new file mode 100644
index 000000000000..3d58b3929973
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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.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/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 >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.palapeli
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.2/src/palapeli-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3ccecc9c7577..39ab0a6bba52 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 52d67858c846..000000000000
--- a/metadata/md5-cache/kde-apps/parley-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/parley-20.08.2 b/metadata/md5-cache/kde-apps/parley-20.08.2
new file mode 100644
index 000000000000..197c329ca5fb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=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.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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.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/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.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.2/src/parley-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 346db58bfe41..9499e02c9949 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 18cf7bef49a5..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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/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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.picmi https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/picmi-20.08.2 b/metadata/md5-cache/kde-apps/picmi-20.08.2
new file mode 100644
index 000000000000..08c90a89ee51
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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.2: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/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.picmi https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2: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/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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/picmi-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 f6f5c3cbea03..a3f31b830030 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 52558d676413..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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/kmailtransport-20.08.1:5 >=kde-apps/kmime-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/karchive-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/kitemviews-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 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.pimdataexporter https://userbase.kde.org/KMail/Backup_Options
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-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/kmailtransport-20.08.1:5 >=kde-apps/kmime-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/karchive-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/kitemviews-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 telemetry? ( dev-libs/kuserfeedback:5 ) || ( 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.08.1/src/pim-data-exporter-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74e95903c25aa04057713125c13d38d3
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.2
new file mode 100644
index 000000000000..633f0eb0552a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/pimcommon-20.08.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/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/kitemviews-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 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.pimdataexporter https://userbase.kde.org/KMail/Backup_Options
+IUSE=telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2:5 >=kde-apps/kidentitymanagement-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/kmime-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-apps/mailcommon-20.08.2:5 >=kde-apps/pimcommon-20.08.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/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/kitemviews-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 telemetry? ( dev-libs/kuserfeedback:5 ) || ( 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.08.2/src/pim-data-exporter-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 97e71c7e4e24..a1c2af0d7149 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d425f8669a7b..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=>=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/calendarsupport-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kcalendarcore-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/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.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/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/libksieve-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kcalendarcore-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/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( 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.08.1/src/pim-sieve-editor-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3aa12bb4e259af4794e7c1bd0ad57c7
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.2
new file mode 100644
index 000000000000..bbebe549d3f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=>=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.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kcalendarcore-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/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.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/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-mime-20.08.2:5 >=kde-apps/calendarsupport-20.08.2:5 >=kde-apps/kmailtransport-20.08.2:5 >=kde-apps/libksieve-20.08.2:5 >=kde-apps/pimcommon-20.08.2:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kcalendarcore-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/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( 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.08.2/src/pim-sieve-editor-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a565e286044b..0b68edb6b219 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f04fe3c9e2e2..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-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/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/kimap-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-frameworks/karchive-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/kcontacts-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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/purpose-5.72.0:5 test? ( >=kde-apps/kmime-20.08.1:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ 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/qtprintsupport-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/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/kimap-20.08.1:5 >=kde-apps/kldap-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-frameworks/karchive-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/kcontacts-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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/purpose-5.72.0:5 !<kde-apps/libkdepim-20.07.80:5 || ( 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.08.1/src/pimcommon-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d3bb0c3e1cc2a8792d1936d88098ce9
diff --git a/metadata/md5-cache/kde-apps/pimcommon-20.08.2 b/metadata/md5-cache/kde-apps/pimcommon-20.08.2
new file mode 100644
index 000000000000..a81dfd9db359
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-frameworks/karchive-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/kcontacts-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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/purpose-5.72.0:5 test? ( >=kde-apps/kmime-20.08.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common PIM libraries
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ 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/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.2:5 >=kde-apps/akonadi-contacts-20.08.2:5 >=kde-apps/akonadi-search-20.08.2:5 >=kde-apps/kimap-20.08.2:5 >=kde-apps/kldap-20.08.2:5 >=kde-apps/kpimtextedit-20.08.2:5 >=kde-apps/libkdepim-20.08.2:5 >=kde-frameworks/karchive-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/kcontacts-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/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knewstuff-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/purpose-5.72.0:5 !<kde-apps/libkdepim-20.07.80:5 || ( 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.08.2/src/pimcommon-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/plasma-telepathy-meta-20.08.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.1
deleted file mode 100644
index e3c14e22e664..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ktp-accounts-kcm-20.08.1:5 >=kde-apps/ktp-approver-20.08.1:5 >=kde-apps/ktp-auth-handler-20.08.1:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-apps/ktp-contact-list-20.08.1:5 >=kde-apps/ktp-contact-runner-20.08.1:5 >=kde-apps/ktp-desktop-applets-20.08.1:5 >=kde-apps/ktp-filetransfer-handler-20.08.1:5 >=kde-apps/ktp-kded-module-20.08.1:5 >=kde-apps/ktp-send-file-20.08.1:5 >=kde-apps/ktp-text-ui-20.08.1:5 gstreamer? ( >=kde-apps/ktp-call-ui-20.08.1:5 )
-SLOT=5
-_md5_=131acc51a33795bedc92f869d819df46
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.2
new file mode 100644
index 000000000000..bb7f39c7d49c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ktp-accounts-kcm-20.08.2:5 >=kde-apps/ktp-approver-20.08.2:5 >=kde-apps/ktp-auth-handler-20.08.2:5 >=kde-apps/ktp-common-internals-20.08.2:5 >=kde-apps/ktp-contact-list-20.08.2:5 >=kde-apps/ktp-contact-runner-20.08.2:5 >=kde-apps/ktp-desktop-applets-20.08.2:5 >=kde-apps/ktp-filetransfer-handler-20.08.2:5 >=kde-apps/ktp-kded-module-20.08.2:5 >=kde-apps/ktp-send-file-20.08.2:5 >=kde-apps/ktp-text-ui-20.08.2:5 gstreamer? ( >=kde-apps/ktp-call-ui-20.08.2:5 )
+SLOT=5
+_md5_=131acc51a33795bedc92f869d819df46
diff --git a/metadata/md5-cache/kde-apps/poxml-20.04.3 b/metadata/md5-cache/kde-apps/poxml-20.04.3
index b4c7312ec6ff..3ca7243e2a84 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a6c4fa832576..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-20.08.1
+++ /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 nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.14.2:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/poxml-20.08.2 b/metadata/md5-cache/kde-apps/poxml-20.08.2
new file mode 100644
index 000000000000..2ab913bc4e59
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-20.08.2
@@ -0,0 +1,14 @@
+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 nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.14.2:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/poxml-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 8fc866a76550..59f909c9ba41 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bad4d8bb9ee1..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/print-manager-20.08.2 b/metadata/md5-cache/kde-apps/print-manager-20.08.2
new file mode 100644
index 000000000000..a9028555f0b2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/print-manager-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 eae5683e9626..e638e76c5d6c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index aa253cac6cd9..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5[scripttools] >=dev-qt/qtsvg-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/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemviews-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=dev-libs/boost-1.49 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5[scripttools] >=dev-qt/qtsvg-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/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemviews-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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/rocs-20.08.2 b/metadata/md5-cache/kde-apps/rocs-20.08.2
new file mode 100644
index 000000000000..dd75e7110a24
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5[scripttools] >=dev-qt/qtsvg-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/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemviews-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/ktextwidgets-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=dev-libs/boost-1.49 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5[scripttools] >=dev-qt/qtsvg-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/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemviews-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/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
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/rocs-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 fb770717e0e8..4f24f7f6fd31 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b881498a2510..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.72.0:5 net-libs/signond dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KWallet extension for signond
-EAPI=7
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/signon-kwallet-extension-20.08.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.2
new file mode 100644
index 000000000000..dee1bb59e219
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.72.0:5 net-libs/signond dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KWallet extension for signond
+EAPI=7
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/signon-kwallet-extension-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 088a8786a7a2..bd2877d47d7e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7ff4360909f0..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qdbus-5.14.2:5 >=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 >=dev-qt/qtx11extras-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/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwayland-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 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-20.08.1:5= ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Screenshot capture utility
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.spectacle
-IUSE=kipi share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=dev-qt/qdbus-5.14.2:5 >=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 >=dev-qt/qtx11extras-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/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwayland-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 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-20.08.1:5= ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) kipi? ( >=kde-apps/kipi-plugins-20.08.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/spectacle-20.08.2 b/metadata/md5-cache/kde-apps/spectacle-20.08.2
new file mode 100644
index 000000000000..09d37dfc338a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=dev-qt/qdbus-5.14.2:5 >=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 >=dev-qt/qtx11extras-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/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwayland-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 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-20.08.2:5= ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Screenshot capture utility
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.spectacle
+IUSE=kipi share debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=dev-qt/qdbus-5.14.2:5 >=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 >=dev-qt/qtx11extras-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/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwayland-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 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-20.08.2:5= ) share? ( >=kde-frameworks/purpose-5.72.0:5 ) kipi? ( >=kde-apps/kipi-plugins-20.08.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/spectacle-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 06ed8b7d7966..2fa9b09f35b7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index afda1e98c67a..000000000000
--- a/metadata/md5-cache/kde-apps/step-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake 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=>=dev-cpp/eigen-3.2:3 >=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 >=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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interactive physics simulator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.step https://edu.kde.org/step/
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/eigen-3.2:3 >=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 >=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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/step-20.08.2 b/metadata/md5-cache/kde-apps/step-20.08.2
new file mode 100644
index 000000000000..9532a6d52761
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake 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=>=dev-cpp/eigen-3.2:3 >=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 >=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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Interactive physics simulator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.step https://edu.kde.org/step/
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/eigen-3.2:3 >=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 >=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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-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/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/step-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d624018b1a69..a605e6c9da43 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ec3489793564..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/svgpart-20.08.2 b/metadata/md5-cache/kde-apps/svgpart-20.08.2
new file mode 100644
index 000000000000..a11ebacd5880
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2/src/svgpart-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3ce995335cfb..89906a41d2b1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ab4ed01ac785..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.sweeper https://utils.kde.org/projects/sweeper/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~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/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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/sweeper-20.08.2 b/metadata/md5-cache/kde-apps/sweeper-20.08.2
new file mode 100644
index 000000000000..cd2d01aa9686
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.sweeper https://utils.kde.org/projects/sweeper/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~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/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.2/src/sweeper-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e6c103a03f3f..0b5dd110d17e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6fda434b12b1..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/thumbnailers-20.08.2 b/metadata/md5-cache/kde-apps/thumbnailers-20.08.2
new file mode 100644
index 000000000000..6b08ee3247a7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.2:5 >=kde-apps/libkexiv2-20.08.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.2:5 >=kde-apps/libkexiv2-20.08.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.2/src/kdegraphics-thumbnailers-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3f0448c733e0..f3522b53af69 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ce111dd8d423..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt ) >=kde-frameworks/kdelibs4support-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE UML Modeller
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.umbrello https://umbrello.kde.org
-IUSE=php test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt ) || ( 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.08.1/src/umbrello-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b8645322f92e7426c5a4891f03400be
diff --git a/metadata/md5-cache/kde-apps/umbrello-20.08.2 b/metadata/md5-cache/kde-apps/umbrello-20.08.2
new file mode 100644
index 000000000000..9cc9a7f19aaa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=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=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt ) >=kde-frameworks/kdelibs4support-5.72.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE UML Modeller
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.umbrello https://umbrello.kde.org
+IUSE=php test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-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/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-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-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt ) || ( 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.08.2/src/umbrello-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 c9b5e5f5fb30..e216dcfaf792 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c7aa594f7e98..000000000000
--- a/metadata/md5-cache/kde-apps/yakuake-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Quake-style terminal emulator based on konsole
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.yakuake
-IUSE=absolute-position X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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/yakuake-20.08.2 b/metadata/md5-cache/kde-apps/yakuake-20.08.2
new file mode 100644
index 000000000000..f33bbc1a50fd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/yakuake-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.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 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/konsole-20.08.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/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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Quake-style terminal emulator based on konsole
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.yakuake
+IUSE=absolute-position X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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.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/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.2/src/yakuake-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 5c1b429927e3..96025caeed0b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index cfbef1c0556a..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-apps/zeroconf-ioslave-20.08.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.2
new file mode 100644
index 000000000000..2bd89264b522
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.72.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+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.2/src/zeroconf-ioslave-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4fee9da65cc0..2b92166086c1 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.70.0 b/metadata/md5-cache/kde-frameworks/attica-5.70.0
deleted file mode 100644
index ea32e4554443..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=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/attica-5.70.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_=55521f96496d8b8514943887501c20aa
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.74.0 b/metadata/md5-cache/kde-frameworks/attica-5.74.0
index 18847619684d..6c2ac909eae0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=222be283a39cf9adbf0ddee6038596bd
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.75.0 b/metadata/md5-cache/kde-frameworks/attica-5.75.0
new file mode 100644
index 000000000000..2aa1bddf1273
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/attica-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 45823ac3b8a6..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/lmdb-0.9.17 >=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-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/kfilemetadata-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kidletime-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/solid-5.70*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-db/lmdb-0.9.17 >=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-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/kfilemetadata-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kidletime-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/solid-5.70*: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.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/baloo-5.70.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_=a3302bc9b190f663a89740636020b5d7
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.74.0 b/metadata/md5-cache/kde-frameworks/baloo-5.74.0
index e7f0514bbe2b..3bced641b7e0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=754dd6bdb74ffbb7a156d5e59c92e7b6
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.75.0 b/metadata/md5-cache/kde-frameworks/baloo-5.75.0
new file mode 100644
index 000000000000..bc6e85224032
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-db/lmdb-0.9.17 >=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/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/kfilemetadata-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kidletime-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/solid-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-db/lmdb-0.9.17 >=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/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/kfilemetadata-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kidletime-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/solid-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/baloo-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d6104bbc45b0..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	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 ada5e964590c..18355913d413 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=769e6ee2c907f63303d8a1b3a30def8d
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.75.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.75.0
new file mode 100644
index 000000000000..bf2c5926c3c7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5 virtual/pkgconfig
+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/qtnetwork-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=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/qtnetwork-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/bluez-qt-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f504821cc947..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.70:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	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 fb91ad3fc5a4..284202c17cdf 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.75.0
new file mode 100644
index 000000000000..49c545abaa05
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.75:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/breeze-icons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 7ae786041a13..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.70:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-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	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 f9282462af1e..b890e59333ea 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.75.0
new file mode 100644
index 000000000000..25b4f0e5caec
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.75:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/breeze-icons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a1789ab133e0..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( 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-qt/qthelp-5.12.3:5 ) test? ( >=dev-qt/linguist-tools-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
-IUSE=doc test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86
-LICENSE=BSD
-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	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 65813f2983c3..a828bfcb44b8 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=eec0a1f000a09b52b73f297fe3752d78
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.75.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.75.0
new file mode 100644
index 000000000000..ba32cc83825a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( ( 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-qt/qthelp-5.14.2:5 ) test? ( >=dev-qt/linguist-tools-5.14.2:5 >=dev-qt/qtcore-5.14.2:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/extra-cmake-modules-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b73c9966ce1c..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.70.0
+++ /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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/knewstuff-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kpackage-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/knewstuff-5.70*:5 =kde-frameworks/knotifications-5.70*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 8a7bf89df1db..4d2f69ae080b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c97732addf79d63cafd9aa2f55e2725
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.75.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.75.0
new file mode 100644
index 000000000000..00b0a7fd8e77
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.75.0
@@ -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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5= =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/knewstuff-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5= =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/knewstuff-5.75*:5 =kde-frameworks/knotifications-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/frameworkintegration-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ba498f7459d5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-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/qtsql-5.12.3:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for working with KDE activities
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-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/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=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/kactivities-5.70.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_=ef682dd8583780011f072172d06e2aa8
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.74.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
index 3bc5684a020f..45d40619b8ca 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=547b5931f5db00d00506aa75244f294b
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.75.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.75.0
new file mode 100644
index 000000000000..c71856b803e2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.75.0
@@ -0,0 +1,15 @@
+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.75: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[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for working with KDE activities
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+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/qtsql-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kactivities-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 2a97e6f76218..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivities-5.70*:5 =kde-frameworks/kconfig-5.70*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivities-5.70*:5 =kde-frameworks/kconfig-5.70*:5 >=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/kactivities-stats-5.70.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_=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 9f844d2966a6..36e3e850fa64 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e69a07b49ba0f94891df566ce15d49c4
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.75.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.75.0
new file mode 100644
index 000000000000..dbbff7446256
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 =kde-frameworks/kactivities-5.75*:5 =kde-frameworks/kconfig-5.75*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 =kde-frameworks/kactivities-5.75*:5 =kde-frameworks/kconfig-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kactivities-stats-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 07c5f1fded34..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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(-)] )
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen python_single_target_python3_6? ( dev-python/jinja[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) media-gfx/graphviz[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_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=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kapidox-5.70.0.tar.xz
-_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/kapidox-5.74.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
index e321c6e50530..f712bb704598 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kapidox-5.74.0.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	074252323c6185f751658b74c09b68ff	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce3fa8d5abc5f00180fa058794f66290
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.75.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.75.0
new file mode 100644
index 000000000000..bdf258168bd8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=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_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(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) media-gfx/graphviz[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kapidox-5.75.0.tar.xz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=966cb57d0951c8acb5fb35ff01e42062
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1 b/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1
deleted file mode 100644
index 5cdf67a06915..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=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/karchive-5.70.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_=babbe428b37659ea411502b082e710b5
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.74.0 b/metadata/md5-cache/kde-frameworks/karchive-5.74.0
index daaf9411980d..3ebe3c976986 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/karchive-5.75.0
new file mode 100644
index 000000000000..32d5969dae3d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/karchive-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5aa0619bf23f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.70.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 bb6420c27022..97ee3265f6ad 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=a63987b411e9d7282d41cfebc4438a09
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9bbfd7f1b731d0108770868997604ba9
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.75.0 b/metadata/md5-cache/kde-frameworks/kauth-5.75.0
new file mode 100644
index 000000000000..336cc7e22b54
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.75.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2: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.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+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.75*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kauth-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38d7ce9beecf2428908762685f633873
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0
deleted file mode 100644
index c8b9cc84bb2a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3: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.70: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/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=kde-frameworks/kconfigwidgets-5.70:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 7f8bbaae0db4..946fa8f7b8d3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=695dcc056e4f49eedf5b85cf1ad0b9b7
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.75.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.75.0
new file mode 100644
index 000000000000..cd4499a6020b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2: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.75: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 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kconfigwidgets-5.75:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kbookmarks-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 09bcd006dfe2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison 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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interfacing with calendars
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= !kde-apps/kcalcore: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.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kcalendarcore-5.70.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_=0a46f97b6b8ff5267b6f49b62e2887ff
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
index 9db7cc620685..a485ccf6dcd9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3055a5d6fc5c378d6cff9341dcac14e8
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.75.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.75.0
new file mode 100644
index 000000000000..1d720143eded
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison 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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libical:= >=dev-qt/qtgui-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interfacing with calendars
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=dev-libs/libical:= >=dev-qt/qtgui-5.14.2:5 !kde-apps/kcalcore: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcalendarcore-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0114fa18c6b8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 61e615303744..764f5cf3a9c9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41b5ebd79192b108b3079b8ecc146fad
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.75.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.75.0
new file mode 100644
index 000000000000..90ed6dd0afa5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75: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[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kdeclarative-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=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[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kdeclarative-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcmutils-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4657e8dbc895..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2+
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 4a7c5ba3762c..c5ee68661924 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=d55e6c89285c4ff322932250c3f75e0d
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffd86ff2f868624dc59e38c959562347
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.75.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.75.0
new file mode 100644
index 000000000000..fb5acd8bfba2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcodecs-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=98f061cba49afe3a136b0aab5047f32f
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0
deleted file mode 100644
index 35e159a0cb00..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) 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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 2f28032c9111..718b9b558b8e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=c4708820fc13a24f13c688df1b922305
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd63961195e5f8cbaced7c8cd7f1cce8
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.75.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.75.0
new file mode 100644
index 000000000000..3366495c1a48
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcompletion-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b07ec741e2c9a7ca337be9dfaaf9624e
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.70.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.70.0
deleted file mode 100644
index 153a18c898ec..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3: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.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kconfig-5.70.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_=40d11f41dae3df83b1eab5069c0151d2
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.74.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
index 097604673ea7..362050c48b9a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=70e3c8e96b67a5587989a91a6c7cf104
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d156f038dc9cd313074d46b4ed3709a3
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.75.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.75.0
new file mode 100644
index 000000000000..101013ca3b0b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2: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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 dbus? ( >=dev-qt/qtdbus-5.14.2:5 ) test? ( >=dev-qt/qtconcurrent-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 dbus? ( >=dev-qt/qtdbus-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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kconfig-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b1b0ba0fa77e8b881ab1a8b8e999d54
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0
deleted file mode 100644
index ca7a70d1a693..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.70:5 ) 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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kguiaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kguiaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 249ed56c2dd4..7119a0183449 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=659af7bda5f7ed1f073ecf814a8f4248
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c86d539aba16c60bef721e265ab6049d
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.75.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.75.0
new file mode 100644
index 000000000000..e5044dd4e248
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.75:5 ) 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.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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/kauth-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kconfigwidgets-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e8e7b90efb8d3cdb44f380b8104b4ae
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0
deleted file mode 100644
index ad35bb05ca63..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 >=dev-qt/qtgui-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND==kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 b0634aa9b4c6..709610b3a4e6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c625e8a4f47c68a79f4518efec643e86
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.75.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.75.0
new file mode 100644
index 000000000000..b97c0300044b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcontacts-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 844b6092c6bf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=fam nls debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=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/kcoreaddons-5.70.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_=e5125a54fba5b955762096dffafeb8c5
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
index af54a11771ce..8d0a68e2f0f3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=658e975fd6ee254ba949c7e19e48b63c
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2955c07558dae067372e37da19c9737c
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.75.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.75.0
new file mode 100644
index 000000000000..0b6739c6a030
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.14.2:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.14.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcoreaddons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c08ba582f6fba76a8eeb767e88444044
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.70.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.70.0
deleted file mode 100644
index 61b029051fc5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 4da0e2690f08..1fb7f2f3862e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76e827235090ee0e55f8f36a5020507f
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.75.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.75.0
new file mode 100644
index 000000000000..83a57f6f9a14
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2: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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kcrash-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 fb05c9148fa4..afe65f0690d9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25482f72367fbcd4d159af19089b5fb8
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.75.0 b/metadata/md5-cache/kde-frameworks/kdav-5.75.0
new file mode 100644
index 000000000000..f00bb6485e2c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kcoreaddons-5.75:5 >=kde-frameworks/ki18n-5.75:5 >=kde-frameworks/kio-5.75:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=7
+HOMEPAGE=https://api.kde.org/frameworks/kdav/html/index.html
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kcoreaddons-5.75:5 >=kde-frameworks/ki18n-5.75:5 >=kde-frameworks/kio-5.75:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/frameworks/5.75/kdav-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 51a34bf169e7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=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/kdbusaddons-5.70.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_=ce691ba90afca2716e38754cea09be61
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
index 18a39eb03a7c..256eb7d9a4fd 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=07cb56c00fe39406a93fc1147660b784
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c8abe190ad0f571427365cff63342fe9
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.75.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.75.0
new file mode 100644
index 000000000000..b53f04f9aefa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2: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 )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kdbusaddons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b9479d22fac887f35c10b37ad93756d
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0
deleted file mode 100644
index 0c066f7456a2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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 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==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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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-r1 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
index 8005b4d7643f..f725839bb79a 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
@@ -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 =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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=058dfa4269fde184480f838e6cd741cc
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.75.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.75.0
new file mode 100644
index 000000000000..9a98a31713b3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.75.0
@@ -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.75: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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*: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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kdeclarative-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kded-5.70.0 b/metadata/md5-cache/kde-frameworks/kded-5.70.0
deleted file mode 100644
index 6009c0586890..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.70:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70: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/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 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 12b6d844fa42..8ebbd95f9b11 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f2fd78acc179182b52ef2cb12268d69
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.75.0 b/metadata/md5-cache/kde-frameworks/kded-5.75.0
new file mode 100644
index 000000000000..0fec6d200754
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.75:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/kinit-5.75*:5 =kde-frameworks/kservice-5.75*:5 dev-qt/qtcore:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man 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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/kinit-5.75*:5 =kde-frameworks/kservice-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kded-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index afcf6329fc98..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70:5 ) >=kde-frameworks/extra-cmake-modules-5.70: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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kcrash-5.70*:5 =kde-frameworks/kdbusaddons-5.70*:5 >=kde-frameworks/kded-5.70:5 =kde-frameworks/kdesignerplugin-5.70*:5 =kde-frameworks/kdoctools-5.70*:5 =kde-frameworks/kemoticons-5.70*:5 =kde-frameworks/kglobalaccel-5.70*:5 =kde-frameworks/kguiaddons-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/kjobwidgets-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kunitconversion-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/solid-5.70*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=libressl X test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kcrash-5.70*:5 =kde-frameworks/kdbusaddons-5.70*:5 >=kde-frameworks/kded-5.70:5 =kde-frameworks/kdesignerplugin-5.70*:5 =kde-frameworks/kdoctools-5.70*:5 =kde-frameworks/kemoticons-5.70*:5 =kde-frameworks/kglobalaccel-5.70*:5 =kde-frameworks/kguiaddons-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/kjobwidgets-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kunitconversion-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/solid-5.70*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) =kde-frameworks/kinit-5.70*:5 =kde-frameworks/kitemmodels-5.70*:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 9ed9ac1f1365..cb737a4ad6d1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbc33de2fe12874eaca8ed4b2b479b37
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.75.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.75.0
new file mode 100644
index 000000000000..432c080a42ad
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.75:5 ) >=kde-frameworks/extra-cmake-modules-5.75: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 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qttest-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 >=kde-frameworks/kded-5.75:5 =kde-frameworks/kdesignerplugin-5.75*:5 =kde-frameworks/kdoctools-5.75*:5 =kde-frameworks/kemoticons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kunitconversion-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/solid-5.75*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.14.2:5 test? ( >=dev-qt/qtconcurrent-5.14.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=libressl X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=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/qtsvg-5.14.2:5 >=dev-qt/qttest-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 >=kde-frameworks/kded-5.75:5 =kde-frameworks/kdesignerplugin-5.75*:5 =kde-frameworks/kdoctools-5.75*:5 =kde-frameworks/kemoticons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kunitconversion-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/solid-5.75*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) =kde-frameworks/kinit-5.75*:5 =kde-frameworks/kitemmodels-5.75*:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kdelibs4support-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 183416a2e2c8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 dev-qt/qtcore:5
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 0027508fa8a7..b83cfddf6e69 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c3a9e8ffaacb4c27e6356af331c7d19
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.75.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.75.0
new file mode 100644
index 000000000000..08fa8f859d56
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.75:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 dev-qt/qtcore:5
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND==kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kdesignerplugin-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1bab2d12e7e1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kpty-5.70*:5 =kde-frameworks/kservice-5.70*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle super user actions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kpty-5.70*:5 =kde-frameworks/kservice-5.70*:5 X? ( x11-libs/libX11 ) >=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/kdesu-5.70.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_=ec6f830886a08510cd123306bc4e4d3f
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.74.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
index 4fdcd527b9f2..c6688f57dd6b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.75.0
new file mode 100644
index 000000000000..e45b8d476d3a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kpty-5.75*:5 =kde-frameworks/kservice-5.75*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle super user actions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kpty-5.75*:5 =kde-frameworks/kservice-5.75*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kdesu-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f0929e70bea0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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 ) >=dev-qt/qtnetwork-5.12.3:5 dev-qt/qtcore:5
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=designer debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 c64132fe7c92..cb6abba6ac7a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f7a473d15aad9481b504ee1737dd224
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.75.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.75.0
new file mode 100644
index 000000000000..42072a1130ff
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwallet-5.75*:5 designer? ( =kde-frameworks/kdesignerplugin-5.75*:5 ) >=dev-qt/qtnetwork-5.14.2:5 dev-qt/qtcore:5
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=designer debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwallet-5.75*:5 designer? ( =kde-frameworks/kdesignerplugin-5.75*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kdewebkit-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 800925f96633..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=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/kdnssd-5.70.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_=49b19629f5889173330c47fb5e4d6997
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
index 4580781fc8bd..a429a5478b71 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc4a428eb947d7c6980544eef9ff1a36
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.75.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.75.0
new file mode 100644
index 000000000000..f2a8954e93dd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.14.2:5 zeroconf? ( >=dev-qt/qtdbus-5.14.2:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 zeroconf? ( >=dev-qt/qtdbus-5.14.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kdnssd-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bcf0570d7e65..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.70:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.70*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.70*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kdoctools-5.70.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_=e33bd84fa8d2bb1bc29c6faf16c6628d
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
index 51037e2dcbfc..b870f7b1cc58 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.75.0
new file mode 100644
index 000000000000..fb7381bec15a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.75:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.75*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kdoctools-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b1f988855647..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kservice-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kservice-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3: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.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kemoticons-5.70.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_=abbfc891a4154b93c2039236baab8f55
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
index 1a19916fa750..478fc65db04f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97ff4c5b7baa57c1af7e6d5bc7ffd73b
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.75.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.75.0
new file mode 100644
index 000000000000..270cbcc3f1fd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75: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 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kservice-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kservice-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kemoticons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 97526d8a4596..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.70*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for extracting file metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.70*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kfilemetadata-5.70.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	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 7bfe2f03b9b4..19370a4f9db0 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=69fef8d5039c306f69f11f122bf088ab
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.75.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.75.0
new file mode 100644
index 000000000000..b37bc396f0db
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.75*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for extracting file metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.75*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kfilemetadata-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d23bc5df44d4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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/kwindowsystem-5.70*:5[X] >=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/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==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/kwindowsystem-5.70*:5[X] >=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/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 a8fa3c275ee9..d27e619255ea 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c35339831f6813ce5f35fd13866fef19
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.75.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.75.0
new file mode 100644
index 000000000000..3fdda91e6743
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2: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.75: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 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kglobalaccel-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ba199753cc27..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 f86ee5e1040e..0da72e00b3ea 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=adaee2718c7a5e2dcbf8ea1c0abf8b2f
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e5db3af3c4eff2168abe2fc094781c
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.75.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.75.0
new file mode 100644
index 000000000000..1088efd8cc88
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kguiaddons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dbc94113acc91ff5f1852722cdcfad4c
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.70.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.70.0
deleted file mode 100644
index 8b9d5257b5fc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kholidays-5.70.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_=c90400e1ebe035ef4e54ef1c5078569a
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.74.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
index 5809cdcde43d..7ec9c1bad1c4 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c101e0336f26931969c269f3d42ccf81
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.75.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.75.0
new file mode 100644
index 000000000000..6211f5d02048
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kholidays-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c22e5145f650..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-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/kjobwidgets-5.70*:5 =kde-frameworks/kjs-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwallet-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/sonnet-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-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/kjobwidgets-5.70*:5 =kde-frameworks/kjs-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwallet-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/sonnet-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 fea3a8ab01c9..dc683ebfb937 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c17f87f2a18a2a5fd44ab7f407bd357
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.75.0 b/metadata/md5-cache/kde-frameworks/khtml-5.75.0
new file mode 100644
index 000000000000..aa0942451a6a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.75: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 >=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/karchive-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kjs-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwallet-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/sonnet-5.75*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.14.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=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/karchive-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kjs-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwallet-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/sonnet-5.75*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/khtml-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4f67d761eef1..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.70.0
+++ /dev/null
@@ -1,16 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-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-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=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-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/ki18n-5.70.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	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 75d10ed15824..0e27cf4d094b 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	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_=42f59850ff15a4fb740cce03426c463a
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=2a7e27dd9d7cbcb6790cadaa70ccb501
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.75.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.75.0
new file mode 100644
index 000000000000..a9ecbd136fba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.75.0
@@ -0,0 +1,16 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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-qt/qtdeclarative-5.14.2:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdeclarative-5.14.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/ki18n-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=d2b525c9ca13497a673faabbbdf9f4b5
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0
deleted file mode 100644
index 4072bb7ad4a5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=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 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=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 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 f7b381793df5..da5419e6401e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52dafd6b208c51cc3a2e4d949301bf6b
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.75.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.75.0
new file mode 100644
index 000000000000..de98fd74f5cb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.75.0
@@ -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.75: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 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for icon theming and configuration
+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/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-frameworks/karchive-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kiconthemes-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 92fc192a5edf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X xscreensaver debug doc
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kidletime-5.70.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_=7873fcf725aac962efbccf896fda8b26
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.74.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
index c0a475c37cb9..95bde9c920de 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82feed59e00b2a715b512c46881eff1d
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.75.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.75.0
new file mode 100644
index 000000000000..8b83e8d35607
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.14.2:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.14.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kidletime-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 83cd7cbc9009..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.70.0
+++ /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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.70*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=eps openexr test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/karchive-5.70*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 55ff3f98ab7d..586188e6a39e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70511b84d9336c762bcead5203443ad9
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.75.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.75.0
new file mode 100644
index 000000000000..b93e6d4a5ac8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.75.0
@@ -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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/karchive-5.75*:5 eps? ( >=dev-qt/qtprintsupport-5.14.2:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/karchive-5.75*:5 eps? ( >=dev-qt/qtprintsupport-5.14.2:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kimageformats-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d382dbbfba06..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.70:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70: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 =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 ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 365a3003916f..d33f490cdd09 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3542e222570c58372dfff1849c6fc73
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.75.0 b/metadata/md5-cache/kde-frameworks/kinit-5.75.0
new file mode 100644
index 000000000000..26f224caadee
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.75:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75: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 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+caps +man X 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 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kinit-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f7fdda9de8d4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.70.1-r1
+++ /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.70: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.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kauth-5.70*:5 =kde-frameworks/karchive-5.70*:5 =kde-frameworks/kbookmarks-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-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/kiconthemes-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kjobwidgets-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/solid-5.70*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.70*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.70*:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3: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.70:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kauth-5.70*:5 =kde-frameworks/karchive-5.70*:5 =kde-frameworks/kbookmarks-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-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/kiconthemes-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kjobwidgets-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/solid-5.70*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.70*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.70*:5 ) X? ( >=dev-qt/qtx11extras-5.12.3: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.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kio-5.70.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_=4b88d009d42cf3cd0e7756fe4ced690e
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1 b/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
index 1e06834d3604..0253b86f8a72 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtde
 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2bd6d2b6f3d77f98be0784aadef1efc
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.75.0 b/metadata/md5-cache/kde-frameworks/kio-5.75.0
new file mode 100644
index 000000000000..7ff547104a43
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.75.0
@@ -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.75: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.75*:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kbookmarks-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/solid-5.75*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.75*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.75*: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.75: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.75*:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kbookmarks-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/solid-5.75*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.75*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kio-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kirigami-5.70.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.70.0
deleted file mode 100644
index 93cba53ed195..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3: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.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kirigami2-5.70.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_=f1f5b99907aee9c03324f49506f440da
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
index b8dacccaa813..3ee99cdd03cc 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
@@ -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
 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e17ba1fff4da4a065ad81a1c7142f487
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.75.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.75.0
new file mode 100644
index 000000000000..a319d48df6cb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.75.0
@@ -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.75: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kirigami2-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kitemmodels-5.70.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
deleted file mode 100644
index 960f05ae8483..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=qml test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 d5912a84ed77..28799fbd97ce 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=2cfc88cacf5c62da7c5151350c9f0bdf
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bec11571df50c0a21bcac70cb3e210a7
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.75.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.75.0
new file mode 100644
index 000000000000..04e7dd066b34
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) test? ( >=dev-qt/qtwidgets-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kitemmodels-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=83236c9d39e3a1491641c146ba3d2267
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
deleted file mode 100644
index 14010580722f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) 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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 4f16ac8c55b2..4afbb855af91 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=8a8e99ad624628c7fee76cd4780afece
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd92bd5fa2606a6b0cda462bc1d56f87
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.75.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.75.0
new file mode 100644
index 000000000000..31c98264cdd7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kitemviews-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe8a3eba955013b35ee2fb24ec5f5fc2
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0
deleted file mode 100644
index a7bfae80b67c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=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/kjobwidgets-5.70.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_=d0363d818aff3fdf191c0756a640206c
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
index 0798d015d043..56ecedc57655 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=957b23f1136ec4cd463923dae3cf7c4e
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd8da39681feaee531c22a845512b88b
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.75.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.75.0
new file mode 100644
index 000000000000..383a95b11dec
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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/kcoreaddons-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*: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 )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kjobwidgets-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8a850831d8fc012d42ab7da277d52bf
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.70.0 b/metadata/md5-cache/kde-frameworks/kjs-5.70.0
deleted file mode 100644
index 9dca09d9c07f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=BSD-2 LGPL-2+
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 2bd02422e82a..111f094fe3bc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/kjs-5.75.0
new file mode 100644
index 000000000000..a84e1a3cbad6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.75:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kjs-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b57701a154c2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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 >=dev-qt/designer-5.12.3:5 dev-qt/qtcore:5
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 1e2e8362ae9f..874083a75e05 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43c87afd469fd4c72c46d4a8307f6c71
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.75.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.75.0
new file mode 100644
index 000000000000..c5505c8d5edf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.75:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.75*:5 =kde-frameworks/kjs-5.75*:5 >=dev-qt/designer-5.14.2:5 dev-qt/qtcore:5
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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.75*:5 =kde-frameworks/kjs-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kjsembed-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 335c08d9f2ee..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.70.0
+++ /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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kparts-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a common interface for KParts that can play media files
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND==kde-frameworks/kparts-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 e20d69b5f6ea..c21865874410 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfe312ca33a15217c94cb434580895b7
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.75.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.75.0
new file mode 100644
index 000000000000..4166b4aa55cf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.75.0
@@ -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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a common interface for KParts that can play media files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kmediaplayer-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 5a66d81ea888..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-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.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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 1e607bbcb812..f955f30e712c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aad1cbceec51c544f59813744d14239a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.75.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.75.0
new file mode 100644
index 000000000000..a2119be5cad8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.75.0
@@ -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.75: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 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/attica-5.75*:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+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 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/attica-5.75*:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kirigami-5.75:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/knewstuff-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index cd8dbb1c24a8..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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 ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 a3d454f5cd45..443cc46c903e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10892d40eea5f0091904d01942e5889d
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.75.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.75.0
new file mode 100644
index 000000000000..e3173547b7b2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*: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 ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/knotifications-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0e332a600276..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==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(+)] ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=phonon debug doc
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 b720ac0ec802..986bf27c6c85 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=342378627ada87ae84994d679e4bc37f
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.75.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.75.0
new file mode 100644
index 000000000000..053a23ad4195
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.75.0
@@ -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.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/knotifyconfig-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d0915bdce70b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.70:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=man debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 >=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/kpackage-5.70.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_=bd06e9ae971ebf58a95f165025722e7e
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.74.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
index bf424d4a740e..d3ee78170927 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.75.0
new file mode 100644
index 000000000000..427d6918f271
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.75:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/karchive-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/karchive-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kpackage-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 6b80cbe016d6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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.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/kjobwidgets-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=kde-frameworks/ktextwidgets-5.70:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=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.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/kjobwidgets-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 9d95ec7bd400..da1e14afb44e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d069fe60bd3c8b8fdc49b9673524cd5f
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.75.0 b/metadata/md5-cache/kde-frameworks/kparts-5.75.0
new file mode 100644
index 000000000000..0ffb8099ae0c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/ktextwidgets-5.75:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-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.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kparts-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d11c495a511c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE contact person abstraction library
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kpeople
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 08b888e5e163..8b4cfa08adb2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fccc46e08f2afaa8fb3fc26f485254fa
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.75.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.75.0
new file mode 100644
index 000000000000..5bddd2fef3e7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75: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 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE contact person abstraction library
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kpeople
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=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 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kpeople-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 1a2cb60af2de..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing easy data-plotting functions
-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/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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 1b9880e88939..883b465cd7ac 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3763f80e83c674d4074b9a9600fa1145
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.75.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.75.0
new file mode 100644
index 000000000000..29d8b079f1a3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.75.0
@@ -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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing easy data-plotting functions
+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/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kplotting-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index aa86ef197cba..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 sys-libs/libutempter >=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/kpty-5.70.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_=083a13cd60dcac490a7ca9e34f399be8
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.74.0 b/metadata/md5-cache/kde-frameworks/kpty-5.74.0
index 22814811bc0c..bd561b74bee3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/kpty-5.75.0
new file mode 100644
index 000000000000..72f86961c598
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kpty-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index a46f70a0026f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.70.0
+++ /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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 examples? ( >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kdeclarative-5.70*:5 =kde-frameworks/kirigami-5.70*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=QtQuick plugin providing high-performance charts
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
-IUSE=test debug examples test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 examples? ( >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kdeclarative-5.70*:5 =kde-frameworks/kirigami-5.70*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 b23c70bcf1b6..e5aed59482d8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64fb1ee15c260499591be473d543ef67
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.75.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.75.0
new file mode 100644
index 000000000000..9662e7b195f2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.75.0
@@ -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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 examples? ( >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kdeclarative-5.75*:5 =kde-frameworks/kirigami-5.75*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=QtQuick plugin providing high-performance charts
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
+IUSE=test debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 examples? ( >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kdeclarative-5.75*:5 =kde-frameworks/kirigami-5.75*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kquickcharts-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 60dba04c6f26..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcompletion-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/kparts-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcompletion-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/kparts-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 43f1e415a239..3c9b744df535 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=552cff9ec4f73aa1a37794153af342a0
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.75.0 b/metadata/md5-cache/kde-frameworks/kross-5.75.0
new file mode 100644
index 000000000000..fe5669d36fa2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.75:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=dev-qt/designer-5.14.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kross-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 0daeeeed9e59..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/plasma-5.70*:5 =kde-frameworks/solid-5.70*:5 =kde-frameworks/threadweaver-5.70*: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 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/plasma-5.70*:5 =kde-frameworks/solid-5.70*:5 =kde-frameworks/threadweaver-5.70*: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-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 910d4a26e4b5..c4086cc9e3e6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f4464a5804088325750af55a886719c
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.75.0 b/metadata/md5-cache/kde-frameworks/krunner-5.75.0
new file mode 100644
index 000000000000..e7187bdbc317
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=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.75: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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/plasma-5.75*:5 =kde-frameworks/solid-5.75*:5 =kde-frameworks/threadweaver-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=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 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/plasma-5.75*:5 =kde-frameworks/solid-5.75*:5 =kde-frameworks/threadweaver-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/krunner-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4e2a6e70ed45..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.70:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-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 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-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/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kservice-5.70.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_=34da97965170b1fc7deaf03a5ef973b0
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.74.0 b/metadata/md5-cache/kde-frameworks/kservice-5.74.0
index 46d2c4295eca..325668339859 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=254981fc7e2840bfcb828a436ef3c447
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.75.0 b/metadata/md5-cache/kde-frameworks/kservice-5.75.0
new file mode 100644
index 000000000000..b4a1237832d2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.75:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 test? ( >=dev-qt/qtconcurrent-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kcrash-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kservice-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index c7d3b4bdffdb..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.70.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.70: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-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.70*:5 =kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kguiaddons-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/kjobwidgets-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/sonnet-5.70*:5 =kde-frameworks/syntax-highlighting-5.70*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a full text editor component
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-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.70*:5 =kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kguiaddons-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/kjobwidgets-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 =kde-frameworks/sonnet-5.70*:5 =kde-frameworks/syntax-highlighting-5.70*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 c0615659ab7a..6851520f3c8f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=035d8d93015ebea6ec0ab07186ebcb3f
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.75.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.75.0
new file mode 100644
index 000000000000..031f21bfd9f0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.75: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.75: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/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/sonnet-5.75*:5 =kde-frameworks/syntax-highlighting-5.75*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a full text editor component
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+editorconfig git test debug doc test
+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/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kauth-5.75*:5 =kde-frameworks/kcodecs-5.75*:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kjobwidgets-5.75*:5 =kde-frameworks/kparts-5.75*:5 =kde-frameworks/ktextwidgets-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 =kde-frameworks/sonnet-5.75*:5 =kde-frameworks/syntax-highlighting-5.75*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/ktexteditor-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 732a4cf07ee1..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/sonnet-5.70*:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=speech test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/sonnet-5.70*:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 114327ed9f3f..8bf73bdea38d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f93209fcc1c1cd2ad9d4205ca44f7f3d
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.75.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.75.0
new file mode 100644
index 000000000000..5d2e3a974e5c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.75.0
@@ -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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/sonnet-5.75*:5 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcompletion-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/sonnet-5.75*:5 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/ktextwidgets-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 45f0ccf4a610..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/ki18n-5.70*:5 >=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting units
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/ki18n-5.70*:5 >=dev-qt/qtnetwork-5.12.3:5 >=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/kunitconversion-5.70.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_=8de30f8c0bac234db7a32563b75398dd
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
index e5bc02dfcd90..5ddf8f9cf2e9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8568dcea4ed30e67ec48ec02936a7cd1
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.75.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.75.0
new file mode 100644
index 000000000000..372dda8b26da
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.14.2:5 =kde-frameworks/ki18n-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting units
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 =kde-frameworks/ki18n-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kunitconversion-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 16bac96249d8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.70:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=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/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kdbusaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gpg +man debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libgcrypt:0= >=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/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kdbusaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=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/kwallet-5.70.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_=a4b0f5feb33b28dec723f4b82cfb4cb6
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.74.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
index 35f51fca79ef..08c1b8510501 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0074d955f5519b2442a14e157245ca6f
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.75.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.75.0
new file mode 100644
index 000000000000..cc91322f1ec9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.75:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=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.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libgcrypt:0= >=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.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kdbusaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kwallet-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 272c53ca89ee..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-qt/qtwayland-5.12.3:5 media-libs/mesa[egl] >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kwayland
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-qt/qtwayland-5.12.3:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/kwayland-5.70.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_=733943d7f237e7e8f2103f3aa329be73
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.74.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
index 9a29267a6a43..f3b451dc6200 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66e465e2cd56d72ecc478a4bf2db4c21
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.75.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.75.0
new file mode 100644
index 000000000000..e1bbcf32c22e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kwayland
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kwayland-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4e19a598db60..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) 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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 93845b5bdbff..553e3374827f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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_=2af788b580e75dc28c5670106e3d4e58
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb72fc6f7871e5423ffb27d934e95a66
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.75.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.75.0
new file mode 100644
index 000000000000..2e17ecf6518b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kwidgetsaddons-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1e6cea0615f1a8e815947ce79bb26602
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0
deleted file mode 100644
index 1ae25e84b976..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 62bb9bf421d0..5cb575579cb8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14ac289cce3c86cec4f54cf612afc8b7
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.75.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.75.0
new file mode 100644
index 000000000000..8a357c9dee28
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2: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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kwindowsystem-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 96854a61c2e6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.70.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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-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/kitemviews-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*: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.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-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/kitemviews-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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-r1 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
index 8a3140e455e3..9e362d024d3a 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
@@ -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 )
 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a41ac16b98703cec5528d0d358761e00
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.75.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.75.0
new file mode 100644
index 000000000000..5ed2c70d552b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.75.0
@@ -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.75: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.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*: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.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kitemviews-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/kxmlgui-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kxmlrpcclient-5.70.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0
deleted file mode 100644
index 45bd52725912..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 >=dev-qt/qtxml-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 >=dev-qt/qtxml-5.12.3:5 >=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/kxmlrpcclient-5.70.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_=e0dd8c5627533d57592667b3d07b67ed
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
index c8033f4258d7..1b7cd261a796 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=342b650a53a8bee3b52c8ad0b921e150
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.75.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.75.0
new file mode 100644
index 000000000000..833afe9be6b4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/portingAids/kxmlrpcclient-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 41145c167aa1..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 954a73d4678b..be5c82b39fc7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5d7ebc58531a9d53e8dd5046c0aa65b
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.75.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.75.0
new file mode 100644
index 000000000000..605185f19b34
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/modemmanager-qt-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 9b3ce022de97..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=teamd debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=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/networkmanager-qt-5.70.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_=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 090ba0bc31a3..ee686633ff30 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8bf059db58e3ab439531c35d109d74b
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.75.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.75.0
new file mode 100644
index 000000000000..53ee21c0be4e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/networkmanager-qt-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index d48e4f1243a2..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-qt/qtcore-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.70:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( >=dev-qt/qttest-5.12.3:5 )
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-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	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 52da3e822a53..f413c6f9fa1e 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=991ac9598d0a2850da55f5e3313be597
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.75.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.75.0
new file mode 100644
index 000000000000..51977676e304
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.75.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-qt/qtcore-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.75:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( >=dev-qt/qttest-5.14.2:5 )
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/oxygen-icons5-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4fd146c6f022..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.70.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.70: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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2-only=] >=dev-qt/qtquickcontrols-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/kactivities-5.70*:5 =kde-frameworks/karchive-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/kglobalaccel-5.70*:5 =kde-frameworks/kguiaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kirigami-5.70*:5 =kde-frameworks/knotifications-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 =kde-frameworks/kxmlgui-5.70*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.70*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3: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.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2-only=] >=dev-qt/qtquickcontrols-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/kactivities-5.70*:5 =kde-frameworks/karchive-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/kglobalaccel-5.70*:5 =kde-frameworks/kguiaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kirigami-5.70*:5 =kde-frameworks/knotifications-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 =kde-frameworks/kxmlgui-5.70*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.70*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3: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.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/plasma-framework-5.70.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_=16861bb5ca5fa780fbe7cddd3a3ccac7
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
index 41eca048ba5a..3709bde03c52 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
@@ -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 ) 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a641d54273c1479a00f67ccf6efd84f8
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.75.0 b/metadata/md5-cache/kde-frameworks/plasma-5.75.0
new file mode 100644
index 000000000000..28c3b2c3151a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.75: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.75: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.75*:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kdeclarative-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kirigami-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.75*: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.75*:5 =kde-frameworks/karchive-5.75*:5 =kde-frameworks/kconfig-5.75*:5 =kde-frameworks/kconfigwidgets-5.75*:5 =kde-frameworks/kcoreaddons-5.75*:5 =kde-frameworks/kdeclarative-5.75*:5 =kde-frameworks/kglobalaccel-5.75*:5 =kde-frameworks/kguiaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kirigami-5.75*:5 =kde-frameworks/knotifications-5.75*:5 =kde-frameworks/kpackage-5.75*:5 =kde-frameworks/kservice-5.75*:5 =kde-frameworks/kwidgetsaddons-5.75*:5 =kde-frameworks/kwindowsystem-5.75*:5 =kde-frameworks/kxmlgui-5.75*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/plasma-framework-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/prison-5.70.0 b/metadata/md5-cache/kde-frameworks/prison-5.70.0
deleted file mode 100644
index b85485467d4a..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/prison
-IUSE=qml debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=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/prison-5.70.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_=50bfa24a65ad3b44d0a671a5f5d15ced
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.74.0 b/metadata/md5-cache/kde-frameworks/prison-5.74.0
index 5be43ad93b10..c8eb6d176ea7 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4431806e16628f29bc670597a3aae82
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.75.0 b/metadata/md5-cache/kde-frameworks/prison-5.75.0
new file mode 100644
index 000000000000..0a7cd75ab3c8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) test? ( >=dev-qt/qtwidgets-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/prison
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/prison-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index b75bc1643c3b..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kirigami-5.70*:5 dolphin? ( =kde-frameworks/knotifications-5.70*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+dolphin +kaccounts debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-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 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kirigami-5.70*:5 dolphin? ( =kde-frameworks/knotifications-5.70*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kdeclarative-5.70:5 kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/purpose-5.70.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_=6cdaf2c6968685738c09ccb3b4b2ae66
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.74.0 b/metadata/md5-cache/kde-frameworks/purpose-5.74.0
index 8c9f67de2dd0..5d8d2b8a34fe 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e67801ea9842ba287212e92935da8f6
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.75.0 b/metadata/md5-cache/kde-frameworks/purpose-5.75.0
new file mode 100644
index 000000000000..acac998c02f8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75: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/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kirigami-5.75*:5 dolphin? ( =kde-frameworks/knotifications-5.75*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=bluetooth +dolphin +kaccounts debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+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/kcoreaddons-5.75*:5 =kde-frameworks/ki18n-5.75*:5 =kde-frameworks/kio-5.75*:5 =kde-frameworks/kirigami-5.75*:5 dolphin? ( =kde-frameworks/knotifications-5.75*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kdeclarative-5.75:5 bluetooth? ( =kde-frameworks/bluez-qt-5.75*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/purpose-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 8b880d00e049..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kirigami-5.70*:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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==kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kirigami-5.70*:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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-r1 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
index b67ef57132e8..38a41a40905f 100644
--- 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
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidg
 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c00ce92b36b054241a78310dabc17df
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.75.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.75.0
new file mode 100644
index 000000000000..650b925f5228
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.75: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.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kirigami-5.75*: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.75*:5 =kde-frameworks/kiconthemes-5.75*:5 =kde-frameworks/kirigami-5.75*: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.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/qqc2-desktop-style-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f26f53dfba8d6ab813fbee7c824cc78
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.70.0 b/metadata/md5-cache/kde-frameworks/solid-5.70.0
deleted file mode 100644
index a32c83e06710..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.12.3: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.70: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/qtdeclarative-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 edde2c4ef458..096a7bd1ea18 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d25e40307b94dda8cf730a1b514123
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.75.0 b/metadata/md5-cache/kde-frameworks/solid-5.75.0
new file mode 100644
index 000000000000..3fcc11d95ca6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.14.2: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.75: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 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 sys-fs/udisks:2 virtual/libudev:= test? ( >=dev-qt/qtconcurrent-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/solid-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 4bde4eb17569..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) 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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 061873781565..eb5bad403282 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69a235e26c15f1bf49521e4edfa172d4
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.75.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.75.0
new file mode 100644
index 000000000000..22cdf0573f3a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) 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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=aspell +hunspell nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/sonnet-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index f0c7d1d47386..000000000000
--- a/metadata/md5-cache/kde-frameworks/syndication-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcodecs-5.70*:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcodecs-5.70*:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=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/syndication-5.70.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_=4d2c5d3399c2b511b9fa639a752fd2de
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.74.0 b/metadata/md5-cache/kde-frameworks/syndication-5.74.0
index 8224c260f056..49d56a8b04be 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac010ef999bf486c7e72eef87cf615eb
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.75.0 b/metadata/md5-cache/kde-frameworks/syndication-5.75.0
new file mode 100644
index 000000000000..16117d01cab4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.75*:5 test? ( >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.75*:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/syndication-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index ef2269bb28ca..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=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/syntax-highlighting-5.70.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_=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 26fc7eb85608..96063ea5e3a6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25d1fedf5a097e63e5f133c19cb43df6
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.75.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.75.0
new file mode 100644
index 000000000000..2d051abcbaf6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.75.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.14.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for syntax highlighting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/syntax-highlighting-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 295d553b4296..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.70.0
+++ /dev/null
@@ -1,15 +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.70:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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 e73f226a99bf..f3bc9816db81 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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.75.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.75.0
new file mode 100644
index 000000000000..d7b77f13fb65
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.75.0
@@ -0,0 +1,15 @@
+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.75:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.75
+SRC_URI=mirror://kde/stable/frameworks/5.75/threadweaver-5.75.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 9d89e3dec0dc..53a8792de0ba 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
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 a9a263ba33ac..45105047c311 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-r1 b/metadata/md5-cache/kde-misc/kdeconnect-20.04.3-r1
index 55a2e09fb11e..c250a757d243 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-20.04.3-r1
+++ b/metadata/md5-cache/kde-misc/kdeconnect-20.04.3-r1
@@ -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.04.3/src/kdeconnect-kde-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	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05f694290244143e7a68ab89c6302434
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-20.08.1-r1 b/metadata/md5-cache/kde-misc/kdeconnect-20.08.1-r1
deleted file mode 100644
index 3906cd16e456..000000000000
--- a/metadata/md5-cache/kde-misc/kdeconnect-20.08.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake 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-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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/kirigami-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/plasma-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Adds communication between KDE Plasma and your smartphone
-EAPI=7
-HOMEPAGE=https://kdeconnect.kde.org/ https://kde.org/applications/en/kdeconnect.kcm
-IUSE=bluetooth pulseaudio wayland X debug +handbook test selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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/kirigami-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/plasma-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.72.0:5 ) dev-libs/kpeoplevcard >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kdeclarative-5.72.0:5 net-fs/sshfs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-kdeconnect )
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7db846c12812b28eb58ea495b00aac6
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-20.08.2 b/metadata/md5-cache/kde-misc/kdeconnect-20.08.2
new file mode 100644
index 000000000000..1834c49b8c0e
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kdeconnect-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake 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-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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/kirigami-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/plasma-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.72.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Adds communication between KDE Plasma and your smartphone
+EAPI=7
+HOMEPAGE=https://kdeconnect.kde.org/ https://kde.org/applications/en/kdeconnect.kcm
+IUSE=bluetooth pulseaudio wayland X debug +handbook test selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-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/kirigami-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/plasma-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.72.0:5 ) dev-libs/kpeoplevcard >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kdeclarative-5.72.0:5 net-fs/sshfs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-kdeconnect )
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kdeconnect-kde-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a243bd5145d473b557e90597b109103c
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 868858fecb71..dc83c9f475dc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 a542063e81d6..7fee6fdff198 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kimtoy-1.92_pre20190225 b/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
index c67caf06026d..3e01317b2f82 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 890c6a2df504..3798990231b3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 53fba87e06cf..5266557235d6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index bf028988c840..000000000000
--- a/metadata/md5-cache/kde-misc/kio-gdrive-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake 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=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkgapi-19.08.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/knotifications-5.72.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.1:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KIO Slave for Google Drive service
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.kio_gdrive
-IUSE=+kaccounts debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkgapi-19.08.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/knotifications-5.72.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.1:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-gdrive-20.08.2 b/metadata/md5-cache/kde-misc/kio-gdrive-20.08.2
new file mode 100644
index 000000000000..1047482e3a6c
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake 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=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkgapi-19.08.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/knotifications-5.72.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.2:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KIO Slave for Google Drive service
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.kio_gdrive
+IUSE=+kaccounts debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkgapi-19.08.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/knotifications-5.72.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.2:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.08.2/src/kio-gdrive-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4c6c4340446f..ffbdc94b4c33 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-stash-1.0-r1 b/metadata/md5-cache/kde-misc/kio-stash-1.0-r1
index 2f09d2208c8c..1263a87306b9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 997c19c62b22..fa20436d6245 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 1e92faef8c9d..8b16dca6d932 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 2cc686a35b4a..4dc17409398d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 e212b36d53a6..a6f36e5f9999 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/krename-5.0.1 b/metadata/md5-cache/kde-misc/krename-5.0.1
index e758e7ca9eef..118c12915da4 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.1
+++ b/metadata/md5-cache/kde-misc/krename-5.0.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 )
 SLOT=5
 SRC_URI=mirror://kde/stable/krename/5.0.1/src/krename-5.0.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88c20a86aa91f3bcc45930ecc87acbf3
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.2 b/metadata/md5-cache/kde-misc/krusader-2.7.2
index 42299f6b69c7..ff6415aa5b3d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 89b746e83c28..836085018bac 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/latte-dock-0.9.11 b/metadata/md5-cache/kde-misc/latte-dock-0.9.11
index 52b767172bd6..54bd4775248e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 38372f0dc212..f41ba8c17f2a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/plasma-pass-1.1.0 b/metadata/md5-cache/kde-misc/plasma-pass-1.1.0
index 63cff1d886a5..af851b414036 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/rsibreak-0.12.13 b/metadata/md5-cache/kde-misc/rsibreak-0.12.13
index 79ad46a83ab3..c7b181a9d678 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 3b168dd072da..0b6edd6ad557 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 2bf382ef5b77..52e27edf4518 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 182bd637a562..07fbf89fa3bd 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/wacomtablet-3.2.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.2.0
index e1cdf2ca55e6..430678801b96 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 b50e99178c3d..77f85a433fda 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 ffd0241267a0..0b3cb7a0fbf2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 57e835ea724b..c820295daf8b 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.18.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.18.5
deleted file mode 100644
index 30c80f370a09..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 9e098e87e38d..300fd666f788 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f9e5c8b8c65874dc2861477e05a10478
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-5.18.5
deleted file mode 100644
index 318e010dd71f..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kpackage-5.66.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-IUSE=wayland X debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.66.0:5 >=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/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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 c274e3010d6d..e5a2ed420d29 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=011377a888684736985bc12a131f7ceb
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.18.5
deleted file mode 100644
index f8234f8ad99a..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.18.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz
-_eclasses_=kde.org	074252323c6185f751658b74c09b68ff
-_md5_=ca51bc6534ba4c193e1dc63899d48d37
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
index 9f362e85e312..20bcddaeba3b 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-grub-5.19.5.tar.xz
-_eclasses_=kde.org	074252323c6185f751658b74c09b68ff
+_eclasses_=kde.org	16ab706e1b049cfaa65425a0c0e28cac
 _md5_=ca51bc6534ba4c193e1dc63899d48d37
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5
deleted file mode 100644
index 3652ead35e61..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/sassc || ( ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pycairo[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=kde-plasma/breeze-5.18.5:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	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 44c6e501b1bb..949fef2d4805 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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_=675d2fe959cc84fe00792bb5cf749d2d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5
deleted file mode 100644
index 4cd28a291e4d..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.66.0:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	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 40b775bc897e..73104a56f084 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a04d4b890b3d09c4e2f6ee792d1f41d
diff --git a/metadata/md5-cache/kde-plasma/discover-5.18.5 b/metadata/md5-cache/kde-plasma/discover-5.18.5
deleted file mode 100644
index c0c5cee3df9f..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.18.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.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-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/kio-5.66.0:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-frameworks/kitemmodels-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/kxmlgui-5.66.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/Discover
-IUSE=+firmware telemetry test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-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/kio-5.66.0:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-frameworks/kitemmodels-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/kxmlgui-5.66.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-frameworks/kirigami-5.66.0:5 || ( 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.18.5/discover-5.18.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_=0c2ab207055c7c4c2c1f9bfac0204ea3
diff --git a/metadata/md5-cache/kde-plasma/discover-5.19.5 b/metadata/md5-cache/kde-plasma/discover-5.19.5
index 1770e9a48acc..6ae3d1657531 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18c2334f5f4dca3f39b437d937c7c512
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2 b/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2
deleted file mode 100644
index a7c8f944301c..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.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/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 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=X debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 6e8c0027a5f4..c9c6f62b684e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d67a82c8d8d713e1697d1893e7afad83
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5
deleted file mode 100644
index 011e38f8c5c4..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.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/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 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 4365c7dfe8df..f9f6d155f09a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8cebf47f26853d20b1bb114ca775a869
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
deleted file mode 100644
index a30e29f206fc..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.18.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-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/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/kservice-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-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/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.66.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-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/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/kservice-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-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/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.66.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 55f46b14a6c0..24c4df5778b0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0201245a822dd30653db8c31a894ce1
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
deleted file mode 100644
index e27397842234..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.18.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.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-IUSE=test debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/kde-gtk-config-5.18.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_=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 544e9f56b7fe..1ea5a7b0f92e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dd73c4d3ec2f21c90b6e3683b202a11
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.18.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.18.5
deleted file mode 100644
index 1fd9f09476b7..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.18.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.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.66.0:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.66.0:5 >=dev-qt/qtgui-5.12.3:5 || ( 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.18.5/kdecoration-5.18.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_=e614cdb10c56fdc1fe09bc620fd594da
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.19.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
index ea1f6a78ba8f..874a7fba270e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0b026ccdc3e53d593580d78ec8bd117
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
deleted file mode 100644
index 03a3e866e714..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=share webengine debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 3707448949a7..ad223d359b75 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
@@ -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/plasma/5.19.5/kdeplasma-addons-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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65c1f1983c2cd2fa5b3d4e061fba0eab
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.18.5 b/metadata/md5-cache/kde-plasma/kgamma-5.18.5
deleted file mode 100644
index 915949a0611e..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 bdece878b425..5903239a41c2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bae2d9cfcda590f0e93fc58b2804ea07
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.18.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.18.5
deleted file mode 100644
index 1f219d95a164..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 2cde3bedb6ea..3eee6000b661 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=356330c3de02d91e293c1b2c0c5934b9
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
deleted file mode 100644
index 1be9db787e97..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.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/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2-only=] >=dev-qt/qtwidgets-5.12.3: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/kpackage-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/solid-5.66.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.66.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.66.0:5 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
-IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2-only=] >=dev-qt/qtwidgets-5.12.3: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/kpackage-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/solid-5.66.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.66.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kirigami-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
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 4a82d30910ec..17a598d23666 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-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-
 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d72c8e0841f21e2a7835baa02de9964
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
deleted file mode 100644
index e8454f38daf8..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.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/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/kinit-5.66.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 248045904765..924a1f2c8aab 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edac06cb0bd42d575b11343b3dea1da8
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.18.5 b/metadata/md5-cache/kde-plasma/kscreen-5.18.5
deleted file mode 100644
index 18b79099647d..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdeclarative-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/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/libkscreen-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/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=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/kdeclarative-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/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/libkscreen-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/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.18.5:5 >=dev-qt/qtgraphicaleffects-5.12.3: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=mirror://kde/stable/plasma/5.18.5/kscreen-5.18.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_=54ea37309e7c28e97b923ad81beba116
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.19.5 b/metadata/md5-cache/kde-plasma/kscreen-5.19.5
index e1aada68c2fd..8f84149babe4 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9750c9e1f6a1e510e79785bf050e78d
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
deleted file mode 100644
index 53d87a555375..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
+++ /dev/null
@@ -1,17 +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.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-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/kidletime-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/ktextwidgets-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/solid-5.66.0: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/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=+pam seccomp test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.18.5:5
-RDEPEND=>=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/kcrash-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/kidletime-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/ktextwidgets-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/solid-5.66.0: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/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	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_=4d5b2b325eb2d0fb895c688795b7a3bc
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
index 65e96d894161..23317208bcc6 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=510548df9f912e9bd4e0f7d6f316c03f
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5
deleted file mode 100644
index a46ff53fb083..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/ksshaskpass
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-r1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
index fdf654ed6cbd..425d543cd4dd 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
@@ -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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=270d53e2a9c076c4a5f854f2a0b299f9
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.18.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.18.5
deleted file mode 100644
index 2306de07a783..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=lm-sensors pcap debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 dfdd894d57f3..f8e5166d5d98 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
@@ -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
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/ksysguard-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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99bd6a2ad31533f1cd7f2b48286120fa
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5
deleted file mode 100644
index 6eb36246c932..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.66.0:5 dev-libs/libgcrypt:0= sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 026a36196b28..b98fa1c74cc9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=975a674f6220beb518461647889268a8
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5
deleted file mode 100644
index cc2eca3d98e4..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwindowsystem-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
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/kwayland-integration-5.18.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_=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 3eddc1c41115..cdff83a3a0da 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a98dd33d7df2b4728fdbe0c99694bea4
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 b14c551c13c3..563ee5c6686a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d44b69a7fabcf7e91de5337668f7b58f
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1 b/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1
deleted file mode 100644
index fddb4042f15a..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-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/kdeclarative-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/kidletime-5.66.0:5= >=kde-frameworks/kinit-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/kservice-5.66.0:5 >=kde-frameworks/ktextwidgets-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] >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kdecoration-5.18.5:5 >=kde-plasma/kscreenlocker-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=[gles2-only=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/designer-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=caps gles2-only multimedia test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.18.5:5
-RDEPEND=>=kde-frameworks/kactivities-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/kdeclarative-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/kidletime-5.66.0:5= >=kde-frameworks/kinit-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/kservice-5.66.0:5 >=kde-frameworks/ktextwidgets-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] >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kdecoration-5.18.5:5 >=kde-plasma/kscreenlocker-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=[gles2-only=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=kde-frameworks/kirigami-5.66.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtvirtualkeyboard-5.12.3:5 multimedia? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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
deleted file mode 100644
index b45623b4d1b2..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2-only=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kactivities-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/kdeclarative-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/kidletime-5.66.0:5= >=kde-frameworks/kinit-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/kservice-5.66.0:5 >=kde-frameworks/ktextwidgets-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] >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kdecoration-5.18.5:5 >=kde-plasma/kscreenlocker-5.18.5:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/designer-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=caps gles2-only multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.18.5:5
-RDEPEND=>=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2-only=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kactivities-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/kdeclarative-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/kidletime-5.66.0:5= >=kde-frameworks/kinit-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/kservice-5.66.0:5 >=kde-frameworks/ktextwidgets-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] >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kdecoration-5.18.5:5 >=kde-plasma/kscreenlocker-5.18.5:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtvirtualkeyboard-5.12.3:5 >=kde-frameworks/kirigami-5.66.0:5 multimedia? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-r1 b/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
index 47e6a9a8dfaa..0d0d8453b099 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
@@ -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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1527586101da27f2606285726277726
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.18.5 b/metadata/md5-cache/kde-plasma/kwrited-5.18.5
deleted file mode 100644
index cf351a89af7c..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 a216849b83b0..0585911b0547 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5046c88994d2ca7c220b371a0a7119d8
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.18.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.18.5
deleted file mode 100644
index 735e5e9b6a44..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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.66.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/qtx11extras-5.12.3:5 >=kde-frameworks/kwayland-5.66.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kwayland-5.66.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 11c308489847..b0afb38ca1b5 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7edcb36026d612d3ea1087a705198097
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.18.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.18.5
deleted file mode 100644
index 1be14230120c..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.18.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.66.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 >=kde-frameworks/kauth-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/ki18n-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.66.0:5 !minimal? ( >=kde-frameworks/plasma-5.66.0:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=minimal webengine X test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-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 >=kde-frameworks/kauth-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/ki18n-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 f39ccca403c3..a4dc3ebc1283 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b42c65e6c4327c3e403b53b6543b9473
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5
deleted file mode 100644
index ba7ee769842a..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.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/qtx11extras-5.12.3:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/kscreenlocker-5.18.5:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.18.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-plasma/kscreenlocker-5.18.5:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-workspace-5.18.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_=de0e341b9e816a03f20fb828098ceeec
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
index 43cf9c73e2f0..e909159129e8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29184bb27473c49966b0c9d731ef5d36
diff --git a/metadata/md5-cache/kde-plasma/milou-5.18.5 b/metadata/md5-cache/kde-plasma/milou-5.18.5
deleted file mode 100644
index cf87a6dcfd08..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kitemmodels-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/milou
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=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/kitemmodels-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=dev-qt/qtdeclarative-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/milou-5.18.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_=7692a725ba7aea50f47242e1cbef9c33
diff --git a/metadata/md5-cache/kde-plasma/milou-5.19.5 b/metadata/md5-cache/kde-plasma/milou-5.19.5
index cdbec5671cbf..45ae579f13b8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07b819c0560ba658de9f7dd13d8db27c
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.18.5 b/metadata/md5-cache/kde-plasma/oxygen-5.18.5
deleted file mode 100644
index f64c46734273..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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-frameworks/kservice-5.66.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-IUSE=wayland debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 77f344c48d7a..fae0d972f19f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da1699307357cbaa1eca33ff0a91d5d8
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
deleted file mode 100644
index a5295da17993..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 f058b421f670..4221f5fc1fa8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e0502a66acafc968d888db7dc1a8096
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
deleted file mode 100644
index e2f64b32f06e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-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 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kemoticons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-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/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kparts-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-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/solid-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5:5 media-libs/phonon[qt5(+)] 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.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.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
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-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 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kemoticons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-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/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kparts-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-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/solid-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5:5 media-libs/phonon[qt5(+)] 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.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-frameworks/qqc2-desktop-style-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kde-cli-tools-5.18.5:5 >=kde-plasma/oxygen-5.18.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.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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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
deleted file mode 100644
index 8796913e5357..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-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 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kemoticons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-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/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kparts-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-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/solid-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5:5 media-libs/phonon[qt5(+)] 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.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.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
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-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 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kemoticons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-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/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kparts-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-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/solid-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5:5 media-libs/phonon[qt5(+)] 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.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-frameworks/qqc2-desktop-style-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kde-cli-tools-5.18.5:5 >=kde-plasma/oxygen-5.18.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.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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 7419a6330cfd..59426e2a042e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-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/plasma-desktop-5.19.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6430aff5d7c8a6771d017653c034ee2b
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.18.5
deleted file mode 100644
index 52a7df745e23..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.18.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.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-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/kwayland-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/breeze-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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=>=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/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-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/kwayland-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/breeze-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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.18.5/plasma-integration-5.18.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_=ecb56baad6aee918953003f5f043e82d
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
index e4a5e1aedcf9..7d551fe716d1 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquick
 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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69359503b4902e7985d1df392238213b
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.18.5
deleted file mode 100644
index 68a7e95c0ffb..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.18.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.18.5:5 >=kde-plasma/drkonqi-5.18.5:5 >=kde-plasma/kactivitymanagerd-5.18.5:5 >=kde-plasma/kde-cli-tools-5.18.5:5 >=kde-plasma/kdecoration-5.18.5:5 >=kde-plasma/kdeplasma-addons-5.18.5:5 >=kde-plasma/kgamma-5.18.5:5 >=kde-plasma/khotkeys-5.18.5:5 >=kde-plasma/kinfocenter-5.18.5:5 >=kde-plasma/kmenuedit-5.18.5:5 >=kde-plasma/kscreen-5.18.5:5 >=kde-plasma/kscreenlocker-5.18.5:5 >=kde-plasma/ksshaskpass-5.18.5:5 >=kde-plasma/ksysguard-5.18.5:5 >=kde-plasma/kwayland-integration-5.18.5:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/kwrited-5.18.5:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/milou-5.18.5:5 >=kde-plasma/oxygen-5.18.5:5 >=kde-plasma/plasma-desktop-5.18.5:5 >=kde-plasma/plasma-integration-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5:5 >=kde-plasma/polkit-kde-agent-5.18.5:5 >=kde-plasma/powerdevil-5.18.5:5 >=kde-plasma/systemsettings-5.18.5:5 >=kde-plasma/user-manager-5.18.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.18.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.18.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.18.5:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.18.5:5 ) discover? ( >=kde-plasma/discover-5.18.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.18.5:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.18.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.18.5:5 >=kde-plasma/kde-gtk-config-5.18.5:5 ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.18.5:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.18.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.18.5:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.18.5:5 >=kde-plasma/plymouth-kcm-5.18.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.18.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.18.5:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.18.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.18.5:5 )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=5
-_md5_=27daa1b792d353d6c7dd90a45c924d4e
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
deleted file mode 100644
index 95a3557c061d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-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/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/kitemviews-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/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/networkmanager-qt-5.66.0:5[teamd=] >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.66.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-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/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/kitemviews-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/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/networkmanager-qt-5.66.0:5[teamd=] >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.66.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-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
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-nm-5.18.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_=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 3efccdf1c691..2b0be670c7b8 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b0e2b639e9e503cd982762a0c8b0f43
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
deleted file mode 100644
index b718488d6f68..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 c10854d7d8b2..5124131e72b4 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9097ac7917a255389e1682baa5d3e620
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5
deleted file mode 100644
index 01328017ff1a..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.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.66.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/qtdeclarative-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/karchive-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/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/kpackage-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktexteditor-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=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/qtxml-5.12.3:5 >=kde-frameworks/karchive-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/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/kpackage-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktexteditor-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kirigami-5.66.0:5 || ( 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.18.5/plasma-sdk-5.18.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_=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 dfe1655e6db5..0eca486ad13f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=757d1857078363babe1cd13cf8d8e30c
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
deleted file mode 100644
index 83dd8d9bc29e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcoreaddons-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/knotifications-5.66.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcoreaddons-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/knotifications-5.66.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-thunderbolt-5.18.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_=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 bf0ef11c51f2..50f35ea8715e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a07325f96c69fac1ffd057e607f1bb31
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
deleted file mode 100644
index bd9553bcf899..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=amd64 ~arm arm64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 609e0667edb4..98a85e0906c2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c27f08493cbd587a9da7ae3beccca573
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
deleted file mode 100644
index 9f66d28acaa7..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.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/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5=[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-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/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-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/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kidletime-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/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/kpeople-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktexteditor-5.66.0:5 >=kde-frameworks/ktextwidgets-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 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/kscreenlocker-5.18.5:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.66.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.66.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.66.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.18.5:5
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5=[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-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/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-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/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kidletime-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/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/kpeople-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktexteditor-5.66.0:5 >=kde-frameworks/ktextwidgets-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 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/kscreenlocker-5.18.5:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.66.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.66.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.66.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpaths-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5[widgets] >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kquickcharts-5.66.0:5 >=kde-frameworks/kdesu-5.66.0:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-plasma/ksysguard-5.18.5:5 >=kde-plasma/milou-5.18.5:5 >=kde-plasma/plasma-integration-5.18.5:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.16.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore: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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
index f11ea01ebafb..d2a520d640a7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
@@ -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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=941707ced6aaf7a384ca2430fc2e4060
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
deleted file mode 100644
index f71a6fdde3c5..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Wallpapers for the Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-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	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 7836817a4e30..20b7bae956c5 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/plymouth-kcm-5.18.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
deleted file mode 100644
index f8857956ca96..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 3ecd5c770b8d..9f061a3cd7fc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c8b0e36a1ae91d3a7619aa7a03471d9
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
deleted file mode 100644
index 91e7182db95e..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 0d8e1b13a4b4..44280d3b4c83 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6bcb40513a1a7314fbd63c892bbdb454
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5
deleted file mode 100644
index 0b89ca8a3460..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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
deleted file mode 100644
index 36b74f961921..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 d9710f660bec..0f9990f10381 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e6389609b001293132e58f085b16366
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5
deleted file mode 100644
index a008b59208eb..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 4e6ac9dee1f6..48b87f5eb37b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44df926095b1a558b9456acc1bb17eaa
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.18.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.18.5
deleted file mode 100644
index ed8ee080f105..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 a7a09d34f3f6..611b91e24019 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac96a7a5d242d50fdea195e8ae72025d
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.18.5 b/metadata/md5-cache/kde-plasma/user-manager-5.18.5
deleted file mode 100644
index c45a8ecc9e82..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 afac41caf2ec..a6b48dd8352c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e49a11139816baa333a5c039058c1ec2
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
deleted file mode 100644
index 2a293576af8e..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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:= ) >=kde-frameworks/kwayland-5.66.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=screencast debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.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 ed2a29f1c3be..347ffd616015 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b9609a5d66f07bc07dbc7ee6a6e23c0
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
deleted file mode 100644
index 115f939aeca4..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=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
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-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	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 a1bbe69fc159..773591825b34 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e0a135a6f91c9662ee80e1a484476ae
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index c8c2deb0c91c..6206bbfc947a 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
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 56ba88373e15..b9cb1951bbb6 100644
--- a/metadata/md5-cache/mail-client/kube-0.7.0-r1
+++ b/metadata/md5-cache/mail-client/kube-0.7.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync:5 >=dev-libs/sink-0.7.0:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-apps/kmime:5 kde-frameworks/breeze-icons:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/kcodecs:5 || ( kde-frameworks/kcontacts:5 kde-apps/kcontacts:5 ) test? ( dev-qt/qttest:5 )
+DEPEND=>=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync:5 >=dev-libs/sink-0.7.0:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-apps/kmime:5 kde-frameworks/breeze-icons:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/kcodecs:5 kde-frameworks/kcontacts:5 test? ( dev-qt/qttest:5 )
 DESCRIPTION=Mail client based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kube-project.com
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync:5 >=dev-libs/sink-0.7.0:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-apps/kmime:5 kde-frameworks/breeze-icons:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/kcodecs:5 || ( kde-frameworks/kcontacts:5 kde-apps/kcontacts:5 )
+RDEPEND=>=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync:5 >=dev-libs/sink-0.7.0:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-apps/kmime:5 kde-frameworks/breeze-icons:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/kcodecs:5 kde-frameworks/kcontacts:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kube/0.7.0/src/kube-0.7.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_=4f42197017ff909235b8eabee33ee3fa
+_md5_=28bc2813af4917b88b3a1da122a61eab
diff --git a/metadata/md5-cache/mail-client/thunderbird-68.12.0 b/metadata/md5-cache/mail-client/thunderbird-68.12.0
deleted file mode 100644
index eb6c23662296..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-68.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.44.4 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=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 system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils virtual/pkgconfig >=virtual/rust-1.34.0 || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=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 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/thunderbird
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free +gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo pulseaudio selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.44.4 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=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 system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=pgo? ( lto ) wifi? ( dbus )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ar.xpi -> thunderbird-68.12.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ast.xpi -> thunderbird-68.12.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/be.xpi -> thunderbird-68.12.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/bg.xpi -> thunderbird-68.12.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/br.xpi -> thunderbird-68.12.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ca.xpi -> thunderbird-68.12.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/cak.xpi -> thunderbird-68.12.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/cs.xpi -> thunderbird-68.12.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/cy.xpi -> thunderbird-68.12.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/da.xpi -> thunderbird-68.12.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/de.xpi -> thunderbird-68.12.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/dsb.xpi -> thunderbird-68.12.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/el.xpi -> thunderbird-68.12.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.12.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.12.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.12.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/et.xpi -> thunderbird-68.12.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/eu.xpi -> thunderbird-68.12.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/fi.xpi -> thunderbird-68.12.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/fr.xpi -> thunderbird-68.12.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.12.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.12.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/gd.xpi -> thunderbird-68.12.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/gl.xpi -> thunderbird-68.12.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/he.xpi -> thunderbird-68.12.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hr.xpi -> thunderbird-68.12.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.12.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hu.xpi -> thunderbird-68.12.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.12.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/id.xpi -> thunderbird-68.12.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/is.xpi -> thunderbird-68.12.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/it.xpi -> thunderbird-68.12.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ja.xpi -> thunderbird-68.12.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ka.xpi -> thunderbird-68.12.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/kab.xpi -> thunderbird-68.12.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/kk.xpi -> thunderbird-68.12.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ko.xpi -> thunderbird-68.12.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/lt.xpi -> thunderbird-68.12.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ms.xpi -> thunderbird-68.12.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.12.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/nl.xpi -> thunderbird-68.12.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.12.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/pl.xpi -> thunderbird-68.12.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.12.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.12.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/rm.xpi -> thunderbird-68.12.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ro.xpi -> thunderbird-68.12.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ru.xpi -> thunderbird-68.12.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/si.xpi -> thunderbird-68.12.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sk.xpi -> thunderbird-68.12.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sl.xpi -> thunderbird-68.12.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sq.xpi -> thunderbird-68.12.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sr.xpi -> thunderbird-68.12.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.12.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/tr.xpi -> thunderbird-68.12.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/uk.xpi -> thunderbird-68.12.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/uz.xpi -> thunderbird-68.12.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/vi.xpi -> thunderbird-68.12.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.12.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.12.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/source/thunderbird-68.12.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-15.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozcoreconf-v6	7efde39c6e3b6ffe287e0c4b2eed5e65	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a8fd4b224dadf431a36d80d104fc238
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.3.1 b/metadata/md5-cache/mail-client/thunderbird-78.3.1
deleted file mode 100644
index 8a81567ed8b9..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-78.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( 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 ) 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=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.mozilla.org/thunderbird
-IUSE=clang cpu_flags_arm_neon dbus debug eme-free hardened jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi 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 ) 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 ) !<x11-plugins/enigmail-2.2
-SLOT=0/78
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/source/thunderbird-78.3.1.source.tar.xz https://dev.gentoo.org/~axs/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_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/af.xpi -> thunderbird-78.3.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ar.xpi -> thunderbird-78.3.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ast.xpi -> thunderbird-78.3.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/be.xpi -> thunderbird-78.3.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/bg.xpi -> thunderbird-78.3.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/br.xpi -> thunderbird-78.3.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ca.xpi -> thunderbird-78.3.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/cak.xpi -> thunderbird-78.3.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/cs.xpi -> thunderbird-78.3.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/cy.xpi -> thunderbird-78.3.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/da.xpi -> thunderbird-78.3.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/de.xpi -> thunderbird-78.3.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.3.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/el.xpi -> thunderbird-78.3.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.3.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.3.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.3.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.3.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/et.xpi -> thunderbird-78.3.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/eu.xpi -> thunderbird-78.3.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fa.xpi -> thunderbird-78.3.1-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fi.xpi -> thunderbird-78.3.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fr.xpi -> thunderbird-78.3.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.3.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.3.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/gd.xpi -> thunderbird-78.3.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/gl.xpi -> thunderbird-78.3.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/he.xpi -> thunderbird-78.3.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hr.xpi -> thunderbird-78.3.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.3.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hu.xpi -> thunderbird-78.3.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.3.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/id.xpi -> thunderbird-78.3.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/is.xpi -> thunderbird-78.3.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/it.xpi -> thunderbird-78.3.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ja.xpi -> thunderbird-78.3.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ka.xpi -> thunderbird-78.3.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/kab.xpi -> thunderbird-78.3.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/kk.xpi -> thunderbird-78.3.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ko.xpi -> thunderbird-78.3.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/lt.xpi -> thunderbird-78.3.1-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ms.xpi -> thunderbird-78.3.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.3.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/nl.xpi -> thunderbird-78.3.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.3.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.3.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pl.xpi -> thunderbird-78.3.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.3.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.3.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/rm.xpi -> thunderbird-78.3.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ro.xpi -> thunderbird-78.3.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ru.xpi -> thunderbird-78.3.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/si.xpi -> thunderbird-78.3.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sk.xpi -> thunderbird-78.3.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sl.xpi -> thunderbird-78.3.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sq.xpi -> thunderbird-78.3.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sr.xpi -> thunderbird-78.3.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.3.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/th.xpi -> thunderbird-78.3.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/tr.xpi -> thunderbird-78.3.1-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/uz.xpi -> thunderbird-78.3.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/vi.xpi -> thunderbird-78.3.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.3.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.3.1-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_=3f328ca7925c9a6ae57771e33b4da467
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.3.2 b/metadata/md5-cache/mail-client/thunderbird-78.3.2
index b99378ec7bdd..160c1945bebf 100644
--- a/metadata/md5-cache/mail-client/thunderbird-78.3.2
+++ b/metadata/md5-cache/mail-client/thunderbird-78.3.2
@@ -5,10 +5,10 @@ DESCRIPTION=Thunderbird Mail Client
 EAPI=7
 HOMEPAGE=https://www.mozilla.org/thunderbird
 IUSE=clang cpu_flags_arm_neon dbus debug eme-free hardened jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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 ) 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 ) !<x11-plugins/enigmail-2.2
 SLOT=0/78
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/source/thunderbird-78.3.2.source.tar.xz https://dev.gentoo.org/~axs/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_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/af.xpi -> thunderbird-78.3.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ar.xpi -> thunderbird-78.3.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ast.xpi -> thunderbird-78.3.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/be.xpi -> thunderbird-78.3.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/bg.xpi -> thunderbird-78.3.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/br.xpi -> thunderbird-78.3.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ca.xpi -> thunderbird-78.3.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cak.xpi -> thunderbird-78.3.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cs.xpi -> thunderbird-78.3.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cy.xpi -> thunderbird-78.3.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/da.xpi -> thunderbird-78.3.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/de.xpi -> thunderbird-78.3.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.3.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/el.xpi -> thunderbird-78.3.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.3.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.3.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.3.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.3.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/et.xpi -> thunderbird-78.3.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/eu.xpi -> thunderbird-78.3.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fa.xpi -> thunderbird-78.3.2-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fi.xpi -> thunderbird-78.3.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fr.xpi -> thunderbird-78.3.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.3.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.3.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/gd.xpi -> thunderbird-78.3.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/gl.xpi -> thunderbird-78.3.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/he.xpi -> thunderbird-78.3.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hr.xpi -> thunderbird-78.3.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.3.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hu.xpi -> thunderbird-78.3.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.3.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/id.xpi -> thunderbird-78.3.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/is.xpi -> thunderbird-78.3.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/it.xpi -> thunderbird-78.3.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ja.xpi -> thunderbird-78.3.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ka.xpi -> thunderbird-78.3.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/kab.xpi -> thunderbird-78.3.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/kk.xpi -> thunderbird-78.3.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ko.xpi -> thunderbird-78.3.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/lt.xpi -> thunderbird-78.3.2-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ms.xpi -> thunderbird-78.3.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.3.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nl.xpi -> thunderbird-78.3.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.3.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.3.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pl.xpi -> thunderbird-78.3.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.3.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.3.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/rm.xpi -> thunderbird-78.3.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ro.xpi -> thunderbird-78.3.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ru.xpi -> thunderbird-78.3.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/si.xpi -> thunderbird-78.3.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sk.xpi -> thunderbird-78.3.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sl.xpi -> thunderbird-78.3.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sq.xpi -> thunderbird-78.3.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sr.xpi -> thunderbird-78.3.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.3.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/th.xpi -> thunderbird-78.3.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/tr.xpi -> thunderbird-78.3.2-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/uz.xpi -> thunderbird-78.3.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/vi.xpi -> thunderbird-78.3.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.3.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.3.2-zh-TW.xpi )
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/source/thunderbird-78.3.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/af.xpi -> thunderbird-78.3.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ar.xpi -> thunderbird-78.3.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ast.xpi -> thunderbird-78.3.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/be.xpi -> thunderbird-78.3.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/bg.xpi -> thunderbird-78.3.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/br.xpi -> thunderbird-78.3.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ca.xpi -> thunderbird-78.3.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cak.xpi -> thunderbird-78.3.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cs.xpi -> thunderbird-78.3.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cy.xpi -> thunderbird-78.3.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/da.xpi -> thunderbird-78.3.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/de.xpi -> thunderbird-78.3.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.3.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/el.xpi -> thunderbird-78.3.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.3.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.3.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.3.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.3.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/et.xpi -> thunderbird-78.3.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/eu.xpi -> thunderbird-78.3.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fa.xpi -> thunderbird-78.3.2-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fi.xpi -> thunderbird-78.3.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fr.xpi -> thunderbird-78.3.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.3.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.3.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/gd.xpi -> thunderbird-78.3.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/gl.xpi -> thunderbird-78.3.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/he.xpi -> thunderbird-78.3.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hr.xpi -> thunderbird-78.3.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.3.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hu.xpi -> thunderbird-78.3.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.3.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/id.xpi -> thunderbird-78.3.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/is.xpi -> thunderbird-78.3.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/it.xpi -> thunderbird-78.3.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ja.xpi -> thunderbird-78.3.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ka.xpi -> thunderbird-78.3.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/kab.xpi -> thunderbird-78.3.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/kk.xpi -> thunderbird-78.3.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ko.xpi -> thunderbird-78.3.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/lt.xpi -> thunderbird-78.3.2-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ms.xpi -> thunderbird-78.3.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.3.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nl.xpi -> thunderbird-78.3.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.3.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.3.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pl.xpi -> thunderbird-78.3.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.3.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.3.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/rm.xpi -> thunderbird-78.3.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ro.xpi -> thunderbird-78.3.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ru.xpi -> thunderbird-78.3.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/si.xpi -> thunderbird-78.3.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sk.xpi -> thunderbird-78.3.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sl.xpi -> thunderbird-78.3.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sq.xpi -> thunderbird-78.3.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sr.xpi -> thunderbird-78.3.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.3.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/th.xpi -> thunderbird-78.3.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/tr.xpi -> thunderbird-78.3.2-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/uz.xpi -> thunderbird-78.3.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/vi.xpi -> thunderbird-78.3.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.3.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.3.2-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_=140d1eef85cad2faf08b49da3ff51726
+_md5_=36b29273afc0aebbd0a0c2cffc84bc38
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-68.12.0 b/metadata/md5-cache/mail-client/thunderbird-bin-68.12.0
deleted file mode 100644
index 6e915ad3b891..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-68.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=app-arch/unzip app-arch/zip app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=https://www.thunderbird.net/
-IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ar.xpi -> thunderbird-68.12.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ast.xpi -> thunderbird-68.12.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/be.xpi -> thunderbird-68.12.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/bg.xpi -> thunderbird-68.12.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/br.xpi -> thunderbird-68.12.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ca.xpi -> thunderbird-68.12.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/cs.xpi -> thunderbird-68.12.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/cy.xpi -> thunderbird-68.12.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/da.xpi -> thunderbird-68.12.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/de.xpi -> thunderbird-68.12.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/el.xpi -> thunderbird-68.12.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.12.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.12.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.12.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/et.xpi -> thunderbird-68.12.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/eu.xpi -> thunderbird-68.12.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/fi.xpi -> thunderbird-68.12.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/fr.xpi -> thunderbird-68.12.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.12.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.12.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/gd.xpi -> thunderbird-68.12.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/gl.xpi -> thunderbird-68.12.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/he.xpi -> thunderbird-68.12.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hr.xpi -> thunderbird-68.12.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.12.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hu.xpi -> thunderbird-68.12.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.12.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/id.xpi -> thunderbird-68.12.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/is.xpi -> thunderbird-68.12.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/it.xpi -> thunderbird-68.12.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ja.xpi -> thunderbird-68.12.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ko.xpi -> thunderbird-68.12.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/lt.xpi -> thunderbird-68.12.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.12.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/nl.xpi -> thunderbird-68.12.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.12.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/pl.xpi -> thunderbird-68.12.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.12.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.12.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/rm.xpi -> thunderbird-68.12.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ro.xpi -> thunderbird-68.12.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/ru.xpi -> thunderbird-68.12.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/si.xpi -> thunderbird-68.12.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sk.xpi -> thunderbird-68.12.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sl.xpi -> thunderbird-68.12.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sq.xpi -> thunderbird-68.12.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sr.xpi -> thunderbird-68.12.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.12.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/tr.xpi -> thunderbird-68.12.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/uk.xpi -> thunderbird-68.12.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/vi.xpi -> thunderbird-68.12.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.12.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.12.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2 -> thunderbird-bin_x86_64-68.12.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2 -> thunderbird-bin_i686-68.12.0.tar.bz2 ) https://dev.gentoo.org/~juippis/distfiles/lightning-68.0b6.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=060694f20afe5108ddcd3bacb5d1720e
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.3.1-r2 b/metadata/md5-cache/mail-client/thunderbird-bin-78.3.1-r2
deleted file mode 100644
index f94646c71415..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.3.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.thunderbird.net/
-IUSE=+alsa +ffmpeg +pulseaudio selinux startup-notification wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/78
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-US/thunderbird-78.3.1.tar.bz2 -> thunderbird-bin_x86_64-78.3.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-US/thunderbird-78.3.1.tar.bz2 -> thunderbird-bin_i686-78.3.1.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/af.xpi -> thunderbird-78.3.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ar.xpi -> thunderbird-78.3.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ast.xpi -> thunderbird-78.3.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/be.xpi -> thunderbird-78.3.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/bg.xpi -> thunderbird-78.3.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/br.xpi -> thunderbird-78.3.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ca.xpi -> thunderbird-78.3.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/cak.xpi -> thunderbird-78.3.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/cs.xpi -> thunderbird-78.3.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/cy.xpi -> thunderbird-78.3.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/da.xpi -> thunderbird-78.3.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/de.xpi -> thunderbird-78.3.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.3.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/el.xpi -> thunderbird-78.3.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.3.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.3.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.3.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.3.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/et.xpi -> thunderbird-78.3.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/eu.xpi -> thunderbird-78.3.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fa.xpi -> thunderbird-78.3.1-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fi.xpi -> thunderbird-78.3.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fr.xpi -> thunderbird-78.3.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.3.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.3.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/gd.xpi -> thunderbird-78.3.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/gl.xpi -> thunderbird-78.3.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/he.xpi -> thunderbird-78.3.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hr.xpi -> thunderbird-78.3.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.3.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hu.xpi -> thunderbird-78.3.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.3.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/id.xpi -> thunderbird-78.3.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/is.xpi -> thunderbird-78.3.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/it.xpi -> thunderbird-78.3.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ja.xpi -> thunderbird-78.3.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ka.xpi -> thunderbird-78.3.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/kab.xpi -> thunderbird-78.3.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/kk.xpi -> thunderbird-78.3.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ko.xpi -> thunderbird-78.3.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/lt.xpi -> thunderbird-78.3.1-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ms.xpi -> thunderbird-78.3.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.3.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/nl.xpi -> thunderbird-78.3.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.3.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.3.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pl.xpi -> thunderbird-78.3.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.3.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.3.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/rm.xpi -> thunderbird-78.3.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ro.xpi -> thunderbird-78.3.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/ru.xpi -> thunderbird-78.3.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/si.xpi -> thunderbird-78.3.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sk.xpi -> thunderbird-78.3.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sl.xpi -> thunderbird-78.3.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sq.xpi -> thunderbird-78.3.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sr.xpi -> thunderbird-78.3.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.3.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/th.xpi -> thunderbird-78.3.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/tr.xpi -> thunderbird-78.3.1-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/uz.xpi -> thunderbird-78.3.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/vi.xpi -> thunderbird-78.3.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.3.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.3.1-zh-TW.xpi )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75c137d6a01cf92710ee92a7d670e6e9
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.3.2 b/metadata/md5-cache/mail-client/thunderbird-bin-78.3.2
index 0d48b9eb8cd6..0693ec8e41ac 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.3.2
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-78.3.2
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0/78
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/en-US/thunderbird-78.3.2.tar.bz2 -> thunderbird-bin_x86_64-78.3.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-i686/en-US/thunderbird-78.3.2.tar.bz2 -> thunderbird-bin_i686-78.3.2.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/af.xpi -> thunderbird-78.3.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ar.xpi -> thunderbird-78.3.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ast.xpi -> thunderbird-78.3.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/be.xpi -> thunderbird-78.3.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/bg.xpi -> thunderbird-78.3.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/br.xpi -> thunderbird-78.3.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ca.xpi -> thunderbird-78.3.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cak.xpi -> thunderbird-78.3.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cs.xpi -> thunderbird-78.3.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/cy.xpi -> thunderbird-78.3.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/da.xpi -> thunderbird-78.3.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/de.xpi -> thunderbird-78.3.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.3.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/el.xpi -> thunderbird-78.3.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.3.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.3.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.3.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.3.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/et.xpi -> thunderbird-78.3.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/eu.xpi -> thunderbird-78.3.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fa.xpi -> thunderbird-78.3.2-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fi.xpi -> thunderbird-78.3.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fr.xpi -> thunderbird-78.3.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.3.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.3.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/gd.xpi -> thunderbird-78.3.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/gl.xpi -> thunderbird-78.3.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/he.xpi -> thunderbird-78.3.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hr.xpi -> thunderbird-78.3.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.3.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hu.xpi -> thunderbird-78.3.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.3.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/id.xpi -> thunderbird-78.3.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/is.xpi -> thunderbird-78.3.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/it.xpi -> thunderbird-78.3.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ja.xpi -> thunderbird-78.3.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ka.xpi -> thunderbird-78.3.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/kab.xpi -> thunderbird-78.3.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/kk.xpi -> thunderbird-78.3.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ko.xpi -> thunderbird-78.3.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/lt.xpi -> thunderbird-78.3.2-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ms.xpi -> thunderbird-78.3.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.3.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nl.xpi -> thunderbird-78.3.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.3.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.3.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pl.xpi -> thunderbird-78.3.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.3.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.3.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/rm.xpi -> thunderbird-78.3.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ro.xpi -> thunderbird-78.3.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/ru.xpi -> thunderbird-78.3.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/si.xpi -> thunderbird-78.3.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sk.xpi -> thunderbird-78.3.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sl.xpi -> thunderbird-78.3.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sq.xpi -> thunderbird-78.3.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sr.xpi -> thunderbird-78.3.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.3.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/th.xpi -> thunderbird-78.3.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/tr.xpi -> thunderbird-78.3.2-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/uz.xpi -> thunderbird-78.3.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/vi.xpi -> thunderbird-78.3.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.3.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.3.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.3.2-zh-TW.xpi )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75c137d6a01cf92710ee92a7d670e6e9
+_md5_=e38eb569cbd6cfaf936f8d5027db0b82
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 147dcf0d7cc3..37c599dad23e 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
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 9175ee72c1bf..21ac38f8d838 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_=9b46494e76b74b6dd7e0b0c7983f8efe
+_md5_=6449d8cc912701a7a54025cfdeec2341
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6 b/metadata/md5-cache/mail-filter/rspamd-2.6
deleted file mode 100644
index fee18cc5a83a..000000000000
--- a/metadata/md5-cache/mail-filter/rspamd-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hiredis:= dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) 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=] )
-DESCRIPTION=Rapid spam filtering system
-EAPI=7
-HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
-IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
-RDEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hiredis:= dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) 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.6.tar.gz -> rspamd-2.6.tar.gz
-_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_=b80221428840d1e39edb995bbb5b3cca
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6-r1 b/metadata/md5-cache/mail-filter/rspamd-2.6-r1
new file mode 100644
index 000000000000..1be23efa6fda
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-2.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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? ( virtual/blas virtual/lapack ) 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=] )
+DESCRIPTION=Rapid spam filtering system
+EAPI=7
+HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
+IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
+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? ( virtual/blas virtual/lapack ) 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.6.tar.gz -> rspamd-2.6.tar.gz
+_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_=b7d90be4babfea912ea37c3aeb605adf
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 2295cdb4c4d4..b64fa978d3c6 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hiredis:= dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) 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=] )
+DEPEND=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? ( virtual/blas virtual/lapack ) 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=] )
 DESCRIPTION=Rapid spam filtering system
 EAPI=7
 HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
 IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2
 LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
 PROPERTIES=live
-RDEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hiredis:= dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) 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
+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? ( virtual/blas virtual/lapack ) 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	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_=b80221428840d1e39edb995bbb5b3cca
+_md5_=b7d90be4babfea912ea37c3aeb605adf
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 99163c412d58..85af358df530 100644
Binary files a/metadata/md5-cache/mate-extra/Manifest.gz and b/metadata/md5-cache/mate-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.24.0 b/metadata/md5-cache/mate-extra/mate-screensaver-1.24.0
index 3e6a3cc3ba0c..f19fb11b7aad 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.24.0
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.24.0
@@ -1,14 +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
+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 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
+IUSE=X debug 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
+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 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.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb3f66666c54f3735df6f4e769f2c8dc
+_md5_=251e26ac8d243a49021488443be907af
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
index 7ee36a52aef0..c31643b5dcb5 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
@@ -1,14 +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
+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 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
+IUSE=X debug 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
+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 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
+_md5_=953d3fea4e5dff9b176a7bccb2a5a64d
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index cfe124585b1f..49b456144f38 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/fira-code-3.1 b/metadata/md5-cache/media-fonts/fira-code-3.1
deleted file mode 100644
index 46ee542b35b3..000000000000
--- a/metadata/md5-cache/media-fonts/fira-code-3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Monospaced font with programming ligatures
-EAPI=7
-HOMEPAGE=https://github.com/tonsky/FiraCode
-IUSE=X
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/tonsky/FiraCode/archive/3.1.tar.gz -> fira-code-3.1.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=62f5aa6aec1ab5f34fd1f921578f1b25
diff --git a/metadata/md5-cache/media-fonts/fira-code-5.2 b/metadata/md5-cache/media-fonts/fira-code-5.2
index 49a7677e20da..69e6ca252853 100644
--- a/metadata/md5-cache/media-fonts/fira-code-5.2
+++ b/metadata/md5-cache/media-fonts/fira-code-5.2
@@ -4,9 +4,9 @@ DESCRIPTION=Monospaced font with programming ligatures
 EAPI=7
 HOMEPAGE=https://github.com/tonsky/FiraCode
 IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/tonsky/FiraCode/archive/5.2.tar.gz -> fira-code-5.2.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=c500282b467fe13d97ad1e6194dc9bdb
+_md5_=62f5aa6aec1ab5f34fd1f921578f1b25
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 42ebeda13282..98d44b22cb8b 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ecdf9832ddcc..65399e3023c5 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.61 b/metadata/md5-cache/media-gfx/asymptote-2.61
index 42b31921e241..b090f4c33c30 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.61
+++ b/metadata/md5-cache/media-gfx/asymptote-2.61
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) 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(-)] ) X? ( 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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
-HOMEPAGE=http://asymptote.sourceforge.net/
+HOMEPAGE=https://asymptote.sourceforge.io/
 IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.61.src.tgz
 _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
+_md5_=08242d4925b21c3d7d5cf30fd7b7593b
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.62 b/metadata/md5-cache/media-gfx/asymptote-2.62
index dfc534dbaddf..a9fca9906e81 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.62
+++ b/metadata/md5-cache/media-gfx/asymptote-2.62
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) 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(-)] ) X? ( 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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
-HOMEPAGE=http://asymptote.sourceforge.net/
+HOMEPAGE=https://asymptote.sourceforge.io/
 IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.62.src.tgz
 _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
+_md5_=0ba7236b6e712d5b7658167fb32494df
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.65 b/metadata/md5-cache/media-gfx/asymptote-2.65
index d6cf4c82411f..7c97ec4af998 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.65
+++ b/metadata/md5-cache/media-gfx/asymptote-2.65
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) 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(-)] ) X? ( python_targets_python3_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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
-HOMEPAGE=http://asymptote.sourceforge.net/
+HOMEPAGE=https://asymptote.sourceforge.io/
 IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.65.src.tgz
 _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
+_md5_=7eef4554707a2ef904ce35cb2b724d94
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.67 b/metadata/md5-cache/media-gfx/asymptote-2.67
index 1ae650f58cf5..200a3f6a75ca 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.67
+++ b/metadata/md5-cache/media-gfx/asymptote-2.67
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) 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(-)] ) X? ( python_targets_python3_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/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
-HOMEPAGE=http://asymptote.sourceforge.net/
+HOMEPAGE=https://asymptote.sourceforge.io/
 IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.67.src.tgz
 _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
+_md5_=d54ae0b01d6f5a58964bb3d922520053
diff --git a/metadata/md5-cache/media-gfx/blender-2.79b-r2 b/metadata/md5-cache/media-gfx/blender-2.79b-r2
deleted file mode 100644
index 8ac1369e5ff3..000000000000
--- a/metadata/md5-cache/media-gfx/blender-2.79b-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 python_single_target_python3_6? ( >=dev-python/numpy-1.10.1[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( <media-gfx/openvdb-7[abi4-compat] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind ) >=dev-cpp/eigen-3.2.8:3 virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=3D Creation/Animation/Publishing System
-EAPI=6
-HOMEPAGE=https://www.blender.org
-IUSE=+bullet +dds +elbeem +game-engine +openexr collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl player sdl sndfile test tiff valgrind +python_single_target_python3_6
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 python_single_target_python3_6? ( >=dev-python/numpy-1.10.1[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( <media-gfx/openvdb-7[abi4-compat] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm ) player? ( game-engine !headless )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.blender.org/source/blender-2.79b.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=023c4b453a89b076e5f56a42fe5ca0e7
diff --git a/metadata/md5-cache/media-gfx/blender-2.79b-r3 b/metadata/md5-cache/media-gfx/blender-2.79b-r3
new file mode 100644
index 000000000000..3ee026228587
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.79b-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 python_single_target_python3_6? ( >=dev-python/numpy-1.10.1[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0:= ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( <media-gfx/openvdb-7[abi4-compat] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind ) >=dev-cpp/eigen-3.2.8:3 virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=6
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +elbeem +game-engine +openexr collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl player sdl sndfile test tiff valgrind +python_single_target_python3_6
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( GPL-2 BL )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 python_single_target_python3_6? ( >=dev-python/numpy-1.10.1[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0:= ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( <media-gfx/openvdb-7[abi4-compat] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm ) player? ( game-engine !headless )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.blender.org/source/blender-2.79b.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4206ccddc2ac2b92dbc0c5427d5b443
diff --git a/metadata/md5-cache/media-gfx/blender-2.83.4 b/metadata/md5-cache/media-gfx/blender-2.83.4
deleted file mode 100644
index e3ecbdcc701b..000000000000
--- a/metadata/md5-cache/media-gfx/blender-2.83.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
-DESCRIPTION=3D Creation/Animation/Publishing System
-EAPI=7
-HOMEPAGE=https://www.blender.org
-IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.blender.org/source/blender-2.83.4.tar.xz
-_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/blender-2.83.4-r1 b/metadata/md5-cache/media-gfx/blender-2.83.4-r1
new file mode 100644
index 000000000000..bfc5b3592a5f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.83.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=7
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 BL )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.blender.org/source/blender-2.83.4.tar.xz
+_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_=117755343f362f46b8402ea121a52dce
diff --git a/metadata/md5-cache/media-gfx/blender-2.90.1 b/metadata/md5-cache/media-gfx/blender-2.90.1
deleted file mode 100644
index 5751db4bf398..000000000000
--- a/metadata/md5-cache/media-gfx/blender-2.90.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
-DESCRIPTION=3D Creation/Animation/Publishing System
-EAPI=7
-HOMEPAGE=https://www.blender.org
-IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.blender.org/source/blender-2.90.1.tar.xz
-_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_=e278d72d4ceb87ece74b67c48e832565
diff --git a/metadata/md5-cache/media-gfx/blender-2.90.1-r1 b/metadata/md5-cache/media-gfx/blender-2.90.1-r1
new file mode 100644
index 000000000000..9dbc47c02459
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.90.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=7
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 BL )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.blender.org/source/blender-2.90.1.tar.xz
+_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_=9b771e976e12a8e7ac45c99bbd54786f
diff --git a/metadata/md5-cache/media-gfx/cura-3.4.1 b/metadata/md5-cache/media-gfx/cura-3.4.1
deleted file mode 100644
index a25ab6653192..000000000000
--- a/metadata/md5-cache/media-gfx/cura-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.4 >=media-gfx/fdm-materials-3.4 >=dev-libs/libsavitar-3.4:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.4[python_single_target_python3_6(-)?] >=dev-python/uranium-3.4[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A 3D model slicing application for 3D printing
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.4 >=media-gfx/fdm-materials-3.4 >=dev-libs/libsavitar-3.4:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.4[python_single_target_python3_6(-)?] >=dev-python/uranium-3.4[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/Cura/archive/3.4.1.tar.gz -> cura-3.4.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=367ea32459e520c863b4746da8c5a96f
diff --git a/metadata/md5-cache/media-gfx/cura-3.6.0 b/metadata/md5-cache/media-gfx/cura-3.6.0
deleted file mode 100644
index 4b0c06eb27a4..000000000000
--- a/metadata/md5-cache/media-gfx/cura-3.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.6[python_single_target_python3_6(-)?] >=dev-python/uranium-3.6[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A 3D model slicing application for 3D printing
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.6[python_single_target_python3_6(-)?] >=dev-python/uranium-3.6[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/Cura/archive/3.6.0.tar.gz -> cura-3.6.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=367ea32459e520c863b4746da8c5a96f
diff --git a/metadata/md5-cache/media-gfx/cura-4.2.1 b/metadata/md5-cache/media-gfx/cura-4.2.1
deleted file mode 100644
index ad44f73e11c6..000000000000
--- a/metadata/md5-cache/media-gfx/cura-4.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.2[python_single_target_python3_6(-)?] >=dev-python/uranium-4.2[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A 3D model slicing application for 3D printing
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.2[python_single_target_python3_6(-)?] >=dev-python/uranium-4.2[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
-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	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
deleted file mode 100644
index 5b2ae37cd1af..000000000000
--- a/metadata/md5-cache/media-gfx/cura-4.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.3 >=media-gfx/fdm-materials-4.3 >=dev-libs/libsavitar-4.3:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.3[python_single_target_python3_6(-)?] >=dev-python/uranium-4.3[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A 3D model slicing application for 3D printing
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.3 >=media-gfx/fdm-materials-4.3 >=dev-libs/libsavitar-4.3:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.3[python_single_target_python3_6(-)?] >=dev-python/uranium-4.3[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
-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	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.7.0-r1 b/metadata/md5-cache/media-gfx/cura-4.7.0-r1
new file mode 100644
index 000000000000..a5574ff49333
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/cura-4.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+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/libarcus-4.7.0:=[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~dev-libs/libcharon-4.7.0[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~dev-libs/libsavitar-4.7.0:=[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~dev-python/uranium-4.7.0[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~media-gfx/curaengine-4.7.0 ~media-gfx/fdm-materials-4.7.0 python_single_target_python3_6? ( dev-python/mypy[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sentry-sdk[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/mypy[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sentry-sdk[python_targets_python3_7(-)] sci-libs/Shapely[python_targets_python3_7(-)] usb? ( dev-python/pyserial[python_targets_python3_7(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/mypy[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sentry-sdk[python_targets_python3_8(-)] sci-libs/Shapely[python_targets_python3_8(-)] usb? ( dev-python/pyserial[python_targets_python3_8(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A 3D model slicing application for 3D printing
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/Cura
+IUSE=+usb zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-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-libs/libarcus-4.7.0:=[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~dev-libs/libcharon-4.7.0[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~dev-libs/libsavitar-4.7.0:=[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~dev-python/uranium-4.7.0[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ~media-gfx/curaengine-4.7.0 ~media-gfx/fdm-materials-4.7.0 python_single_target_python3_6? ( dev-python/mypy[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sentry-sdk[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/mypy[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sentry-sdk[python_targets_python3_7(-)] sci-libs/Shapely[python_targets_python3_7(-)] usb? ( dev-python/pyserial[python_targets_python3_7(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/mypy[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sentry-sdk[python_targets_python3_8(-)] sci-libs/Shapely[python_targets_python3_8(-)] usb? ( dev-python/pyserial[python_targets_python3_8(-)] ) zeroconf? ( dev-python/zeroconf[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/Ultimaker/Cura/archive/4.7.0.tar.gz -> cura-4.7.0.tar.gz
+_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_=9901967d10ba6992fecf37bf0cc3007a
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.4.1 b/metadata/md5-cache/media-gfx/curaengine-3.4.1
deleted file mode 100644
index 58d4d2d497d7..000000000000
--- a/metadata/md5-cache/media-gfx/curaengine-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf dev-libs/stb doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A 3D model slicing engine for 3D printing
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/CuraEngine
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf dev-libs/stb
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.4.1.tar.gz -> curaengine-3.4.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_=55d767d882b07b947888b36486dbbeee
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.6.0 b/metadata/md5-cache/media-gfx/curaengine-3.6.0
deleted file mode 100644
index 3be0d8f0ff02..000000000000
--- a/metadata/md5-cache/media-gfx/curaengine-3.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libarcus-3.6.0:* dev-libs/protobuf dev-libs/stb doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A 3D model slicing engine for 3D printing
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/CuraEngine
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=~dev-libs/libarcus-3.6.0:* dev-libs/protobuf dev-libs/stb
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.6.0.tar.gz -> curaengine-3.6.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_=55d767d882b07b947888b36486dbbeee
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.2.0 b/metadata/md5-cache/media-gfx/curaengine-4.2.0
deleted file mode 100644
index 00649cd926f1..000000000000
--- a/metadata/md5-cache/media-gfx/curaengine-4.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( <sys-devel/gcc-9 <sys-devel/clang-8 ) doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=~dev-libs/libarcus-4.2.0:* dev-libs/protobuf dev-libs/stb
-DESCRIPTION=A 3D model slicing engine for 3D printing
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/CuraEngine
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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
deleted file mode 100644
index bdc27896988b..000000000000
--- a/metadata/md5-cache/media-gfx/curaengine-4.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( sys-devel/gcc sys-devel/clang ) doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libarcus-4.3.0:* dev-libs/protobuf dev-libs/stb
-DESCRIPTION=A 3D model slicing engine for 3D printing
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/CuraEngine
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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/digikam-6.4.0-r1 b/metadata/md5-cache/media-gfx/digikam-6.4.0-r1
index d11e6baf0c6d..0b980ad640d1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 4cec1e3e1fb2..0eafde04588d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/fdm-materials-3.4.1 b/metadata/md5-cache/media-gfx/fdm-materials-3.4.1
deleted file mode 100644
index 5f804818273a..000000000000
--- a/metadata/md5-cache/media-gfx/fdm-materials-3.4.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=FDM materials for media-gfx/cura
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/fdm_materials
-KEYWORDS=~amd64 ~x86
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/3.4.1.tar.gz -> fdm-materials-3.4.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_=2553485f31b25b30230860237b28ee61
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-3.6.0 b/metadata/md5-cache/media-gfx/fdm-materials-3.6.0
deleted file mode 100644
index 843c3ba2c428..000000000000
--- a/metadata/md5-cache/media-gfx/fdm-materials-3.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=FDM materials for media-gfx/cura
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/fdm_materials
-KEYWORDS=~amd64 ~x86
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/3.6.0.tar.gz -> fdm-materials-3.6.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_=c8a3e77af1486735139d643d26a23296
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.2.0 b/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
deleted file mode 100644
index 6dc8cb5c4302..000000000000
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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
deleted file mode 100644
index f48b3be9e02c..000000000000
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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
deleted file mode 100644
index 0370d5de4377..000000000000
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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/graphviz-2.44.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
index cb2a260ad801..4d46a9fccfaf 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex sys-devel/libtool x11-libs/gdk-pixbuf:2 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) >=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 setup
-DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( 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] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( 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] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Open Source Graph Visualization Software
 EAPI=7
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
-IUSE=+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_single_target_python3_7 python_single_target_python3_8
+IUSE=+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java 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 ~x64-solaris
 LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( 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] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( 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] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www2.graphviz.org/Packages/stable/portable_source/graphviz-2.44.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e4c826ac5aa4bca2c4785d99550f95d
+_md5_=31e4286d5cfb92a7320dd4505512476b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.34 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.34
new file mode 100644
index 000000000000..c36855d3492a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.34
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv ) !test? ( test )
+SLOT=0/6.9.11
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-34.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=032d990205dc20cb5d0a14eef10a5a6a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.34 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.34
new file mode 100644
index 000000000000..211022c6aa7c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.34
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=7
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/7.0.10
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-34.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=089122d5086e3360290d740c237d1af2
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 070aaaaa5d58..36c320567fd2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d947ffdf98c4..574d9e52174c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 061bf3be3d16..f234b5a18f55 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 784ac22e673b..649391161e1c 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 66472699b85a..3fa586c18bb1 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 13ab9fef6e2b..11bb0c286679 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 571d72f8af49..ebe42181ddcb 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/nomacs-3.14.2 b/metadata/md5-cache/media-gfx/nomacs-3.14.2
deleted file mode 100644
index 5db66f5e5afd..000000000000
--- a/metadata/md5-cache/media-gfx/nomacs-3.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= opencv? ( >=media-libs/opencv-3.4:= ) raw? ( media-libs/libraw:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff ) zip? ( dev-libs/quazip )
-DESCRIPTION=Qt-based image viewer
-EAPI=7
-HOMEPAGE=https://nomacs.org/
-IUSE=+jpeg +opencv plugins raw tiff zip
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= opencv? ( >=media-libs/opencv-3.4:= ) raw? ( media-libs/libraw:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff ) zip? ( dev-libs/quazip )
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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 5f53d4458b6b..87b8f8fc32be 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.16.224
+++ b/metadata/md5-cache/media-gfx/nomacs-3.16.224
@@ -5,11 +5,11 @@ DESCRIPTION=Qt-based image viewer
 EAPI=7
 HOMEPAGE=https://nomacs.org/
 IUSE=+jpeg +opencv plugins raw +tiff zip
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= opencv? ( >=media-libs/opencv-3.4:= ) raw? ( media-libs/libraw:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff ) zip? ( dev-libs/quazip )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47e2ac603fc871d4f8b81d63badfe92a
+_md5_=644ffccc4dd93ccd5a8f7a69712d1a79
diff --git a/metadata/md5-cache/media-gfx/pencil-0.6.5 b/metadata/md5-cache/media-gfx/pencil-0.6.5
new file mode 100644
index 000000000000..a52483223d90
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pencil-0.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
+DESCRIPTION=2D animation and drawing program based on Qt5
+EAPI=7
+HOMEPAGE=https://www.pencil2d.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pencil2d/pencil/archive/v0.6.5.tar.gz -> pencil-0.6.5.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=be5f9faedc2df72dd14ab8187d45cdc8
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718 b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718
deleted file mode 100644
index 784aaf8fa26f..000000000000
--- a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/perl >=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
-DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
-EAPI=7
-HOMEPAGE=https://github.com/pts/sam2p
-IUSE=examples gif
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/pts/sam2p/archive/b953f63307c4a83fa4615a4863e3fb250205cd98.tar.gz -> sam2p-0.49.4_p20190718.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3fcc7680175260f39e0d9d5987db30c
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1 b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
new file mode 100644
index 000000000000..04c92d80ba23
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl >=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
+DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
+EAPI=7
+HOMEPAGE=https://github.com/pts/sam2p
+IUSE=examples gif
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pts/sam2p/archive/b953f63307c4a83fa4615a4863e3fb250205cd98.tar.gz -> sam2p-0.49.4_p20190718.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=aec547b38d371989759bcca539d1b118
diff --git a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r4 b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r4
index e13d784345cb..389eea2cb894 100644
--- a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r4
+++ b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Scanner Access Now Easy
 EAPI=7
 HOMEPAGE=http://www.sane-project.org
 IUSE=gimp gtk
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-gfx/sane-backends gimp? ( media-gfx/gimp:2 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=https://salsa.debian.org/debian/sane-frontends/-/archive/upstream/1.0.14/sane-frontends-upstream-1.0.14.tar.gz
-_md5_=b126611bf7990f9d85db120dcd1c3fff
+_md5_=97f4eb1a759d7ccafa5b5c51df6e59e1
diff --git a/metadata/md5-cache/media-gfx/slic3r-1.3.0-r2 b/metadata/md5-cache/media-gfx/slic3r-1.3.0-r2
new file mode 100644
index 000000000000..2ca098883e80
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/slic3r-1.3.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-perl/Devel-CheckLib >=dev-perl/ExtUtils-CppGuess-0.70.0 >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 >=dev-perl/ExtUtils-XSpp-0.170.0 >=dev-perl/Module-Build-0.380.0 >=dev-perl/Module-Build-WithXSpp-0.140.0 >=virtual/perl-ExtUtils-MakeMaker-6.800.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 test? ( virtual/perl-Test-Harness virtual/perl-Test-Simple ) dev-lang/perl
+DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
+EAPI=6
+HOMEPAGE=https://slic3r.org
+IUSE=+gui test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 CC-BY-3.0
+RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alexrj/slic3r/archive/1.3.0.tar.gz -> slic3r-1.3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f735f4609082238b1afc5a8a9522ea3e
diff --git a/metadata/md5-cache/media-gfx/slic3r-9999 b/metadata/md5-cache/media-gfx/slic3r-9999
index 663b00c951ea..ffed3353eff3 100644
--- a/metadata/md5-cache/media-gfx/slic3r-9999
+++ b/metadata/md5-cache/media-gfx/slic3r-9999
@@ -10,4 +10,4 @@ RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAc
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f5ea380f0b549989dbe9513e6a92efe4
+_md5_=db4ae2b9798d5abe24a9012012c372d0
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.1.0 b/metadata/md5-cache/media-gfx/symboleditor-2.1.0
index 2b9994defebc..d70f5e67f32a 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/wings-2.1.5 b/metadata/md5-cache/media-gfx/wings-2.1.5
index 842504f73e04..a690db6cf44f 100644
--- a/metadata/md5-cache/media-gfx/wings-2.1.5
+++ b/metadata/md5-cache/media-gfx/wings-2.1.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 DESCRIPTION=Wings 3D is an advanced subdivision modeler
 EAPI=6
 HOMEPAGE=http://www.wings3d.com/
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/wings/wings-2.1.5.tar.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e0d92fde0844f4d2d712cb765ca929d3
+_md5_=c30cee58ba2be6930e7b7e21acb85d30
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.6 b/metadata/md5-cache/media-gfx/wings-2.1.6
index 21923814476f..be4f80ab1ca2 100644
--- a/metadata/md5-cache/media-gfx/wings-2.1.6
+++ b/metadata/md5-cache/media-gfx/wings-2.1.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 DESCRIPTION=Wings 3D is an advanced subdivision modeler
 EAPI=6
 HOMEPAGE=http://www.wings3d.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/wings/wings-2.1.6.tar.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5850ff732e5c6dac4403b3292f04872e
+_md5_=5736734a832793a1c30a88b412f047af
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.7 b/metadata/md5-cache/media-gfx/wings-2.1.7
index b6c12f546ad1..dea2e0c32f91 100644
--- a/metadata/md5-cache/media-gfx/wings-2.1.7
+++ b/metadata/md5-cache/media-gfx/wings-2.1.7
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 DESCRIPTION=Wings 3D is an advanced subdivision modeler
 EAPI=6
 HOMEPAGE=http://www.wings3d.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/wings/wings-2.1.7.tar.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5850ff732e5c6dac4403b3292f04872e
+_md5_=5736734a832793a1c30a88b412f047af
diff --git a/metadata/md5-cache/media-gfx/wings-2.2.5 b/metadata/md5-cache/media-gfx/wings-2.2.5
index 8c749597887b..bb97efd0aa0c 100644
--- a/metadata/md5-cache/media-gfx/wings-2.2.5
+++ b/metadata/md5-cache/media-gfx/wings-2.2.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 DESCRIPTION=Wings 3D is an advanced subdivision modeler
 EAPI=7
 HOMEPAGE=http://www.wings3d.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/wings/wings-2.2.5.tar.bz2
-_md5_=059e1fe5632ce03f055a3f8a31a34bad
+_md5_=31fd38c19e96774fbfe5f8453808118c
diff --git a/metadata/md5-cache/media-gfx/wings-2.2.6.1 b/metadata/md5-cache/media-gfx/wings-2.2.6.1
index c43d084f8c83..3cce80c0b5e1 100644
--- a/metadata/md5-cache/media-gfx/wings-2.2.6.1
+++ b/metadata/md5-cache/media-gfx/wings-2.2.6.1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install
-DEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+DEFINED_PHASES=compile install prepare
+DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 DESCRIPTION=Wings 3D is an advanced subdivision modeler
 EAPI=7
 HOMEPAGE=http://www.wings3d.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=|| ( <dev-lang/erlang-21[smp,wxwidgets] >dev-lang/erlang-21[wxwidgets] ) dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/wings/wings-2.2.6.1.tar.bz2
-_md5_=4eafb06006b88466675204b040e6a4ef
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67ac9ed3a9f648b04b4d1e7a2efae570
diff --git a/metadata/md5-cache/media-gfx/xfig-3.2.7b b/metadata/md5-cache/media-gfx/xfig-3.2.7b
new file mode 100644
index 000000000000..93f61398a580
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xfig-3.2.7b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A menu-driven tool to draw and manipulate objects interactively in an X window
+EAPI=7
+HOMEPAGE=http://mcj.sourceforge.net/
+IUSE=jpeg nls postscript
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/mcj/xfig-3.2.7b.tar.xz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b5f751853311d73e0a363aa2ab7a3ae1
diff --git a/metadata/md5-cache/media-gfx/xli-1.17.0-r5 b/metadata/md5-cache/media-gfx/xli-1.17.0-r5
index 0bc34136ef2e..cac59b461f22 100644
--- a/metadata/md5-cache/media-gfx/xli-1.17.0-r5
+++ b/metadata/md5-cache/media-gfx/xli-1.17.0-r5
@@ -3,10 +3,10 @@ DEPEND=app-arch/bzip2 >=media-libs/libpng-1.0.5 >=sys-libs/zlib-1.1.4 virtual/jp
 DESCRIPTION=X Load Image: view images or load them to root window
 EAPI=5
 HOMEPAGE=ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=HPND
 RDEPEND=app-arch/bzip2 >=media-libs/libpng-1.0.5 >=sys-libs/zlib-1.1.4 virtual/jpeg:0 x11-libs/libXext
 SLOT=0
 SRC_URI=http://pantransit.reptiles.org/prog/xli/xli-2005-02-27.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_=d75571863d594956ffaf6eebc48ae0af
+_md5_=e59a2dce082d873c33b6c27912402497
diff --git a/metadata/md5-cache/media-gfx/xsane-0.999-r2 b/metadata/md5-cache/media-gfx/xsane-0.999-r2
index 9553a20fe8b9..f33b24224b70 100644
--- a/metadata/md5-cache/media-gfx/xsane-0.999-r2
+++ b/metadata/md5-cache/media-gfx/xsane-0.999-r2
@@ -4,11 +4,11 @@ DESCRIPTION=graphical scanning frontend
 EAPI=6
 HOMEPAGE=http://www.xsane.org/
 IUSE=nls jpeg png tiff gimp lcms ocr
-KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=ocr? ( app-text/gocr )
 RDEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) gimp? ( media-gfx/gimp ) lcms? ( media-libs/lcms:2 )
 SLOT=0
 SRC_URI=http://www.xsane.org/download/xsane-0.999.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/xsane-0.998-patches-2.tar.xz https://dev.gentoo.org/~pacho/xsane/xsane-256x256.png
 _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_=50fde8c3efd207fd1010f2172c6a3d20
+_md5_=72a17ff0fc2456b5b3097a49c7b96001
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c4c2c590f377..8f43cd15a755 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/ampache_browser-1.0.1 b/metadata/md5-cache/media-libs/ampache_browser-1.0.1
deleted file mode 100644
index 8d40dadb7b83..000000000000
--- a/metadata/md5-cache/media-libs/ampache_browser-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Ampache desktop client library
-EAPI=6
-HOMEPAGE=http://ampache-browser.org
-IUSE=debug nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/ampache-browser/ampache_browser/archive/v1.0.1.tar.gz -> ampache_browser-1.0.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_=d296570b878d48f6645dcd802c4cd66a
diff --git a/metadata/md5-cache/media-libs/ampache_browser-1.0.3 b/metadata/md5-cache/media-libs/ampache_browser-1.0.3
new file mode 100644
index 000000000000..1888e0930c00
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ampache_browser-1.0.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
+DESCRIPTION=Ampache desktop client library
+EAPI=7
+HOMEPAGE=http://ampache-browser.org https://github.com/ampache-browser/ampache_browser
+IUSE=debug nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/ampache-browser/ampache_browser/archive/v1.0.3.tar.gz -> ampache_browser-1.0.3.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_=846ccff0987caf37b42f3bdb8be40d38
diff --git a/metadata/md5-cache/media-libs/coin-4.0.0 b/metadata/md5-cache/media-libs/coin-4.0.0
index 9ec13d0bf410..330f15332ac3 100644
--- a/metadata/md5-cache/media-libs/coin-4.0.0
+++ b/metadata/md5-cache/media-libs/coin-4.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=A high-level 3D graphics toolkit, fully compatible with SGI Open Inv
 EAPI=7
 HOMEPAGE=https://github.com/coin3d/coin/wiki
 IUSE=debug doc +exceptions javascript man openal qthelp test threads
-KEYWORDS=~amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 PEL )
 RDEPEND=app-arch/bzip2 dev-libs/expat media-libs/fontconfig media-libs/freetype:2 media-libs/simage sys-libs/zlib virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext javascript? ( dev-lang/spidermonkey:60 ) openal? ( media-libs/openal )
 REQUIRED_USE=man? ( doc ) qthelp? ( doc )
@@ -13,4 +13,4 @@ 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=adace3095c23d6e64f871161c96041e7
+_md5_=981508a46198de5cc04c081db6808b0a
diff --git a/metadata/md5-cache/media-libs/dav1d-0.7.0 b/metadata/md5-cache/media-libs/dav1d-0.7.0
index 269e5f4a2046..a010ecbe92c1 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.7.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=dav1d is an AV1 Decoder :)
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/dav1d
 IUSE=+8bit +10bit +asm 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 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~sparc x86
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.7.0/dav1d-0.7.0.tar.bz2
 _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_=bc45c7e10adbea0ddcdd817e4cbb1100
+_md5_=3bcc41cf89fa478fb9e2d11c4ced6876
diff --git a/metadata/md5-cache/media-libs/freetype-2.10.1 b/metadata/md5-cache/media-libs/freetype-2.10.1
deleted file mode 100644
index 6fd2aa16a849..000000000000
--- a/metadata/md5-cache/media-libs/freetype-2.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install 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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
-DESCRIPTION=A high-quality and portable font engine
-EAPI=7
-HOMEPAGE=https://www.freetype.org/
-IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils 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 ~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 ~x86-winnt
-LICENSE=|| ( FTL GPL-2+ )
-PDEPEND=infinality? ( media-libs/fontconfig-infinality )
-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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
-RESTRICT=!bindist? ( bindist )
-SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.10.1.tar.xz mirror://nongnu/freetype/freetype-2.10.1.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.10.1.tar.xz mirror://nongnu/freetype/ft2demos-2.10.1.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.10.1.tar.xz mirror://nongnu/freetype/freetype-doc-2.10.1.tar.xz )
-_eclasses_=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_=0c2c52f43e0bee6be7740e20eddc2505
diff --git a/metadata/md5-cache/media-libs/freetype-2.10.3 b/metadata/md5-cache/media-libs/freetype-2.10.3
new file mode 100644
index 000000000000..125e42153dff
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freetype-2.10.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install 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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
+DESCRIPTION=A high-quality and portable font engine
+EAPI=7
+HOMEPAGE=https://www.freetype.org/
+IUSE=X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils 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 ~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 ~x86-winnt
+LICENSE=|| ( FTL GPL-2+ )
+PDEPEND=infinality? ( media-libs/fontconfig-infinality )
+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(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
+RESTRICT=!bindist? ( bindist )
+SLOT=2
+SRC_URI=mirror://sourceforge/freetype/freetype-2.10.3.tar.xz mirror://nongnu/freetype/freetype-2.10.3.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.10.3.tar.xz mirror://nongnu/freetype/ft2demos-2.10.3.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.10.3.tar.xz mirror://nongnu/freetype/freetype-doc-2.10.3.tar.xz )
+_eclasses_=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_=83f9a4b118e763d40a61d0d388f57ff6
diff --git a/metadata/md5-cache/media-libs/freetype-2.9.1-r3 b/metadata/md5-cache/media-libs/freetype-2.9.1-r3
deleted file mode 100644
index 8bed949f3602..000000000000
--- a/metadata/md5-cache/media-libs/freetype-2.9.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A high-quality and portable font engine
-EAPI=6
-HOMEPAGE=https://www.freetype.org/
-IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils 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 ~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=|| ( FTL GPL-2+ )
-PDEPEND=infinality? ( media-libs/fontconfig-infinality )
-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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
-RESTRICT=!bindist? ( bindist )
-SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-2.9.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.1.tar.bz2 )
-_eclasses_=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_=54b4f69197ace26c98934603632a68d2
diff --git a/metadata/md5-cache/media-libs/freetype-2.9.1-r4 b/metadata/md5-cache/media-libs/freetype-2.9.1-r4
deleted file mode 100644
index 18e98562f1fd..000000000000
--- a/metadata/md5-cache/media-libs/freetype-2.9.1-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A high-quality and portable font engine
-EAPI=6
-HOMEPAGE=https://www.freetype.org/
-IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils 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 ~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=|| ( FTL GPL-2+ )
-PDEPEND=infinality? ( media-libs/fontconfig-infinality )
-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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,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-1.2.51:0=[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? ( 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/libXau-1.0.7-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/libXdmcp-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(-)?] ) )
-RESTRICT=!bindist? ( bindist )
-SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-2.9.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.1.tar.bz2 )
-_eclasses_=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_=7769b75d4ee48e78c07286d1052036eb
diff --git a/metadata/md5-cache/media-libs/freetype-9999 b/metadata/md5-cache/media-libs/freetype-9999
index c52151ab2e42..5250a1e815cc 100644
--- a/metadata/md5-cache/media-libs/freetype-9999
+++ b/metadata/md5-cache/media-libs/freetype-9999
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!bindist? ( bindist )
 SLOT=2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	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	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b183cedfd38d0c3768437a20d552f307
+_md5_=83f9a4b118e763d40a61d0d388f57ff6
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.2 b/metadata/md5-cache/media-libs/glfw-3.3.2
index f183d0f731e6..0eb6e4c95077 100644
--- a/metadata/md5-cache/media-libs/glfw-3.3.2
+++ b/metadata/md5-cache/media-libs/glfw-3.3.2
@@ -5,10 +5,10 @@ DESCRIPTION=The Portable OpenGL FrameWork
 EAPI=7
 HOMEPAGE=https://www.glfw.org/
 IUSE=wayland
-KEYWORDS=~amd64 ~arm64 ~hppa x86
+KEYWORDS=amd64 ~arm64 ~hppa x86
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9062b7fa694357ded42b2397753d9c19
+_md5_=7e70db4819bd22cb5ed187a03dfc2016
diff --git a/metadata/md5-cache/media-libs/lcms-2.11 b/metadata/md5-cache/media-libs/lcms-2.11
index 18e0ebb9655b..305065637b5d 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_=518ff0d33680e309d31458ea9b134411
+_md5_=ae63d924bf16ae09e1ebd0fa4035b3da
diff --git a/metadata/md5-cache/media-libs/lib3ds-1.3.0-r2 b/metadata/md5-cache/media-libs/lib3ds-1.3.0-r2
index be13b38fe198..92c9d7ee7a02 100644
--- a/metadata/md5-cache/media-libs/lib3ds-1.3.0-r2
+++ b/metadata/md5-cache/media-libs/lib3ds-1.3.0-r2
@@ -4,8 +4,8 @@ DESCRIPTION=library for managing 3D-Studio Release 3 and 4 .3DS files
 EAPI=7
 HOMEPAGE=https://code.google.com/p/lib3ds/
 IUSE=static-libs
-KEYWORDS=~amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://lib3ds.googlecode.com/files/lib3ds-1.3.0.zip
-_md5_=088d6997bd20c791365052597e5e4416
+_md5_=f7ca39c033dda8810b4c95ea355ab04a
diff --git a/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1-r1 b/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1-r1
index d5b6acc16bbb..4b95c45343bc 100644
--- a/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1-r1
+++ b/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1-r1
@@ -4,8 +4,8 @@ DESCRIPTION=library for managing 3D-Studio Release 3 and 4 .3DS files
 EAPI=7
 HOMEPAGE=https://code.google.com/p/lib3ds/
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://lib3ds.googlecode.com/files/lib3ds-20080909.zip
-_md5_=4def73afad52e8c876fec52660ca6119
+_md5_=7ede16bab2b899be4c65e0eeac8c0a7c
diff --git a/metadata/md5-cache/media-libs/libaom-2.0.0 b/metadata/md5-cache/media-libs/libaom-2.0.0
index 74f0029af237..cfce38a11718 100644
--- a/metadata/md5-cache/media-libs/libaom-2.0.0
+++ b/metadata/md5-cache/media-libs/libaom-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=7
 HOMEPAGE=https://aomedia.org
 IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon 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=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	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
+_md5_=7ccfd125052e3c81042d26be41196922
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.7 b/metadata/md5-cache/media-libs/libdca-0.0.7
index e26dd769abd4..983fd54a2c2f 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.7
+++ b/metadata/md5-cache/media-libs/libdca-0.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=Library for decoding DTS Coherent Acoustics streams used in DVD
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdca.html
 IUSE=debug oss 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.videolan.org/pub/videolan/libdca/0.0.7/libdca-0.0.7.tar.bz2
 _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_=c0982062f855af0f0703f038093feea4
+_md5_=37b695a88b642985d665503f1fe39e0b
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.19 b/metadata/md5-cache/media-libs/libmpdclient-2.19
index 5bbd89c97de9..9fd0b29575bf 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.19
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.19
@@ -5,10 +5,10 @@ DESCRIPTION=Library for interfacing Music Player Daemon (media-sound/mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
 IUSE=doc examples test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e7073294d3f612813e6228fa7f031a03
+_md5_=cc4a4c7b32e15c9300acd276c35ef074
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
index 3e16396711f1..1542b6fd33fd 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library for writing accessibility clients such as screen readers
 EAPI=7
 HOMEPAGE=https://community.kde.org/Accessibility https://invent.kde.org/libraries/libqaccessibilityclient
 IUSE=test debug examples test
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/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
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-0.4.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92e73fca96ad64aeb9d12b0f5d4d2065
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78f24eb97256ab866a07063be0529a59
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1 b/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
index 85cae21b8cac..b18dfcec2b19 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter fo
 EAPI=7
 HOMEPAGE=http://www.mega-nerd.com/SRC/
 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=09d776c3d6c3e746daad31beedb61b98
+_md5_=b5a07cc9c210d18b90d2b63bf9175c21
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.12-r2 b/metadata/md5-cache/media-libs/libsdl2-2.0.12-r2
index 29a37b1c3a2b..865c716b3007 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.12-r2
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.12-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=7
 HOMEPAGE=https://www.libsdl.org/
 IUSE=alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) 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(-)?] ) kms? ( >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] >=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(-)?] ) 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(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXcursor-1.1.14[abi_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/libXi-1.7.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/libXrandr-1.4.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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) gles2? ( video ) jack? ( sound ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) vulkan? ( video ) wayland? ( gles2 ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=https://www.libsdl.org/release/SDL2-2.0.12.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	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14a3239f1bd18f66c84a128f3513e5d6
+_md5_=1eb235d3fb4747a2f4a260ee9b03dc3f
diff --git a/metadata/md5-cache/media-libs/libtimidity-0.2.6 b/metadata/md5-cache/media-libs/libtimidity-0.2.6
index c165b01abed6..245ad2313143 100644
--- a/metadata/md5-cache/media-libs/libtimidity-0.2.6
+++ b/metadata/md5-cache/media-libs/libtimidity-0.2.6
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI to WAVE converter library
 EAPI=7
 HOMEPAGE=http://libtimidity.sourceforge.net
 IUSE=ao 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
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ao? ( >=media-libs/libao-1.1.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(-)?] )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=mirror://sourceforge/libtimidity/libtimidity-0.2.6.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=835043fc4ff13366bbc7fc30a01c0fcf
+_md5_=cd37a63264a0ad0560d0b3ab44e06fb0
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.10 b/metadata/md5-cache/media-libs/lilv-0.24.10
new file mode 100644
index 000000000000..ccde64948dc1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lilv-0.24.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/serd[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[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[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(-)?] || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-python/unittest2 )
+DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
+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
+LICENSE=ISC
+RDEPEND=dev-libs/serd[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[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[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.10.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_=7b31e51fa357a40d93d82fc2c3267e7b
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.6-r2 b/metadata/md5-cache/media-libs/lilv-0.24.6-r2
deleted file mode 100644
index a0a62f145dae..000000000000
--- a/metadata/md5-cache/media-libs/lilv-0.24.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=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(-)?] || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-python/unittest2 )
-DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
-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
-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.6.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_=a3578f9faa041f1b873bacebe126d85e
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 1ca6d7c34ea3..371f47a53f81 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_=d6fbb6a69cae64ea5b27d9ca5fc14c7c
+_md5_=a3578f9faa041f1b873bacebe126d85e
diff --git a/metadata/md5-cache/media-libs/mutagen-1.45.1 b/metadata/md5-cache/media-libs/mutagen-1.45.1
new file mode 100644
index 000000000000..ded4d502b300
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mutagen-1.45.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme ) test? ( 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/pyflakes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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=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 python_targets_python3_9
+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 ) 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/quodlibet/mutagen/releases/download/release-1.45.1/mutagen-1.45.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c02378b12b9dee454c862b6ac01aee2b
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.1 b/metadata/md5-cache/media-libs/opencolorio-1.1.1
new file mode 100644
index 000000000000..ba757b49436b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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(-)] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) 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] ) )
+DESCRIPTION=A color management framework for visual effects and animation
+EAPI=7
+HOMEPAGE=https://opencolorio.org/
+IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) 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] ) )
+REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/imageworks/OpenColorIO/archive/v1.1.1.tar.gz -> opencolorio-1.1.1.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_=0561b0de2015db7f153d0f63e5b197c2
diff --git a/metadata/md5-cache/media-libs/opencv-4.4.0 b/metadata/md5-cache/media-libs/opencv-4.4.0
deleted file mode 100644
index a50e4bfd7219..000000000000
--- a/metadata/md5-cache/media-libs/opencv-4.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=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(-)?] dev-libs/protobuf:=[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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[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(-)?] ) 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-libs/gst-plugins-base: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(-)?] ) gtk3? ( 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/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(-)?] ) ieee1394? ( media-libs/libdc1394:=[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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) 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(-)?] ) openexr? ( media-libs/openexr[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[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(-)?] ) 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(-)?] ) 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(-)] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[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(-)?] ) threads? ( dev-cpp/tbb[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:0[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-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=7
-HOMEPAGE=https://opencv.org
-IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 elibc_FreeBSD java elibc_FreeBSD 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_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=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(-)?] dev-libs/protobuf:=[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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[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(-)?] ) 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-libs/gst-plugins-base: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(-)?] ) gtk3? ( 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/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(-)?] ) ieee1394? ( media-libs/libdc1394:=[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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) 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(-)?] ) openexr? ( media-libs/openexr[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[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(-)?] ) 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(-)?] ) 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(-)] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[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(-)?] ) threads? ( dev-cpp/tbb[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:0[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-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
-SLOT=0/4.4.0
-SRC_URI=https://github.com/opencv/opencv/archive/4.4.0.tar.gz -> opencv-4.4.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.4.0.tar.gz -> opencv-4.4.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d66de84108535e5c7dd27fa870184ec6
diff --git a/metadata/md5-cache/media-libs/opencv-4.4.0-r1 b/metadata/md5-cache/media-libs/opencv-4.4.0-r1
new file mode 100644
index 000000000000..912a4213e8b0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-4.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=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(-)?] dev-libs/protobuf:=[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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[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(-)?] ) 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-libs/gst-plugins-base: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(-)?] ) gtk3? ( 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/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(-)?] ) ieee1394? ( media-libs/libdc1394:=[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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/lapack ) 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(-)?] ) openexr? ( media-libs/openexr[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[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(-)?] ) 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(-)?] ) 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(-)] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[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(-)?] ) threads? ( dev-cpp/tbb[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:0[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-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=7
+HOMEPAGE=https://opencv.org
+IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 elibc_FreeBSD java elibc_FreeBSD 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_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=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(-)?] dev-libs/protobuf:=[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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype: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/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[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(-)?] ) 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-libs/gst-plugins-base: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(-)?] ) gtk3? ( 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/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(-)?] ) ieee1394? ( media-libs/libdc1394:=[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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) lapack? ( virtual/lapack ) 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(-)?] ) openexr? ( media-libs/openexr[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[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(-)?] ) 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(-)?] ) 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(-)] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[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(-)?] ) threads? ( dev-cpp/tbb[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:0[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-0.8.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(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
+SLOT=0/4.4.0
+SRC_URI=https://github.com/opencv/opencv/archive/4.4.0.tar.gz -> opencv-4.4.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.4.0.tar.gz -> opencv-4.4.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efc7eae726e1d5f92b5d775103145251
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.7.0 b/metadata/md5-cache/media-libs/openimageio-2.2.7.0
new file mode 100644
index 000000000000..c50b7a9c56a0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-2.2.7.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sci-libs/dcmtk sys-libs/zlib:= virtual/jpeg:0 ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) 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] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=A library for reading and writing images
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+IUSE=doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sci-libs/dcmtk sys-libs/zlib:= virtual/jpeg:0 ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) 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] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+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/2.2
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.7.0.tar.gz -> openimageio-2.2.7.0.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_=7783213bad933e430f0ca14a3837b767
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 7e13151a336a..19fa315bb885 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 d3e81caf16fa..3c770493df1d 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 28a29adbf58a..3bc9cbd48311 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 1904162becb0..b23a37639289 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_=2418fa443015bd9bd291fd4f91d52060
+_md5_=16744b21f80e9da2717615dbdb1c9989
diff --git a/metadata/md5-cache/media-libs/pulseaudio-qt-1.2 b/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
index 2d05ccc92a33..c8fd11ec7408 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/sdl-gfx-2.0.26 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
index 27f4ef604217..66d2f7cf78eb 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_=e7b04cd5b9b1119748b35b0731c8078f
+_md5_=f0e26e186d9edd341c2ed4d5dfae1eb7
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
new file mode 100644
index 000000000000..be6f10e2b909
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-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
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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(-)?]
+DESCRIPTION=Graphics drawing primitives library for SDL
+EAPI=7
+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
+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/16
+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_=84b5a85d685fe3fbae4ba579439dd238
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.5 b/metadata/md5-cache/media-libs/sdl2-image-2.0.5
index bf8b86633c0c..ee37d6d2e261 100644
--- a/metadata/md5-cache/media-libs/sdl2-image-2.0.5
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Image file loading library
 EAPI=7
 HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
 IUSE=gif jpeg png static-libs tiff webp 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=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.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-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(-)?] png? ( >=media-libs/libpng-1.6.10:0[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-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-3.9.7-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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.5.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b79c0aa5637dda34a57c7b55b7d7f07
+_md5_=56c2258c1b6a2fcf9133f5cde7adfba5
diff --git a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15 b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
index b37a254e129d..ee60f7438cd3 100644
--- a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
+++ b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
@@ -5,10 +5,10 @@ DESCRIPTION=library that allows you to use TrueType fonts in SDL applications
 EAPI=7
 HOMEPAGE=http://www.libsdl.org/projects/SDL_ttf/
 IUSE=static-libs 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
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=ZLIB
 RDEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl2-2.0.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(-)?] >=media-libs/freetype-2.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(-)?] 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=http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.15.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b34b61469044a98f8d901cb5b20d4ff0
+_md5_=9d9d9eb79a18e099eb4ba71d6335cb48
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 0cba10d0296d..c5cc832dd7e4 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_=e416bd9b92d1260631d0fa6b0297def6
+_md5_=c8f0a4a5e5107629ee2d1478c278adbe
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1-r1 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1-r1
deleted file mode 100644
index 67bb96aa6b85..000000000000
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=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(-)?]
-DESCRIPTION=Audio processing system for plugins to extract information from audio data
-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
-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://code.soundsoftware.ac.uk/attachments/download/2206/vamp-plugin-sdk-2.7.1.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c446666c44ef808e87b1d56c4785b8c0
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 14ce14b18ad7..e29c1ac92911 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
@@ -5,9 +5,9 @@ DESCRIPTION=Vulkan Validation Layers
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 IUSE=wayland 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
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+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	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_=022752fb148eb171a92cb48709941eeb
+_md5_=a12bf5446168657f4a3de57fd8eedf02
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 b73b41fdcfa7..bd3139f0e63e 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
@@ -5,10 +5,10 @@ DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 IUSE=layers wayland 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
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 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	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_=78de0b977af195271ce9984504095137
+_md5_=f0edc1c2e3b8e587d1d7bec06519e3c6
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 93fa00a88690..6c585f697f4d 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
+++ b/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
@@ -3,9 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
 EAPI=7
 HOMEPAGE=https://github.com/nu-book/zxing-cpp
+IUSE=test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b2ec6a2cd276cdb07335dfc28a871f1
+_md5_=5df2e95ac5f2faf3e6b4a536b24d03cb
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 0151af5c21f3..07ed08ebf41b 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/caps-plugins-0.9.24 b/metadata/md5-cache/media-plugins/caps-plugins-0.9.24
deleted file mode 100644
index f1762a7c790c..000000000000
--- a/metadata/md5-cache/media-plugins/caps-plugins-0.9.24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ladspa-sdk
-DESCRIPTION=The CAPS Audio Plugin Suite - LADSPA plugin suite
-EAPI=6
-HOMEPAGE=http://quitte.de/dsp/caps.html
-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 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://quitte.de/dsp/caps_0.9.24.tar.bz2
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7e5763d3fd5ea02e4e4391dfa0ba6ff3
diff --git a/metadata/md5-cache/media-plugins/caps-plugins-0.9.26 b/metadata/md5-cache/media-plugins/caps-plugins-0.9.26
index 6cb3e9b27e1f..55acec9945d7 100644
--- a/metadata/md5-cache/media-plugins/caps-plugins-0.9.26
+++ b/metadata/md5-cache/media-plugins/caps-plugins-0.9.26
@@ -4,9 +4,9 @@ DESCRIPTION=The CAPS Audio Plugin Suite - LADSPA plugin suite
 EAPI=7
 HOMEPAGE=http://quitte.de/dsp/caps.html
 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 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://quitte.de/dsp/caps_0.9.26.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c47968c9c8702ba89dfaa8f0672138f3
+_md5_=2602fc43bcdb2630d844c3e94b9320d4
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.1 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.1
new file mode 100644
index 000000000000..90ec537ecc49
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
+DESCRIPTION=Libretro compatibility layer for the Kodi Game API
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/peripheral.joystick
+KEYWORDS=~amd64 ~x86
+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.1-Matrix.tar.gz -> kodi-peripheral-joystick-1.7.1.tar.gz
+_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-pvr-argustv-6.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2
new file mode 100644
index 000000000000..a48e8ff40165
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+DESCRIPTION=Kodi's ARGUS TV client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/6.0.2-Matrix.tar.gz -> kodi-pvr-argustv-6.0.2.tar.gz
+_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_=b1db694c1500dc9e59bbc7c46991f170
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
index 142c7c5f37e6..5b35000ef7fd 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/jsoncpp
+DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's ARGUS TV client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/jsoncpp
+RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 SLOT=0
 _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
+_md5_=364f2693a9a4c1dfa6b091b60fe288ec
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.4.1 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.4.1
new file mode 100644
index 000000000000..78add9191345
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.4.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
+DESCRIPTION=Kodi's IPTVSimple client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/6.4.1-Matrix.tar.gz -> kodi-pvr-iptvsimple-6.4.1.tar.gz
+_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_=9ff0d91aee56e04a7212a486c1047c2e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.1.0 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.1.0
new file mode 100644
index 000000000000..678b3a601f7c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.1.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+DESCRIPTION=Kodi's NextPVR client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/7.1.0-Matrix.tar.gz -> kodi-pvr-nextpvr-7.1.0.tar.gz
+_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_=df2f4f7afa10a6aee7e037a73e179aff
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
index 3e386bd8b36d..2562938c8350 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml2
+DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 DESCRIPTION=Kodi's NextPVR client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml2
+RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 SLOT=0
 _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
+_md5_=8a963b63ead519e6cee1c8b44cf2afd9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2
new file mode 100644
index 000000000000..8fc2deeaed6a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
+DESCRIPTION=Kodi's Stalker client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.2-Matrix.tar.gz -> kodi-pvr-stalker-6.0.2.tar.gz
+_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_=1a35e639fdba029ce4751fca42bead41
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3
new file mode 100644
index 000000000000..8779304599d5
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.3-Matrix.tar.gz -> kodi-pvr-vbox-7.0.3.tar.gz
+_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_=4c74970ca991f9e2dc8b99472e8f22aa
diff --git a/metadata/md5-cache/media-plugins/live-2020.05.15 b/metadata/md5-cache/media-plugins/live-2020.05.15
index 413d916d6a62..14988691307d 100644
--- a/metadata/md5-cache/media-plugins/live-2020.05.15
+++ b/metadata/md5-cache/media-plugins/live-2020.05.15
@@ -5,10 +5,10 @@ DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=7
 HOMEPAGE=http://www.live555.com/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0/9
 SRC_URI=http://www.live555.com/liveMedia/public/live.2020.05.15.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=437345b36affb9ebc826ac6b2c72420c
+_md5_=336d319949ecbc5c83229a589c0f4c88
diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
deleted file mode 100644
index 4e1df113638e..000000000000
--- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-sound/gsm-1.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(-)?] >=sci-libs/fftw-3.3.3-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(-)?] media-libs/ladspa-sdk sys-devel/gettext 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=Large collection of LADSPA audio plugins/effects
-EAPI=5
-HOMEPAGE=http://plugin.org.uk
-IUSE=cpu_flags_x86_3dnow nls cpu_flags_x86_sse 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 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=media-sound/gsm-1.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(-)?] >=sci-libs/fftw-3.3.3-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(-)?]
-SLOT=0
-SRC_URI=http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz https://dev.gentoo.org/~mgorny/dist/swh-plugins-0.4.15-patchset.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	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_=fad47ce7eee1a83139063899d851406f
diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.17 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.17
index 356812465ae0..60900aa1340b 100644
--- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.17
+++ b/metadata/md5-cache/media-plugins/swh-plugins-0.4.17
@@ -5,10 +5,10 @@ DESCRIPTION=Large collection of LADSPA audio plugins/effects
 EAPI=7
 HOMEPAGE=http://plugin.org.uk
 IUSE=nls cpu_flags_x86_3dnow cpu_flags_x86_sse 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
 RDEPEND=>=media-sound/gsm-1.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(-)?] >=sci-libs/fftw-3.3.3-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(-)?]
 SLOT=0
 SRC_URI=https://github.com/swh/ladspa/archive/v0.4.17.tar.gz -> swh-plugins-0.4.17.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	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b9d193609acddc8e683d2747e3739a5
+_md5_=5bbca64c8aec002a73acb6dbca835ac8
diff --git a/metadata/md5-cache/media-plugins/tap-plugins-0.7.3 b/metadata/md5-cache/media-plugins/tap-plugins-0.7.3
deleted file mode 100644
index ce83bcd80f97..000000000000
--- a/metadata/md5-cache/media-plugins/tap-plugins-0.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/ladspa-sdk
-DESCRIPTION=A bunch of LADSPA plugins for audio processing
-EAPI=7
-HOMEPAGE=http://tap-plugins.sourceforge.net
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/ladspa-sdk
-SLOT=0
-SRC_URI=mirror://sourceforge/tap-plugins/tap-plugins-0.7.3.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fa814c999d813af7264a3a1e9244ec7a
diff --git a/metadata/md5-cache/media-plugins/tap-plugins-1.0.1 b/metadata/md5-cache/media-plugins/tap-plugins-1.0.1
index 4328b601cd03..9f4c0eb26ee1 100644
--- a/metadata/md5-cache/media-plugins/tap-plugins-1.0.1
+++ b/metadata/md5-cache/media-plugins/tap-plugins-1.0.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/ladspa-sdk
 DESCRIPTION=Tom's audio processing (TAP) LADSPA plugins
 EAPI=7
 HOMEPAGE=https://github.com/tomszilagyi/tap-plugins http://tap-plugins.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=https://github.com/tomszilagyi/tap-plugins/archive/v1.0.1.tar.gz -> tap-plugins-1.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3419d0e55ba57ee0d2ac98585bea12be
+_md5_=007ae7e6ca32a4c2a59554fff7181257
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
index 5b9215cd1fc6..7f9f63808fec 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3* ||
 DESCRIPTION=Onset detection, pitch tracking, note tracking and tempo tracking plugins
 EAPI=6
 HOMEPAGE=https://www.vamp-plugins.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
 SRC_URI=https://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.tar.bz2 https://waf.io/waf-2.0.20
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b5263d4f0d3a4c7ca41d07c7c42c0cc
+_md5_=e3dac07e977c38eedd0ad3849d264a6a
diff --git a/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.2 b/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.2
deleted file mode 100644
index dc332d5df624..000000000000
--- a/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.9 >=media-libs/liblo-0.12 x11-libs/gtk+:2 media-libs/ladspa-sdk virtual/pkgconfig
-DESCRIPTION=A software synthesizer plugin for the DSSI Soft Synth Interface
-EAPI=7
-HOMEPAGE=http://dssi.sourceforge.net/download.html#Xsynth-DSSI
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.9 >=media-libs/liblo-0.12 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/dssi/xsynth-dssi-0.9.2.tar.gz
-_md5_=c7c93618b4f58906fa92e1ac8bb385d7
diff --git a/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.4 b/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.4
index 14ac1d699db8..966fa7f92bef 100644
--- a/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.4
+++ b/metadata/md5-cache/media-plugins/xsynth-dssi-0.9.4
@@ -3,9 +3,9 @@ DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.9 >=media-libs/liblo-0.12 x11-lib
 DESCRIPTION=A software synthesizer plugin for the DSSI Soft Synth Interface
 EAPI=7
 HOMEPAGE=http://dssi.sourceforge.net/download.html#Xsynth-DSSI
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.9 >=media-libs/liblo-0.12 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/dssi/xsynth-dssi-0.9.4.tar.gz
-_md5_=e92f3ac8725954f8648a18904118a18a
+_md5_=4152f71ff1b42049dbd8fbd17d9b64ce
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f8b9fe3037fe..b90d9c3f4537 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.12-r4 b/metadata/md5-cache/media-sound/apulse-0.1.12-r4
deleted file mode 100644
index 08ddb66d9cfc..000000000000
--- a/metadata/md5-cache/media-sound/apulse-0.1.12-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] 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(-)?] sdk? ( !media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PulseAudio emulation for ALSA
-EAPI=6
-HOMEPAGE=https://github.com/i-rinat/apulse
-IUSE=debug sdk 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
-LICENSE=MIT 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(-)?] 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(-)?] sdk? ( !media-sound/pulseaudio ) !!media-plugins/alsa-plugins[pulseaudio]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.12.tar.gz -> apulse-0.1.12.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_=82e6d5dd3dd8f62cd2988d3f5dace4bd
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20190721 b/metadata/md5-cache/media-sound/audex-0.95_pre20190721
index e7353195b82d..c435f2919bd9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/codecgraph-20120114-r2 b/metadata/md5-cache/media-sound/codecgraph-20120114-r2
deleted file mode 100644
index 0e1a2ad2b034..000000000000
--- a/metadata/md5-cache/media-sound/codecgraph-20120114-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure 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] ) media-gfx/graphviz media-gfx/imagemagick
-DESCRIPTION=Generates a graph based on the ALSA description of an HD Audio codec
-EAPI=6
-HOMEPAGE=http://helllabs.org/codecgraph/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64
-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] ) media-gfx/graphviz
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://helllabs.org/codecgraph/codecgraph-20120114.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5b6636968b972ea439f3320dba99d647
diff --git a/metadata/md5-cache/media-sound/elisa-20.04.3 b/metadata/md5-cache/media-sound/elisa-20.04.3
index 3b40196e89a3..d5a75a50b3ee 100644
--- a/metadata/md5-cache/media-sound/elisa-20.04.3
+++ b/metadata/md5-cache/media-sound/elisa-20.04.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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 13a0f623c44c..000000000000
--- a/metadata/md5-cache/media-sound/elisa-20.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=>=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://elisa.kde.org/ https://kde.org/applications/en/elisa
-IUSE=mpris semantic-desktop +vlc debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=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-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2: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=mirror://kde/stable/release-service/20.08.1/src/elisa-20.08.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	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5c1100d303bf90be791bdba9281dca8
diff --git a/metadata/md5-cache/media-sound/elisa-20.08.2 b/metadata/md5-cache/media-sound/elisa-20.08.2
new file mode 100644
index 000000000000..e24a618a0f53
--- /dev/null
+++ b/metadata/md5-cache/media-sound/elisa-20.08.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake 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=>=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://elisa.kde.org/ https://kde.org/applications/en/elisa
+IUSE=mpris semantic-desktop +vlc debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=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-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2: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=mirror://kde/stable/release-service/20.08.2/src/elisa-20.08.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/freebirth-0.3.2-r1 b/metadata/md5-cache/media-sound/freebirth-0.3.2-r1
deleted file mode 100644
index a6d80ab13da5..000000000000
--- a/metadata/md5-cache/media-sound/freebirth-0.3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=Free software bass synthesizer step sequencer
-EAPI=5
-HOMEPAGE=http://freshmeat.net/releases/8834
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.bitmechanic.com/projects/freebirth/freebirth-0.3.2.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_=d46423b50b3d0bd63c2a1e963d164fe4
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110 b/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
deleted file mode 100644
index 93ed1700696b..000000000000
--- a/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-db/sqlite:3 >=dev-db/wxsqlite3-3.2.1 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-1.6.4 net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] appindicator? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-libs/gnonlin:1.0 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 ) app-arch/unzip sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Music management program designed for all music enthusiasts
-EAPI=6
-HOMEPAGE=https://guayadeque.org/
-IUSE=appindicator ipod +minimal
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-db/sqlite:3 >=dev-db/wxsqlite3-3.2.1 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-1.6.4 net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] appindicator? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-libs/gnonlin:1.0 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
-SRC_URI=https://github.com/anonbeat/guayadeque/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> guayadeque-0.4.5_p20170110.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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af2b430d290ba9d7010380558e16c1f2
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.4.6 b/metadata/md5-cache/media-sound/guayadeque-0.4.6
index ec3d128de989..c410cbd7211f 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.4.6
+++ b/metadata/md5-cache/media-sound/guayadeque-0.4.6
@@ -5,11 +5,11 @@ DESCRIPTION=Music management program designed for all music enthusiasts
 EAPI=7
 HOMEPAGE=https://guayadeque.org/
 IUSE=appindicator ipod +minimal
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 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
 SRC_URI=https://github.com/anonbeat/guayadeque/archive/v0.4.6.tar.gz -> guayadeque-0.4.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	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb71a67858411dd7b52a3b3e664b5a19
+_md5_=882c5be7bd84effa207f7ecb64a52d98
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
index 499558e1222e..a7a02d04156d 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A low-latency audio server
 EAPI=7
 HOMEPAGE=http://www.jackaudio.org
 IUSE=cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse 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
-KEYWORDS=~amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/db:=[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= >=media-libs/libsndfile-1.0.0 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(-)?] media-libs/zita-resampler media-libs/zita-alsa-pcmi ) >=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )
 SLOT=0
 SRC_URI=https://github.com/jackaudio/jack1/archive/0.125.0.tar.gz -> jack-audio-connection-kit-0.125.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8190ca9aefc9a60f1f6f9ef9856a7ae3
+_md5_=a5ceee034f2d21421a3165215b11c411
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.3 b/metadata/md5-cache/media-sound/kid3-3.8.3
index 56f060650b46..d8258c039f70 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
index 9a4906ae8e28..04ed5ab918ea 100644
--- a/metadata/md5-cache/media-sound/kid3-3.8.4
+++ b/metadata/md5-cache/media-sound/kid3-3.8.4
@@ -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.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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/lltag-0.14.5 b/metadata/md5-cache/media-sound/lltag-0.14.5
deleted file mode 100644
index c0a2cf143552..000000000000
--- a/metadata/md5-cache/media-sound/lltag-0.14.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Automatic command-line mp3/ogg/flac file tagger and renamer
-EAPI=5
-HOMEPAGE=http://home.gna.org/lltag
-IUSE=flac mp3 ogg readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://download.gna.org/lltag/lltag-0.14.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b8f01a4f188e073b0523644c11c10d8
diff --git a/metadata/md5-cache/media-sound/picard-2.3.1 b/metadata/md5-cache/media-sound/picard-2.3.1
deleted file mode 100644
index eb6e91076e88..000000000000
--- a/metadata/md5-cache/media-sound/picard-2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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_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(-)] )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=nls? ( dev-qt/linguist-tools:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cross-platform music tagger
-EAPI=7
-HOMEPAGE=https://picard.musicbrainz.org
-IUSE=discid nls python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-python/PyQt5[dbus,declarative,gui,network,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[dbus,declarative,gui,network,widgets,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[dbus,declarative,gui,network,widgets,python_targets_python3_8(-)] ) dev-qt/qtgui:5 media-libs/mutagen discid? ( dev-python/python-discid ) 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8eda4f976f40de9437d4aa958e8b77c2
diff --git a/metadata/md5-cache/media-sound/picard-2.4.2 b/metadata/md5-cache/media-sound/picard-2.4.2
index 0582112ec6e0..bae26388a100 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_=ee297b9d229befdbed8e74eba1fc9e5a
+_md5_=d7fa4572da646ea75041f940b932a097
diff --git a/metadata/md5-cache/media-sound/qastools-0.22.0 b/metadata/md5-cache/media-sound/qastools-0.22.0
deleted file mode 100644
index 590dba235453..000000000000
--- a/metadata/md5-cache/media-sound/qastools-0.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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:=
-DESCRIPTION=Qt5 GUI ALSA tools: mixer, configuration browser
-EAPI=7
-HOMEPAGE=https://gitlab.com/sebholt/qastools
-KEYWORDS=amd64 x86
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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 1dba6ee383ef..5a2f146e04a6 100644
--- a/metadata/md5-cache/media-sound/qastools-0.23.0
+++ b/metadata/md5-cache/media-sound/qastools-0.23.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/q
 DESCRIPTION=Qt5 GUI ALSA tools: mixer, configuration browser
 EAPI=7
 HOMEPAGE=https://gitlab.com/sebholt/qastools
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb7c83bce75e86481a04a6230aad90f1
+_md5_=27785adbcfd48cd28ef3af6eed65fe68
diff --git a/metadata/md5-cache/media-sound/strawberry-0.8.1 b/metadata/md5-cache/media-sound/strawberry-0.8.1
new file mode 100644
index 000000000000..f2f1d7a0c9eb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-0.8.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=7
+HOMEPAGE=https://www.strawbs.org/
+IUSE=cdda +dbus debug ipod mms mtp pulseaudio +udisks test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=udisks? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.8.1/strawberry-0.8.1.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	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfefdf8772d3267c7de68f2cfaab4f50
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta24 b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta24
deleted file mode 100644
index 17b8901688da..000000000000
--- a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm
-DESCRIPTION=A client software for quality voice communication via the internet
-EAPI=7
-HOMEPAGE=https://www.teamspeak.com/
-LICENSE=teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )
-RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig:1.0 media-sound/pulseaudio net-print/cups sys-power/upower sys-apps/dbus x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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 x11-libs/pango
-RESTRICT=bindist fetch mirror
-SLOT=5
-SRC_URI=teamspeak-client.tar.gz -> teamspeak-client-5.0.0_beta24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9682d7ef6b348ebdc458cf72c0e0cabc
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27 b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27
new file mode 100644
index 000000000000..325ca7f92f27
--- /dev/null
+++ b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=A client software for quality voice communication via the internet
+EAPI=7
+HOMEPAGE=https://www.teamspeak.com/
+LICENSE=teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )
+RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig:1.0 media-sound/pulseaudio net-print/cups sys-power/upower sys-apps/dbus x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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 x11-libs/pango
+RESTRICT=bindist mirror
+SLOT=5
+SRC_URI=https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> teamspeak-client-5.0.0_beta27.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7861aa9ff822810f02924db8e9fc5c96
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 6d99850a66eb..23c37be385c0 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1 b/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
index f28532ddde23..8abf65050657 100644
--- a/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
+++ b/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/q
 DESCRIPTION=Cross-platform libmpv-based multimedia player with uncluttered design
 EAPI=7
 HOMEPAGE=http://bakamplayer.u8sand.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 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-video/mpv[libmpv] x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/u8sand/Baka-MPlayer/archive/v2.0.4.tar.gz -> baka-mplayer-2.0.4.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d02a3ccbd5bbfdaacafadb6d90ce83c7
+_md5_=cbec281e97f7cc05709b999f0e87183b
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3.1 b/metadata/md5-cache/media-video/ffmpeg-4.3.1
index d1459b61b14a..254f0dc81cb3 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.3.1
+++ b/metadata/md5-cache/media-video/ffmpeg-4.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 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(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.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(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.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(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.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(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.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(-)?] ) mp3? ( >=media-sound/lame-3.99.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(-)?] ) openh264? ( >=media-libs/openh264-1.4.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(-)?] ) rav1e? ( media-video/rav1e:=[capi] ) snappy? ( >=app-arch/snappy-1.1.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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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/libogg-1.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(-)?] ) twolame? ( >=media-sound/twolame-0.3.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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.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(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[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-1.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(-)?] ) iconv? ( >=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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) 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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2: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(-)?] ) libaom? ( >=media-libs/libaom-1.0.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(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( 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(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.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(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.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(-)?] ) libxml2? ( 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(-)?] ) lv2? ( media-libs/lv2[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/lilv[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(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.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(-)?] ) openal? ( >=media-libs/openal-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(-)?] ) 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/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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) 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(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.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(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,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[sound,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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) srt? ( >=net-libs/srt-1.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(-)?] ) ssh? ( >=net-libs/libssh-0.5.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(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) vidstab? ( >=media-libs/vidstab-1.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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-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/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.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(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[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/libXv-1.0.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(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) 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(-)?] ) !libressl? ( openssl? ( >=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(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[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=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl?
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1812ff1c3593a1614b92697f861fec63
+_md5_=1974d9b7004ee9c74a1a73409198cf79
diff --git a/metadata/md5-cache/media-video/gpac-1.0.1 b/metadata/md5-cache/media-video/gpac-1.0.1
index 5a49377b3c08..dca76bd10e6b 100644
--- a/metadata/md5-cache/media-video/gpac-1.0.1
+++ b/metadata/md5-cache/media-video/gpac-1.0.1
@@ -5,10 +5,10 @@ DESCRIPTION=Implementation of the MPEG-4 Systems standard developed from scratch
 EAPI=7
 HOMEPAGE=https://gpac.wp.imt.fr/
 IUSE=a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libogg a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-video/ffmpeg:0= ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2 ) mad? ( media-libs/libmad ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) theora? ( media-libs/libtheora ) truetype? ( media-libs/freetype:2 ) sdl? ( media-libs/libsdl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext ) xml? ( dev-libs/libxml2:2= ) xvid? ( media-libs/xvid )
 SLOT=0/10
 SRC_URI=https://github.com/gpac/gpac/archive/v1.0.1.tar.gz -> gpac-1.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=331445433596cb3e742139036e5989c4
+_md5_=426631ce9069787594ffc26f80c1bdd6
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.18 b/metadata/md5-cache/media-video/kaffeine-2.0.18
index 9bd8c5786547..ced4baf61f1f 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 6b1409fe6de7..a7833456f61e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/pipewire-0.3.13 b/metadata/md5-cache/media-video/pipewire-0.3.13
new file mode 100644
index 000000000000..56735fdbc650
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.13
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.13.tar.gz -> pipewire-0.3.13.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3b6e1af498add81f31d68787a162739f
diff --git a/metadata/md5-cache/media-video/rav1e-0.3.3 b/metadata/md5-cache/media-video/rav1e-0.3.3
index d50949ed6c7a..74a504709f10 100644
--- a/metadata/md5-cache/media-video/rav1e-0.3.3
+++ b/metadata/md5-cache/media-video/rav1e-0.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 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	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc583b27f213ceea3176eb5792de1261
+_md5_=e3edee0922c9802cdaad4b50e4688c70
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 1f4589eda70b..6866e3c8ca27 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/driftnet-1.3.0 b/metadata/md5-cache/net-analyzer/driftnet-1.3.0
index b50db2f05511..3402358fc9b1 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-1.3.0
+++ b/metadata/md5-cache/net-analyzer/driftnet-1.3.0
@@ -5,11 +5,11 @@ 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
+KEYWORDS=~amd64 ~arm64 ~ppc -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
+_md5_=d6d0a70623af451eaa8a359883e20a13
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202 b/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202
deleted file mode 100644
index 730c0652d20d..000000000000
--- a/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) =net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 dev-util/cppunit
-DESCRIPTION=gnuradio fosphor block (GPU spectrum display)
-EAPI=7
-HOMEPAGE=https://sdr.osmocom.org/trac/wiki/fosphor
-IUSE=glfw qt5 wxwidgets +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) =net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl 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=https://github.com/osmocom/gr-fosphor/archive/fa6761afbf8c2658782e0c7fc5d51063679b7ae4.tar.gz -> gr-fosphor-0.0_p20191202.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=9f17dc5b10b002bfb2d8440ff4f31476
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
index 593f1c558d9e..e15c5e081e8b 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
@@ -4,7 +4,7 @@ DESCRIPTION=Check websites for broken links
 EAPI=7
 HOMEPAGE=https://github.com/linkcheck/linkchecker
 IUSE=sqlite python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/beautifulsoup[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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(-)] 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
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/a977e4d7129450ba9fda8389724c80c1bde66883.tar.gz -> linkchecker-10.0.0_pre20200729.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ce402e2611df1f320416a437abc774c
+_md5_=9c6d4c5f6f5f35daaddc84fda31362fb
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10
deleted file mode 100644
index 9de598497272..000000000000
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS: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(-)] ) perl? ( dev-perl/Module-Install:0 virtual/perl-ExtUtils-MakeMaker:0 virtual/perl-File-Path:0 virtual/perl-File-Spec:0 virtual/perl-File-Temp:0 test? ( dev-perl/File-Copy-Recursive:0 dev-perl/Test-Pod:0 dev-perl/Test-Perl-Critic:0 dev-perl/Test-Pod-Coverage:0 dev-perl/Perl-Critic:0 dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 dev-perl/Perl-Critic-Deprecated:0 dev-perl/Perl-Critic-Nits: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=Nagios/Icinga event broker that allows quick/direct access to your status data
-EAPI=6
-HOMEPAGE=http://mathias-kettner.de/checkmk_livestatus.html
-IUSE=examples nagios4 perl python test python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS: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(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cc09387c465803b3b0d368ee29f0350f
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
deleted file mode 100644
index 413e91d5b9c1..000000000000
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) perl? ( dev-perl/Module-Install:0 virtual/perl-ExtUtils-MakeMaker:0 virtual/perl-File-Path:0 virtual/perl-File-Spec:0 virtual/perl-File-Temp:0 test? ( dev-perl/File-Copy-Recursive:0 dev-perl/Test-Pod:0 dev-perl/Test-Perl-Critic:0 dev-perl/Test-Pod-Coverage:0 dev-perl/Perl-Critic:0 dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 dev-perl/Perl-Critic-Deprecated:0 dev-perl/Perl-Critic-Nits: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=Nagios/Icinga event broker that allows quick/direct access to your status data
-EAPI=6
-HOMEPAGE=http://mathias-kettner.de/checkmk_livestatus.html
-IUSE=examples nagios4 perl python test +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( 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? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p16.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6d581074f2410a83f474205957695d3e
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1
deleted file mode 100644
index a666d3be89e2..000000000000
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) perl? ( dev-perl/Module-Install:0 virtual/perl-ExtUtils-MakeMaker:0 virtual/perl-File-Path:0 virtual/perl-File-Spec:0 virtual/perl-File-Temp:0 test? ( dev-perl/File-Copy-Recursive:0 dev-perl/Test-Pod:0 dev-perl/Test-Perl-Critic:0 dev-perl/Test-Pod-Coverage:0 dev-perl/Perl-Critic:0 dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 dev-perl/Perl-Critic-Deprecated:0 dev-perl/Perl-Critic-Nits: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=Nagios/Icinga event broker that allows quick/direct access to your status data
-EAPI=6
-HOMEPAGE=http://mathias-kettner.de/checkmk_livestatus.html
-IUSE=examples nagios4 perl python test +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( 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? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p26.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cf960eed3b59fb5a3251c34a4889fd48
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1
deleted file mode 100644
index b7b7fd91019f..000000000000
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-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=compile configure install postinst prepare setup test
-DEPEND=!sys-apps/ucspi-unix:0 net-analyzer/rrdtool:= boost? ( dev-libs/boost ) perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) re2? ( dev-libs/re2:= ) perl? ( dev-perl/Module-Install:0 virtual/perl-ExtUtils-MakeMaker:0 virtual/perl-File-Path:0 virtual/perl-File-Spec:0 virtual/perl-File-Temp:0 test? ( dev-perl/File-Copy-Recursive:0 dev-perl/Test-Pod:0 dev-perl/Test-Perl-Critic:0 dev-perl/Test-Pod-Coverage:0 dev-perl/Perl-Critic:0 dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 dev-perl/Perl-Critic-Deprecated:0 dev-perl/Perl-Critic-Nits:0 ) )
-DESCRIPTION=Nagios/Icinga event broker that allows quick/direct access to your status data
-EAPI=7
-HOMEPAGE=https://checkmk.com/
-IUSE=boost examples nagios4 perl python re2 test +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-apps/ucspi-unix:0 net-analyzer/rrdtool:= boost? ( dev-libs/boost ) perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) re2? ( dev-libs/re2:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://checkmk.com/support/1.5.0p22/mk-livestatus-1.5.0p22.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=623bf4f6df73794142bed2fc782a0b8f
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.2-r1 b/metadata/md5-cache/net-analyzer/sslscan-2.0.2-r1
new file mode 100644
index 000000000000..81c8fed7184c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sslscan-2.0.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Fast SSL configuration scanner
+EAPI=7
+HOMEPAGE=https://github.com/rbsec/sslscan
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.2.tar.gz -> sslscan-2.0.2.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1h.tar.gz -> sslscan-OpenSSL_1_1_1h.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=78ab9b5c4ba6519e9486534d8ce17415
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.3 b/metadata/md5-cache/net-analyzer/suricata-5.0.3
deleted file mode 100644
index eedf9b94341f..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.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
-DEFINED_PHASES=config configure install postinst prepare pretend 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.33 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.0.6 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=7
-HOMEPAGE=https://suricata-ids.org/
-IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.33 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.0.6 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ?? ( lua luajit ) bpf? ( af-packet )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.3.tar.gz
-_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	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6ad0b528893e0003b76aad19d9cf617
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.4 b/metadata/md5-cache/net-analyzer/suricata-5.0.4
new file mode 100644
index 000000000000..b00094e2bbd0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.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
+DEFINED_PHASES=config configure install postinst prepare pretend 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.35 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
+EAPI=7
+HOMEPAGE=https://suricata-ids.org/
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.35 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ?? ( lua luajit ) bpf? ( af-packet )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.4.tar.gz
+_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	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=577e78e5463eae320c947489bb5fcdc2
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.0 b/metadata/md5-cache/net-analyzer/suricata-6.0.0
new file mode 100644
index 000000000000..3921c927778e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.0
@@ -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=config configure install postinst prepare pretend 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.35 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
+EAPI=7
+HOMEPAGE=https://suricata-ids.org/
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.35 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ?? ( lua luajit ) bpf? ( af-packet )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.0.tar.gz
+_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	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=61ef6f5314b0191745fb4fedbfe714ea
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.6 b/metadata/md5-cache/net-analyzer/vnstat-2.6
index ec9d9b92c4f7..d38f5f04a8fb 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.6
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.6
@@ -5,11 +5,11 @@ DESCRIPTION=Console-based network traffic monitor that keeps statistics of netwo
 EAPI=7
 HOMEPAGE=https://humdi.net/vnstat/
 IUSE=gd selinux test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.6.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=4c5b0e8494abedd45f1f136ca8083e3b
+_md5_=8bb8755c7656a0f4310bbde6538a0d27
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.6 b/metadata/md5-cache/net-analyzer/wireshark-3.2.6
deleted file mode 100644
index f1812e852663..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-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.6
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.6.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_=57db767ca3a8d993285a7ef4b62b3562
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.7 b/metadata/md5-cache/net-analyzer/wireshark-3.2.7
index e526de23044a..79ac7f52d1ab 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.7
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.2.7
@@ -5,7 +5,7 @@ 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
+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 )
@@ -13,4 +13,4 @@ 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_=a4c8c804a501a815842b9e15526df795
+_md5_=57db767ca3a8d993285a7ef4b62b3562
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.23 b/metadata/md5-cache/net-analyzer/zabbix-4.0.23
deleted file mode 100644
index 54ea649b8626..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.23
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.23.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03007a6c810eb8099d3fed1ea405846f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.24 b/metadata/md5-cache/net-analyzer/zabbix-4.0.24
index be09beace93d..065affec388d 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.24
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.24
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.24.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4defb7ad955805f4c9311d83ed98f81
+_md5_=03007a6c810eb8099d3fed1ea405846f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.25 b/metadata/md5-cache/net-analyzer/zabbix-4.0.25
new file mode 100644
index 000000000000..cb9d265346a8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.25
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.25.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98c207cbd32ce9f3f5dd52cba394e4d1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.2 b/metadata/md5-cache/net-analyzer/zabbix-5.0.2
deleted file mode 100644
index 8f840dc9dc30..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f366b1da9545bb34489489844b157c00
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.3 b/metadata/md5-cache/net-analyzer/zabbix-5.0.3
index 16957025a72d..2d7f30428817 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bdfe178f739026dcd5249240e7849bd
+_md5_=f366b1da9545bb34489489844b157c00
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.4 b/metadata/md5-cache/net-analyzer/zabbix-5.0.4
new file mode 100644
index 000000000000..4b4b1ad4650b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.4.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91e57c23041003da6c0573ba37e60b0f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 80e1b936c222..cd228171c5c2 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/ddclient-3.9.1 b/metadata/md5-cache/net-dns/ddclient-3.9.1
index 4a548bac506e..fcdc5bde7227 100644
--- a/metadata/md5-cache/net-dns/ddclient-3.9.1
+++ b/metadata/md5-cache/net-dns/ddclient-3.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl client used to update dynamic DNS entries
 EAPI=7
 HOMEPAGE=https://ddclient.net/
 IUSE=examples iproute2
-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=acct-group/ddclient acct-user/ddclient dev-lang/perl dev-perl/Data-Validate-IP dev-perl/Digest-SHA1 dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL virtual/perl-Digest-SHA virtual/perl-JSON-PP iproute2? ( sys-apps/iproute2 ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/ddclient/ddclient/archive/v3.9.1.tar.gz -> ddclient-3.9.1.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5a80a174b3765123790830649b9a673
+_md5_=9c59936164c79a75508f4c3d8f39c57a
diff --git a/metadata/md5-cache/net-dns/dnssec-validator-2.2.3 b/metadata/md5-cache/net-dns/dnssec-validator-2.2.3
index c5cb8bc9d09b..15859015de22 100644
--- a/metadata/md5-cache/net-dns/dnssec-validator-2.2.3
+++ b/metadata/md5-cache/net-dns/dnssec-validator-2.2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to ease the validation of DNSSEC related technologies
 EAPI=7
 HOMEPAGE=https://www.dnssec-tools.org/
 IUSE=dlv +ipv6 +nsec3 static-libs +threads
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-1.1.0:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-2.2.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e83c97d112962c2fa06a8795b4f6d97b
+_md5_=d9d423236e082250506e6907064b4848
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.1 b/metadata/md5-cache/net-dns/nsd-4.3.1
deleted file mode 100644
index 273395c0e768..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc systemd? ( 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
-DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=7
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4e3272e00ff24094340355a544b0897
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.3 b/metadata/md5-cache/net-dns/nsd-4.3.3
new file mode 100644
index 000000000000..93b48a9a33eb
--- /dev/null
+++ b/metadata/md5-cache/net-dns/nsd-4.3.3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc systemd? ( 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
+DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
+DESCRIPTION=An authoritative only, high performance, open source name server
+EAPI=7
+HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
+IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e4e3272e00ff24094340355a544b0897
diff --git a/metadata/md5-cache/net-dns/openresolv-3.9.2 b/metadata/md5-cache/net-dns/openresolv-3.9.2
deleted file mode 100644
index 99033c38de73..000000000000
--- a/metadata/md5-cache/net-dns/openresolv-3.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=config configure
-DESCRIPTION=A framework for managing DNS information
-EAPI=7
-HOMEPAGE=https://roy.marples.name/projects/openresolv
-IUSE=selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=selinux? ( sec-policy/selinux-resolvconf )
-SLOT=0
-SRC_URI=https://roy.marples.name/downloads/openresolv/openresolv-3.9.2.tar.xz
-_md5_=c3c8c819203c8e4d5574146091bc0c87
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.3.3.0 b/metadata/md5-cache/net-dns/s6-dns-2.3.3.0
new file mode 100644
index 000000000000..77f85abd5183
--- /dev/null
+++ b/metadata/md5-cache/net-dns/s6-dns-2.3.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+DESCRIPTION=Suite of DNS client programs and libraries for Unix systems
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-dns/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/s6-dns/s6-dns-2.3.3.0.tar.gz
+_md5_=d61d2667adf20d4de623410bc46e4d21
diff --git a/metadata/md5-cache/net-dns/unbound-1.12.0 b/metadata/md5-cache/net-dns/unbound-1.12.0
new file mode 100644
index 000000000000..b6b248c6fa86
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.12.0
@@ -0,0 +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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/unbound acct-user/unbound >=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(-)?] >=dev-libs/libevent-2.0.21:0=[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-2.2.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(-)?] ) !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(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[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/protobuf-c-1.0.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(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) 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] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=7
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/unbound acct-user/unbound >=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(-)?] >=dev-libs/libevent-2.0.21:0=[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-2.2.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(-)?] ) !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(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[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/protobuf-c-1.0.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(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) 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] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+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? ( test )
+SLOT=0/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.12.0.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e502a3174ce469615540c1a926c849f6
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index c8c19261dd43..6e851a87fda4 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.6 b/metadata/md5-cache/net-fs/openafs-1.8.6
index 5d30ea48f7b3..d5d8e0312a35 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.6
+++ b/metadata/md5-cache/net-fs/openafs-1.8.6
@@ -5,10 +5,10 @@ DESCRIPTION=The OpenAFS distributed file system
 EAPI=7
 HOMEPAGE=https://www.openafs.org/
 IUSE=apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write kernel_linux kernel_linux
-KEYWORDS=~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) kernel_linux? ( sys-apps/kmod[tools] ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.6/openafs-1.8.6-src.tar.bz2 https://openafs.org/dl/openafs/1.8.6/openafs-1.8.6-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20200913.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6d1e48fe106b6f41c77d42533a957e33
+_md5_=934b44fdda6c46bdc689017221a36a52
diff --git a/metadata/md5-cache/net-fs/samba-4.11.13 b/metadata/md5-cache/net-fs/samba-4.11.13
index bcc6f96a8ff6..ef213f39617f 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_=08a6dddbd90095f05bd4a2c793654df5
+_md5_=b1b2544102b08d5cb7d2af3f60156125
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 0606ff3a645c..8ddc099295e8 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/choqok-1.7.0 b/metadata/md5-cache/net-im/choqok-1.7.0
index ce92de34da0c..531442089c0b 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/jabber-base-0.01-r1 b/metadata/md5-cache/net-im/jabber-base-0.01-r1
index 31f46fb8c9b8..9fb8f4fb8111 100644
--- a/metadata/md5-cache/net-im/jabber-base-0.01-r1
+++ b/metadata/md5-cache/net-im/jabber-base-0.01-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Jabber servers and transports layout package
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 _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_=0586eba02cb7e1fb04a782643b294485
+_md5_=2b75c899e88abfc03ad625b88db6643d
diff --git a/metadata/md5-cache/net-im/jabber-base-0.01-r2 b/metadata/md5-cache/net-im/jabber-base-0.01-r2
new file mode 100644
index 000000000000..e9d98ea9945d
--- /dev/null
+++ b/metadata/md5-cache/net-im/jabber-base-0.01-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Base layout package for various jabber services
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/jabber acct-user/jabber
+SLOT=0
+_md5_=d636b492acd264ab5571ac80f6c4c9f3
diff --git a/metadata/md5-cache/net-im/prosody-0.11.7 b/metadata/md5-cache/net-im/prosody-0.11.7
deleted file mode 100644
index 5c44c6ff1507..000000000000
--- a/metadata/md5-cache/net-im/prosody-0.11.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-lua/LuaBitOp net-dns/libidn net-im/jabber-base libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) test? ( dev-lua/busted )
-DESCRIPTION=Prosody is a flexible communications server for Jabber/XMPP written in Lua
-EAPI=7
-HOMEPAGE=https://prosody.im/
-IUSE=libevent libressl luajit mysql postgres sqlite ssl test zlib
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=dev-lua/LuaBitOp net-dns/libidn net-im/jabber-base libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ~dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem dev-lua/luasocket libevent? ( dev-lua/luaevent ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://prosody.im/downloads/source/prosody-0.11.7.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f21cc8f0b71f27b64428411a5ec5b7d6
diff --git a/metadata/md5-cache/net-im/prosody-0.11.7-r1 b/metadata/md5-cache/net-im/prosody-0.11.7-r1
new file mode 100644
index 000000000000..def0da7eace5
--- /dev/null
+++ b/metadata/md5-cache/net-im/prosody-0.11.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=|| ( >=dev-lang/lua-5.2:* dev-lua/lua-bit32 ) net-dns/libidn net-im/jabber-base libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) test? ( dev-lua/busted )
+DESCRIPTION=Prosody is a modern XMPP communication server
+EAPI=7
+HOMEPAGE=https://prosody.im/
+IUSE=+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=dev-lang/lua-5.2:* dev-lua/lua-bit32 ) net-dns/libidn net-im/jabber-base libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) dev-lua/luaexpat dev-lua/luafilesystem dev-lua/luasocket libevent? ( dev-lua/luaevent ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://prosody.im/downloads/source/prosody-0.11.7.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5482d4cb32052d0268e2187bbd9e6658
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
deleted file mode 100644
index 2b4a02b77f9c..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.36.2
+++ /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.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/signal-desktop-bin-1.36.3 b/metadata/md5-cache/net-im/signal-desktop-bin-1.36.3
new file mode 100644
index 000000000000..87be548e72c3
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.36.3
@@ -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(+)] media-sound/pulseaudio 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.3_amd64.deb
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=45e704d10de7dca49ce5ebc2c5175338
diff --git a/metadata/md5-cache/net-im/teams-1.3.00.25560 b/metadata/md5-cache/net-im/teams-1.3.00.25560
new file mode 100644
index 000000000000..621b6d4f9409
--- /dev/null
+++ b/metadata/md5-cache/net-im/teams-1.3.00.25560
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DESCRIPTION=Microsoft Teams, an Office 365 multimedia collaboration client, pre-release
+EAPI=7
+HOMEPAGE=https://products.office.com/en-us/microsoft-teams/group-chat-software/
+IUSE=system-ffmpeg system-mesa
+KEYWORDS=-* ~amd64
+LICENSE=ms-teams-pre
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo 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/libxcb x11-libs/libxkbfile x11-libs/pango system-mesa? ( media-libs/mesa ) system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+RESTRICT=bindist mirror splitdebug test
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.25560_amd64.deb
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2b04a36dc7df7c8af34278ae9c8903f
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index c1be75020430..34507139ddf0 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/ii-1.8 b/metadata/md5-cache/net-irc/ii-1.8
index ef464734814b..20c556e57f82 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 ~arm64 ~ppc ~ppc64 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_=8be5f78b07ce0a36ead6497efbb819db
+_md5_=9a8b0aef94c281a205721aa33721e8f5
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 88d129287529..d60f328120a0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
index 9df81e80e780..6ebeabae9628 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.6
+++ b/metadata/md5-cache/net-irc/konversation-1.7.6
@@ -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.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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/znc-palaver-1.2.1 b/metadata/md5-cache/net-irc/znc-palaver-1.2.1
index dce15f8d0804..2c4a50528bda 100644
--- a/metadata/md5-cache/net-irc/znc-palaver-1.2.1
+++ b/metadata/md5-cache/net-irc/znc-palaver-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A ZNC module which provides push notifications to Palaver
 EAPI=7
 HOMEPAGE=https://github.com/cocodelabs/znc-palaver
 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=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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-irc/znc:=[ssl]
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cocodelabs/znc-palaver/archive/1.2.1.tar.gz -> znc-palaver-1.2.1.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f00d9aecddfe4ab9223cbfb44c998598
+_md5_=7018bf4c448f5e0cc43680362cf44edb
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 2a65a0bb318f..97d9f3778363 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/enet-1.2.2-r1 b/metadata/md5-cache/net-libs/enet-1.2.2-r1
index c4fa442987b4..c6133b1294bf 100644
--- a/metadata/md5-cache/net-libs/enet-1.2.2-r1
+++ b/metadata/md5-cache/net-libs/enet-1.2.2-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure
-DESCRIPTION=relatively thin, simple and robust network communication layer on top of UDP
-EAPI=6
+DEFINED_PHASES=configure install
+DESCRIPTION=Relatively thin, simple and robust network communication layer on top of UDP
+EAPI=7
 HOMEPAGE=http://enet.bespin.org/
 IUSE=static-libs
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://enet.bespin.org/download/enet-1.2.2.tar.gz
-_md5_=b44bcc4be9834336044a3c7634ac6b13
+_md5_=d41c1748017ca90ee83207b07a75dabf
diff --git a/metadata/md5-cache/net-libs/enet-1.3.13 b/metadata/md5-cache/net-libs/enet-1.3.13
index 12e69a6c64e0..6ec72adc0045 100644
--- a/metadata/md5-cache/net-libs/enet-1.3.13
+++ b/metadata/md5-cache/net-libs/enet-1.3.13
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
-DESCRIPTION=relatively thin, simple and robust network communication layer on top of UDP
-EAPI=5
+DESCRIPTION=Relatively thin, simple and robust network communication layer on top of UDP
+EAPI=7
 HOMEPAGE=http://enet.bespin.org/
 IUSE=static-libs
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
@@ -8,5 +8,4 @@ LICENSE=MIT
 RDEPEND=!net-libs/enet:0
 SLOT=1.3/7
 SRC_URI=http://enet.bespin.org/download/enet-1.3.13.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_=5abe272fac2b9b46ac744c5e68552020
+_md5_=fd7782dc2aa4ec0c88ce7fa2ab4b74f3
diff --git a/metadata/md5-cache/net-libs/enet-1.3.16 b/metadata/md5-cache/net-libs/enet-1.3.16
new file mode 100644
index 000000000000..1626fbd949b8
--- /dev/null
+++ b/metadata/md5-cache/net-libs/enet-1.3.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Relatively thin, simple and robust network communication layer on top of UDP
+EAPI=7
+HOMEPAGE=http://enet.bespin.org/ https://github.com/lsalzman/enet/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=!net-libs/enet:0
+SLOT=1.3/7
+SRC_URI=http://enet.bespin.org/download/enet-1.3.16.tar.gz
+_md5_=f614dd6d053706e77a07cafd96e70641
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.24 b/metadata/md5-cache/net-libs/gloox-1.0.24
new file mode 100644
index 000000000000..bbe74f398728
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gloox-1.0.24
@@ -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=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A portable high-level Jabber/XMPP library for C++
+EAPI=7
+HOMEPAGE=https://camaya.net/gloox/
+IUSE=debug gnutls idn libressl ssl static-libs test zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
+SLOT=0/18
+SRC_URI=https://camaya.net/download/gloox-1.0.24.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6bde36b6d6616c9da813f51083884d3f
diff --git a/metadata/md5-cache/net-libs/kdav2-0.3.0 b/metadata/md5-cache/net-libs/kdav2-0.3.0
index 4feeb9956266..b16c18d61740 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/kimap2-0.3.0 b/metadata/md5-cache/net-libs/kimap2-0.3.0
index d07a5a7d5411..d4da4be695e3 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/libhtp-0.5.33 b/metadata/md5-cache/net-libs/libhtp-0.5.33
deleted file mode 100644
index d732a8004e7e..000000000000
--- a/metadata/md5-cache/net-libs/libhtp-0.5.33
+++ /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=compile configure install prepare test
-DEPEND=sys-libs/zlib[static-libs?]
-DESCRIPTION=security-aware parser for the HTTP protocol and the related bits and pieces
-EAPI=7
-HOMEPAGE=https://github.com/OISF/libhtp
-IUSE=debug 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 ~arm64 ~mips ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib[static-libs?]
-SLOT=0
-SRC_URI=https://github.com/OISF/libhtp/archive/0.5.33.tar.gz -> libhtp-0.5.33.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29a5f8b6d88a5e3710124beb69ed577d
diff --git a/metadata/md5-cache/net-libs/libhtp-0.5.34 b/metadata/md5-cache/net-libs/libhtp-0.5.34
deleted file mode 100644
index d946b0f0f86f..000000000000
--- a/metadata/md5-cache/net-libs/libhtp-0.5.34
+++ /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=compile configure install prepare test
-DEPEND=sys-libs/zlib[static-libs?]
-DESCRIPTION=security-aware parser for the HTTP protocol and the related bits and pieces
-EAPI=7
-HOMEPAGE=https://github.com/OISF/libhtp
-IUSE=debug 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 ~arm64 ~mips ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib[static-libs?]
-SLOT=0
-SRC_URI=https://github.com/OISF/libhtp/archive/0.5.34.tar.gz -> libhtp-0.5.34.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29a5f8b6d88a5e3710124beb69ed577d
diff --git a/metadata/md5-cache/net-libs/libhtp-0.5.35 b/metadata/md5-cache/net-libs/libhtp-0.5.35
new file mode 100644
index 000000000000..8437bf92c21c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libhtp-0.5.35
@@ -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 prepare test
+DEPEND=sys-libs/zlib[static-libs?]
+DESCRIPTION=security-aware parser for the HTTP protocol and the related bits and pieces
+EAPI=7
+HOMEPAGE=https://github.com/OISF/libhtp
+IUSE=debug 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 ~arm64 ~mips ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib[static-libs?]
+SLOT=0
+SRC_URI=https://github.com/OISF/libhtp/archive/0.5.35.tar.gz -> libhtp-0.5.35.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=29a5f8b6d88a5e3710124beb69ed577d
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 625976d4760c..220717002097 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 0b41262cac8b..7cb0ef3e3e67 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/libmediawiki-5.37.0-r1 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
index 838121f111cf..38aebd1e0a1c 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/libproxy-0.4.15-r2 b/metadata/md5-cache/net-libs/libproxy-0.4.15-r2
new file mode 100644
index 000000000000..8245518bb1f7
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.15-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=gnome? ( 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(-)?] ) mono? ( dev-lang/mono ) networkmanager? ( sys-apps/dbus:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= ) webkit? ( net-libs/webkit-gtk:4 )
+DESCRIPTION=Library for automatic proxy configuration management
+EAPI=7
+HOMEPAGE=https://github.com/libproxy/libproxy
+IUSE=gnome kde mono networkmanager spidermonkey test webkit 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 ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+PDEPEND=networkmanager? ( net-misc/networkmanager )
+RDEPEND=gnome? ( 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(-)?] ) mono? ( dev-lang/mono ) networkmanager? ( sys-apps/dbus:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= ) webkit? ( net-libs/webkit-gtk:4 ) kde? ( kde-frameworks/kconfig:5 )
+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	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_=be74bcad441070b1b9249080cc263383
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.1.2 b/metadata/md5-cache/net-libs/libwebsockets-4.1.2
index f5d7032c0b52..b40238b860e2 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.1.2
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=A flexible pure-C library for implementing network protocols
 EAPI=7
 HOMEPAGE=https://libwebsockets.org/
 IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl static-libs threads zip
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !libressl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( >net-libs/mbedtls-2.0.0 ) ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) socks5? ( client http-proxy ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent )
 SLOT=0/17
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.1.2.tar.gz -> libwebsockets-4.1.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-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a04fb68984cb54f95a779f3d29580559
+_md5_=efd5b72d4b59b5c59bd5d5c3fd09f5ad
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
index 5a028b151977..581f8d3da35a 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+BDEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which ) verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install prepare test unpack
 DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
+IUSE=ipv6 kernel_linux static-libs verify-sig
 KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f30bc72d0712bd794f3dce95ed132b4a
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz.sig )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_md5_=a1fc4975eeacc04e35a34cc29daafaa1
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index c9669a1dda2a..0ba738347b91 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -12,4 +12,4 @@ 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_=62f013dda7d95bb7f909aa8422f8a2bc
+_md5_=c874b19d9a3046777fd712326ac4c66a
diff --git a/metadata/md5-cache/net-libs/signon-oauth2-0.24 b/metadata/md5-cache/net-libs/signon-oauth2-0.24
index 18ddaf3ba79e..39d22ef51dbc 100644
--- a/metadata/md5-cache/net-libs/signon-oauth2-0.24
+++ b/metadata/md5-cache/net-libs/signon-oauth2-0.24
@@ -4,11 +4,11 @@ DESCRIPTION=OAuth2 plugin for Signon daemon
 EAPI=7
 HOMEPAGE=https://gitlab.com/accounts-sso/signon-plugin-oauth2
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] net-libs/signond
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_0.24/signon-plugin-oauth2-VERSION_0.24.tar.gz -> signon-oauth2-0.24.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2dc07e60b371ae45ae7025117dffb044
+_md5_=4d65df6cbf342ef50ece887b93f177f4
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 c9e787b56c66..93ba14166aea 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/xrootd-4.12.4 b/metadata/md5-cache/net-libs/xrootd-4.12.4
index ec0f60e8c2f3..083eb4214a26 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.12.4
+++ b/metadata/md5-cache/net-libs/xrootd-4.12.4
@@ -5,7 +5,7 @@ DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
 IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.12.4/xrootd-4.12.4.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=30d2664befa04c2d2d8f69f1a6717506
+_md5_=697ec42f24949ce7edde4513acc38cb0
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 405e9f054b61..e4590fca97d0 100644
--- a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
+++ b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
@@ -4,10 +4,10 @@ DEPEND=net-libs/xrootd !<net-libs/xrootd-4.10.0[rbd] sys-cluster/ceph
 DESCRIPTION=xrootd OSS plug-in for interfacing with Ceph storage platform
 EAPI=7
 HOMEPAGE=https://xrootd.slac.stanford.edu/
-KEYWORDS=~amd64 ~amd64-linux
+KEYWORDS=amd64 ~amd64-linux
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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
+_md5_=5e9c5d8c5780173f395f047db4ff92b4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index fe7331e928a7..afe9b70ad707 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.2 b/metadata/md5-cache/net-misc/electrum-4.0.2
index f51346dbdbbe..002582e2d81a 100644
--- a/metadata/md5-cache/net-misc/electrum-4.0.2
+++ b/metadata/md5-cache/net-misc/electrum-4.0.2
@@ -4,7 +4,7 @@ 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
+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/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.2.tar.gz -> electrum-4.0.2.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_=cb023ad7f17ab90939c88da150bafe0a
+_md5_=eb9c31ee4cbeed0fd1513473c09638d1
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109 b/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109
deleted file mode 100644
index 206695d2e42b..000000000000
--- a/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A GUI application that allows to manage multiple target systems through BMC
-EAPI=6
-HOMEPAGE=https://www.supermicro.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=supermicro
-RDEPEND=net-misc/stunnel virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror strip
-SLOT=0
-SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.15.0_build.190109_bundleJRE_Linux.tar.gz )
-_eclasses_=desktop	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	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=60836d7c75a4833214f1c33582754ce2
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.17.0.200505 b/metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
index 41b5ad61d74c..46a186e52641 100644
--- a/metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
+++ b/metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
@@ -1,5 +1,5 @@
 BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
+DEFINED_PHASES=compile install preinst prepare setup unpack
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=A GUI application that allows to manage multiple target systems through BMC
 EAPI=7
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.supermicro.com/
 IUSE=elibc_FreeBSD
 KEYWORDS=-* ~amd64
 LICENSE=supermicro
-RDEPEND=net-misc/stunnel virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
+RDEPEND=net-misc/stunnel sys-libs/ncurses-compat:5 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz
+SRC_URI=https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=62398a49c093a6146ad3558e9528e9ed
+_md5_=fd7c0db70cd3f1fabb62d1ca61fa27a0
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928 b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
index 0ff021e75319..5c7464759c89 100644
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
@@ -1,12 +1,14 @@
-DEFINED_PHASES=compile configure install
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install unpack
 DEPEND=net-libs/libnfnetlink
 DESCRIPTION=MiniSSDP Daemon
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
+IUSE=verify-sig
 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
+SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz verify-sig? ( http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz.sig )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_md5_=50527fbe201e220319258d3da40367a8
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
index 6d816a052477..245f57d8cb60 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
@@ -1,13 +1,14 @@
-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
+BDEPEND=sys-apps/lsb-release verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst unpack
+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:= )
 DESCRIPTION=MiniUPnP IGD Daemon
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
+IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
 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
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC2.tar.gz.sig )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3 b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
deleted file mode 100644
index 7942208479c0..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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= ) 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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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= ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.4.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_=25900bacdeb61f753f0ced85c6cd7f55
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.6 b/metadata/md5-cache/net-misc/networkmanager-1.18.6
deleted file mode 100644
index 8cde98dc5ea3..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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= ) 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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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= ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.6.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_=a25b04e2dbbe1c8f3aa8f8d88f46222d
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.20.12 b/metadata/md5-cache/net-misc/networkmanager-1.20.12
deleted file mode 100644
index b46f705941f8..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.20.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=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= ) 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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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= ) 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.20/NetworkManager-1.20.12.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_=75c6134b63e02500569a9f17cdd86977
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11 b/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11
deleted file mode 100644
index 253cb12a9033..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) sys-devel/gettext virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-libs/libxslt dev-lang/perl ) vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-libs/libndp sys-apps/dbus sys-kernel/linux-headers virtual/libudev audit? ( sys-process/audit ) bluetooth? ( net-wireless/bluez ) concheck? ( net-misc/curl ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( sys-auth/consolekit ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls ) introspection? ( dev-libs/gobject-introspection:= ) json? ( dev-libs/jansson ) libpsl? ( net-libs/libpsl ) modemmanager? ( net-misc/mobile-broadband-provider-info net-misc/modemmanager ) nss? ( dev-libs/nss ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) policykit? ( sys-auth/polkit ) ppp? ( net-dialup/ppp[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) teamd? ( dev-libs/jansson net-misc/libteam ) tools? ( dev-libs/newt sys-libs/ncurses sys-libs/readline:0= )
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux syslog systemd teamd test +tools vala wext +wifi kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-libs/libndp sys-apps/dbus sys-kernel/linux-headers virtual/libudev audit? ( sys-process/audit ) bluetooth? ( net-wireless/bluez ) concheck? ( net-misc/curl ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( sys-auth/consolekit ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls ) introspection? ( dev-libs/gobject-introspection:= ) json? ( dev-libs/jansson ) libpsl? ( net-libs/libpsl ) modemmanager? ( net-misc/mobile-broadband-provider-info net-misc/modemmanager ) nss? ( dev-libs/nss ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) policykit? ( sys-auth/polkit ) ppp? ( net-dialup/ppp[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) teamd? ( dev-libs/jansson net-misc/libteam ) tools? ( dev-libs/newt sys-libs/ncurses sys-libs/readline:0= ) acct-group/plugdev || ( net-analyzer/arping net-misc/iputils[arping(+)] ) wifi? ( iwd? ( net-wireless/iwd ) !iwd? ( net-wireless/wpa_supplicant[dbus] ) )
-REQUIRED_USE=gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) ^^ ( gnutls nss ) ?? ( consolekit elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/1.22.10/NetworkManager-1.22.10.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f794cf9c84acbad0f8214946b9cb61d
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.22.10-r12 b/metadata/md5-cache/net-misc/networkmanager-1.22.10-r12
new file mode 100644
index 000000000000..db22ca7b9d90
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.22.10-r12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) sys-devel/gettext virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-libs/libxslt dev-lang/perl ) vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-libs/libndp sys-apps/dbus sys-kernel/linux-headers virtual/libudev audit? ( sys-process/audit ) bluetooth? ( net-wireless/bluez ) concheck? ( net-misc/curl ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls ) introspection? ( dev-libs/gobject-introspection:= ) json? ( dev-libs/jansson ) libpsl? ( net-libs/libpsl ) modemmanager? ( net-misc/mobile-broadband-provider-info net-misc/modemmanager ) nss? ( dev-libs/nss ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) policykit? ( sys-auth/polkit ) ppp? ( net-dialup/ppp[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) teamd? ( dev-libs/jansson net-misc/libteam ) tools? ( dev-libs/newt sys-libs/ncurses sys-libs/readline:0= )
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth +concheck connection-sharing +dhclient dhcpcd debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux syslog systemd teamd test +tools vala wext +wifi kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-libs/libndp sys-apps/dbus sys-kernel/linux-headers virtual/libudev audit? ( sys-process/audit ) bluetooth? ( net-wireless/bluez ) concheck? ( net-misc/curl ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls ) introspection? ( dev-libs/gobject-introspection:= ) json? ( dev-libs/jansson ) libpsl? ( net-libs/libpsl ) modemmanager? ( net-misc/mobile-broadband-provider-info net-misc/modemmanager ) nss? ( dev-libs/nss ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) policykit? ( sys-auth/polkit ) ppp? ( net-dialup/ppp[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) teamd? ( dev-libs/jansson net-misc/libteam ) tools? ( dev-libs/newt sys-libs/ncurses sys-libs/readline:0= ) acct-group/plugdev || ( net-analyzer/arping net-misc/iputils[arping(+)] ) wifi? ( iwd? ( net-wireless/iwd ) !iwd? ( net-wireless/wpa_supplicant[dbus] ) )
+REQUIRED_USE=gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/1.22.10/NetworkManager-1.22.10.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1568c8a157f2559cd9440098c5fd4e1b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.22.14 b/metadata/md5-cache/net-misc/networkmanager-1.22.14
deleted file mode 100644
index a0f5c56a542b..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.22.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.22/NetworkManager-1.22.14.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_=62b4f5bcc506b7fba072487d9978e215
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.24.2 b/metadata/md5-cache/net-misc/networkmanager-1.24.2
deleted file mode 100644
index 9cf696b6fb5a..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.24.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.24/NetworkManager-1.24.2.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_=14b34c8b87cc145902773f58f0b0d61e
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.26.0 b/metadata/md5-cache/net-misc/networkmanager-1.26.0
deleted file mode 100644
index 39b2a7ad25c3..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 )
-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_=9f42414677b47f378540b229e4013235
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.26.0-r1 b/metadata/md5-cache/net-misc/networkmanager-1.26.0-r1
new file mode 100644
index 000000000000..777f97539e4a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.26.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=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 ) 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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing 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
+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 ) 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 ) ?? ( elogind systemd )
+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_=b81c9aad7d4142219856d474fe0ed31e
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.26.2 b/metadata/md5-cache/net-misc/networkmanager-1.26.2
deleted file mode 100644
index 8bbebeea2c3e..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.26.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.26/NetworkManager-1.26.2.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_=14b34c8b87cc145902773f58f0b0d61e
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.26.2-r1 b/metadata/md5-cache/net-misc/networkmanager-1.26.2-r1
new file mode 100644
index 000000000000..d9c3cba00356
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.26.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=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 ) 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 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) 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(+)] ) ) test? ( || ( ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing 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
+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 ) 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 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.26/NetworkManager-1.26.2.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_=d8efa7d3618c0317319383cf2a912420
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1-r2 b/metadata/md5-cache/net-misc/pssh-2.3.1-r2
deleted file mode 100644
index 2e252fd666e7..000000000000
--- a/metadata/md5-cache/net-misc/pssh-2.3.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=net-misc/openssh !net-misc/putty 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/setuptools-42.0.2[python_targets_python2_7(-)] )
-DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
-EAPI=5
-HOMEPAGE=https://code.google.com/p/parallel-ssh/
-IUSE=+python_single_target_python2_7
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=net-misc/openssh !net-misc/putty 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://parallel-ssh.googlecode.com/files/pssh-2.3.1.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_=c7ad008d7abcdfa5291e43c6eac2be12
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
deleted file mode 100644
index 351e64d3aebd..000000000000
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup
-DEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.0[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.8.0 <dev-lang/elixir-1.11.0 dev-libs/libxslt || ( ( dev-lang/python:3.8 dev-python/simplejson[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/simplejson[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/simplejson[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
-DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
-EAPI=7
-HOMEPAGE=https://www.rabbitmq.com/
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2 MPL-1.1
-RDEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.0[ssl]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.4/rabbitmq-server-3.8.4.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=09a1d7966ac639755c2e2d10cdb7c319
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.7 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.7
index ebd20ed65d5b..fe4e3523fddc 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.7
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.7
@@ -4,11 +4,11 @@ DEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.1[ssl] app-arch/zip app-a
 DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
 EAPI=7
 HOMEPAGE=https://www.rabbitmq.com/
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2 MPL-2.0
 RDEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.1[ssl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.7/rabbitmq-server-3.8.7.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f1b12127e1e06320f7f46576a56f6db2
+_md5_=e37fd5f9bb1d2792206dcfbf2c862961
diff --git a/metadata/md5-cache/net-misc/ris-linux-0.4-r1 b/metadata/md5-cache/net-misc/ris-linux-0.4-r1
deleted file mode 100644
index 5dd8041771a8..000000000000
--- a/metadata/md5-cache/net-misc/ris-linux-0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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/setuptools-42.0.2[python_targets_python2_7(-)] )
-DESCRIPTION=BINL server to doing Windows(r) RIS
-EAPI=5
-HOMEPAGE=https://oss.netfarm.it/guides/pxe.php
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( net-ftp/atftp net-ftp/tftp-hpa ) net-misc/dhcp net-fs/samba sys-boot/syslinux 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=https://oss.netfarm.it/guides/ris-linux-0.4.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_=7f77d88be221b1464046e81b0621a3c8
diff --git a/metadata/md5-cache/net-misc/s6-networking-2.3.2.0 b/metadata/md5-cache/net-misc/s6-networking-2.3.2.0
new file mode 100644
index 000000000000..174ea5358e17
--- /dev/null
+++ b/metadata/md5-cache/net-misc/s6-networking-2.3.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-lang/execline-2.6.1.1:=[static-libs?] >=dev-libs/skalibs-2.9.3.0:=[static-libs?] >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] !static? ( >=net-dns/s6-dns-2.3.3.0:= ssl? ( >=dev-libs/libressl-3.1.4:= ) ) >=net-dns/s6-dns-2.3.3.0[static-libs?] ssl? ( >=dev-libs/libressl-3.1.4[static-libs?] )
+DESCRIPTION=Suite of small networking utilities for Unix systems
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-networking/
+IUSE=ssl static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.6.1.1:=[static-libs?] >=dev-libs/skalibs-2.9.3.0:=[static-libs?] >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] !static? ( >=net-dns/s6-dns-2.3.3.0:= ssl? ( >=dev-libs/libressl-3.1.4:= ) )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/s6-networking/s6-networking-2.3.2.0.tar.gz
+_md5_=2895ffa8932d4c6a022219cfbdee1792
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r4 b/metadata/md5-cache/net-misc/sks-1.1.6-r4
deleted file mode 100644
index d23564537e1f..000000000000
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3 dev-ml/findlib virtual/pkgconfig
-DESCRIPTION=An OpenPGP keyserver which is decentralized with highly reliable synchronization
-EAPI=6
-HOMEPAGE=https://bitbucket.org/skskeyserver/sks-keyserver
-IUSE=optimize test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=70246936965d6c0f1a90da5e56c49d15
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r5 b/metadata/md5-cache/net-misc/sks-1.1.6-r5
deleted file mode 100644
index a0d45d1bbb22..000000000000
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3 dev-ml/findlib virtual/pkgconfig
-DESCRIPTION=An OpenPGP keyserver which is decentralized with highly reliable synchronization
-EAPI=6
-HOMEPAGE=https://bitbucket.org/skskeyserver/sks-keyserver
-IUSE=optimize test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ccbfcb0138079802aa3f94f0b3326f63
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6_p20200624 b/metadata/md5-cache/net-misc/sks-1.1.6_p20200624
new file mode 100644
index 000000000000..77cc770930d6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sks-1.1.6_p20200624
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test
+DEPEND=acct-user/sks acct-group/sks >=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= dev-ml/num:= sys-libs/db:5.3 dev-ml/findlib
+DESCRIPTION=An OpenPGP keyserver which is decentralized with highly reliable synchronization
+EAPI=7
+HOMEPAGE=https://github.com/SKS-Keyserver/sks-keyserver
+IUSE=optimize test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/sks acct-group/sks >=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= dev-ml/num:= sys-libs/db:5.3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SKS-Keyserver/sks-keyserver/archive/591a7834dc9f1dff3d336d769a6561138a5befe7.tar.gz -> sks-1.1.6_p20200624.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=89c71fcc7a63df1e6eb1841d92aa28cc
diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.6 b/metadata/md5-cache/net-misc/smb4k-3.0.6
index 1cae430a3d3a..d5d2ef7be2f1 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/sntpd-2.2018.244-r1 b/metadata/md5-cache/net-misc/sntpd-2.2018.244-r1
deleted file mode 100644
index 07256a2bb485..000000000000
--- a/metadata/md5-cache/net-misc/sntpd-2.2018.244-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=A NTP (RFC-1305 and RFC-4330) client for unix-alike systems
-EAPI=7
-HOMEPAGE=https://github.com/troglobit/sntpd
-IUSE=debug embedded obsolete +syslog
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/troglobit/sntpd/releases/download/2018.244/ntpclient-2018_244.tar.xz
-_md5_=78d0d9a56a19048c6c2b6cc24dde3f68
diff --git a/metadata/md5-cache/net-misc/sntpd-3.0-r1 b/metadata/md5-cache/net-misc/sntpd-3.0-r1
index 0ce2b3f82636..86d72277c870 100644
--- a/metadata/md5-cache/net-misc/sntpd-3.0-r1
+++ b/metadata/md5-cache/net-misc/sntpd-3.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A NTP (RFC-1305 and RFC-4330) client and server for unix-alike syste
 EAPI=7
 HOMEPAGE=https://github.com/troglobit/sntpd
 IUSE=adjtimex systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/troglobit/sntpd/releases/download/v3.0/sntpd-3.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=155a09a1c497e6bacc412edffc8b5a33
+_md5_=19a73d19c3911626933b500958e81d52
diff --git a/metadata/md5-cache/net-misc/wol-0.7.1-r2 b/metadata/md5-cache/net-misc/wol-0.7.1-r2
index 37003a8bcf5a..f822476f4aff 100644
--- a/metadata/md5-cache/net-misc/wol-0.7.1-r2
+++ b/metadata/md5-cache/net-misc/wol-0.7.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Implements Wake On LAN (Magic Paket) functionality in a small progra
 EAPI=7
 HOMEPAGE=http://ahh.sourceforge.net/wol/
 IUSE=nls
-KEYWORDS=amd64 arm ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/ahh/wol-0.7.1.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee58d09f1d9f8c73ebe625af1a1e43e4
+_md5_=1cd3f0d05c4702acc8ad70307092e020
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 7ca5e2618474..0a2be57d9e55 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.50 b/metadata/md5-cache/net-nds/openldap-2.4.50
index 64bb33734093..da2dd98e6b19 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.50
+++ b/metadata/md5-cache/net-nds/openldap-2.4.50
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.50.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.50.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.50.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.50.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e8459352a36e35d5e412ec2550e9606
+_md5_=014a146ac64de6d7bb46c93f9213d28a
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.53 b/metadata/md5-cache/net-nds/openldap-2.4.53
index 4ee90dd95605..4c64f7b9e035 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.53
+++ b/metadata/md5-cache/net-nds/openldap-2.4.53
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.53.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.53.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.53.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.53.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46b26f781b8ea4c80c45598f2bdd2835
+_md5_=7e8afda3a7b8b8d23f206600fdde432d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 17b7c186b4c4..e8d1c545309a 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
deleted file mode 100644
index cf56998650ba..000000000000
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst preinst
-DESCRIPTION=Main implementation of IPFS
-EAPI=7
-HOMEPAGE=https://ipfs.io/
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=sys-fs/fuse
-SLOT=0
-SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.19/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.19.bash
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ab17c9e9408a1d454c848078b07778d1
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
deleted file mode 100644
index 1cce6563b219..000000000000
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst preinst
-DESCRIPTION=Main implementation of IPFS
-EAPI=7
-HOMEPAGE=https://ipfs.io/
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=sys-fs/fuse
-SLOT=0
-SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.20/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.20.bash
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ab17c9e9408a1d454c848078b07778d1
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
new file mode 100644
index 000000000000..7e2ecf11a1f9
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
@@ -0,0 +1,12 @@
+BDEPEND=acct-group/ipfs acct-user/ipfs virtual/pkgconfig
+DEFINED_PHASES=install postinst preinst
+DESCRIPTION=Main implementation of IPFS
+EAPI=7
+HOMEPAGE=https://ipfs.io/
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=acct-group/ipfs acct-user/ipfs !net-p2p/go-ipfs sys-fs/fuse:0
+SLOT=0
+SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.7.0/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.7.0.bash
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7f7ab9e589362938a5cb2a3945bb5b64
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 491b1c006b4d..bc8ddd9f4abc 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index fddb079cd350..431c94e1924c 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.2 b/metadata/md5-cache/net-proxy/mitmproxy-5.2
deleted file mode 100644
index ccf669ff8f8e..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.11.0[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=>=app-arch/brotli-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/flask-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hypothesis-4.50.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parver-0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-asyncio-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=7
-HOMEPAGE=https://mitmproxy.org/
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.11.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(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.2.tar.gz -> mitmproxy-5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e0ee66f31378e616aa03120acf88aa03
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1 b/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
new file mode 100644
index 000000000000..bfebd98ffc19
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.11.0[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[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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=>=app-arch/brotli-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/flask-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hypothesis-4.50.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parver-0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-asyncio-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
+EAPI=7
+HOMEPAGE=https://mitmproxy.org/
+IUSE=test test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstandard-0.11.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[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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 ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.2.tar.gz -> mitmproxy-5.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=33b2a4017e54c81a771ca284ab7db224
diff --git a/metadata/md5-cache/net-vpn/6tunnel-0.13 b/metadata/md5-cache/net-vpn/6tunnel-0.13
index c77be1fd462e..fefc73100f1e 100644
--- a/metadata/md5-cache/net-vpn/6tunnel-0.13
+++ b/metadata/md5-cache/net-vpn/6tunnel-0.13
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=TCP proxy for applications that don't speak IPv6
 EAPI=7
 HOMEPAGE=https://github.com/wojtekka/6tunnel
-KEYWORDS=~amd64 ~s390 ~x86
+KEYWORDS=amd64 ~s390 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/wojtekka/6tunnel/releases/download/0.13/6tunnel-0.13.tar.gz
-_md5_=9e2cbd16b91c037d152f3102aa4eb69c
+_md5_=b760016278afaf4072e8dbb236eb30f5
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 1fd2340b1c4a..3c205f16bd04 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200908 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200908
index a047e82c2a38..c05fc16d90fd 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200908
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200908
@@ -4,10 +4,10 @@ DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art crypto
 EAPI=7
 HOMEPAGE=https://www.wireguard.com/
 IUSE=debug +module module-src kernel_linux kernel_linux module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=module? ( kernel_linux? ( sys-apps/kmod[tools] ) )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200908.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7efead65e1758bfce024dfb0956e454c
+_md5_=fd47ea14bb881eab26436b1f09dab3a0
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 4d18eb7ebb75..a7e740726dcd 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1 b/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
index 6b632f3ea327..11da1abf125c 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
@@ -5,7 +5,7 @@ DESCRIPTION=WLAN tools for breaking 802.11 WEP/WPA keys
 EAPI=7
 HOMEPAGE=http://www.aircrack-ng.org
 IUSE=+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=kernel_linux? ( net-wireless/iw net-wireless/wireless-tools sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[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=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( python_targets_python3_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(-)] ) airgraph-ng? ( python_targets_python3_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(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
@@ -13,4 +13,4 @@ REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_6 python_targets_python3_
 SLOT=0
 SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ccf0ef31b8e3dafca731559579d6225
+_md5_=df7fc5c68a8b7ef772059610271578e4
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3
deleted file mode 100644
index c330c289c1cf..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-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-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( dev-python/scipy-python2[python_targets_python2_7(-)] dev-python/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig python_single_target_python2_7? ( dev-python/cheetah[python_targets_python2_7(-)] doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=6
-HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-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-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( dev-python/scipy-python2[python_targets_python2_7(-)] dev-python/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-RESTRICT=!test? ( test )
-SLOT=0/3.7.13.5
-SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-codec2.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=152f3fcc3467caffbedc462257b5b0b5
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4
deleted file mode 100644
index 51351bc0c2d9..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-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-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( virtual/jack ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( dev-python/scipy-python2[python_targets_python2_7(-)] dev-python/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig python_single_target_python2_7? ( dev-python/cheetah[python_targets_python2_7(-)] doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=6
-HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-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-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( virtual/jack ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( dev-python/scipy-python2[python_targets_python2_7(-)] dev-python/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-RESTRICT=!test? ( test )
-SLOT=0/3.7.13.5
-SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-codec2.tar.xz https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2
-_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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=655c20c9b3e2075e1ca1cde5a2623930
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606
deleted file mode 100644
index 03bc43bdee03..000000000000
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[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-lang/swig:0
-DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
-EAPI=7
-HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[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] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0/0.0_p20190606
-SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/d3d94023c71af9e6d7721f7412fba88ff5325234.tar.gz -> gr-ieee802154-0.0_p20190606.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=9512edef1a33beaeb72ca5fe963bb96a
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3-r3 b/metadata/md5-cache/net-wireless/gr-iio-0.3-r3
deleted file mode 100644
index d0238059b375..000000000000
--- a/metadata/md5-cache/net-wireless/gr-iio-0.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-3.7*:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
-DESCRIPTION=GNU Radio IIO Blocks
-EAPI=7
-HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-3.7*:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/v0.3.tar.gz -> gr-iio-0.3.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=8985216dca9ba9fc2d00245bb7ea7c0e
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.3 b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.3
deleted file mode 100644
index 5d827e725256..000000000000
--- a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=gnuradio I/Q balancing
-EAPI=7
-HOMEPAGE=http://git.osmocom.org/gr-iqbal/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= 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/0.37.3
-SRC_URI=https://github.com/osmocom/gr-iqbal/archive/v0.37.3.tar.gz -> gr-iqbal-0.37.3.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=6dab9a8ad54972a17699dbeb968c5a3f
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
deleted file mode 100644
index 836573daf225..000000000000
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= =net-wireless/gnuradio-3.7*:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) 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_python2_7(-)?] ) dev-python/cheetah
-DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
-EAPI=7
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-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/boost:= =net-wireless/gnuradio-3.7*:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) 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_python2_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0/0.1.5
-SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.1.5.tar.gz -> gr-osmosdr-0.1.5.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=2c15fd9cc12be052e7e3c2973dafde4d
diff --git a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418 b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418
deleted file mode 100644
index ea9f37f39216..000000000000
--- a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-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-libs/boost:=[python_targets_python2_7(-)] ) =net-wireless/gnuradio-3.7*:=[python_single_target_python2_7(-)?]
-DESCRIPTION=Paints monochrome images into the waterfall of a receiver
-EAPI=7
-HOMEPAGE=https://github.com/drmpeg/gr-paint
-IUSE=doc +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-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-libs/boost:=[python_targets_python2_7(-)] ) =net-wireless/gnuradio-3.7*:=[python_single_target_python2_7(-)?] media-gfx/imagemagick
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/drmpeg/gr-paint/archive/e36b2c638061d14f1b3c3bf3e889a8c99c273930.tar.gz -> gr-paint-0.0_p20200418.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	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_=e7b2666df7358fb106c85ff51068319f
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r3 b/metadata/md5-cache/net-wireless/hostapd-2.9-r3
index 4d3f1413c779..7e161fc8c6ba 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.9-r3
+++ b/metadata/md5-cache/net-wireless/hostapd-2.9-r3
@@ -4,11 +4,11 @@ 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
+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_=9015c895923f5dac549936627a584f2f
+_md5_=9bdea577aa3f804517b12554f74222c3
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
index eccd1b0ff364..f1e7912ec498 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
@@ -4,7 +4,7 @@ DESCRIPTION=A generic library for injecting 802.11 frames
 EAPI=7
 HOMEPAGE=https://github.com/kismetwireless/lorcon
 IUSE=python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=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(-)] ) dev-libs/libnl:3= net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/7dbf24ee6f7c277240c0fbd988b6902850577772.tar.gz -> lorcon-0.0_p20200214.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=521d867c5b62472e84d6515485df5172
+_md5_=dba0b48a2d938a6a5a58393800fbc680
diff --git a/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2 b/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2
deleted file mode 100644
index 7b412c05028f..000000000000
--- a/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-embedded/sdcc[device-lib,mcs51,sdbinutils]
-DESCRIPTION=Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards
-EAPI=6
-HOMEPAGE=https://www.mousejack.com/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-embedded/sdcc[device-lib,mcs51,sdbinutils] 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/pyusb[python_targets_python2_7(-)] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/BastilleResearch/nrf-research-firmware/archive/02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93.tar.gz -> mousejack-0.0_p20160726.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f6daccea96266dbabc9de9122723f511
diff --git a/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3 b/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
deleted file mode 100644
index 528c0ced99d1..000000000000
--- a/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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=Provides r/w access to a wireless network card's capabilities
-EAPI=5
-HOMEPAGE=https://pypi.org/project/python-wifi/
-IUSE=examples python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1 examples? ( GPL-2 )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/python-wifi.berlios/python-wifi-0.5.0.tar.bz2
-_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_=2ae72458a3e2b6685dce2749d671dcc7
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 8a0200f8dca9..7feb9dbec164 100644
Binary files a/metadata/md5-cache/ros-meta/Manifest.gz and b/metadata/md5-cache/ros-meta/Manifest.gz differ
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 884b559185b2..40679b5f469f 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.6
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common code for working with audio in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 edd8baa9a085..1a64be92f958 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.7
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common code for working with audio in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 82229ee7fb4c..f73c9637db63 100644
--- a/metadata/md5-cache/ros-meta/audio_common-9999
+++ b/metadata/md5-cache/ros-meta/audio_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common code for working with audio in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common https://github.com/ros-drivers/audio_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 50b172525ff0..845679a4ddbd 100644
--- a/metadata/md5-cache/ros-meta/bond_core-1.8.5
+++ b/metadata/md5-cache/ros-meta/bond_core-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond_core https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 287a83e1321f..e496b52e28ca 100644
--- a/metadata/md5-cache/ros-meta/bond_core-1.8.6
+++ b/metadata/md5-cache/ros-meta/bond_core-1.8.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond_core https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c4d63c74e945..513431ea7326 100644
--- a/metadata/md5-cache/ros-meta/bond_core-9999
+++ b/metadata/md5-cache/ros-meta/bond_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond_core https://github.com/ros/bond_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8b4774d3eba0..72e7281772a1 100644
--- a/metadata/md5-cache/ros-meta/calibration-0.10.14
+++ b/metadata/md5-cache/ros-meta/calibration-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides a toolchain running through the robot calibration process
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibration_msgs dev-ros/calibration_setup_helper dev-ros/image_cb_detector dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibration_msgs dev-ros/calibration_setup_helper dev-ros/image_cb_detector dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/settlerlib 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7d0105051c32..7e431b2cd81c 100644
--- a/metadata/md5-cache/ros-meta/calibration-9999
+++ b/metadata/md5-cache/ros-meta/calibration-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Provides a toolchain running through the robot calibration process
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration https://github.com/ros-perception/calibration
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibration_msgs dev-ros/calibration_setup_helper dev-ros/image_cb_detector dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibration_msgs dev-ros/calibration_setup_helper dev-ros/image_cb_detector dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/settlerlib 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b2b80d50fd2e..97c9c5e50882 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-1.13.0
+++ b/metadata/md5-cache/ros-meta/common_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Messages that are widely used by other ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/common_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4d55a66f3fee..232342170df2 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-9999
+++ b/metadata/md5-cache/ros-meta/common_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Messages that are widely used by other ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/common_msgs https://github.com/ros/common_msgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5299e3bbb5a5..9539a62fc92e 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.1.12
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage that contains common tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/common_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bbb5958cd584..b781c6698271 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.2.0
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage that contains common tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/common_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0e0dfbfc1258..0cbf4e6f819a 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/common_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage that contains common tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/common_tutorials https://github.com/ros/common_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6614ed4e7a28..a60b5ad95b1a 100644
--- a/metadata/md5-cache/ros-meta/desktop-1.5.0
+++ b/metadata/md5-cache/ros-meta/desktop-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for a basic ROS desktop install
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/desktop https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 298a85bef2bc..69b7b0826f22 100644
--- a/metadata/md5-cache/ros-meta/desktop-9999
+++ b/metadata/md5-cache/ros-meta/desktop-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for a basic ROS desktop install
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/desktop https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 691e37896f78..8b999de33a0a 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-1.5.0
+++ b/metadata/md5-cache/ros-meta/desktop_full-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS complete desktop install
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/desktop_full https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2faf76ca1f12..ca03c6b9524e 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-9999
+++ b/metadata/md5-cache/ros-meta/desktop_full-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS complete desktop install
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/desktop_full https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4abc8dd09b02..ddf96e8c0420 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.10.1
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Packages related to gathering, viewing, and analyzing diagnostics data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fef34d0b6ee6..9148c6fbd074 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.4
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Packages related to gathering, viewing, and analyzing diagnostics data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1d8e990df6ab..705e4781c953 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.6
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Packages related to gathering, viewing, and analyzing diagnostics data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0a162b7192b7..f940438e1cf4 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-9999
+++ b/metadata/md5-cache/ros-meta/diagnostics-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Packages related to gathering, viewing, and analyzing diagnostics data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostics https://github.com/ros/diagnostics
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 95fe8542d6df..ce0d921e2f4e 100644
--- a/metadata/md5-cache/ros-meta/driver_common-1.6.8
+++ b/metadata/md5-cache/ros-meta/driver_common-1.6.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/driver_base dev-ros/timestamp_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Classes and tools that are useful throughout the driver stacks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_common https://github.com/ros-drivers/driver_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/driver_base dev-ros/timestamp_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d739da432ea5..26bd831b9e27 100644
--- a/metadata/md5-cache/ros-meta/driver_common-9999
+++ b/metadata/md5-cache/ros-meta/driver_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/driver_base dev-ros/timestamp_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Classes and tools that are useful throughout the driver stacks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_common https://github.com/ros-drivers/driver_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/driver_base dev-ros/timestamp_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 344629f0b3fd..fbd4ef320838 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-2.5.0
+++ b/metadata/md5-cache/ros-meta/executive_smach-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=SMACH library and ROS SMACH integration packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/executive_smach https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2671da182fda..b860ebaa9ea6 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-9999
+++ b/metadata/md5-cache/ros-meta/executive_smach-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=SMACH library and ROS SMACH integration packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/executive_smach https://github.com/ros/executive_smach
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 787a491d109a..4e61558c9cfb 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface for using ROS with the gazebo simulator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_pkgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a2d73cc99137..f58bf878a06f 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Interface for using ROS with the gazebo simulator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_pkgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fa2b764ea0cf..c5f361c603d3 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-0.5.5
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geodesy dev-ros/geographic_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Geographic information metapackage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_info https://github.com/ros-geographic-info/geographic_info
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f8224e4d554a..e5ed9a903069 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-9999
+++ b/metadata/md5-cache/ros-meta/geographic_info-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/geodesy dev-ros/geographic_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Geographic information metapackage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_info https://github.com/ros-geographic-info/geographic_info
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5330ae618485..e29e103a0a7e 100644
--- a/metadata/md5-cache/ros-meta/geometry-1.13.2
+++ b/metadata/md5-cache/ros-meta/geometry-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common geometric calculations
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5fd366498449..40ea64d7a9ca 100644
--- a/metadata/md5-cache/ros-meta/geometry-9999
+++ b/metadata/md5-cache/ros-meta/geometry-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common geometric calculations
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry https://github.com/ros/geometry
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0e179fa84b68..b4516f8166d6 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.7.2
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3905b12a2c98..2d4402ac3127 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.7.3
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ad34a3a8db1a..ce4da1c3e29a 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.7.5
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 161e2e89d5b5..ca413b4f4eb2 100644
--- a/metadata/md5-cache/ros-meta/geometry2-9999
+++ b/metadata/md5-cache/ros-meta/geometry2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=The second generation Transform Library in ros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry2 https://github.com/ros/geometry2
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ba76523d9f22..82d06d5ec34a 100644
--- a/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
+++ b/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage of geometry tutorials ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_tutorials https://github.com/ros/geometry_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 15e4a649d09d..524a8e1af0f3 100644
--- a/metadata/md5-cache/ros-meta/geometry_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/geometry_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage of geometry tutorials ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_tutorials https://github.com/ros/geometry_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 48efd938bcb9..14b84ea47ddb 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-0.3.0
+++ b/metadata/md5-cache/ros-meta/hector_localization-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Collection of packages, that provide the full 6DOF pose of a robot or platform
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_localization https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e374f6cb1206..e1b93c5d4380 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-9999
+++ b/metadata/md5-cache/ros-meta/hector_localization-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Collection of packages, that provide the full 6DOF pose of a robot or platform
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_localization https://github.com/tu-darmstadt-ros-pkg/hector_localization
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9c1f05e0f6bc..83dc1f66fcdb 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-0.4.1
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=hector_mapping and related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9e867fb65e68..fb17d3162526 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-9999
+++ b/metadata/md5-cache/ros-meta/hector_slam-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=hector_mapping and related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8f12707ecfac..be93dd9126b2 100644
--- a/metadata/md5-cache/ros-meta/image_common-1.12.0
+++ b/metadata/md5-cache/ros-meta/image_common-1.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common code for working with images in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_common https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3bb815067911..7c0da568eec0 100644
--- a/metadata/md5-cache/ros-meta/image_common-9999
+++ b/metadata/md5-cache/ros-meta/image_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Common code for working with images in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_common https://github.com/ros-perception/image_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2e25f6b743a7..ff6a3ba2f43b 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.15.2
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Fills the gap between raw images from a camera and higher-level processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_pipeline https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 2d7ea8d632fc..c533bee57958 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/image_pipeline-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Fills the gap between raw images from a camera and higher-level processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_pipeline https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 10d37b7ae614..19828a79aa0f 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugins for creating topics in representations other than raw pixel data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport_plugins https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 065de0288f64..4caed2e0b4a0 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-9999
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Plugins for creating topics in representations other than raw pixel data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport_plugins https://github.com/ros-perception/image_transport_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b721cb6102e3..434337f34eba 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/imu_processors dev-ros/imu_transformer 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for processing IMU messages for easier use by later subscribers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 516c9b9b4172..82d84aa312de 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/imu_processors dev-ros/imu_transformer 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Tools for processing IMU messages for easier use by later subscribers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 93091fbb5d36..314d006201cd 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-1.2.2
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Various tools for IMU devices
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 6e1bdc758741..66c14ddad027 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-9999
+++ b/metadata/md5-cache/ros-meta/imu_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Various tools for IMU devices
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e3a8ac344778..3d3d1589bd8f 100644
--- a/metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
+++ b/metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Meta-package for processing laser data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_pipeline https://github.com/ros-perception/laser_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4b0c7e7bcc5c..b73d4dad85db 100644
--- a/metadata/md5-cache/ros-meta/laser_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/laser_pipeline-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Meta-package for processing laser data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_pipeline https://github.com/ros-perception/laser_pipeline
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f519e67fdfbc..6aadfa121e9e 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.17.0
+++ b/metadata/md5-cache/ros-meta/navigation-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=2D navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navigation https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD LGPL-2.1
-RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 70882570f32a..e36a8a9451f9 100644
--- a/metadata/md5-cache/ros-meta/navigation-9999
+++ b/metadata/md5-cache/ros-meta/navigation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=2D navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navigation https://github.com/ros-planning/navigation
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c5c1d6555a5c..e85ac392228f 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-1.10.0
+++ b/metadata/md5-cache/ros-meta/nodelet_core-1.10.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelet Core Metapackage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_core https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 f93ddb324c8a..2935ddb17492 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-9999
+++ b/metadata/md5-cache/ros-meta/nodelet_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Nodelet Core Metapackage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_core https://github.com/ros/nodelet_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_tools python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d2c75afd3f3d..63651405717c 100644
--- a/metadata/md5-cache/ros-meta/perception-1.5.0
+++ b/metadata/md5-cache/ros-meta/perception-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS perception stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/perception https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c1b08c915cfd..103409b8212a 100644
--- a/metadata/md5-cache/ros-meta/perception-9999
+++ b/metadata/md5-cache/ros-meta/perception-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS perception stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/perception https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 29d4a9381734..84ac6cb1fff1 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.7.1
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.7.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/perception_pcl https://github.com/ros-perception/perception_pcl
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e02573752988..b7c43fbb1b17 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-9999
+++ b/metadata/md5-cache/ros-meta/perception_pcl-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/perception_pcl https://github.com/ros-perception/perception_pcl
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 cf21aaecaea2..20cd10767b46 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.4
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4ae960418815..eba18cb1949c 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-9999
+++ b/metadata/md5-cache/ros-meta/pr2_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5964fea0b9c2..a68a931b7673 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Integration of ROS-specific plugins for a Qt-based GUI
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_core https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 eaaec4c02476..d1ea46b704d4 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Integration of ROS-specific plugins for a Qt-based GUI
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_core https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 10418e2c4ab2..cd18ee3c0b41 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-9999
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Integration of ROS-specific plugins for a Qt-based GUI
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_core https://github.com/ros-visualization/qt_gui_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e041e8687264..4bf4bf22d4e3 100644
--- a/metadata/md5-cache/ros-meta/robot-1.5.0
+++ b/metadata/md5-cache/ros-meta/robot-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage which includes ROS libaries for any robot hardware
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 fa76f02c0bbe..c1559080b7bb 100644
--- a/metadata/md5-cache/ros-meta/robot-9999
+++ b/metadata/md5-cache/ros-meta/robot-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage which includes ROS libaries for any robot hardware
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 63a46225f6e8..9067285e1f3e 100644
--- a/metadata/md5-cache/ros-meta/robot_model-1.12.11
+++ b/metadata/md5-cache/ros-meta/robot_model-1.12.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Packages for modeling various aspects of robot information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_model https://github.com/ros/robot_model
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ba5d12514a5d..a97b3915ddb2 100644
--- a/metadata/md5-cache/ros-meta/robot_model-9999
+++ b/metadata/md5-cache/ros-meta/robot_model-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Packages for modeling various aspects of robot information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_model https://github.com/ros/robot_model
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 a5f2094b9c36..e0f4c3afde05 100644
--- a/metadata/md5-cache/ros-meta/ros-1.15.5
+++ b/metadata/md5-cache/ros-meta/ros-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS packaging system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 622785e5205e..aa26380acc68 100644
--- a/metadata/md5-cache/ros-meta/ros-1.15.6
+++ b/metadata/md5-cache/ros-meta/ros-1.15.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS packaging system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8f6473b22b63..b8aa0b987c01 100644
--- a/metadata/md5-cache/ros-meta/ros-9999
+++ b/metadata/md5-cache/ros-meta/ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS packaging system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros https://github.com/ros/ros
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 383e462d2810..e5d39b11bc58 100644
--- a/metadata/md5-cache/ros-meta/ros_base-1.5.0
+++ b/metadata/md5-cache/ros-meta/ros_base-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage which extends ros_core and includes other basic non-robot tools
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_base https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 7518351590c5..93ad34e2f7ba 100644
--- a/metadata/md5-cache/ros-meta/ros_base-9999
+++ b/metadata/md5-cache/ros-meta/ros_base-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage which extends ros_core and includes other basic non-robot tools
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_base https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c54f572b14e8..459827deb5e7 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.15.7
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS communications-related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_comm https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2b42e10de23..2216ec3db19e 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.15.8
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS communications-related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_comm https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 19209be13419..7ac458497da0 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-9999
+++ b/metadata/md5-cache/ros-meta/ros_comm-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS communications-related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_comm https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 036e023261bc..d84910dd99cd 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.19.1
+++ b/metadata/md5-cache/ros-meta/ros_control-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Controller interfaces, managers, transmissions, control_toolbox
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_control https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b02343504e1b..cd9e00b8e5e7 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.19.2
+++ b/metadata/md5-cache/ros-meta/ros_control-0.19.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Controller interfaces, managers, transmissions, control_toolbox
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_control https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 285b533ae1ce..c8bd0f532aea 100644
--- a/metadata/md5-cache/ros-meta/ros_control-9999
+++ b/metadata/md5-cache/ros-meta/ros_control-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Controller interfaces, managers, transmissions, control_toolbox
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_control https://github.com/ros-controls/ros_control
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b0dd49094bf3..00d3c258cb97 100644
--- a/metadata/md5-cache/ros-meta/ros_core-1.5.0
+++ b/metadata/md5-cache/ros-meta/ros_core-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage to aggregate the packages required to use core ROS concepts
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_core https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 37884055d895..97a4d939e01c 100644
--- a/metadata/md5-cache/ros-meta/ros_core-9999
+++ b/metadata/md5-cache/ros-meta/ros_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage to aggregate the packages required to use core ROS concepts
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_core https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b45336af9801..ca95da8e4d12 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates various features of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3ee76eca9fb6..65120d281959 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates various features of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 87d95eca47b8..07a509507924 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Demonstrates various features of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_tutorials https://github.com/ros/ros_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d9d968c2db8c..ab846347beb5 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=JSON API to ROS functionality for non-ROS programs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_suite https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 69e8c436acff..a16a6d1196b6 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=JSON API to ROS functionality for non-ROS programs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_suite https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0b0c36496329..a647aadbed73 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=JSON API to ROS functionality for non-ROS programs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_suite https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 44ed62a51140..fc2b76444f0a 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-9999
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=JSON API to ROS functionality for non-ROS programs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_suite https://github.com/RobotWebTools/rosbridge_suite
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/rosbridge_server 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 09565d0d5f29..1048e7d66049 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.7.2
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Underlying data libraries for roscpp messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_core https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c2534b3336e4..3f7d368b936c 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-9999
+++ b/metadata/md5-cache/ros-meta/roscpp_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Underlying data libraries for roscpp messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_core https://github.com/ros/roscpp_core
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 332036a57751..dfc119f2c4ba 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.8.0
+++ b/metadata/md5-cache/ros-meta/rosserial-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for core of rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 693ead5c3f6f..88c7ce256494 100644
--- a/metadata/md5-cache/ros-meta/rosserial-9999
+++ b/metadata/md5-cache/ros-meta/rosserial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for core of rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial https://github.com/ros-drivers/rosserial
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 e7130eac8d65..406158a61c5b 100644
--- a/metadata/md5-cache/ros-meta/rqt-0.5.2
+++ b/metadata/md5-cache/ros-meta/rqt-0.5.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Qt-based framework for GUI development for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5f8f75f3e7db..c2852e5d4282 100644
--- a/metadata/md5-cache/ros-meta/rqt-9999
+++ b/metadata/md5-cache/ros-meta/rqt-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Qt-based framework for GUI development for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt https://github.com/ros-visualization/rqt
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9f1792d3d075..9c8480b90b5b 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS backend graphical tools suite that can be used on/off of robot runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_common_plugins https://github.com/ros-visualization/rqt_common_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 d0a3707c09e3..d9c06fbf7a66 100644
--- a/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
+++ b/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS backend graphical tools suite that can be used on/off of robot runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_common_plugins https://github.com/ros-visualization/rqt_common_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4376191efbdb..36cfe1dac060 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=rqt plugins that are particularly used with robots during its operation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_plugins https://github.com/ros-visualization/rqt_robot_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 b3e1501fa902..7536beb927ed 100644
--- a/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
+++ b/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=rqt plugins that are particularly used with robots during its operation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_plugins https://github.com/ros-visualization/rqt_robot_plugins
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 dba34cff5d5d..faf3458bea4d 100644
--- a/metadata/md5-cache/ros-meta/simulators-1.5.0
+++ b/metadata/md5-cache/ros-meta/simulators-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS simulation packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/simulators https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 44669eb550f6..b0c1ab92e51e 100644
--- a/metadata/md5-cache/ros-meta/simulators-9999
+++ b/metadata/md5-cache/ros-meta/simulators-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS simulation packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/simulators https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 0c9790bc6e43..95b1ce4eb0cc 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gmapping 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 05b069191cb1..3e1280431ced 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gmapping 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 21e1a93a25ec..9fc3bb9db101 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-9999
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/gmapping 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 8ec63c2f8869..40a1414a52d6 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
+++ b/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/unique_id dev-ros/uuid_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS messages and interfaces for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/unique_identifier https://github.com/ros-geographic-info/unique_identifier
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 022a7378097b..c2b86f2965c8 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-9999
+++ b/metadata/md5-cache/ros-meta/unique_identifier-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/unique_id dev-ros/uuid_msgs 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=ROS messages and interfaces for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/unique_identifier https://github.com/ros-geographic-info/unique_identifier
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 3b4d95900503..12584775a0a6 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/vision_opencv https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 9e456ecb9278..a4a178b7ccdf 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-9999
+++ b/metadata/md5-cache/ros-meta/vision_opencv-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/vision_opencv https://github.com/ros-perception/vision_opencv
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 ec9cab145ed8..651f23f2bbec 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-0.11.1
+++ b/metadata/md5-cache/ros-meta/vision_visp-0.11.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Virtual package providing ViSP related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/vision_visp https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 c093bdd65689..35361d35abfe 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-9999
+++ b/metadata/md5-cache/ros-meta/vision_visp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Virtual package providing ViSP related packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/vision_visp https://github.com/lagadic/vision_visp
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 4c781b7c30c7..9604270dfc60 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage referencing tutorials related to rviz and visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 1157c66f726f..3a56e2b6b5c8 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage referencing tutorials related to rviz and visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 5662bdd35d23..06bf0545d306 100644
--- a/metadata/md5-cache/ros-meta/viz-1.5.0
+++ b/metadata/md5-cache/ros-meta/viz-1.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS visualization packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/viz https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz 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_7 python_single_target_python3_8 )
 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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 689583266d11..1cd7c67d438d 100644
--- a/metadata/md5-cache/ros-meta/viz-9999
+++ b/metadata/md5-cache/ros-meta/viz-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz 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-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Metapackage for ROS visualization packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/viz https://github.com/ros/metapackages
-IUSE=+python_single_target_python3_7 test
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz 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_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	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 bda60ec8bf41..c5207666e871 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.4.3 b/metadata/md5-cache/sci-astronomy/kstars-3.4.3
index ccb35cf2c492..2dcc9c9397d2 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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
deleted file mode 100644
index 969e7fd7d356..000000000000
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-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/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=3D photo-realistic skies in real time
-EAPI=7
-HOMEPAGE=https://www.stellarium.org/
-IUSE=debug gps media nls stars test test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
-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	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.3 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.3
new file mode 100644
index 000000000000..a4cd0a108192
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.20.3
@@ -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 ) doc? ( app-doc/doxygen[dot] ) nls? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( sci-libs/indilib:= ) dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=3D photo-realistic skies in real time
+EAPI=7
+HOMEPAGE=https://stellarium.org/
+IUSE=debug deep-sky doc gps media nls stars telescope test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ SGI-B-2.0
+RDEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( sci-libs/indilib:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.3/stellarium-0.20.3.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.11/catalog.dat -> stellarium-dso-catalog-3.11.dat ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v0.20.3/stellarium_user_guide-0.20.3-1.pdf ) 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	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	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34ababd377f73e4edcba134c26c8e25a
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 0cdcda66495b..58f77f96867b 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/amos-3.1.0-r4 b/metadata/md5-cache/sci-biology/amos-3.1.0-r4
deleted file mode 100644
index c1310bd3d9ac..000000000000
--- a/metadata/md5-cache/sci-biology/amos-3.1.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-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 Modular, Open-Source whole genome assembler
-EAPI=6
-HOMEPAGE=http://amos.sourceforge.net/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic
-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-perl/DBI dev-perl/Statistics-Descriptive sci-biology/mummer
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/amos/amos-3.1.0.tar.gz https://dev.gentoo.org/~soap/distfiles/amos-3.1.0-fix-c++14.patch.bz2
-_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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aec6d1c76d5ea621c66e803800e2b3c4
diff --git a/metadata/md5-cache/sci-biology/embassy-meme-4.7.660 b/metadata/md5-cache/sci-biology/embassy-meme-4.7.660
deleted file mode 100644
index 3a9b464950ac..000000000000
--- a/metadata/md5-cache/sci-biology/embassy-meme-4.7.660
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install 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 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
-DESCRIPTION=EMBOSS integrated version of MEME - Multiple Em for Motif Elicitation
-EAPI=6
-HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=mysql pdf png postgres static-libs X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2 GPL-2
-RDEPEND=sci-biology/meme dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt ) >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]
-SLOT=0
-SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/MEME-4.7.660.tar.gz -> embassy-meme-4.7.660.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	8895be811ae4511c202bcf2ddb7dbfd8	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_=b18db6d7a2159272c7b69d34a14dc9b5
diff --git a/metadata/md5-cache/sci-biology/meme-4.11.2_p2 b/metadata/md5-cache/sci-biology/meme-4.11.2_p2
deleted file mode 100644
index 8caf09a15316..000000000000
--- a/metadata/md5-cache/sci-biology/meme-4.11.2_p2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-shells/tcsh dev-libs/libxml2:2 dev-libs/libxslt sys-libs/zlib app-text/ghostscript-gpl media-gfx/imagemagick dev-lang/perl:= dev-perl/HTML-Parser dev-perl/HTML-Template dev-perl/Log-Log4perl dev-perl/Math-CDF dev-perl/XML-Compile-SOAP dev-perl/XML-Compile-WSDL11 dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes mpi? ( virtual/mpi ) >=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 MEME/MAST system - Motif discovery and search
-EAPI=6
-HOMEPAGE=http://meme-suite.org/tools/meme
-IUSE=debug doc examples mpi +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=meme
-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-shells/tcsh dev-libs/libxml2:2 dev-libs/libxslt sys-libs/zlib app-text/ghostscript-gpl media-gfx/imagemagick dev-lang/perl:= dev-perl/HTML-Parser dev-perl/HTML-Template dev-perl/Log-Log4perl dev-perl/Math-CDF dev-perl/XML-Compile-SOAP dev-perl/XML-Compile-WSDL11 dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes mpi? ( virtual/mpi )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://meme-suite.org/meme-software/4.11.2/meme_4.11.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a4080439675628436c06de8db9f59c6e
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.2.3 b/metadata/md5-cache/sci-biology/shrimp-2.2.3
deleted file mode 100644
index 812ae5b7b020..000000000000
--- a/metadata/md5-cache/sci-biology/shrimp-2.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare pretend setup
-DEPEND=!sci-mathematics/cado-nfs
-DESCRIPTION=SHort Read Mapping Package
-EAPI=5
-HOMEPAGE=http://compbio.cs.toronto.edu/shrimp/
-IUSE=custom-cflags +cpu_flags_x86_sse2 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=shrimp
-RDEPEND=!sci-mathematics/cado-nfs 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://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_2_3.src.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	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98a7a2b9765ad5e245b1b7b9be67060b
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.8 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
deleted file mode 100644
index 13166ef197df..000000000000
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) 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(-)] ) python? ( dev-lang/swig: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 dev-lang/perl:=[-build(-)]
-DESCRIPTION=RNA secondary structure prediction and comparison
-EAPI=5
-HOMEPAGE=http://www.tbi.univie.ac.at/~ivo/RNA/
-IUSE=doc openmp python static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=vienna-rna
-RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) 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-lang/perl:=[-build(-)]
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.1.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2a6486af275e75c6365ab7eeba1e0bd
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index eadc42a1a146..5ba382104d84 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
index 5fc926956f1b..901eb1958263 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 2294e9f8834f..5531fabd2275 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
new file mode 100644
index 000000000000..3c0fde40a0ec
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -0,0 +1,15 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen 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(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake 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(-)] )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=7
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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] ) !sci-chemistry/gmxapi 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=|| ( 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_8 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0/2020.4
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.4.tar.gz )
+_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-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 516664bcc411..5dfdc168caf2 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/iverilog-11.0 b/metadata/md5-cache/sci-electronics/iverilog-11.0
new file mode 100644
index 000000000000..e80038c3f40e
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/iverilog-11.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/gperf sys-devel/bison sys-devel/flex >=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=install prepare
+DEPEND=sys-libs/readline:= sys-libs/zlib
+DESCRIPTION=A Verilog simulation and synthesis tool
+EAPI=7
+HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/readline:= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/steveicarus/iverilog/archive/v11_0.tar.gz -> iverilog-11.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53fe7f5f4565527a26b28a22c2a45c7c
diff --git a/metadata/md5-cache/sci-electronics/iverilog-9999 b/metadata/md5-cache/sci-electronics/iverilog-9999
index e12eb7b11a75..bee32d203c65 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-9999
+++ b/metadata/md5-cache/sci-electronics/iverilog-9999
@@ -4,10 +4,9 @@ DEPEND=sys-libs/readline:= sys-libs/zlib
 DESCRIPTION=A Verilog simulation and synthesis tool
 EAPI=7
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
-IUSE=examples
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ff154232ba7c8d2d31948f27debaf354
+_md5_=53fe7f5f4565527a26b28a22c2a45c7c
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2 b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
deleted file mode 100644
index 1ea871803076..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[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? ( >=dev-lang/swig-3.0:0 )
-DESCRIPTION=Electronic Schematic and PCB design tools
-EAPI=7
-HOMEPAGE=https://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[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] ) ) sci-electronics/electronics-menu
-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	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 ea3b18319375..9380631bbd3b 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.6
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 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	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
+_md5_=d48c77dafd845e257baff6b312caea91
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.7 b/metadata/md5-cache/sci-electronics/kicad-5.1.7
new file mode 100644
index 000000000000..e13e635b9d51
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.7
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[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? ( >=dev-lang/swig-3.0:0 )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=7
+HOMEPAGE=https://www.kicad-pcb.org
+IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0
+RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[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] ) ) sci-electronics/electronics-menu
+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.7/kicad-5.1.7.tar.bz2
+_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_=f0db98876ecd190ab7d4de7dfeeec730
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5
deleted file mode 100644
index 9635253c099c..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
-EAPI=7
-HOMEPAGE=https://kicad.github.io/footprints/
-KEYWORDS=~amd64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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.7 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.7
new file mode 100644
index 000000000000..417f6b809ec0
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.7
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
+EAPI=7
+HOMEPAGE=https://kicad.github.io/footprints/
+KEYWORDS=~amd64 ~x86
+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.7.tar.gz -> kicad-footprints-5.1.7.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_=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
deleted file mode 100644
index 36becd14d14c..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools GUI translations
-EAPI=7
-HOMEPAGE=https://github.com/KiCad/kicad-i18n
-KEYWORDS=~amd64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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.7 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.7
new file mode 100644
index 000000000000..45230ab03a06
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.7
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools GUI translations
+EAPI=7
+HOMEPAGE=https://gitlab.com/kicad/code/kicad-i18n
+KEYWORDS=~amd64 ~x86
+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.7/kicad-i18n-5.1.7.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-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3d7a9913098d6a8b9933b81e1fe292a5
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.5
deleted file mode 100644
index a7846b4bcb13..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
-EAPI=7
-HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc minimal nls
-KEYWORDS=~amd64
-LICENSE=metapackage
-RDEPEND=>=sci-electronics/kicad-5.1.5 >=sci-electronics/kicad-symbols-5.1.5 >=sci-electronics/kicad-footprints-5.1.5 doc? ( >=app-doc/kicad-doc-5.1.5 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.5 >=sci-electronics/kicad-templates-5.1.5 ) nls? ( >=sci-electronics/kicad-i18n-5.1.5 )
-SLOT=0
-_md5_=152c37759e71dd604573ee755e718cd0
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.7 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.7
new file mode 100644
index 000000000000..26202eee8558
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.7
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=7
+HOMEPAGE=http://www.kicad-pcb.org
+IUSE=doc minimal nls
+KEYWORDS=~amd64
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-5.1.7 >=sci-electronics/kicad-symbols-5.1.7 >=sci-electronics/kicad-footprints-5.1.7 doc? ( >=app-doc/kicad-doc-5.1.7 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.7 >=sci-electronics/kicad-templates-5.1.7 ) nls? ( >=sci-electronics/kicad-i18n-5.1.7 )
+SLOT=0
+_md5_=7b38c49ddf9454e7df825975e62c9625
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5
deleted file mode 100644
index 0f5e222d72c4..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
-EAPI=7
-HOMEPAGE=https://kicad.github.io/packages3d/
-IUSE=occ +oce
-KEYWORDS=~amd64
-LICENSE=CC-BY-SA-4.0
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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.7 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.7
new file mode 100644
index 000000000000..e1405925b4a8
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
+EAPI=7
+HOMEPAGE=https://kicad.github.io/packages3d/
+IUSE=occ +oce
+KEYWORDS=~amd64
+LICENSE=CC-BY-SA-4.0
+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.7.tar.gz -> kicad-packages3d-5.1.7.tar.gz
+_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_=fbbcd2ee98fb01f64012d655919b3dd6
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5
deleted file mode 100644
index 87ce4f332949..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
-EAPI=7
-HOMEPAGE=https://kicad.github.io/symbols/
-KEYWORDS=~amd64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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.7 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.7
new file mode 100644
index 000000000000..4e4c5ab5c254
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.7
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
+EAPI=7
+HOMEPAGE=https://kicad.github.io/symbols/
+KEYWORDS=~amd64 ~x86
+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.7.tar.gz -> kicad-symbols-5.1.7.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_=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
deleted file mode 100644
index 3f3b3c73f7d9..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools project templates
-EAPI=7
-HOMEPAGE=https://github.com/kicad/kicad-templates
-KEYWORDS=~amd64 ~x86
-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	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	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.7 b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.7
new file mode 100644
index 000000000000..fd742472c5bf
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.7
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools project templates
+EAPI=7
+HOMEPAGE=https://github.com/kicad/kicad-templates
+KEYWORDS=~amd64 ~x86
+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.7.tar.gz -> kicad-templates-5.1.7.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_=40e0c99cbbce1697e38730c1563bc006
diff --git a/metadata/md5-cache/sci-electronics/ktechlab-0.50.0 b/metadata/md5-cache/sci-electronics/ktechlab-0.50.0
index 94eb9e4e7a3f..897b02e6f1da 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/qelectrotech-0.61 b/metadata/md5-cache/sci-electronics/qelectrotech-0.61
deleted file mode 100644
index 46362356d700..000000000000
--- a/metadata/md5-cache/sci-electronics/qelectrotech-0.61
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui: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
-DESCRIPTION=Qt5 application to design electric diagrams
-EAPI=7
-HOMEPAGE=https://qelectrotech.org/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=CC-BY-3.0 GPL-2+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui: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://download.tuxfamily.org/qet/tags/20180823/qelectrotech-0.61-src.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=572e4650eff58d0ae4b596c347debf07
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-0.70 b/metadata/md5-cache/sci-electronics/qelectrotech-0.70
index 453315d6570b..4747afbb497e 100644
--- a/metadata/md5-cache/sci-electronics/qelectrotech-0.70
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-0.70
@@ -5,10 +5,10 @@ DESCRIPTION=Qt5 application to design electric diagrams
 EAPI=7
 HOMEPAGE=https://qelectrotech.org/
 IUSE=doc
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=CC-BY-3.0 GPL-2+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui: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 kde-frameworks/kcoreaddons:5 kde-frameworks/kwidgetsaddons:5
 SLOT=0
 SRC_URI=https://git.tuxfamily.org/qet/qet.git/snapshot/qet-0.7.0.tar.gz -> qelectrotech-0.70.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a69582576a541b53fdf4939bcbf12b82
+_md5_=d8698292fad4b7b0e5b5ea24de51be86
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 9b2db0ba7105..30eb55f2a790 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.36.4.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.36.4.1
new file mode 100644
index 000000000000..1810f3ab50f9
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.36.4.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A map application for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Maps
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.44.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/3.36/gnome-maps-3.36.4.1.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	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a034a49dfe53d3b358e1f59499aa9a06
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index fbd154b21d9e..4facbc8e8e1c 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802 b/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
deleted file mode 100644
index 6298d6c163e3..000000000000
--- a/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
+++ /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/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=R-Tree spatial index for Python GIS
-EAPI=7
-HOMEPAGE=https://github.com/Toblerity/rtree
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=sci-libs/libspatialindex 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/Toblerity/rtree/archive/c6437a8ae182cb58aef1d0a4465bfc0c6f75b273.tar.gz -> Rtree-0.8.3_p20180802.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd13d996d4836c229fef5f9a1bd5a031
diff --git a/metadata/md5-cache/sci-libs/Rtree-0.9.4 b/metadata/md5-cache/sci-libs/Rtree-0.9.4
deleted file mode 100644
index 9b100436e13f..000000000000
--- a/metadata/md5-cache/sci-libs/Rtree-0.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-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(+)] ) ) ) test? ( sci-libs/libspatialindex >=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
-DESCRIPTION=R-Tree spatial index for Python GIS
-EAPI=7
-HOMEPAGE=https://rtree.readthedocs.io/en/latest/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sci-libs/libspatialindex 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=mirror://pypi/R/Rtree/Rtree-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_=cb8da2137ee1a5a6f3b4154258e27d3c
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r5 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r5
index c345313b9b64..a6b49d749c85 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.4.0-r5
+++ b/metadata/md5-cache/sci-libs/cantera-2.4.0-r5
@@ -5,7 +5,7 @@ DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, an
 EAPI=7
 HOMEPAGE=https://www.cantera.org
 IUSE=+cti fortran pch +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 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? ( 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(-)] ) ) <sci-libs/sundials-5.3.0:0= fortran? ( virtual/fortran )
 REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f3a108188d568832aa932745bd51185
+_md5_=70f6ec48129333244bbdb3ce0bec3960
diff --git a/metadata/md5-cache/sci-libs/colamd-2.9.6 b/metadata/md5-cache/sci-libs/colamd-2.9.6
index 94284d1738d1..2641f923434d 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/colamd-2.9.6
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure install
 DEPEND=>=sci-libs/suitesparseconfig-5.4.0
 DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=7
-HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
+HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/colamd-2.9.6.tar.bz2
-_md5_=42add896b05e2ab5bec4bcf21f4c4915
+_md5_=543b6a9da9ee42a6efd87420ea53b546
diff --git a/metadata/md5-cache/sci-libs/cxsparse-3.2.0 b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
index 677a43832e5f..66a05c6082d2 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-3.2.0
+++ b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=>=sci-libs/suitesparseconfig-5.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(-)?]
 DESCRIPTION=Extended sparse matrix package
 EAPI=7
-HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
+HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 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 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1+
@@ -11,4 +11,4 @@ RDEPEND=>=sci-libs/suitesparseconfig-5.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cxsparse-3.2.0.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d37a4d63daf80e6ecd30675cf8c1d71b
+_md5_=a2fd46bfe73d395a5c98715760e38a75
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.10 b/metadata/md5-cache/sci-libs/openblas-0.3.10
index 393827245e54..63d47670a06e 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.10
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.10
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.10.tar.gz -> openblas-0.3.10.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bc55d820be9daf2d7423a61de54505ed
+_md5_=3820f0bc812138000dc1ea0b28b83cd8
diff --git a/metadata/md5-cache/sci-libs/rtree-0.9.4 b/metadata/md5-cache/sci-libs/rtree-0.9.4
new file mode 100644
index 000000000000..9f6b82f095a6
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rtree-0.9.4
@@ -0,0 +1,15 @@
+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(+)] ) ) ) test? ( sci-libs/libspatialindex >=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
+DESCRIPTION=R-Tree spatial index for Python GIS
+EAPI=7
+HOMEPAGE=https://rtree.readthedocs.io/en/latest/
+IUSE=doc test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sci-libs/libspatialindex 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=mirror://pypi/R/Rtree/Rtree-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_=80edde979d47fb285962b9411485d89d
diff --git a/metadata/md5-cache/sci-libs/sundials-5.2.0 b/metadata/md5-cache/sci-libs/sundials-5.2.0
index 90e9bbf8c009..70baa5b3b332 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.2.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Suite of nonlinear solvers
 EAPI=7
 HOMEPAGE=https://computation.llnl.gov/projects/sundials
 IUSE=cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/5
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-5.2.0.tar.gz
 _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
+_md5_=f2258c2d278b937416737be6df6e3827
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.3.1 b/metadata/md5-cache/sci-libs/tensorflow-2.3.1
new file mode 100644
index 000000000000..be26f8f0c8e8
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.3.1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config dev-lang/swig =dev-util/bazel-3* 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-10.2*[profiler] =dev-libs/cudnn-7* ) ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] =dev-libs/cudnn-7* ) ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) ) ) 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/pybind11[python_targets_python3_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.3.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/dill[python_targets_python3_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/tblib[python_targets_python3_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.3.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-10.2*[profiler] =dev-libs/cudnn-7* ) ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] =dev-libs/cudnn-7* ) ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) ) ) 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/pybind11[python_targets_python3_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.3.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/dill[python_targets_python3_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/tblib[python_targets_python3_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.3.1.tar.gz -> tensorflow-2.3.1.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.3.1.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/386d809bde475c65b7940f290efe80e6a05878c4/eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.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/archive/5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz -> bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/apple_support/archive/501b4afb27745c4813a88ffa28acd901408014e4.tar.gz -> bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.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_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz 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/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.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/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.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/7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz -> llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip -> ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz -> nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.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_=5636e3750840bb389c7e0e2b75f70b36
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
new file mode 100644
index 000000000000..d7c2aa2709b8
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-java/java-config >=dev-util/bazel-3 >=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.3.0.tar.gz -> tensorflow-estimator-2.3.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_=012eba3f952e83336f13e0da8c556bb4
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 5b845a885f6a..7c1b3e6fcf4a 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
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
deleted file mode 100644
index 5fa6f476b870..000000000000
--- a/metadata/md5-cache/sci-mathematics/agda-2.4.2.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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 ) dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy cpphs? ( dev-haskell/cpphs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A dependently typed functional programming language and proof assistant
-EAPI=5
-HOMEPAGE=https://wiki.portal.chalmers.se/agda/
-IUSE=+cpphs +stdlib emacs doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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	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
deleted file mode 100644
index 071543ff698f..000000000000
--- a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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/edisoncore-1.3.1.1:=[profile?] <dev-haskell/edisoncore-1.3.2:=[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/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[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/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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/transformers-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[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.10.1:= >=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?] uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?] >=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?] >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] >=dev-haskell/uulib-0.9.20:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) dev-haskell/alex >=dev-haskell/cabal-1.22.2.0 dev-haskell/happy cpphs? ( dev-haskell/cpphs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A dependently typed functional programming language and proof assistant
-EAPI=6
-HOMEPAGE=https://wiki.portal.chalmers.se/agda/
-IUSE=+cpphs debug uhc +stdlib emacs doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.5.2.0.13 )
-RDEPEND=>=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/edisoncore-1.3.1.1:=[profile?] <dev-haskell/edisoncore-1.3.2:=[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/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[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/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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/transformers-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[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.10.1:= >=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?] uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?] >=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?] >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] >=dev-haskell/uulib-0.9.20:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) !sci-mathematics/agda-executable
-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	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-stdlib-2.4.2.5 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5
deleted file mode 100644
index 10a5d4e18e79..000000000000
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~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 ) >=dev-haskell/cabal-1.8.0.2
-DESCRIPTION=Agda standard library
-EAPI=6
-HOMEPAGE=https://wiki.portal.chalmers.se/agda/
-IUSE=profile +ffi
-KEYWORDS=~amd64 ~x86
-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	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/rkward-0.7.1b b/metadata/md5-cache/sci-mathematics/rkward-0.7.1b
index a6a7f734db40..2148c77a3af6 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 84e01d78d0e6..b61046154735 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/gato-1.2.2 b/metadata/md5-cache/sci-misc/gato-1.2.2
deleted file mode 100644
index 362be52ebd32..000000000000
--- a/metadata/md5-cache/sci-misc/gato-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk(+)] ) >=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=Graph Animation Toolbox
-EAPI=6
-HOMEPAGE=http://gato.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gato/Gato-1.2.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_=865641d9134cbd6df5dd7fc57db23e2b
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 8c0d17d568e3..6b4309e8268f 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/bullet-3.05 b/metadata/md5-cache/sci-physics/bullet-3.05
new file mode 100644
index 000000000000..117e3bed05d3
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/bullet-3.05
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=virtual/opengl media-libs/freeglut tbb? ( dev-cpp/tbb )
+DESCRIPTION=Continuous Collision Detection and Physics Library
+EAPI=7
+HOMEPAGE=https://www.bulletphysics.com/
+IUSE=doc examples openmp tbb test threads
+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/3.05
+SRC_URI=https://github.com/bulletphysics/bullet3/archive/3.05.tar.gz -> bullet-3.05.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_=a0d1cfdb855af8fdc17bbc13d7165767
diff --git a/metadata/md5-cache/sci-physics/rivet-2.6.0-r2 b/metadata/md5-cache/sci-physics/rivet-2.6.0-r2
deleted file mode 100644
index f65d77650df7..000000000000
--- a/metadata/md5-cache/sci-physics/rivet-2.6.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/boost:= sci-libs/gsl:= sci-physics/fastjet[plugins] sci-physics/hepmc sci-physics/yoda:=[python] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) python? ( python_single_target_python2_7? ( dev-python/cython[python_targets_python2_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=Toolkit for validation of Monte Carlo HEP event generators
-EAPI=6
-HOMEPAGE=http://rivet.hepforge.org/
-IUSE=doc python static-libs +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= sci-libs/gsl:= sci-physics/fastjet[plugins] sci-physics/hepmc sci-physics/yoda:=[python] python? ( 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? ( ^^ ( python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://www.hepforge.org/archive/rivet/Rivet-2.6.0.tar.bz2 doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0073e79972c14c3934acbe9d2ab37df1
diff --git a/metadata/md5-cache/sci-physics/thepeg-1.9.2 b/metadata/md5-cache/sci-physics/thepeg-1.9.2
index f57d9f38733b..619cddf4cce4 100644
--- a/metadata/md5-cache/sci-physics/thepeg-1.9.2
+++ b/metadata/md5-cache/sci-physics/thepeg-1.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) test? ( sys-process/time ) >=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 )
+DEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) zlib? ( sys-libs/zlib:0= ) test? ( sys-process/time ) >=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=Toolkit for High Energy Physics Event Generation
 EAPI=5
 HOMEPAGE=http://home.thep.lu.se/ThePEG/
-IUSE=c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib elibc_FreeBSD java
+IUSE=c++11 emacs fastjet hepmc java lhapdf static-libs test zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 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	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
+_md5_=99e17936cc5d8388824d01b94f3efd9f
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.0 b/metadata/md5-cache/sci-physics/thepeg-2.0.0
index 27a02be84059..ecb154fb8683 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.0
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) test? ( sys-process/time ) >=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 )
+DEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) zlib? ( sys-libs/zlib:0= ) test? ( sys-process/time ) >=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=Toolkit for High Energy Physics Event Generation
 EAPI=5
 HOMEPAGE=http://home.thep.lu.se/ThePEG/
-IUSE=c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib elibc_FreeBSD java
+IUSE=c++11 emacs fastjet hepmc java lhapdf static-libs test zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 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	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
+_md5_=2d114e0f15a3659b0ae9a6655fd7ecf9
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.4 b/metadata/md5-cache/sci-physics/thepeg-2.0.4
index aef97b31acb8..149e563a12cf 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.4
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( >=sci-physics/lhapdf-6.0:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) test? ( sys-process/time ) >=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 )
+DEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( >=sci-physics/lhapdf-6.0:0= ) zlib? ( sys-libs/zlib:0= ) test? ( sys-process/time ) >=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=Toolkit for High Energy Physics Event Generation
 EAPI=6
 HOMEPAGE=http://home.thep.lu.se/ThePEG/
-IUSE=c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib elibc_FreeBSD java
+IUSE=c++11 emacs fastjet hepmc java lhapdf static-libs test zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( >=sci-physics/lhapdf-6.0:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( >=sci-physics/lhapdf-6.0:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 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	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
+_md5_=20348f4ff3394363b1a461ff0d67c6be
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 312db3ad1fae..7137c348c4aa 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.56 b/metadata/md5-cache/sci-visualization/gwyddion-2.56
index 5a34425f8f24..fec6f94f9230 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.56
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.56
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= >=sci-libs/fft
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.56/gwyddion-2.56.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ecb4afb049c21419b517508d4ba233b
+_md5_=ac5afc0cbf13020c43ecda23d8675c2f
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.7.0 b/metadata/md5-cache/sci-visualization/labplot-2.7.0
index d090b7f013e1..79f23b9224d4 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 7598738fd935..ccd48aa1aa9d 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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.3.0 b/metadata/md5-cache/sci-visualization/tensorboard-2.3.0
new file mode 100644
index 000000000000..14cf24b95698
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/tensorboard-2.3.0
@@ -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.3.0-py3-none-any.whl -> tensorboard-2.3.0.zip
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77ddca9113c1d27c01e8ce0dd05b1832
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index 6b5152c4057f..d657ae0adf99 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0 b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
new file mode 100644
index 000000000000..958130ca88b3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A collection of profiles for the AppArmor application security system
+EAPI=7
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=minimal
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
+_md5_=62dbf868daca00f9fa9200791a90cac9
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
index e3979cf58f38..e3992515169e 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for abrt
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=65dd475fb446978835791079a8daaf75
+_md5_=890f658d8a99d0afd8330d89cdb18449
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
index 02861cc8e336..a0b1ece52b33 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for accountsd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=1c8d7db45f6b9ac069466ed68b6961d8
+_md5_=2b8711366d65e0b0ffb8975159e4c1ca
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
index 6e6f548de962..ef9a4bf3553f 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for acct
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4d1b42871231eed7caeaacf1bcae551c
+_md5_=6b3f5313b3dfe2fa163d2c23c1cd980e
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
index 4937ad51e8f9..9c577027a0ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ada
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c6cd73918adc194a0a7d3e41f85580ea
+_md5_=70aa2d3e78e7c3866b898be7b6cab6e5
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
index 6147f5b4a6f4..f02b585cacb2 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for afs
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=caeb4419ca90d6c1f1fe443de1155ca8
+_md5_=b9585b0426bfa499b7d78b096eb7207b
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
index 916599c7cccb..258632b6ed8d 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for aide
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=aee748cb6d343fb29e7f8f0b39257500
+_md5_=4acf14ecfe153a61d5f5b2982abd4062
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
index 8aeef170af97..4d5c6205cc4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for alsa
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8061f5eba76f0e84ebc0bf9cc1ae73e2
+_md5_=39bdb937daa993062fb04026d15d25d3
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
index b76d09fe8798..99ac3fb7b80a 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for amanda
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=10899d3db9a54936d6fbf0afba29e234
+_md5_=ce93950b26b5485478db337db8854795
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
index 613e57a57613..1471a141a23a 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for amavis
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e111c870304a036042aaf5b68d22dca2
+_md5_=cbce383b689e5d7eac7847e57d61f2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
index 3c5d893de331..be6b5b64e976 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreu
 DESCRIPTION=SELinux policy for android
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=290154e16da3b8e79714b3e1c75d5299
+_md5_=e61a833f652198000be9bd3bdf32a42c
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
index d2ee1dd005ec..711c12aa9903 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-polic
 DESCRIPTION=SELinux policy for apache
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=1ddb1008bd60b3fea1e9a8be511966ea
+_md5_=c163787369f9702fcad9a39a00fe703d
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
index 37e7d50a689f..4389b5a10c1a 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for apcupsd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=0f04157f464b0d7069fb24e51a1c8a23
+_md5_=2b09540eaf90b8e0a2a7a6fd8daaec63
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
index acd2d23fe7e7..a51931abcc34 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for acpi
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8d64ce8d476682ef0013aced4eacf807
+_md5_=ca778587f8dfad569e8d17ecb21d6376
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
index a7bb8261c375..dfcf7e098554 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for arpwatch
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fd0cbcd275da3c970e6a21b222f029cd
+_md5_=5e56f6642091e72b9163084feb4c14a8
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
index e7cf5d7c643c..28d585a230bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for asterisk
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=89ddb0174aa007b456b8d4412803777a
+_md5_=b8c3c1f82570d7267dd406b20f327910
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
index 700bbeb27f41..dc1df6cc009b 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for at
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4d0600b98c2bf55b5fc2518d8bc6d7b5
+_md5_=b98d0baabfac1b40015135cc5704d065
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
index 85a87b4032a3..ad52f43da132 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for automount
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=47f19e2e40c9060673308d63ef374fa0
+_md5_=3df0fbd06e5e5b83c2320ff79444704e
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
index 81e28304cc2c..7fad6c350aac 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for avahi
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=96f8d1abcb5f95384960bb0d60a172cb
+_md5_=e0feb21b430a33908bbb4f807001989b
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
index 2e18ea0963cc..4882b07837a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for awstats
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=3752fbbd5d634f7903d7cd455929da9c
+_md5_=1b145a306910a6368178fe4a2fa860ef
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
index 112dde0e9025..24c2c32a97a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for generic backup apps
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=962fa62babf432fe79a999b4b4820b2c
+_md5_=9ad6c0ff3402703f079f5a16447580d7
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
index b3da83f38589..344bf8323044 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for bacula
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=378710dd9c7a9c4ebdecda305b3c0e27
+_md5_=7561da95f4fecf7b79c33bce19b2785e
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
index 6232a98e96ec..aa56d7bc6133 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Gentoo base policy for SELinux
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=doc +unknown-perms systemd +ubac +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.8 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_md5_=8e26926f732d6d9a913255b01bbecedc
+_md5_=2600a0b1c2250216f58723284bb9950e
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
index 1ed7b0e66fb0..0018fe602a49 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for core modules
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=systemd +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
 RDEPEND==sec-policy/selinux-base-2.20190609-r1[systemd?]
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_md5_=d13e163f6daabcc5be56d0a8e397a905
+_md5_=0b4dee9637e85c91ef495b1ced16a785
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
index 089940c9cad4..372b339fef65 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for bind
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=abe53d7079564c342cf59be2996efbb3
+_md5_=1f1d57bf72299d3046bf37f4ffee91a1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
index 3e87d8e577c2..b9d86ed66b19 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for bitcoin
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=adabd92de7df88a0a7549e3f4b917420
+_md5_=985e90b348a4c30b7d5b5bab02afd4c1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
index a76a7a26cb7c..6613446ead6e 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for bitlbee
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=429fbbd900427a8905c564fbd7fdc963
+_md5_=4519a87756b7ea6667d1e345d6fc292c
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
index 6821db5553cc..b5d29f58d0d7 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for bluetooth
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=bd25297798202568d9832b184cd0f7f6
+_md5_=ae2d9980e857a4d7d34298fc1b5b0e87
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
index acd2c4f535f9..71291745c0a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for brctl
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=45a15ef8291a38cc5f90164a5076e1b8
+_md5_=d48cc39f7e66156e2704888282089bed
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
index 14b3582ba8d6..8c957ca9cd26 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cachefilesd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=acf263db8d5e2715dc73ed5b64d5bef5
+_md5_=1beca5635731c476fdfd2773bd598543
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
index bc0317317579..a57e72b31931 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for calamaris
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=69f187286ce8cb5180ec7f913b39b099
+_md5_=cabaa07211ca830b9d6dee0011904a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
index 00edfa19e2a6..5358db5ee3b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for canna
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=2ee505f089856ddafb922478b110d1c1
+_md5_=54147818d940387fbca70ead77e0028e
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
index 0edbf403f349..8bbdd5f517d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ccs
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d1cf3bad772b4588143cb7bcbdeb8c26
+_md5_=a0dc400f36aafae7141be2bb982da496
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
index 38570b75c3a9..6417a7d54162 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cdrecord
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=62174deeca8519f9aa89a39e3056fd92
+_md5_=76d2b29bef98cb93c464cf63eab63056
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
index 330127d4cf55..b9751928a32d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ceph
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c67db34781443df9fbd44295183e2330
+_md5_=400d25014787f24345b01e6648e6ad95
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
index 71da5fb6dee3..94878a548265 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cgmanager
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c16b2b5a12d8c80939864e45b87fc055
+_md5_=c18cabfa673d8e87ba926dc91e2a5ec7
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
index 20203ef29d8e..7cde6ee6b36e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cgroup
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=3c59303b4606575740b782c7012ff251
+_md5_=e947b35899f76d8148d3a0bff206cf64
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
index 360a0525938e..54d9006bf685 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for chromium
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c70c6b3933dd01e8e81b04fa25642bbd
+_md5_=132a76cacc720ddb84d169aeb034d0b2
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
index a2dfd296df32..d7963c718494 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for chronyd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=53cf532bfebffe9e91d54518b8edfa1a
+_md5_=99a2577d95f0559d1a0cb1aaa8d34f95
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
index d6784d8dbd27..44c14a39de81 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for clamav
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d5132f0c646dc7e03e81321b9185e937
+_md5_=c9e219c79d7e370079e1bc176b1d7473
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
index 4cfc63cedfb5..fae652794de6 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for clockspeed
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=af43c22bbf165973938c081ffc6c7d3c
+_md5_=18f37249b33ad0c30b902f278d848e29
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
index c1f99bee51e9..c5739f821119 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for collectd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b287f70a2422b9d2c4e40f2e7259fdbf
+_md5_=a07fe5b8d40615d37ce87800467b8e15
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
index 6a30b97e47d1..4e148397ca7c 100644
--- a/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for colord
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=547915980b8b800d526a6c59295ceda6
+_md5_=266bb3bb643d2a48386ccdf78931c732
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
index 109c88b9ead3..dea3303f925a 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for corosync
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b1bc287d5aa879cd588903ec2a03b588
+_md5_=8d31920fe160df226777a349ee8c0a04
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
index ab922602d753..cfffaa5a2a28 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for couchdb
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=aa6c8204e43af790d7d10a60e8d86807
+_md5_=feeff9e8eec99ab228b724ae60d7dc33
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
index 8bbe670f704a..da16c0dbfd84 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for courier
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=51ef765b504fb20711314be2d3818419
+_md5_=f34f2145d745a4cfffde5b785a2afb5e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
index d9fb15adf3f1..770b701de198 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cpucontrol
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c506894457db803bf293146a418ced77
+_md5_=4cbe8fdc7eb5851e9437b658ba8e10a0
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
index 68d7730901e7..a1a2ee50a230 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cpufreqselector
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=2219155ab3f639ba0d4c7457623b5f11
+_md5_=9356d5a0ccfa2c750a856443d1b4cfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
index 476b9bb9c316..451dd1076ea5 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/sel
 DESCRIPTION=SELinux policy for cups
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b1abd409b6c033c8f06d982b68558111
+_md5_=92febf8c49c7fad763ea05f933064498
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
index 31ce5d34ca4e..25e4cd5d7c6a 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreu
 DESCRIPTION=SELinux policy for cvs
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=775a54f9b810eb0e048df43e78b0499a
+_md5_=35a47288882182b57e3e72a180bd6510
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
index 8ec926e1b400..94496bd05f78 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for cyphesis
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9f36b48e9e7adc7fc7d6eba3ad1f4200
+_md5_=f11df02e58ead1d82aaa20cc7cd836eb
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
index 067e33027509..ef19c91ec277 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for daemontools
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=046ed4b57f0dbf601e7b7f82d61e86a7
+_md5_=7276bfe4e05fbd7714ef52a963c030f9
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
index 243f4ab9f0f6..9ecfc3670f12 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dante
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=0a9e20103528bc059d8dbc7e751161d1
+_md5_=50d8d3ac0a2ad7a590acecee4a31b150
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
index ad64797bfa12..463e7da9184d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dbadm
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=68e806fb41361a95c53e359e5731adef
+_md5_=fb9a1d309f5a57ea3075189e48f297be
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
index 09b47090bbab..9a7734fb3584 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for dbskk
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7e82061cf55498f6917a61179210bd88
+_md5_=daf23695d7c1d1c1ed70fb0dec004221
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
index 1ef436093e6b..518d5ee4b78c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dbus
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5d5ee1436a31993f02c9f599b1e60fd0
+_md5_=fb2356cf1d53f5d1e2b2fbc0e5bdadd6
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
index 295a24c5eded..24b040ee9f9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dcc
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=602e3107d042e26942f6126be05ae181
+_md5_=ea5f2da63d0d02f42785ddbc9c34d006
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
index 48cb75f80711..f1f85df28696 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ddclient
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=22991f22281c83037b857e510cf29d9e
+_md5_=7a74d850e7dc4e46e90afc469ce7c3ab
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
index 3f63dbbad532..edd1e6893d59 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ddcprobe
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=eb174f30413b15eec23b0ef790c12258
+_md5_=05ba03e76310ae8387c5806fa5f40197
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
index bd4adbe5b0d5..c6fb639e4506 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for denyhosts
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f3f380362b938f94da9a3f31b56b200d
+_md5_=bcd69e3afd859002241764ba12fceb94
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
index 4f83c5b49bd2..c78dc44a46a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for devicekit
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a115cc68eb18a33f56b574d6e2cdb0b8
+_md5_=0a3e0386d095cb28cd2744b9d30fd935
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
index f6757be34725..a2635a38f506 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dhcp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5d99d5d76644f38aa52e35a9158225b7
+_md5_=b880b5eb6876eca756c355b42a4c8a32
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
index 6f7538bfc217..b4b869909fd3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dictd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d6de3a061e5252151051ab99731cefbf
+_md5_=30f053200193e1af823ae56ba2220e86
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
index bfbf3db15e6d..28934393c97c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dirmngr
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=089d7629bddc5bf054c4a0b4479a56bc
+_md5_=1167b4c6975dabc36e4c978f7461e2a8
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
index 53ba1f6d42e0..0946a5f22e11 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dirsrv
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b4e264f13a8e5f50cf6ae4a0313a68c9
+_md5_=3dfa885d59e4520e3c02d50a72d04a9d
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
index 05fcb1f52d0e..adbc76ee3884 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for distcc
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ced047500d1cfd200dd9a88a8dc5a33c
+_md5_=bfb2532a0f3abd624d50806ad0bf4bd9
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
index f5af3d658cdb..5118ffc608af 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/pol
 DESCRIPTION=SELinux policy for djbdns
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c01fc83c8a48521d6b1982ebdd0d0517
+_md5_=d722fd8977b94b6217108626055e06cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
index 8b54e202dc83..611687a6eaed 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for dkim
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b599c864420626bca0c2522c09edf9c3
+_md5_=e44036f3ca13145518194ef3a86e28e8
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
index 4a7f96aba38f..05cfcdb29da7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dmidecode
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9dc1cc82d683db1ae7827d7d6ae24c64
+_md5_=9e5d1c91574697bee3bbb97777e622a1
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
index e0d9763caa4b..17200db24d82 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dnsmasq
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=50376e838576959c09131968e94ff7ca
+_md5_=dbdbe91f57b297937aae53763b85ef3d
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
index 77aa0ee8440f..4fc583571ee0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dovecot
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5dd0b007795d09cd024a6a190d9097d6
+_md5_=08bc70707b1c4713c57ff99be0ab5c47
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
index 9a83a655af0f..b95d6c3458cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dpkg
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=777214923af380fb0c3f92e33f1888c0
+_md5_=f5474ccced5516dc762ad97d9d5efe27
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
index d05639a6b66c..55a6d4c91774 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for dracut
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8524076a4794eeceaccec3694a0abdb8
+_md5_=6b45c4c32962c1b11262db563745e499
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
index 200473587d40..c03fad417243 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreu
 DESCRIPTION=SELinux policy for dropbox
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9ada1760b0acf36b90aa8a79f74b1427
+_md5_=3b464e63c1959607f5d61da5702c41e9
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
index a8ce912faf1f..2017877aabb1 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for entropyd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9742a647d8e19005085e35eb773b9a86
+_md5_=2a4a7436f7e83cb879fd04aa34133c8f
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
index bcda7d323a53..3d3e9f056214 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for evolution
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=db0dd0a687b2c5ff06320cb91c5cd99a
+_md5_=a839c3060223326e76e5af83f537f3a3
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
index 82b807710493..14f5a1bb32ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for exim
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4c065e3714740b1cb4f8fba24cfbdbe1
+_md5_=bf4faa9010f635c6145d6072bfae8c03
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
index a6faa223acf8..6941e52617ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for fail2ban
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=cf2a4aa305c1e31cae16ccbeaf316e3d
+_md5_=6610ed378f453f649facc32858562d69
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
index 6ca52035a580..5760ad7aa587 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for fetchmail
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5eb39a6361215555b23030b76248a2fd
+_md5_=a58d2a0bf5f966b8356ef6f6af8d9cde
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
index 81a6481d0e1c..47ace1dcaef6 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for finger
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=50b7de0b4ca31abe6c898d87384d6421
+_md5_=8718b06ae58a79d6dcd3e472bd8b1ff9
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
index 18fe6e536724..1af79b77be1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for flash
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=32405d0b74cacc76f76718120a9c9f7f
+_md5_=b8622c465ca9eb5ba83d5802ab923cd3
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
index 515eff7675ce..2e1f9299e8bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for fprintd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8fe93d9746716eb50e2064dfff0f5842
+_md5_=efdfb026aa9ac9dd91f93b3331714662
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
index e16579436d7b..d6ce90bf5ae8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ftp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a3c8ae7cb74c79ccdc1a1de580ce7668
+_md5_=8035346c30e72e0af7a43552a33630cf
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
index a53821325f12..22935560330a 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for games
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=416730b885ab55e46ce185350266be5c
+_md5_=7e2e79d766bfdcc9cf849530f46a8135
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
index ac9bda766c9f..408f83537a35 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gatekeeper
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=763fc1d1e4c54ef693446c5ec1f0068d
+_md5_=9c52f9d5b68113af27de279367130d07
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
index 5033bb01d4a1..64fb9d4452fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for git
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d0ebd98e526a26142d728e75803e4104
+_md5_=b0b7c2ce05640e4de50438703f5781d6
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
index d8233e5bd3a4..1527c4b765c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gitosis
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4331c368112847f4c8d0ce3e35aacbb8
+_md5_=410d854d2e88d43178cb5c24fb539916
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
index 199b8407152d..8814d9992247 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gnome
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=865594e57e1e65bdf6221144cf9cc412
+_md5_=7fff4e85195dca4ced69d8ec4b1b30ae
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
index ba364dc6af2d..f05df1afaf8f 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for googletalk
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9c4d71c79e48ee85d7d24db509122cca
+_md5_=9f4e3ae24bb1de828040e3acc6cb6d39
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
index 885022d9dc1c..ead7202b6cff 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gorg
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=db842577f03b5dc5d8cf23ad8b0f6e1d
+_md5_=56b93be2d22ba45a4182224676af0962
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
index f13c94f069ec..c26b551bbd1d 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for gpg
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7673dcb3cbb9326bdee7a9aa228430b3
+_md5_=6f7ec6450d21b3cb9b3a8111b9e67705
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
index d5f8797d19cf..98b8b06b79e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gpm
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ffac969fb8f3e2e2589cbdc7d125ecb5
+_md5_=54ff6aaff055acfb4728b2221ee51d40
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
index 7336770d30a8..c3045e5c8188 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gpsd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ae7d1a9d15343d5557caf960b93a79d1
+_md5_=9e3716b5e17ae5e3b5e75d450da89f49
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
index 8b05aeecc9c6..08e1416ecd92 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for gssproxy
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ddbac65a6ba9a1cdf80ed1b84bb5f291
+_md5_=5f29414a361633bd5c069646c881901d
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
index 299243eaa61c..686b7a6d4bf4 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for hddtemp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e4942123b175ef6267fd608bd7011c7b
+_md5_=751eeeedbc0ecbb98f57b1313155a64e
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
index 46fecda825cd..6d861853fc30 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for howl
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9c643bdf75a7de8282a682724ed32103
+_md5_=43e2f72624dda67652db5bf590029361
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
index 50632d46f4a0..6f2b0746708f 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for icecast
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b52103577c527aad5f2dd2df8908f4e5
+_md5_=a1ab1b49389adecac0bf71b182a49882
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
index d3ddaf68c9b9..6abf55d399d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ifplugd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7ca9fcd99e0fdff45212be6b2a9dd4e7
+_md5_=3cba97d459fa92a77958abaf6916c276
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
index 0a41460f0e01..549ea92b5401 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for imaze
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9d3598791241e218f6a02effc460a629
+_md5_=bc90bab13571bab1af3e0b0c0e92f905
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
index b240c323b020..fa41547be3dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for inetd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d0aa9aae21d094796a0a5f6690c54d8c
+_md5_=0d053136f029888924edcfc036a90c14
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
index 159dd7dd320b..62964fd3383a 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for inn
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=1fc298055e103862a7dced2c3a57a9d3
+_md5_=cc173496c40912134053dd889f2700fd
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
index 65df7e5ae90e..02ba8cb788e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ipsec
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=68149b97941ba63e7d96bf9416c8bf40
+_md5_=bfa5af92f6581e8432c469362a450b69
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
index 20e6d5d8c2e9..5b64d7043912 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for irc
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=0204dbebd4e882dee8b1a8a506195c23
+_md5_=05e5b338107d3c181c722fc8fdc4a9b8
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
index 8fac519cc589..13fc04ec8074 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ircd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4e31c9ffd83e732333935524a7de51a2
+_md5_=3875a5375c971f53cc9b04f8e3a64bfe
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
index b267bc3ea09a..6718fe1a7801 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for irqbalance
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=44dc479768add11c5632751a7ef2ae6c
+_md5_=5ba5933b39c26b7814a88507554364bc
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
index ad71f43970b4..bb5b898bb100 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for jabber
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9c3b848060a9d71fae3adf49f6fe1a6d
+_md5_=73a53eda43ca63538ac5ac0d9e125cbf
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
index 6dfc1d13e0d3..0b3db411d8af 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for java
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=94377336465fc43dad005e5d2bbd7e86
+_md5_=2e55f00bb85c974be23ce20e6e2a4b6c
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
index 758a0d8fa95f..2b9967fd2f7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for kdeconnect
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e4f9a015ea6554e9122d6cf92f7ead35
+_md5_=2d980d2a2ecae4c81aeefc269ab7f9a6
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
index 7f1a1387847b..c5abbcb72120 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for kdump
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4f8e49b9fe6f066959ac499ff65c464b
+_md5_=3fa1d480ea11ae879b9f73ca0ff28a79
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
index ac2b0390e874..f9f8e4672179 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for kerberos
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5aa622c06909d4bc8089904e3ae02c42
+_md5_=316b68134565e6cb8f614525dcac0bd9
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
index a12a4c6e8584..25d61bb9a294 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for kerneloops
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=42cebad97f80d20fe2d932b932bee9a1
+_md5_=5ecb0af055347f06aa60b91f25ccd9a5
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
index 4ba44f479fea..50e2acc49274 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for kismet
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=2f68feb488c5b91c028e52849fbf938d
+_md5_=c51da03ef383f0c857a8bfa191cfc0ae
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
index 1c3e9bee476f..a3aa40cec0a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ksmtuned
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8d6c889691f38ff36eca66596d977bb2
+_md5_=b9b5d2f2673a921f49970842071c2263
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
index 7653d780381f..5df3efa3e088 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for kudzu
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=890adea33e75641f93fe3ec18909973b
+_md5_=4d4acf1774e418276e60a1aad268b6f9
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
index 9b8554248501..3535fb75300a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ldap
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=91e108f7a02d8e22211f0f5a342a8226
+_md5_=bea011199ecc4c038ef81613fb9e0572
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
index 5f3e03aea277..85c1a999f53c 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for links
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ca4b68d42539d1c957066c3a5c8de86b
+_md5_=7ef191bcab0b13009ba4a40ea3f22961
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
index 56b3722b0544..19584f7bc823 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for lircd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=994e00dc05c5a3b1ca04f6e7990ac316
+_md5_=68cb45ad78bfb33b554f37c5d0218b64
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
index 2036a9386399..3c1c1feff27d 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for loadkeys
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a0150973f2aa197dd07e8806e7119365
+_md5_=43a36322832619723c2513f83c3a20ca
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
index 078dbf40a7a4..769d34ffd5c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for lockdev
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fd906b833f702035784b73ed90e3f073
+_md5_=5e24a2c36ead55cf0883d3e12851d13a
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
index b79b5996df7c..78c3ff5854f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for logrotate
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e86f14d2920a94c38228130d3c8b5ed3
+_md5_=ca9976056371eb687248b57dc0318fe8
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
index f56c1f49aba6..e92325cc6fe5 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for logsentry
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=449899b968a78cbe8eff56af7c4bb26b
+_md5_=9549dc0b418f0946a337abbc5581544f
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
index 10ab9b8d2019..f159cc04f4ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for logwatch
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e89b4c822581312b06d5fd154578cafb
+_md5_=b8949a42f524cc0ee9534946f54c23a4
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
index 467873a079d1..19dd0aae77fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for lpd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=98b14a870f4a3e781436720e43a434d1
+_md5_=627348b850777ee5865a10a974071f10
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
index 5d7b5d327986..941d2c6a4d83 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mailman
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=37b8868667d41a508be03816521f79a8
+_md5_=e4984cc29c7ddeead84f86825c1edf53
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
index 14d47dd6a07d..db40ae5aad2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for makewhatis
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a648cc8c9f883d9fe6f1eb3f5666cb4c
+_md5_=6ab43104da973e7f22e080de56019d9b
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
index c5713433fabc..2aff083928a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mandb
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=36566d832ef8e0b181cf5839e439be54
+_md5_=a71303a2afbe7e50807d170263d27f3c
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
index c5ff49d0efeb..2e17b11b4ae7 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mcelog
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=2032e417fead8840d7de482eb4c90571
+_md5_=c7bdf6e1c5543440aa1caca5b2104fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
index 83cf3547c0d7..966fd2332950 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for memcached
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7a103aee20db13991c4dca38b1a6c598
+_md5_=68e3ce60c44083573d9a101d4dd67107
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
index 45c6f3b7f0df..9e2e92d7a377 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for milter
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=568ae63102150e12597f125b1399fc94
+_md5_=631de6c07972a33922045bf99beed69f
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
index 72d2f45e895d..39647bd44fd4 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for modemmanager
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e1b194c5ddb870a951b2f301f46edf6d
+_md5_=749da5ef7d80055fe5de323c9a0a6379
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
index 2a1fe6eb1296..0be647fa0ec4 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mono
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=79842b30509f8e8aebd0a83e8e596353
+_md5_=6db1ffe2f17806a7e01fcaf750a3a60e
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
index d18318afa88d..e4d20bd0e042 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for mozilla
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=37b03ee6bf27cc606b8b9a849d9a0147
+_md5_=e2a3c90e0509bef63eda95a7f2216418
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
index 7bdce43e4e58..1cac5d9b2351 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mpd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9a4a29ce6d7349aff5d4700c767f3ecd
+_md5_=e357719180c1925602154081c43d16e5
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
index a9532b577fa3..f8e1f2aac12c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for mplayer
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=00f5ce8d00538c96a1de39094110f8e1
+_md5_=91a9770460e4f948f0165a407d1c7466
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
index e5833d78d965..33a673919f03 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mrtg
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=0f994248da943878ed89a18743cd902b
+_md5_=b6b7491537270b9f96a1f1f935559e12
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
index ce62d5f47464..130f0dfefa52 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for munin
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b43261d62930ef123c2b841f14add0c6
+_md5_=0a93842833cd9bbb91a52e915533cf0a
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
index e401ac110fa4..4cbc269e9b17 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mutt
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fd4c8fde759a2d8e1f8347cd647a86ab
+_md5_=ddb89e48ebbe7d62a9e9a1d36d4cd2f9
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
index 4bcf588b08f9..97f5a45941e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for mysql
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e76fbafe6c8f96c2b4bff73f3da23573
+_md5_=f08b3ba691919ffdffb9012c62699031
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
index c62852f26741..b48ee2d6a09b 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for nagios
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=37b3c4e612e88385c1e6e3be499743a4
+_md5_=bbb876df859ff52042372b69fe255b1f
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
index 6b269dc88ed7..c16e111a4722 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ncftool
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=839733c1b06593663d8fd2ffc593561e
+_md5_=fd37c2ea9249fcbdda5cde7e1d2492bf
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
index a02565ab971a..b3893a7782cc 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for networkmanager
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=1490a30cdf1afdf310d1f8d0ad025235
+_md5_=c116d4fa341079848c53a07232bdc83d
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
index d7ad74af3360..35e75302bb0a 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for nginx
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4dffbec892c55af33dc4aff7c3987a29
+_md5_=9274eb1ea3b1463e8ca9091aef314bf7
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
index c2b7319df5fb..1e5b2dc94fcd 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for nslcd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9138f7b0124bd0d1c0b8e6cf39c156fc
+_md5_=bb9f6282e0d502ca60126ece17751152
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
index 04f8ea4be3be..00b0e62fc86c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ntop
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ecb682eb4f078f82a2f1aa9f98b10ec7
+_md5_=ed65d4fa1b762b26e64952ae26259644
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
index 598837065304..e03835f9f4f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ntp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=83abae24125a881fde3f63955327dc82
+_md5_=bede2ebf6ef02e143aa103c2000b0d1c
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
index b6b64d69a2bb..78a3a3ae04c5 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for nut
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=226174a2260ec3ead431ff9d417e4671
+_md5_=c29ed8cc0ab16aeec591d72c4facf3bd
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
index 8453e190837f..0fed926212c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for nx
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7022d2d140832aeb883ffe5e9c2ec5fc
+_md5_=af609b7add7f21cdb5fcfa27763b40c7
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
index 5aae4088d8dc..5402b1813fe4 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for oddjob
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7c15605af2588971d66b1e6c20dc1ce2
+_md5_=fd4dbfe7cbf2ef352540e1d1dcf7e1b0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
index 00a0baf34fb3..9e5f505118ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for oident
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=70e11e1dafdd6c352cb35fbd5b4225d2
+_md5_=3d6f7ae530bc9853974d5f680e4ad776
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
index a0c9c63ba282..f179d07fffe4 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for openct
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4ab037f023981c2d5aea255ccab9d1b9
+_md5_=88c3c725c24146f4e51cbd5184b38ec1
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
index ec84dc511d4e..783d8c168ca5 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for openrc
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b78b6b952ac773f5064d9a47901768f5
+_md5_=7c832c738ebf25c150acb525e211363f
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
index 728e7adc378c..9423ab5ab47c 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for openvpn
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=31b744c5122116e447c8540bb2292c16
+_md5_=61013425e649bd329ca1901da95e9cea
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
index 20b8a962a60f..31123748e449 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for pan
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=83b6111304c4a9dd6d167528c56b56b4
+_md5_=564673d258d74b2a343fae178498e1de
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
index 30e1658db712..a2863dcb40b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for pcmcia
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8e7b902d60ace984cab32ca26e930d95
+_md5_=6dfec9011cd12da465eda41036b8e472
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
index 808e808b4e93..f6a3036dbca2 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for pcscd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=6b89a7da8e8518cc0ab0cd9a6387b109
+_md5_=a2d3acb7822e4080bfa12555a6035bd6
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
index d30aa66abfad..955f5371ba31 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for phpfpm
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b240628ab4e33ce26aeaa0a3e644fafb
+_md5_=1957136ee1d44be668d5f1733ae0cbef
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
index 02fc96bdcbe6..ec584c8e68d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for plymouthd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=38d549b574a140cb37836fc6aadc88cc
+_md5_=04a8595c280c8f3b1a7b6e1900e8b9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
index 07b9e7e72805..0195f63e994a 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for podsleuth
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a366b364c22108bdd0d7583769b39d5e
+_md5_=d5fdb68e87d9d4525c5670acff41d5c3
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
index 205c8b4c118e..d476c0124132 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for policykit
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=74e69db2135424fed298ee32455da370
+_md5_=a394c585f7a63f6f92ef2876c0f8c2e9
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
index 7992b7c669b5..45c7a014e9f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for portmap
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a15ec73742aa3bad30c1bf3fd29d0912
+_md5_=4893d81e58328c61595ef83bf427ab84
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
index 38047c416d0c..a6c00e625801 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for postfix
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=04dcb72b6a93e9ddddbd6b80b00e4d2d
+_md5_=62891ae24f0ebb0764ac6916da14b937
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
index 7d224dfe9548..201c5ba464cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for postgresql
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=38bb4e225e12c4eb6caeacdd8c83707b
+_md5_=863e69d2534df45eae7ad72170f975d8
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
index f5a2cce6450f..a9bccee48f5d 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for postgrey
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=004839adc6ed5b9dddd498877b76f688
+_md5_=2fb522957056a7f07d39f9bf41d8d021
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
index a8b6907f9458..f2c7c31f133e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ppp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9e38e6b4e5b0a8584561d39b52889e3b
+_md5_=cd322253df5d97addf7309121660bd1b
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
index c522ce1d4b5d..d247a889e646 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for prelink
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9aac284d8e1392746cd37bc480374e15
+_md5_=e8a976daf4404d045303f1359daf9f58
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
index 141a37846291..f99b164a9a35 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for prelude
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5f49e67d453f0a0f107555e00816f95d
+_md5_=c352fccfd9b7396447ec1d4d45ece668
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
index 1561f6dccd0e..9d11f43a1d27 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for privoxy
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d268dfde5ef24a53f670e26ade6e8bb7
+_md5_=cdf9cd3e275571b974b46c81a008bd56
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
index d4231bda58bd..74df28f1750e 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for procmail
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ee32a9a48ffdb098aa74184db4932e2f
+_md5_=1573e31e7f8260e3e8aced8b53ea7ec5
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
index 4c353239c262..d52bbe11069c 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for psad
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=340cbe5006c457c2899e309e8cd41884
+_md5_=9240b333f3ae9e7a833da47f211c9820
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
index 7be3a56af05c..b883408c4af8 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for publicfile
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=78924b935338bbe08f5ba1346375616c
+_md5_=1acd550b44e990331d2801ce962d3368
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
index 61d3e8bf8801..bbcab92e6606 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for pulseaudio
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=47affdb7af6af73071aac7e92213b8bd
+_md5_=15042aae7cfce62676cb4da58e23f606
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
index e7851151d632..9794b94089e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for puppet
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=3dee976a254b1cfbf1e14667edf26848
+_md5_=adcfcbcbf792d6d8af326cb437c87293
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
index fb2bdfe9caeb..01b4335ab0ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for pyicqt
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=09a0f76fcd02ab9d0166687906736432
+_md5_=063940920809fa478d540c53257d109a
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
index 9705adda2ffe..788b9cd36b7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for pyzor
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=38de4c3997859ac387f7c8d5c735e765
+_md5_=6b3b4ad3f961578e1b363ac49e6faa1b
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
index 24b4743f06da..fc6ce733aa27 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for qemu
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=dc029a0b4d23698641f0b26f6274b324
+_md5_=4780a98a63f430221523338f39cdd3d8
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
index 6b75028f4d02..3854b7b5e512 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for qmail
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f9baebbd8ba75795ca6beec1c29c8138
+_md5_=64118d1a7f6a9bfccba30d29d84e9ca1
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
index 312ac02658e2..8638fd3679ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for quota
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a497f753b84f5095a2c51f637ce6e703
+_md5_=df00e628cfbb6cded23d7420706e5c6e
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
index 08d8e5a59cc4..725a37583d08 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for radius
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a39537a58bbc4d7a93839b4f18cf8e63
+_md5_=44ac99eef7b015530e975587a7d3e502
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
index 441a26f6c71a..c08896a1f108 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for radvd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=37b3d0f8e4638d3ab98ccd54e20880d9
+_md5_=9dd2ce957b85bbd5e021749f180c7ac2
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
index aae10d83d122..27ed506159ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for razor
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d0518eec5c71904db91a3ba7869a74e5
+_md5_=e4bf0d283e050518774a648c714d1268
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
index e799e0c18682..1fd12fd21ef7 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for redis
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=df7540006ccaee5bfad977cf2b946e19
+_md5_=fc99f9ad4e03fa07aad21fdecf1d46e3
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
index bef023511c14..abed87d8e361 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for remotelogin
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=01f86f1d32b619d3b324d4ef48d859b9
+_md5_=8d9cc7db2b63ac05406a8c3b9f9964a7
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
index 5df20beaedf8..e3b5796b858a 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for resolvconf
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5894c24c7d93e9a9338d9c9f12abbfa1
+_md5_=b0dcf3ff37efc164051ae149c423fa1e
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
index 2753df624fa6..c26dc8318e98 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rgmanager
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f829cd953894f987b342169f9c76120e
+_md5_=6990a61f96bda55d327fffce39c0ec39
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
index 530af0715a3c..c640f945fd79 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rngd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c22298ea1504998f478bdeceb7ea3fae
+_md5_=b7c13d1d70140eb8af8e1d559eed8563
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
index 4fc34c2a6eb7..32f327a60f44 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for roundup
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=09a0c1c58955bc2fd0b8bafdb4522ace
+_md5_=54a643f7a354c984d306fdb28092d3fd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
index 2899a1a9ce64..c7ce3b1baf2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rpc
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a421f9a2a5b18c79b3f0cdfa570858f1
+_md5_=01504e76614a3eeec2645824df3b62c3
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
index 7640b2916b6c..5ff42833974f 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rpcbind
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fee19a27ed5c4b06a93324fa065caf8e
+_md5_=3b9c0639fe36dec3a19ea3b7865e4750
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
index 516e666bbab1..4518c72fa89a 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rpm
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=70c8df287971403795783e63c5705434
+_md5_=205748421295c086c9d3db9040b01c53
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
index c84213994357..23a757cc1e71 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rssh
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b4be2baabcbabc8cf3de4b9bbaa3831b
+_md5_=8e3ab3350a3c8b1b38451c25d8de2bf2
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
index 4b1c37cfc0c0..d93751253c02 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for rtkit
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=82b8995364d14a0d5468b2f8564ba6ae
+_md5_=3d7f2acbb845b34be2f174752953802c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
index d6e149d9af58..37d506b01ed5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for rtorrent
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=355dd2014668b6fb380e525be1b2042c
+_md5_=3140f9ce1a4ff6a9188c3eaf9f1fc435
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
index 534f2dd4ce8e..0fc66be17c06 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for salt
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=8ac2e15403f616f7d8fca7f21cda8ecc
+_md5_=31a80aeb136c145c1ddd81561b775fd3
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
index 7db640207e63..511fadff4b22 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for samba
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=50667337b79fdac370a8e301cf3fb229
+_md5_=4d3863326a8b11013cdaf7e6a0055efc
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
index c6708191c04d..c3497e7658be 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sasl
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=728522b049177204d10b8393cfbfb1e7
+_md5_=ff86703d069017cc414f2efe7e4992a3
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
index 8d05df83807c..6a488622b9ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for screen
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=166669fc89649203d28a20560a518aa5
+_md5_=d5ea669e4e069848f9ccabb8d9b2787e
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
index 6baaebf89d0d..ec76aaba6f0b 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sendmail
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9cb7499f1acc7bfb43fedda4cf47ebb3
+_md5_=afb3cbd1a04cd7872dbc1843be334451
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
index 35bbbc9fd6c5..6cb50443ff74 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sensord
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=839be046cba06995b256acf740785c0c
+_md5_=6815783f7e11f3f22a4e11d6ffbf6993
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
index b3071df5386c..52911dc51073 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for shorewall
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=adfd4fefa73b0990612645371c4c0a8b
+_md5_=61867bb467e758c6202d0441e6baf4a1
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
index 758fba76c00c..1601422b2d2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for shutdown
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f6c80c5763c8beb381235c5611c922a1
+_md5_=34fb2e65ab6b6628d665c8dd74234ba3
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
index aecd5652add6..9a4e56e243a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy for skype
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=3a0226cfa938cae3351f40d267097833
+_md5_=5203163b93f28903897f7f12e6b3fd36
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
index fedcc4a16698..7f7931d9d43f 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for slocate
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=59f5a55cc27fbc6f5042b761e0cda5cb
+_md5_=7f9a39f5e3080ee85463d462927574d3
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
index 337541d8995e..a1773ea47555 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for slrnpull
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=3e1e577eba67873a3f39c17f32a17adc
+_md5_=226212618dbe63715501d1368546056d
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
index f39eec7d8c26..eee6dab515f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for smartmon
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e9a31f0d2039789270715518f7b3d651
+_md5_=a515dac305a333c5386e1fa6aa10a4e3
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
index f852816a823e..4a1eb33a2ff4 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for smokeping
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=61f3f767dcf8ca701b738487f37a73c4
+_md5_=10537e3420c819d5fd69bf948c8c0e6a
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
index 5a6f5bd92b42..5b25e2c808b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for snmp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=91ddc82dcba0797c22626dac8072bab6
+_md5_=dd8813fcddaa671224b793d697b071d4
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
index 2a173bd5eb0b..2a15f28162f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for snort
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=45c7e2040e43054baea0dc53b0066799
+_md5_=241552533c15eb5ebb1d50eac5ea2a28
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
index 969965a4cdc4..044aa6c10526 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for soundserver
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7639a32656a72f025d53c5db9ec7ead0
+_md5_=4ddfae103b5209bfbbe1692408923b9e
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
index d800675fbc46..6c479d3122f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for spamassassin
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=83b60c41c1ed874410a09a5fed05ac61
+_md5_=15c3275adcdf680feafe84bc92cb1834
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
index b5091490ab0e..a6a45985d094 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for speedtouch
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=866253bb8de27e8186026fd415c56ace
+_md5_=831ef3ee8032de4f8895f0c249b3e7b5
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
index 77b22e294822..6dfdce686aac 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for squid
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=031ee5727aa889b4fc0703f1d43101e1
+_md5_=561109f2ab1554b14e432be307c61db7
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
index 410573ec6437..910043b0dc58 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sssd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fc4312129656d93d7cbd3c9ff2dcc8fa
+_md5_=a2cba9a93de153b6c8f0fd3b7fc19578
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
index b101300bec6f..d8d9c0513d3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for stunnel
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=1a19d63eb5f575904800055f5147b3c1
+_md5_=2c360be3b0f5ce516246e7aa34069c28
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
index 696fe9930653..a0911c3767ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for subsonic
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=ee5210bdade926c991f9208223a60846
+_md5_=940a7144ac0575bc6b86a1e0cb2c0942
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
index 0d99e72a0eaa..8c7f90fee14e 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sudo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e7614d59adf9f73736706734fe318a26
+_md5_=ef5879c0ab02036015d6c2aa089fa3db
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
index a7971a511124..5d5a5aebb5c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sxid
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fae0f43066e6f5bb9e05a94fbd7385a6
+_md5_=b6285f4de9d9904ce09c1cd2a3695152
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
index 8394bc440a77..e74ce490b27e 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for syncthing
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=eb3d77698cc8c11a9d584fa9ddc36e6b
+_md5_=f9ab2c03e999d7d10d6434079e4e40f4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
index 3d286919fc2a..2858f6c7b3b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for sysstat
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c5f44fcf0ef790766d8becd850af33b7
+_md5_=e3e846c32b57174ad370e6617eb1f04a
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
index c3a7b6418b5d..61ee8dfe8963 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tboot
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=70fc941d50fede7b1207f8db92b43727
+_md5_=5ccf2003176127a9b8ad29a84a77d7e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
index 3a1ca77714ea..1d98100c8761 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for tcpd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=fb67aa6e14a4b730237033523bcf6f9e
+_md5_=9c7749ba99f6754689bff4c3088f9c9f
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
index 1237dddf2d28..0894c2febec0 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tcsd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=af854601c2f70f38b48418fac0277a3e
+_md5_=5ef6f77135005dc72c5fd8b790dc287d
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
index 85ada14610ca..c05363c4b896 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-po
 DESCRIPTION=SELinux policy for telnet
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=d61e2efce314add17b56cbb1a5f7aecb
+_md5_=6b71bc3d75d1764b6ea02386fcb48930
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
index 4199be60cd2d..53827247b8fc 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tftp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=98f47dfaa576de4f0886246138bf797c
+_md5_=76a6407e99aaea86f755f8e998e5f3c6
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
index 53da4bcf60c7..847325f7fd09 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tgtd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9a0df6f436b6bead278f26e815a17c94
+_md5_=9df39a56adc20e081ad6e4ce57ea0bfe
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
index c4c804ad5473..d7cc6353eeed 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for thunderbird
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=2e268444fcc5d6e7d259be9b5935f94c
+_md5_=399d6c8600a3e64a5f923d20b4ebf489
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
index dc3a04506030..d825b5872ec4 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for timidity
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=0936206f1f4eccaaaf4cf0a5c831b3a8
+_md5_=7b2cc64d74a36adf95e9f61842c22af7
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
index e3abd8b8e2de..ee076cdc9a1f 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tmpreaper
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=578d3082259c3bac8d53e38940491499
+_md5_=a0b113e501aa3093303eebe70cb33d6a
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
index 68510e46ad85..dbb163fcacca 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tor
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9da2e23ed1e72fb795e6c774cf3319ea
+_md5_=4e9a6975443810607b49b83656cbdeb3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
index 2dd263392498..897b5704322e 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for tripwire
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=cf5764db91c1e676c56e2cc7f8abe456
+_md5_=83b201024b7b7aa72d064dd601edfd23
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
index c18e34eeb25d..d600da7711dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ucspitcp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=b5429e6b11737be408f003b8e5f15b6a
+_md5_=d7abe097b970beda1545b9bc7c8b0bdc
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
index d7d570532274..d4c5b3705ffb 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for ulogd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=86435951d6de356fc8c148078c643397
+_md5_=a74a9431871e0c4c957d07a1d559eaff
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
index 1f6e6242f5b6..d721efd32077 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for uml
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=e68afe5f67f9cea3f6caabccc5e279a0
+_md5_=c860e77fb56f3f6e4e45f4d09739ede0
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
index 97b5ead94d5c..46986a5f8f6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for unconfined
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=cb5d22214c4f8636355a23721ee58efc
+_md5_=5168f876cc7683539da5b30df319da5f
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
index 74479c2e96e2..296448202870 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for uptime
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=5a5719f9da3329dfc7ed07a69c5aeefb
+_md5_=76ac9471f51b1e5bfb9ac365a0e7954d
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
index 099492e5396f..031e76a2b29a 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for usbmuxd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f50f813732d19c61ed741b6d51d413ae
+_md5_=44e24d91509fe5cbcbc5f3b60d51a99c
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
index f5a7b7805fb8..ea2cde9d039b 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for uucp
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=4f32b96dc6c1ec637116cf8ac3620f1c
+_md5_=52e26bdfa25dbc15371a72a4271e6ae6
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
index 829f157edcdd..cc0753ace647 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for uwimap
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c5454b1079e228ff2e77966e6031b9e7
+_md5_=dd283b2e1edb197ae0d4911eba52a1a8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
index 8f4937817986..cdf206dc5ad0 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for uWSGI
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=41b1b53b85a63f4105052fd904f637c1
+_md5_=dfd8201457ad155db072f126f06855b3
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
index b9dc21fbcc6e..d01ec24cac82 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for varnishd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=df2feeb7a589ebfd7bd3dc342e7cabc7
+_md5_=6942b872fa71b11a1b46d34edd05755e
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
index a3b5d1f036a9..897cd29f862e 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for vbetool
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=71c5e8ff8ef00b36e1a3e570b0f1c172
+_md5_=99d9a05f53ac31fb97a8c0eb8f6f9caf
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
index 0028e13d4a41..d58f3c3242d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for vdagent
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=55d91e4f6fa804c1f78587423ec0abec
+_md5_=6be8b32d523028bb6ce0dbc270643042
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
index f045445a52bd..842db7c5d93c 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for vde
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=33a03c1f61726cb71a9bef1d4f545e03
+_md5_=55ac30a112746b227f94b0fa15a88299
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
index bc6645542fab..b50c97c7485a 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for virt
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f4fe6d5b808273380f2add4451285516
+_md5_=56cda99d89a39f7ccb08a4b289b64cf3
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
index 324d24853df4..ab9e554090ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for vlock
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=c0cd7a2f766abd3d80aa40bf26d9a4e9
+_md5_=444da282aa5d82c72a75334699901d65
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
index 5c2165c88e81..40cd331f3da4 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for vmware
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=6dedd3a91c684f6bb384a36d1ddee1b9
+_md5_=a2b3d30a7e444eb3f94fb5cc1cdfb344
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
index f6d1c31ccf3a..9a39bd1bae7c 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for vnstatd
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=f409df2e6e8e381a05440284d8c10e27
+_md5_=1f305a9f9ac994b7526bc8a9eae4e8aa
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
index d963d7100e82..cbe54e2f62d7 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for vpn
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=87e0ec3348edfbe0ee34fde451ce10b4
+_md5_=7d2b6390f9bb228039285d3e5e0813f3
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
index e31df400ba14..c252f0f5f5ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for watchdog
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=a603040ac33fab21d616cd54b9cb5f2c
+_md5_=ee870576d768aca0fb863dbbb3271f52
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
index 44a8f61edb91..5f9d9d044956 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for webalizer
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=7e84f13c17e1437ea99d3a27377ba959
+_md5_=3d76d8d25c85836f14c4e25beedbf576
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
index 0f1f9f37ce4a..77eead0d6040 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for wine
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=982c6d17d75c4722f1e9b8315acda538
+_md5_=66421196612f3aeaba72e99bb43cfe34
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
index 139d11832d80..a9caf54c6671 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for wireshark
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9d31e166fa22fed6f42b2eb312d148ac
+_md5_=a49a6e9334fce266115bc6ec616bef9c
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
index 8ec3f263ffa9..37b88fb29860 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for wm
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=77d0f698e6dd07ec061173bbb0c0653a
+_md5_=0908f208225e61b51804fc247ab07e40
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
index 201936c020c8..51c9df108114 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for xen
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=28c21b340b519d6a4b38770921f90f2f
+_md5_=0e8556e2dbb84c967cddb9c37ef7c7a5
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
index 17a50b4a7189..4549f9c43c63 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for xfs
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=775b5b2e3e2b90db9c761c38f65112c7
+_md5_=90ff68ddecd5ddfd33152bfa00d22b41
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
index e0eac39e768a..9ab2c8e92fe1 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for xprint
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=9ae7758456d0295203cfd49734f9f2ce
+_md5_=2fb9a98c81bad957ceaa24a3056a003c
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
index 6a608db0e202..9e3886863fb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for xscreensaver
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=533b00471d37113b0e719e3ffc5d0a9d
+_md5_=2fe695b74866df5f2d489cf5cc11bfc1
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
index 140361c665de..6b059abf5a57 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for xserver
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=0e6acec4f1185012dc7324890d9a1efd
+_md5_=08ba563e225cc6ee06bb709f619eac1d
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
index c65c88c28e38..0aa66db9b789 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2019
 DESCRIPTION=SELinux policy for zabbix
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
 _eclasses_=selinux-policy-2	fc82a837585d258b211de18f9a74d72a
-_md5_=1d4f2dcb853efaa4761b82668e25fda0
+_md5_=0ffec6111f407a383744bb6bd0e43f6a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5db4b62050fa..b5ba74798e5a 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/apparmor-3.0.0 b/metadata/md5-cache/sys-apps/apparmor-3.0.0
new file mode 100644
index 000000000000..7414fee1259b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/apparmor-3.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=~sys-libs/libapparmor-3.0.0 dev-lang/perl sys-devel/bison sys-devel/gettext sys-devel/flex doc? ( dev-tex/latex2html )
+DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
+EAPI=7
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~sys-libs/libapparmor-3.0.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9dd82b8c6a2269254912692f255169be
diff --git a/metadata/md5-cache/sys-apps/apparmor-utils-3.0.0 b/metadata/md5-cache/sys-apps/apparmor-utils-3.0.0
new file mode 100644
index 000000000000..e4a2ba89d021
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/apparmor-utils-3.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl ~sys-libs/libapparmor-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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/gettext dev-lang/perl
+DESCRIPTION=Additional userspace utils to assist with AppArmor profile management
+EAPI=6
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl ~sys-libs/libapparmor-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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-libs/libapparmor-3.0.0[perl,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/apparmor-3.0.0 dev-perl/Locale-gettext dev-perl/RPC-XML dev-perl/TermReadKey virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-lang/perl:=
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=62c03c12caa364378d577f02885e99fa
diff --git a/metadata/md5-cache/sys-apps/cpuid-20201006 b/metadata/md5-cache/sys-apps/cpuid-20201006
new file mode 100644
index 000000000000..8479410c6530
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/cpuid-20201006
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/gzip
+DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
+EAPI=7
+HOMEPAGE=http://www.etallen.com/cpuid.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://www.etallen.com/cpuid/cpuid-20201006.src.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b23807e4159529327d6196b4ea6c098f
diff --git a/metadata/md5-cache/sys-apps/dtc-1.6.0 b/metadata/md5-cache/sys-apps/dtc-1.6.0
index a8ab907bb1e3..74eefffb5fe1 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.6.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Open Firmware device tree compiler
 EAPI=7
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 IUSE=static-libs yaml
-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-2
 RDEPEND=yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.6.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b23acac381521d989c6d3b87867bca8f
+_md5_=103b24db993b3e2df2d2d20439b80786
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.25.3 b/metadata/md5-cache/sys-apps/fakeroot-1.25.3
new file mode 100644
index 000000000000..b9eaf570b6d4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.25.3
@@ -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.3.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/grep-3.4 b/metadata/md5-cache/sys-apps/grep-3.4
index c377800cbb81..95d76912852b 100644
--- a/metadata/md5-cache/sys-apps/grep-3.4
+++ b/metadata/md5-cache/sys-apps/grep-3.4
@@ -5,10 +5,10 @@ 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
+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.4.tar.xz mirror://gentoo/grep-3.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=33b1ec6a97a4e3fb5f107d78563589cb
+_md5_=e91e61bbd05966a60933f99133eda441
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.2 b/metadata/md5-cache/sys-apps/i2c-tools-4.2
new file mode 100644
index 000000000000..fc8eab2b33bc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python? ( 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(-)] )
+DESCRIPTION=I2C tools for bus probing, chip dumping, EEPROM decoding, and more
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/software/utils/i2c-tools
+IUSE=perl python python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python? ( 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(-)] ) perl? ( dev-lang/perl )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.2.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_=e75f4f4071ed1e94f29cd62456a803f9
diff --git a/metadata/md5-cache/sys-apps/ipmicfg-1.31.1.200623 b/metadata/md5-cache/sys-apps/ipmicfg-1.31.1.200623
deleted file mode 100644
index d58f0c48ebdc..000000000000
--- a/metadata/md5-cache/sys-apps/ipmicfg-1.31.1.200623
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install nofetch
-DESCRIPTION=An in-band utility for configuring Supermicro IPMI devices
-EAPI=7
-HOMEPAGE=https://www.supermicro.com
-IUSE=uefi
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=supermicro
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.31.1_build.200623.zip
-_md5_=3e49de62a43e6d160550a7af7eacad15
diff --git a/metadata/md5-cache/sys-apps/ipmicfg-1.32.0.200820 b/metadata/md5-cache/sys-apps/ipmicfg-1.32.0.200820
new file mode 100644
index 000000000000..47291c71de03
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ipmicfg-1.32.0.200820
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=An in-band utility for configuring Supermicro IPMI devices
+EAPI=7
+HOMEPAGE=https://www.supermicro.com
+IUSE=uefi
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://www.supermicro.com/wftp/utility/{MY_PN}/IPMICFG_1.32.0_build.200820.zip
+_md5_=7a3375fd83f895c671ecbd6b1e27fa36
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.8 b/metadata/md5-cache/sys-apps/portage-3.0.8
index 0319cc8931bb..d603453e43ec 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.8
+++ b/metadata/md5-cache/sys-apps/portage-3.0.8
@@ -5,7 +5,7 @@ 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
+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
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.8.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.8.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
+_md5_=ffed20722952bcbfdd060c6fd5e828e5
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 060938f8ea46..63f57f3e7fed 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0-r4
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0-r4
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt?
 DESCRIPTION=A DirectFB getty replacement
 EAPI=6
 HOMEPAGE=http://qingy.sourceforge.net/
-IUSE=consolekit crypt emacs gpm opensslcrypt pam static X
+IUSE=crypt emacs gpm opensslcrypt pam static X
 KEYWORDS=amd64 ppc x86
 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 )
+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:= ) 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
+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
 _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
+_md5_=98ed94899b8c3c85d9dff74590e34089
diff --git a/metadata/md5-cache/sys-apps/s6-2.9.2.0 b/metadata/md5-cache/sys-apps/s6-2.9.2.0
new file mode 100644
index 000000000000..b8ddefeae58c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-2.9.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] ) >=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+DESCRIPTION=skarnet.org's small and secure supervision software suite
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6/
+IUSE=+execline static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] ) >=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/2.9
+SRC_URI=https://www.skarnet.org/software/s6/s6-2.9.2.0.tar.gz
+_md5_=462bf1dd65c95fdcc3e62aac2006d64f
diff --git a/metadata/md5-cache/sys-apps/s6-linux-init-1.0.4.2 b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.4.2
new file mode 100644
index 000000000000..af87589bd3a5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-lang/execline-2.6.1.0:=[static-libs?] >=dev-libs/skalibs-2.9.2.1:=[static-libs?] >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+DESCRIPTION=Generates an init binary for s6-based init systems
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-init/
+IUSE=static static-libs +sysv-utils
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.6.1.0:=[static-libs?] >=dev-libs/skalibs-2.9.2.1:=[static-libs?] >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/1.0
+SRC_URI=https://www.skarnet.org/software/s6-linux-init/s6-linux-init-1.0.4.2.tar.gz
+_md5_=93322716e1b398114faf25f958a9ff17
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.3 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.3
new file mode 100644
index 000000000000..4f32e445582e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( >=dev-libs/skalibs-2.9.3.0:= ) static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] )
+DESCRIPTION=Set of tiny linux utilities
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
+IUSE=static
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.9.3.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.5.1.3.tar.gz
+_md5_=08728ca8de2969d53a4abbad07fecabf
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.0 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.0
new file mode 100644
index 000000000000..f31f872b48a4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( >=dev-libs/skalibs-2.9.3.0:= ) static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] )
+DESCRIPTION=Set of tiny portable unix utilities
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
+IUSE=static
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.9.3.0:= )
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.2.3.0.tar.gz
+_md5_=04410bcd35e538448eeb2889f5f36591
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.2.0 b/metadata/md5-cache/sys-apps/s6-rc-0.5.2.0
new file mode 100644
index 000000000000..f134c14e4c75
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.5.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=>=dev-lang/execline-2.6.1.1:=[static-libs?] >=dev-libs/skalibs-2.9.3.0:=[static-libs?] >=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+DESCRIPTION=Service manager for the s6 supervision suite
+EAPI=7
+HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.6.1.1:=[static-libs?] >=dev-libs/skalibs-2.9.3.0:=[static-libs?] >=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+REQUIRED_USE=static? ( static-libs )
+SLOT=0/0.5
+SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.2.0.tar.gz
+_md5_=99d7de66f7c12200b298ce60eabffc6f
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.4.0.20191206 b/metadata/md5-cache/sys-apps/smc-sum-2.4.0.20191206
deleted file mode 100644
index 91ab477778ff..000000000000
--- a/metadata/md5-cache/sys-apps/smc-sum-2.4.0.20191206
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
-EAPI=7
-HOMEPAGE=https://www.supermicro.com
-IUSE=module
-KEYWORDS=-* ~amd64
-LICENSE=supermicro
-RDEPEND=module? ( sys-apps/smc-sum-driver )
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=sum_2.4.0_Linux_x86_64_20191206.tar.gz
-_md5_=15fb0a3263153ffadc6068f2925ac610
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.5.0.20200722 b/metadata/md5-cache/sys-apps/smc-sum-2.5.0.20200722
new file mode 100644
index 000000000000..5cc440d9eb93
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.5.0.20200722
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch
+DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
+EAPI=7
+HOMEPAGE=https://www.supermicro.com
+IUSE=module
+KEYWORDS=-* ~amd64
+LICENSE=supermicro
+RDEPEND=module? ( sys-apps/smc-sum-driver )
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=sum_2.5.0_Linux_x86_64_20200722.tar.gz
+_md5_=15fb0a3263153ffadc6068f2925ac610
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029 b/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029
deleted file mode 100644
index a28102dc05c8..000000000000
--- a/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI
-EAPI=6
-HOMEPAGE=https://www.supermicro.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=supermicro
-RDEPEND=net-misc/stunnel sys-libs/ncurses-compat:5 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux.tar.gz )
-_eclasses_=desktop	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	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a5e1fbd8d6c9c2f90f99ba3445f78ccf
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.23.0.191216 b/metadata/md5-cache/sys-apps/smcipmitool-2.23.0.191216
index d870db710a18..d53cb0219c77 100644
--- a/metadata/md5-cache/sys-apps/smcipmitool-2.23.0.191216
+++ b/metadata/md5-cache/sys-apps/smcipmitool-2.23.0.191216
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
+DEFINED_PHASES=compile install preinst prepare setup unpack
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI
 EAPI=7
@@ -7,8 +7,8 @@ IUSE=elibc_FreeBSD
 KEYWORDS=-* ~amd64
 LICENSE=supermicro
 RDEPEND=net-misc/stunnel sys-libs/ncurses-compat:5 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
+RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz
+SRC_URI=https://www.supermicro.com/wftp/utility/SMCIPMItool/Linux/SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=4c4ed342e8ba98cbcd3ed429e5f05aaa
+_md5_=c6a7e6e4052e31e0170b76d40358ff76
diff --git a/metadata/md5-cache/sys-apps/tas-1.6.0.200601 b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
index db654341c73a..6bb0aa864dda 100644
--- a/metadata/md5-cache/sys-apps/tas-1.6.0.200601
+++ b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
@@ -1,5 +1,5 @@
 BDEPEND=app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=install nofetch postinst setup unpack
+DEFINED_PHASES=install postinst setup unpack
 DESCRIPTION=Supermicro Thin-Agent Service for monitoring through the BMC/IPMI
 EAPI=7
 HOMEPAGE=https://www.supermicro.com
@@ -7,8 +7,8 @@ IUSE=kernel_linux
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=BSD supermicro
 RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/smartmontools sys-block/storcli sys-devel/bc sys-fs/lsscsi sys-fs/mdadm
-RESTRICT=bindist fetch mirror
+RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=TAS_1.6.0_build.200601.zip
+SRC_URI=https://www.supermicro.com/wftp/utility/TAS/TAS_1.6.0_build.200601.zip
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2ec4474bf8345d27685d9c81e543814
+_md5_=c7faaf4f0441cf9446aca98ee46f6a81
diff --git a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2 b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
index 31bc1dfc133f..40fb8886a17c 100644
--- a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
+++ b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.40:2
 DESCRIPTION=Filtering proxy for D-Bus connections
 EAPI=7
 HOMEPAGE=https://github.com/flatpak/xdg-dbus-proxy
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
-_md5_=1f116184c478103ff62d22a886949f19
+_md5_=88a8a46a48bfd577e9e7c9d8bacb1ead
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre
deleted file mode 100644
index 3074fac4396c..000000000000
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext 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
-DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
-DESCRIPTION=portal backend implementation that is using GTK+ and various pieces of GNOME
-EAPI=7
-HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk
-IUSE=wayland X
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
-SLOT=0
-SRC_URI=https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.7.1/xdg-desktop-portal-gtk-1.7.1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30cc7b1ee10b28500e5e2ccc270d455a
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
new file mode 100644
index 000000000000..3d567d4af396
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext 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
+DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
+DESCRIPTION=portal backend implementation that is using GTK+ and various pieces of GNOME
+EAPI=7
+HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk
+IUSE=wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
+SLOT=0
+SRC_URI=https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.8.0/xdg-desktop-portal-gtk-1.8.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ce85c0f01acec6a3c438332637b376f6
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index b2975e1bea5f..19c84d657b05 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/pambase-20200304 b/metadata/md5-cache/sys-auth/pambase-20200304
deleted file mode 100644
index 5a1a52c1b7b9..000000000000
--- a/metadata/md5-cache/sys-auth/pambase-20200304
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=app-arch/xz-utils app-portage/portage-utils
-DESCRIPTION=PAM base configuration files
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/pambase
-IUSE=caps +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd
-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/pam-1.1.3 cracklib? ( sys-libs/pam[cracklib(+)] ) elogind? ( sys-auth/elogind[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.1.3 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( sys-auth/pam_passwdqc ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( sys-apps/systemd[pam] )
-REQUIRED_USE=?? ( elogind systemd )
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20200304.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2655049fb578c918bce17d8eb7e46621
diff --git a/metadata/md5-cache/sys-auth/pambase-20200917 b/metadata/md5-cache/sys-auth/pambase-20200917
index 8bde5355dada..eb9b1d955b2f 100644
--- a/metadata/md5-cache/sys-auth/pambase-20200917
+++ b/metadata/md5-cache/sys-auth/pambase-20200917
@@ -4,7 +4,7 @@ DESCRIPTION=PAM base configuration files
 EAPI=7
 HOMEPAGE=https://github.com/gentoo/pambase
 IUSE=caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
-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=MIT
 RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) systemd? ( sys-apps/systemd[pam] )
 REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) )
@@ -12,4 +12,4 @@ RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20200917.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=61deee17a5b80602f527a1417bce7d22
+_md5_=79063b011fd59c1de591d3d2e41f1926
diff --git a/metadata/md5-cache/sys-auth/pambase-20201010 b/metadata/md5-cache/sys-auth/pambase-20201010
new file mode 100644
index 000000000000..d64146c9850b
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pambase-20201010
@@ -0,0 +1,15 @@
+BDEPEND=|| ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/jinja[python_targets_python3_7(-),python_single_target_python3_7(+)] ) )
+DEFINED_PHASES=configure install postinst setup test
+DESCRIPTION=PAM base configuration files
+EAPI=7
+HOMEPAGE=https://github.com/gentoo/pambase
+IUSE=caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) systemd? ( sys-apps/systemd[pam] )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) )
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20201010.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=79063b011fd59c1de591d3d2e41f1926
diff --git a/metadata/md5-cache/sys-auth/passwdqc-1.3.0 b/metadata/md5-cache/sys-auth/passwdqc-1.3.0
deleted file mode 100644
index fb88afe2529a..000000000000
--- a/metadata/md5-cache/sys-auth/passwdqc-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=pam? ( sys-libs/pam !<sys-auth/pam_passwdqc-1.3.0 )
-DESCRIPTION=Password strength checking library (and PAM module)
-EAPI=5
-HOMEPAGE=http://www.openwall.com/passwdqc/
-IUSE=pam utils
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Openwall BSD public-domain
-RDEPEND=pam? ( sys-libs/pam !<sys-auth/pam_passwdqc-1.3.0 )
-SLOT=0
-SRC_URI=http://www.openwall.com/passwdqc/passwdqc-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=168ee854d48d4c0f02a564b30b4f5ce6
diff --git a/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r1 b/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r1
index 1ac64f79a9a3..2511ae7023e4 100644
--- a/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r1
+++ b/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/pam
 DESCRIPTION=Password strength checking library (and PAM module)
 EAPI=7
 HOMEPAGE=http://www.openwall.com/passwdqc/
-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=Openwall BSD public-domain
 RDEPEND=sys-libs/pam
 SLOT=0
 SRC_URI=http://www.openwall.com/passwdqc/passwdqc-1.4.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=218bc0f1f3b51ce9f4d13d96f453a5bb
+_md5_=ae2d52ad168fbbade591f1e00e2a82d4
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 67260dcc1c09..e11e3b701320 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-1.16.3-r3 b/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
deleted file mode 100644
index 0c0281fd5712..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-libs/pam-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/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.5 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 )
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=7
-HOMEPAGE=https://pagure.io/SSSD/sssd
-IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test 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=amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-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/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.5 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-1.16.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f47924c7cb6b1fb7a68c931916c0ba5
diff --git a/metadata/md5-cache/sys-auth/sssd-2.1.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
deleted file mode 100644
index 3e0243d51c3d..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-libs/pam-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/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 )
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=7
-HOMEPAGE=https://pagure.io/SSSD/sssd
-IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-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/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d0bbd0fc4b769eaf6e9d920e58fa5f3
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
index 4b52e68c2454..c3c67d8a079a 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=System Security Services Daemon provides access to identity and auth
 EAPI=7
 HOMEPAGE=https://pagure.io/SSSD/sssd
 IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-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/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d0bbd0fc4b769eaf6e9d920e58fa5f3
+_md5_=0db89cc75264ac43e22d8f5547e1cb23
diff --git a/metadata/md5-cache/sys-auth/sssd-2.3.1-r1 b/metadata/md5-cache/sys-auth/sssd-2.3.1-r1
deleted file mode 100644
index 6f3949e67e38..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-2.3.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-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(-)?] net-fs/samba ) python? ( 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) >=sys-devel/autoconf-2.69-r5 doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( 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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-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(-)?] net-fs/samba ) python? ( 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= )
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=7
-HOMEPAGE=https://github.com/SSSD/sssd
-IUSE=acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind 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 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-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(-)?] net-fs/samba ) python? ( 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=pac? ( samba ) python? ( ^^ ( 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/SSSD/sssd/releases/download/sssd-2_3_1/sssd-2.3.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fb416f578ef92e72676bc4b9b172ac9
diff --git a/metadata/md5-cache/sys-auth/sssd-2.3.1-r2 b/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
new file mode 100644
index 000000000000..d4e615857888
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-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(-)?] net-fs/samba ) python? ( 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) >=sys-devel/autoconf-2.69-r5 doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( 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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-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(-)?] net-fs/samba ) python? ( 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= )
+DESCRIPTION=System Security Services Daemon provides access to identity and authentication
+EAPI=7
+HOMEPAGE=https://github.com/SSSD/sssd
+IUSE=acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind 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 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-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(-)?] net-fs/samba ) python? ( 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+REQUIRED_USE=pac? ( samba ) python? ( ^^ ( 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/SSSD/sssd/releases/download/sssd-2_3_1/sssd-2.3.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=96c4bdff936287d47f309a0671c58730
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 0f33e1e069a4..59cf8bca92b9 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/partitionmanager-4.1.0 b/metadata/md5-cache/sys-block/partitionmanager-4.1.0
index 8985d0064a4d..3118b27adbc9 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c26bff380356..a49994ad6155 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.16 b/metadata/md5-cache/sys-cluster/charliecloud-0.16
deleted file mode 100644
index 036967ebafd3..000000000000
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.16
+++ /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 postinst prepare setup
-DEPEND=ch-grow? ( python_single_target_python3_6? ( dev-python/lark-parser[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) ) doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) net-misc/rsync )
-DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
-EAPI=7
-HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=ch-grow doc examples +pv +squashfs squashfuse python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=Apache-2.0
-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] ) pv? ( sys-apps/pv ) squashfs? ( sys-fs/squashfs-tools ) squashfuse? ( sys-fs/squashfuse )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hpc/charliecloud/archive/v0.16.tar.gz -> charliecloud-0.16.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a3c4ff3ceddeafc75133a637926f0ef
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.19 b/metadata/md5-cache/sys-cluster/charliecloud-0.19
new file mode 100644
index 000000000000..21ef08873d4c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.19
@@ -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=configure postinst prepare setup
+DEPEND=ch-grow? ( python_single_target_python3_6? ( dev-python/lark-parser[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lark-parser[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) ) doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) net-misc/rsync )
+DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
+EAPI=7
+HOMEPAGE=https://hpc.github.io/charliecloud/
+IUSE=ch-grow doc examples +squashfs squashfuse python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=Apache-2.0
+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] ) squashfs? ( sys-fs/squashfs-tools ) squashfuse? ( sys-fs/squashfuse )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hpc/charliecloud/archive/v0.19.tar.gz -> charliecloud-0.19.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3f089e31f308e1f0186dfce82c17aa8
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index 98a8cc76ebc3..83a41522c054 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -1,15 +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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure postinst prepare setup unpack
-DEPEND=ch-grow? ( python_single_target_python3_6? ( dev-python/lark-parser[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) ) doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) net-misc/rsync )
+DEPEND=ch-grow? ( python_single_target_python3_6? ( dev-python/lark-parser[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lark-parser[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lark-parser[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) ) doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=7
 HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=ch-grow doc examples +pv +squashfs squashfuse python_single_target_python3_6 python_single_target_python3_7
+IUSE=ch-grow doc examples +squashfs squashfuse python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=Apache-2.0
 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] ) pv? ( sys-apps/pv ) squashfs? ( sys-fs/squashfs-tools ) squashfuse? ( sys-fs/squashfuse )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) squashfs? ( sys-fs/squashfs-tools ) squashfuse? ( sys-fs/squashfuse )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15596e332a3391d8867b43e276ebb2d3
+_md5_=a3f089e31f308e1f0186dfce82c17aa8
diff --git a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2 b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
index 5b530b68c1d3..3a585f87a468 100644
--- a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
+++ b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
@@ -1,15 +1,14 @@
 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(-)] )
+DEFINED_PHASES=configure install postinst
+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 )
 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
+IUSE=minimal pcre examples
 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 ) )
+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 ) !minimal? ( net-analyzer/rrdtool )
 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
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2d2cdf590dbf5a85626784f3e3fc3b67
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.8 b/metadata/md5-cache/sys-cluster/glusterfs-6.8
deleted file mode 100644
index 112e4153a34d..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.8
+++ /dev/null
@@ -1,16 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ipv6? ( libtirpc )
-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	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
deleted file mode 100644
index 6a61d8cc0078..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.9
+++ /dev/null
@@ -1,16 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml 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 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-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
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.9/glusterfs-6.9.tar.gz
-_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
deleted file mode 100644
index 4e7eece2c7e3..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.5
+++ /dev/null
@@ -1,16 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ipv6? ( libtirpc )
-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	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
deleted file mode 100644
index 60a1c1634e64..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.6
+++ /dev/null
@@ -1,16 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml 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 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-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
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.6/glusterfs-7.6.tar.gz
-_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 3a6868c49032..4c21acc7ad85 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.7
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.7
@@ -5,7 +5,7 @@ DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/
 IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml 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
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
 RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
 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 )
@@ -13,4 +13,4 @@ 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	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b926b610f7ddb03de4b7b36072eb7d0
+_md5_=58d4891925e1e00a9459b677d0afd463
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.8 b/metadata/md5-cache/sys-cluster/glusterfs-7.8
deleted file mode 100644
index c0039651069f..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.8
+++ /dev/null
@@ -1,16 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml 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 LGPL-3+ )
-RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
-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
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.8/glusterfs-7.8.tar.gz
-_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-7.8-r1 b/metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
new file mode 100644
index 000000000000..0d83039d0b7c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
@@ -0,0 +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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=7
+HOMEPAGE=https://www.gluster.org/
+IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml 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 LGPL-3+ )
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
+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
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.8/glusterfs-7.8.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f9d359028286429cf8e3a4bf96c6e42d
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
deleted file mode 100644
index 635233f7c527..000000000000
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) >=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=Heartbeat high availability cluster manager
-EAPI=6
-HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
-IUSE=doc snmp static-libs +python_single_target_python2_7
-KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2
-PDEPEND=sys-cluster/resource-agents
-RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) 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://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ff0ecb2eae6e2622f60cd6833782bbc6
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.6
deleted file mode 100644
index b4dd5f23efdb..000000000000
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) >=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=Heartbeat high availability cluster manager
-EAPI=6
-HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
-IUSE=doc snmp static-libs +python_single_target_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-PDEPEND=sys-cluster/resource-agents
-RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) 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://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1a141078713a9a753ccd881a49c4165c
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
deleted file mode 100644
index ff14e86f724e..000000000000
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) >=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=Heartbeat high availability cluster manager
-EAPI=6
-HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
-IUSE=doc snmp static-libs +python_single_target_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-PDEPEND=sys-cluster/resource-agents
-RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) 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://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.6.tar.bz2 -> heartbeat-3.0.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=48b569afa350d3d5fa145ce125eeaa9c
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.2
index 76d94dceda79..a0bac20d726d 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 DESCRIPTION=Kubernetes API server
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d324e9ae050138aa318e91a8ad00ede
+_md5_=e16a9a5ddf1116c30f809d05134d7148
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.2
index eb4b91ae964c..b4d861e1df38 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 DESCRIPTION=Kubernetes Controller Manager
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=eedfc79b55b9181c4dabef09a7802d75
+_md5_=e139ccc1e65e258bd411b84b4f9dc75f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.2
index a99987a2a417..04ecd3982c49 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Kubernetes Proxy service
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=9894d78ef7ea9e62097cf21d60a0c1a7
+_md5_=0fe281a765d94ad243504314573ecafe
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.2
index dde18d63cd79..2cacc6296c55 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 DESCRIPTION=Kubernetes Scheduler
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=864e9e607605bfe168fe8d8747788364
+_md5_=7a24b85a26f70a47d21e46c2836b12c7
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.2 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.2
index a723d1939827..3ab751ba53cf 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b167e646890564c2a0cd1359805cf982
+_md5_=afb44926372eb98e7d0694239613278d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.2 b/metadata/md5-cache/sys-cluster/kubectl-1.19.2
index 4b4d6334f291..8a21d8d10265 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=!sys-cluster/kubernetes
 DESCRIPTION=CLI to run commands against Kubernetes clusters
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66becb69ad5befd5ed7763e8ddbb4ba0
+_md5_=1d975c88b26246d225ac030a58cb6c2d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.2 b/metadata/md5-cache/sys-cluster/kubelet-1.19.2
index f8d3c40d8de9..d5a03a752d03 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.19.2
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Kubernetes Node Agent
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.2.tar.gz -> kubernetes-1.19.2.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d6361f33bd2964e3c94c247dafbff5a
+_md5_=155188854e512cd660297f5916e7ee83
diff --git a/metadata/md5-cache/sys-cluster/nomad-0.12.5 b/metadata/md5-cache/sys-cluster/nomad-0.12.5
new file mode 100644
index 000000000000..4e7f17f89e75
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nomad-0.12.5
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A simple and flexible workload orchestrator
+EAPI=7
+HOMEPAGE=https://nomadproject.io
+IUSE=nvidia
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/nomad/archive/v0.12.5.tar.gz -> nomad-0.12.5.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7bb6f037fe7fab04b3720dcd0ee861a4
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
index 8072073d19db..384390f20ab0 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) 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 ) >=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=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/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) >=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=Pacemaker CRM
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl heartbeat smtp snmp static-libs +python_single_target_python2_7
+IUSE=acl smtp snmp static-libs +python_single_target_python2_7
 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 )
+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/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents 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_=fcc6c52f1dfa576d3164c7f317731352
+_md5_=bf3384d834386760ddd4f353845986b2
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19
index 920d1ed5f55b..f3d0f4ec803c 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) 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 ) >=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=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/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) >=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=Pacemaker CRM
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl heartbeat smtp snmp static-libs +python_single_target_python2_7
+IUSE=acl smtp snmp static-libs +python_single_target_python2_7
 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 )
+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/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents 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.19.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_=346bf8a72058000f51984995663124d0
+_md5_=d81831e92d50caacfac89e0b6a6298b5
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
index 47d07245b7ef..46e28353ee3f 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
@@ -1,15 +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 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] ) 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 )
+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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 DESCRIPTION=Pacemaker CRM
 EAPI=7
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl heartbeat smtp snmp python_single_target_python3_6 python_single_target_python3_7
+IUSE=acl smtp snmp python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~hppa ~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] ) 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 )
+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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/corosync >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.19.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0fc5789793f805b837bb35c528bc400e
+_md5_=1298fba63a53c8fb79e12e5b7a15bec8
diff --git a/metadata/md5-cache/sys-cluster/swift-2.25.1 b/metadata/md5-cache/sys-cluster/swift-2.25.1
new file mode 100644
index 000000000000..eb3e7542b98a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/swift-2.25.1
@@ -0,0 +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(-)]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
+EAPI=7
+HOMEPAGE=https://launchpad.net/swift
+IUSE=account container doc +memcached +object proxy python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyxattr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift 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=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/swift/swift-2.25.1.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_=333263978c7ff73e2850297ebc3556a6
diff --git a/metadata/md5-cache/sys-cluster/swift-2.26.0 b/metadata/md5-cache/sys-cluster/swift-2.26.0
index d83dfeb9b036..b5ecf00e6cbb 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.26.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.26.0
@@ -1,15 +1,15 @@
 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 postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
 IUSE=account container doc +memcached +object proxy python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyxattr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift 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-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyxattr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift 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=|| ( proxy account container object ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.26.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_=0e10985c3de87cd8712fb52a012a82f6
+_md5_=5aefc18ccfd9c1dbbb99811925f781a0
diff --git a/metadata/md5-cache/sys-cluster/swift-2020.2.9999 b/metadata/md5-cache/sys-cluster/swift-2020.2.9999
index 797bd131f94f..8d22562edd79 100644
--- a/metadata/md5-cache/sys-cluster/swift-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2020.2.9999
@@ -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(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-IUSE=account container doc +memcached +object proxy python_targets_python3_6 python_targets_python3_7 kernel_linux
+IUSE=account container doc +memcached +object proxy python_targets_python3_7 python_targets_python3_8 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyxattr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift 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=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyxattr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift 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=|| ( proxy account container object ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b333c42da2aa1ef5616fd5c75e17738b
+_md5_=5aefc18ccfd9c1dbbb99811925f781a0
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 8464f7eea6e0..b14784bdb1b3 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1 b/metadata/md5-cache/sys-devel/clang-10.0.1
index 4da1e7dcb617..73fe051a05b1 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1
@@ -5,7 +5,7 @@ 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_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_AVR 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
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.1 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.1* ) default-libcxx? ( >=sys-libs/libcxx-10.0.1 ) default-lld? ( sys-devel/lld )
 RDEPEND=~sys-devel/llvm-10.0.1:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,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
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.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_=261daec11c3b8e246ff75cc022f5e07e
+_md5_=c047ef2668a7358c0de326caefa5510e
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.1 b/metadata/md5-cache/sys-devel/clang-common-10.0.1
index 8ef2f04813a4..3dde6e5b14dd 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 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-10.0.1.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8515d5f2542cbeb08a1f0048613e54fc
+_md5_=886b10c625deca52b7b2a114a9484c5f
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-10.0.1 b/metadata/md5-cache/sys-devel/clang-runtime-10.0.1
index afd4f26dfbd7..de93865b9ea4 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-10.0.1
@@ -3,10 +3,10 @@ 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
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-10.0.1:10.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-10.0.1:10.0.1 ) ) libcxx? ( >=sys-libs/libcxx-10.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(-)?] ) openmp? ( >=sys-libs/libomp-10.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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=10.0.1
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a87662c0891740b8d5dd1292afc30cf
+_md5_=076033ecd81d1cd3c0592b82c367bdfd
diff --git a/metadata/md5-cache/sys-devel/gcc-10.2.0-r1 b/metadata/md5-cache/sys-devel/gcc-10.2.0-r1
deleted file mode 100644
index d0a8a314e494..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils >=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=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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz mirror://gentoo/gcc-10.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-2.tar.bz2
-_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_=9d104ed5b6f25c32699e20cf2c3084ef
diff --git a/metadata/md5-cache/sys-devel/gcc-5.5.0 b/metadata/md5-cache/sys-devel/gcc-5.5.0
deleted file mode 100644
index 6878c89d6ac3..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-5.5.0
+++ /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 +sanitize cilk ada +vtv jit mpx
-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=5.5.0
-SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-4.tar.bz2 mirror://gentoo/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-piepatches-v1.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_=1f3950005aa3c7fc734864e4406b9d7f
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.3.2 b/metadata/md5-cache/sys-devel/gcc-config-2.3.2
index 73413ac98e10..d5a23d3b694f 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-2.3.2
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.3.2
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to manage compilers
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
 IUSE=+native-symlinks
-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-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.3.2.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5aa90735b2af7ea537d6c4f7f67e77c2
+_md5_=7d6b4e8afc65ecb602b34d0e76388d12
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.1.0 b/metadata/md5-cache/sys-devel/kgcc64-10.1.0
deleted file mode 100644
index 446a30e65baf..000000000000
--- a/metadata/md5-cache/sys-devel/kgcc64-10.1.0
+++ /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=hppa? ( sys-devel/binutils-hppa64 ) 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=
-DESCRIPTION=64bit kernel compiler
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls
-KEYWORDS=~hppa ~mips
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=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=10
-SRC_URI=mirror://gnu/gcc/gcc-10.1.0/gcc-10.1.0.tar.xz mirror://gentoo/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.1.0-patches-1.tar.bz2
-_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_=0cc8b9a248abab45e1494c70e38eb216
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
deleted file mode 100644
index a24dec37888a..000000000000
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 hppa? ( sys-devel/binutils-hppa64 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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= >=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 )
-DESCRIPTION=64bit kernel compiler
-EAPI=5
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls
-KEYWORDS=hppa ~mips
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 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 ) strip
-SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	95b9d37e17621738d2113a52fb4f59dd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de5432adb7e30c5159284286100ba9a8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
deleted file mode 100644
index 5f7976a07aa9..000000000000
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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= >=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 )
-DESCRIPTION=64bit kernel compiler
-EAPI=5
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls
-KEYWORDS=~hppa ~mips
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=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 ) strip
-SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	95b9d37e17621738d2113a52fb4f59dd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d5317e701e42d695083da9ef8d95e6b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
deleted file mode 100644
index f5d381f07d84..000000000000
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 hppa? ( sys-devel/binutils-hppa64 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 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= >=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 )
-DESCRIPTION=64bit kernel compiler
-EAPI=5
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls
-KEYWORDS=hppa ~mips
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 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 ) strip
-SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	95b9d37e17621738d2113a52fb4f59dd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de5432adb7e30c5159284286100ba9a8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.5.0 b/metadata/md5-cache/sys-devel/kgcc64-5.5.0
deleted file mode 100644
index d62a31db79c1..000000000000
--- a/metadata/md5-cache/sys-devel/kgcc64-5.5.0
+++ /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=hppa? ( sys-devel/binutils-hppa64 ) 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=
-DESCRIPTION=64bit kernel compiler
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls
-KEYWORDS=~hppa ~mips
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=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=5.5.0
-SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-3.tar.bz2
-_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_=c32d4de64cb867348e370a203673d56f
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1 b/metadata/md5-cache/sys-devel/lld-10.0.1
index 1435362dacf0..4fcaf931db0c 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 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	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_=63173dd99308bd3510349a463224de74
+_md5_=091642fbd2a99a54a920beadb672f78d
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1 b/metadata/md5-cache/sys-devel/llvm-10.0.1
index ae42f49d5277..0c6c73679651 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1
@@ -5,7 +5,7 @@ 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_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_AVR 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 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-10 )
 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
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.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_=c87130271242c0f77e5d28fa0a7a05a0
+_md5_=933ac8a03109ea6c3ec885d073bf471e
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.1 b/metadata/md5-cache/sys-devel/llvm-common-10.0.1
index d444b10ef584..ded76f627eb5 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 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-10.0.1.tar.gz
 _eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=a923796e60881c6e4879cf177af228ef
+_md5_=50c1f0e11c65867fa9ccc23de12003ff
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.47.0 b/metadata/md5-cache/sys-devel/rust-std-1.47.0
new file mode 100644
index 000000000000..06e60a79980f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/rust-std-1.47.0
@@ -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-lang/rust-1.47.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.47
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.47.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_=fee969b9bbb845be2b0b7c85a2789bc9
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 8bb3c2ab9263..f004a943c35d 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
index 16e5c5a8b599..4fbd409e67b3 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
@@ -4,10 +4,10 @@ DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
 IUSE=+binary
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202008.tar.gz -> edk2-ovmf-202008.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-bin.tar.xz ) https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-qemu-firmware.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5feb8ad42c47a16998e65b966b62d13
+_md5_=86f3fe7f80981332c02fbde18ecd7c5b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 9d0a099db14f..613cdde23be9 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/bashmount-4.3.2 b/metadata/md5-cache/sys-fs/bashmount-4.3.2
new file mode 100644
index 000000000000..749a015a8d47
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bashmount-4.3.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-shells/bash:* sys-apps/dbus sys-apps/util-linux sys-fs/udisks:2 virtual/eject
+DESCRIPTION=Bash script that uses udisks to mount removable devices without GUI
+EAPI=7
+HOMEPAGE=https://github.com/jamielinux/bashmount
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-shells/bash:* sys-apps/dbus sys-apps/util-linux sys-fs/udisks:2 virtual/eject
+SLOT=0
+SRC_URI=https://github.com/jamielinux/bashmount/archive/4.3.2.tar.gz -> bashmount-4.3.2.tar.gz
+_md5_=cffcb93550c9e565fc2538ccc3248a9e
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4
new file mode 100644
index 000000000000..ccfa80b9eb93
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
+EAPI=7
+HOMEPAGE=http://opendarwin.org
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=APSL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=016d0de1e06b31423dd58f5597e435b1
diff --git a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2 b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
deleted file mode 100644
index 1b4ef965841c..000000000000
--- a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-lang/perl:= ) parport? ( sys-kernel/linux-headers ) 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(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) >=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=Access 1-Wire devices like a filesystem
-EAPI=6
-HOMEPAGE=https://owfs.org/ https://sourceforge.net/projects/owfs/
-IUSE=debug ftdi ftpd fuse httpd parport perl python tcl usb zeroconf python_targets_python2_7 kernel_linux
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-lang/perl:= ) parport? ( sys-kernel/linux-headers ) 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(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0/3.2_p2
-SRC_URI=mirror://sourceforge/owfs/owfs-3.2p2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=803eaa94637e9883c16c2edcac23fb00
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0 b/metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
index 7272547b3303..1b6345523392 100644
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
+++ b/metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libmtp sys-fs/fuse:0
 DESCRIPTION=Simple MTP fuse filesystem driver
 EAPI=7
 HOMEPAGE=https://github.com/phatina/simple-mtpfs
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmtp sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/phatina/simple-mtpfs/archive/v0.4.0.tar.gz -> simple-mtpfs-0.4.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df28ad90881f22d100c2c3bfe13626f4
+_md5_=39e3532365488cef8405e5de26c08271
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index ef82cfeea89c..509b1a14512e 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.70 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.70
new file mode 100644
index 000000000000..5f2c714357d0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.70
@@ -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.70 !sys-kernel/vanilla-kernel-bin:5.4.70 || ( 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.70
+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-71.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-71.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.8.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.14
new file mode 100644
index 000000000000..3a00f8b657ce
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.14
@@ -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.14 !sys-kernel/vanilla-kernel-bin:5.8.14 || ( 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.14
+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-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-17.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.70 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.70
new file mode 100644
index 000000000000..6fd2203e2022
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.70
@@ -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.70 !sys-kernel/vanilla-kernel:5.4.70 !sys-kernel/vanilla-kernel-bin:5.4.70 || ( 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.70
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70-1.xpak -> gentoo-kernel-5.4.70-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70-1.xpak -> gentoo-kernel-5.4.70-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.70-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.70-r1
new file mode 100644
index 000000000000..1723b3532954
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.70-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.70 !sys-kernel/vanilla-kernel:5.4.70 !sys-kernel/vanilla-kernel-bin:5.4.70 || ( 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.70
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70-1.xpak -> gentoo-kernel-5.4.70-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70-1.xpak -> gentoo-kernel-5.4.70-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70-1.xpak -> gentoo-kernel-5.4.70-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.8.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.14
new file mode 100644
index 000000000000..0c5fc85cf8c7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.14
@@ -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.14 !sys-kernel/vanilla-kernel:5.8.14 !sys-kernel/vanilla-kernel-bin:5.8.14 || ( 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.14
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14-1.xpak -> gentoo-kernel-5.8.14-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14-1.xpak -> gentoo-kernel-5.8.14-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.14-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.14-r1
new file mode 100644
index 000000000000..a077d0cac801
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.14-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.14 !sys-kernel/vanilla-kernel:5.8.14 !sys-kernel/vanilla-kernel-bin:5.8.14 || ( 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.14
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14-1.xpak -> gentoo-kernel-5.8.14-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14-1.xpak -> gentoo-kernel-5.8.14-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14-1.xpak -> gentoo-kernel-5.8.14-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/pf-sources-5.8_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p7
new file mode 100644
index 000000000000..ed28e1312909
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p7
@@ -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_p7
+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-pf7.diff -> pf-sources-5.8_p7.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.70 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.70
new file mode 100644
index 000000000000..386699f8aec8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.70
@@ -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.70 || ( 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.70
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.70.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.8.14 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.14
new file mode 100644
index 000000000000..2121411f7e3f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.14
@@ -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.14 || ( 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.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.14.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-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 210e4834312f..dc336ad82aac 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
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 7258b6b0ade5..77098d3b90f2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
@@ -5,10 +5,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 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	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_=7457a4c2489b40d53c831d5acdc1bf6f
+_md5_=88ae3e1e1705e138cdb22c65ce5643ec
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 b0b5136b4b47..ba7f7db10e51 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
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 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	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_=3fe9a8f9375574da26d91f24fccaa656
+_md5_=65664816e53ea8a741ffb6eb24d6e062
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r2 b/metadata/md5-cache/sys-libs/glibc-2.32-r2
index 6291c321ffe0..80b313ca3fd0 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r2
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.9 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
+BDEPEND=|| ( dev-lang/python:3.9 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 ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=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
+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 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) 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/
@@ -8,9 +8,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
 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 )
+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 app-arch/gzip sys-apps/grep virtual/awk 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_=86448e6f53897c0ef30770652597c3b0
+_md5_=eaf2a496eff0d0777db0303fff4318f3
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 6f8bcbea557f..ac179d923cc7 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.9 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.27 >=sys-devel/gcc-6 virtual/pkgconfig >=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 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 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
+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 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) 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/
@@ -8,9 +8,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 PROPERTIES=live
-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 )
+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 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=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	git-r3	3e7ec3d6619213460c85e2aa48398441	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_=3be559afdb14de913bbc125f2e2728cb
+_md5_=a16e963bcdc0c0f063c9ab6927532d67
diff --git a/metadata/md5-cache/sys-libs/kpmcore-4.1.0 b/metadata/md5-cache/sys-libs/kpmcore-4.1.0
index c2b545e0deaa..824cf6debe42 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-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	16ab706e1b049cfaa65425a0c0e28cac	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/libapparmor-3.0.0 b/metadata/md5-cache/sys-libs/libapparmor-3.0.0
new file mode 100644
index 000000000000..8eef0b266ccb
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.0
@@ -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=perl? ( dev-lang/perl:= ) 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(-)] ) sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig )
+DESCRIPTION=Library to support AppArmor userspace utilities
+EAPI=7
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=doc +perl +python static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=perl? ( dev-lang/perl:= ) 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3401c3a3b1f1feb5d03e9e4e48d80da8
diff --git a/metadata/md5-cache/sys-libs/libcap-2.44 b/metadata/md5-cache/sys-libs/libcap-2.44
new file mode 100644
index 000000000000..a06e583f79a6
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-2.44
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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(-)?] 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(-)?] ) sys-kernel/linux-headers
+DESCRIPTION=POSIX 1003.1e capabilities
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/fullycapable/
+IUSE=pam 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 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 BSD )
+PDEPEND=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(-)?] )
+RDEPEND=>=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(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.44.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a714c5a43cc90a03bc967509925980b7
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1 b/metadata/md5-cache/sys-libs/libomp-10.0.1
index 4c8ecfe7ca5f..72bd34a621d6 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1
@@ -5,7 +5,7 @@ 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
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 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 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.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_=d617156f055f4f79db36ec8b64b56d8a
+_md5_=9f7bad2fd87fb357bc72560d5dbaf731
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1 b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
deleted file mode 100644
index 8e394b8859f2..000000000000
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
+++ /dev/null
@@ -1,16 +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 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] ) 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 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] ) 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_=e973847df581484559d8c0864cf1dca1
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.28 b/metadata/md5-cache/sys-libs/openipmi-2.0.28
deleted file mode 100644
index 0057aebcd8e1..000000000000
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.28
+++ /dev/null
@@ -1,16 +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 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] ) 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 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] ) 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_=5a74f40626b55ad16a538e7421dd24e0
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.29 b/metadata/md5-cache/sys-libs/openipmi-2.0.29
index 408d60501ccb..1af075c819c8 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.29
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.29
@@ -5,7 +5,7 @@ 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 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86
+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] ) 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 ) )
@@ -13,4 +13,4 @@ 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_=9719dfebca035e0b693f3f6333ad101b
+_md5_=c1983a21a95cbd6bbcecc6c01cf22390
diff --git a/metadata/md5-cache/sys-libs/pam-1.3.1_p20200128-r1 b/metadata/md5-cache/sys-libs/pam-1.3.1_p20200128-r1
deleted file mode 100644
index 4c2c748027b7..000000000000
--- a/metadata/md5-cache/sys-libs/pam-1.3.1_p20200128-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.4 app-text/docbook-xml-dtd:4.5 dev-libs/libxslt sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc >=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=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:=[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-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(-)?] audit? ( >=sys-process/audit-2.2.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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-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(-)?] )
-DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
-EAPI=7
-HOMEPAGE=https://github.com/linux-pam/linux-pam
-IUSE=audit berkdb +cracklib debug nis +pie selinux static-libs +filecaps 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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( BSD GPL-2 )
-PDEPEND=sys-auth/pambase
-RDEPEND=virtual/libcrypt:=[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-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(-)?] audit? ( >=sys-process/audit-2.2.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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-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(-)?] ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/linux-pam/linux-pam/archive/4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz#/pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=bb7eba9d594f1818945ed0495b6681aa
diff --git a/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829 b/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
index 6ff1d7294547..526c06f901be 100644
--- a/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
+++ b/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
@@ -5,11 +5,11 @@ DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
 EAPI=7
 HOMEPAGE=https://github.com/linux-pam/linux-pam
 IUSE=audit berkdb debug nis +pie selinux +filecaps split-usr 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=|| ( BSD GPL-2 )
 PDEPEND=>=sys-auth/pambase-20200616
 RDEPEND=virtual/libcrypt:=[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-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(-)?] audit? ( >=sys-process/audit-2.2.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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) nis? ( 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(-)?] >=net-libs/libtirpc-0.2.4-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(-)?] ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/linux-pam/linux-pam/archive/e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz#/pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz https://dev.gentoo.org/~zlogene/distfiles/sys-libs/pam/pam-1.4.0_p20200809-doc.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=8d8be9ee97e48e52c70dfce53d760873
+_md5_=887a338a2bb95bc69dcdc7230dda032d
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index b2eb74ec41de..cef7a5d41f24 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32-r2 b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
index 846e96b250c1..36cfba1bccdc 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.32-r2
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon for Advanced Configuration and Power Interface
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpid2
 IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~arm arm64 ~ia64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.32-r2_extras.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b28f950003f4c0e135d7320688834901
+_md5_=de2c1e2dabed6f468cd3b27acee94242
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index ed3ca1bc3842..c3d0309d23c5 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/parallel-20200822 b/metadata/md5-cache/sys-process/parallel-20200822
index d004746492f5..4acacc2ac8b4 100644
--- a/metadata/md5-cache/sys-process/parallel-20200822
+++ b/metadata/md5-cache/sys-process/parallel-20200822
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git
-KEYWORDS=~amd64 arm arm64 x86 ~amd64-linux ~x86-linux
+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-20200822.tar.bz2
-_md5_=6e4c36f455958eede2bd79a458f8c6e5
+_md5_=b30edfd6fc01489d8435fc2b3380c83a
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 6d358e64774e..f9f6414e60fe 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/virtual/awk-1
index 57953f6d678b..483831bfdadc 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/virtual/awk-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
 EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox ) !<sys-apps/gawk-4.0.1-r1
 SLOT=0
-_md5_=f2bd2d3c2cb454925905b773015969f3
+_md5_=ca7f3f5b398f6626c2e52684d7d0dc7e
diff --git a/metadata/md5-cache/virtual/jack-1 b/metadata/md5-cache/virtual/jack-1
index f098ba2e7952..369ab5b9e959 100644
--- a/metadata/md5-cache/virtual/jack-1
+++ b/metadata/md5-cache/virtual/jack-1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for JACK Audio Connection Kit
 EAPI=7
 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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 RDEPEND=|| ( media-sound/jack2[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/jack-audio-connection-kit[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_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f3cb24858148b8638768d1f86b9473a4
+_md5_=8ad98afa8f6f8760b6e3c1ea4b0f8dd3
diff --git a/metadata/md5-cache/virtual/rust-1.46.0 b/metadata/md5-cache/virtual/rust-1.46.0
index cbd33aafe269..94f3de841220 100644
--- a/metadata/md5-cache/virtual/rust-1.46.0
+++ b/metadata/md5-cache/virtual/rust-1.46.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Rust language compiler
 EAPI=7
 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 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 RDEPEND=|| ( ~dev-lang/rust-1.46.0[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/rust-bin-1.46.0[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_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a8007d000dd5ccb6c74f575f5f6a96d0
+_md5_=eaa80a0f5e01903009aa36e7cfa6b7cd
diff --git a/metadata/md5-cache/virtual/rust-1.47.0 b/metadata/md5-cache/virtual/rust-1.47.0
new file mode 100644
index 000000000000..aaf4c171afc2
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.47.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+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 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~dev-lang/rust-1.47.0[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/rust-bin-1.47.0[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_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=92d3e1f018aab4e151f4ca1b3c45ebdc
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index b6222690bf98..7f0e5eabc3dd 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0 b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
index 8bb52ee9edc6..093216d96100 100644
--- a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
+++ b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=OWASP ModSecurity Core Rule Set
 EAPI=7
 HOMEPAGE=https://coreruleset.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=www-apache/mod_security-2.9.1
 SLOT=0
 SRC_URI=https://github.com/coreruleset/coreruleset/archive/v3.3.0.tar.gz -> modsecurity-crs-3.3.0.tar.gz
-_md5_=964c7fadd40bf1398a8a35b3743917c0
+_md5_=b185d62059140b2e933e6d7f371bcb9b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index b426bb35318d..63795d5625af 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/hugo-0.69.0 b/metadata/md5-cache/www-apps/hugo-0.69.0
deleted file mode 100644
index 0a6023d27bae..000000000000
--- a/metadata/md5-cache/www-apps/hugo-0.69.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=The world's fastest framework for building websites
-EAPI=7
-HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
-IUSE=+bash-completion doc +sass
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Unlicense BSD BSD-2 MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/gohugoio/hugo/archive/v0.69.0.tar.gz -> hugo-0.69.0.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.37.4.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.4.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.4.12.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.11.0.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.11.0.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.0.0-20190131005048-21591786a5e0.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.0.0-20190131005048-21591786a5e0.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/@v/v1.1.3.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/@v/v1.1.4.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v21.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv21.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v27.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv27.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.4.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.0.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.1.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.1.2+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.2+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 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/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20190418212003-6ac0b49e7197.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20190418212003-6ac0b49e7197.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.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.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/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.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/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.18.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.18.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.16.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.16.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.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/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/golibsass/@v/v0.5.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v0.5.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.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/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.zip -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.zip mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.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/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip 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.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 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/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.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.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/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 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/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.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-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 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/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.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.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.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/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 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-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/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 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/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 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.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.2-0.20191028172631-481baca67f93.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.2-0.20191028172631-481baca67f93.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 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/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+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/google/wire/@v/v0.2.2.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/google/wire/@v/v0.2.2.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.zip 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/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 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/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.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.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.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.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 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.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 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.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 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/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/jdkato/prose/@v/v1.1.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.1.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.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/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/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.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/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.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/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/kyokomi/emoji/@v/v2.2.1+incompatible.zip -> github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/kyokomi/emoji/@v/v2.2.1+incompatible.mod -> github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip 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/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/markbates/inflect/@v/v0.0.0-20171215194931-a12c3aec81a6.zip -> github.com%2Fmarkbates%2Finflect%2F@v%2Fv0.0.0-20171215194931-a12c3aec81a6.zip mirror://goproxy//github.com/markbates/inflect/@v/v0.0.0-20171215194931-a12c3aec81a6.mod -> github.com%2Fmarkbates%2Finflect%2F@v%2Fv0.0.0-20171215194931-a12c3aec81a6.mod mirror://goproxy//github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.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.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.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/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 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/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%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/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.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/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/nicksnyder/go-i18n/@v/v1.10.0.zip -> github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/nicksnyder/go-i18n/@v/v1.10.0.mod -> github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.0.0.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.0.0.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.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/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.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.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip 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/pelletier/go-toml/@v/v1.6.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.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/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.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-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.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-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.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.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.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-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.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/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.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/rogpeppe/go-internal/@v/v1.5.1.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.1.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 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/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/sanity-io/litter/@v/v1.2.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.2.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%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/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.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.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip 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.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 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.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 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/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 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/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip 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/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 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.6.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 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/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.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/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 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/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.6.1.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.1.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.6.1.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.1.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.3.14.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.3.14.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.3.14.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.3.14.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.4.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.4.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/tidwall/pretty/@v/v0.0.0-20190325153808-1166b9ac2b65.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv0.0.0-20190325153808-1166b9ac2b65.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/uber-go/atomic/@v/v1.3.2.mod -> github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/uber/jaeger-client-go/@v/v2.15.0+incompatible.mod -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.15.0+incompatible.mod mirror://goproxy//github.com/uber/jaeger-lib/@v/v1.5.0.mod -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv1.5.0.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/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.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//github.com/yuin/goldmark/@v/v1.1.22.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200218065240-d1af22c1126f.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200218065240-d1af22c1126f.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200218065240-d1af22c1126f.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200218065240-d1af22c1126f.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.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.1.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.zip -> go.opencensus.io%2F@v%2Fv0.21.0.zip mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip 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//gocloud.dev/@v/v0.15.0.zip -> gocloud.dev%2F@v%2Fv0.15.0.zip mirror://goproxy//gocloud.dev/@v/v0.15.0.mod -> gocloud.dev%2F@v%2Fv0.15.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-20181001203147-e3636079e1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181001203147-e3636079e1a4.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-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-20190422183909-d864b10871cd.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422183909-d864b10871cd.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/image/@v/v0.0.0-20191214001246-9130b4cfad52.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20191214001246-9130b4cfad52.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20191214001246-9130b4cfad52.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20191214001246-9130b4cfad52.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-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip 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-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.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-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.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-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190322120337-addf6b3196f6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190322120337-addf6b3196f6.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-20190420063019-afa5a82059c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190420063019-afa5a82059c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190424112056-4829fb13d2c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190424112056-4829fb13d2c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.zip 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-20191209160850-c0dbc17a3553.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.zip 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-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190523182746-aaccbc9213b0.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190523182746-aaccbc9213b0.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190523182746-aaccbc9213b0.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190523182746-aaccbc9213b0.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.zip 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-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 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-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-20181031143558-9b800f95dbbc.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181031143558-9b800f95dbbc.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181031143558-9b800f95dbbc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181031143558-9b800f95dbbc.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-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.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-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-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-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200107144601-ef85f5a75ddf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107144601-ef85f5a75ddf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200107144601-ef85f5a75ddf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107144601-ef85f5a75ddf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 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.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip 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.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.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.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 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/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-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.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-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/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.zip mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 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.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.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.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.zip 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-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.zip 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.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.zip 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-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.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/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/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.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/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.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.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 mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 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.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.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//pack.ag/amqp/@v/v0.8.0.mod -> pack.ag%2Famqp%2F@v%2Fv0.8.0.mod mirror://goproxy//pack.ag/amqp/@v/v0.11.0.mod -> pack.ag%2Famqp%2F@v%2Fv0.11.0.mod
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25a31ef62984c60a4ec86b686f0e38f2
diff --git a/metadata/md5-cache/www-apps/hugo-0.76.3 b/metadata/md5-cache/www-apps/hugo-0.76.3
new file mode 100644
index 000000000000..ebf7e954e5ef
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.76.3
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=The world's fastest framework for building websites
+EAPI=7
+HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
+IUSE=+bash-completion doc +sass
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Unlicense BSD BSD-2 MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.76.3.tar.gz -> hugo-0.76.3.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.37.4.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.4.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.zip mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.4.12.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.11.0.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.11.0.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.0.0-20190131005048-21591786a5e0.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.0.0-20190131005048-21591786a5e0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/@v/v1.1.3.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/@v/v1.1.4.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v21.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv21.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v27.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv27.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.4.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.0.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.1.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.1.2+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.2+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 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/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20190418212003-6ac0b49e7197.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20190418212003-6ac0b49e7197.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.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.0.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.0.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.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/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.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/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.18.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.18.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.16.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.16.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.20.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.20.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.20.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.20.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.21.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.21.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.21.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.21.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.22.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.22.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.22.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.22.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.26.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.26.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.26.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.26.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.27.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.27.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.33.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.33.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.33.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.33.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.34.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.34.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.34.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.34.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.0.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.0.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.0.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/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/golibsass/@v/v0.7.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v0.7.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.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/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.zip -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.zip mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.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/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip 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/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+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-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.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/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 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/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.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.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/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.6.32.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.6.32.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.6.32.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.6.32.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.1.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.1.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.2.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.2.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.2.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.4.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.4.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.7.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.7.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.7.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.7.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.8.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.8.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.8.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.8.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.9.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.9.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.7.9.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.9.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/fortytw2/leaktest/@v/v1.2.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 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/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.14.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.14.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.22.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.22.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.0.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.22.1.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.1.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.22.1.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.1.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 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-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.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-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 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/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.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.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.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/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 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-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/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 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/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 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.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.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/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 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/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+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/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.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/google/wire/@v/v0.2.2.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/google/wire/@v/v0.2.2.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.zip 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/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 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/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.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.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.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/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 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.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 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.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 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/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.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/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/jdkato/prose/@v/v1.1.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.1.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jdkato/prose/@v/v1.2.0.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.2.0.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.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/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.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/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.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/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/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.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.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/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.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/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kyokomi/emoji/@v/v2.2.4+incompatible.zip -> github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.4+incompatible.zip mirror://goproxy//github.com/kyokomi/emoji/@v/v2.2.4+incompatible.mod -> github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.4+incompatible.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip 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/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/markbates/inflect/@v/v0.0.0-20171215194931-a12c3aec81a6.zip -> github.com%2Fmarkbates%2Finflect%2F@v%2Fv0.0.0-20171215194931-a12c3aec81a6.zip mirror://goproxy//github.com/markbates/inflect/@v/v0.0.0-20171215194931-a12c3aec81a6.mod -> github.com%2Fmarkbates%2Finflect%2F@v%2Fv0.0.0-20171215194931-a12c3aec81a6.mod mirror://goproxy//github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.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-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.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.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.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.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/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 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/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 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/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.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/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 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/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.6.3.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.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/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/nicksnyder/go-i18n/@v/v1.10.1.zip -> github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/nicksnyder/go-i18n/@v/v1.10.1.mod -> github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/nicksnyder/go-i18n/v2/@v/v2.1.1.zip -> github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/nicksnyder/go-i18n/v2/@v/v2.1.1.mod -> github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.3.2.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.3.2.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.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/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.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.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip 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/pelletier/go-toml/@v/v1.6.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.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/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.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/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.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-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.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-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.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.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.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-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.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/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.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/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.1.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.1.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 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/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sanity-io/litter/@v/v1.3.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.3.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.mod -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 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/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.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.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip 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.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 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/afero/@v/v1.4.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.4.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 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/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.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/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip 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/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 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.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 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/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.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/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 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.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.6.2.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.2.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.6.2.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.2.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.4.2.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.4.2.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.4.2.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.4.2.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/tidwall/pretty/@v/v0.0.0-20190325153808-1166b9ac2b65.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv0.0.0-20190325153808-1166b9ac2b65.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/uber-go/atomic/@v/v1.3.2.mod -> github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/uber/jaeger-client-go/@v/v2.15.0+incompatible.mod -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.15.0+incompatible.mod mirror://goproxy//github.com/uber/jaeger-lib/@v/v1.5.0.mod -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv1.5.0.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/urfave/cli/@v/v1.22.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.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//github.com/yuin/goldmark/@v/v1.1.22.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.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.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.1.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.zip -> go.opencensus.io%2F@v%2Fv0.21.0.zip mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip 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//gocloud.dev/@v/v0.15.0.zip -> gocloud.dev%2F@v%2Fv0.15.0.zip mirror://goproxy//gocloud.dev/@v/v0.15.0.mod -> gocloud.dev%2F@v%2Fv0.15.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-20181001203147-e3636079e1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181001203147-e3636079e1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.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-20190422183909-d864b10871cd.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422183909-d864b10871cd.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.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/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20191214001246-9130b4cfad52.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20191214001246-9130b4cfad52.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20191214001246-9130b4cfad52.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20191214001246-9130b4cfad52.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/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip 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-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.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-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.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-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.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-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190322120337-addf6b3196f6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190322120337-addf6b3196f6.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-20190420063019-afa5a82059c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190420063019-afa5a82059c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190424112056-4829fb13d2c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190424112056-4829fb13d2c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.zip 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-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.zip 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-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190523182746-aaccbc9213b0.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190523182746-aaccbc9213b0.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190523182746-aaccbc9213b0.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190523182746-aaccbc9213b0.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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.zip 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-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 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-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.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-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181031143558-9b800f95dbbc.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181031143558-9b800f95dbbc.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181031143558-9b800f95dbbc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181031143558-9b800f95dbbc.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-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.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-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.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-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.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-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 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.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip 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.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.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/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.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.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 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/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-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.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-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-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.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/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.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.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.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/api/@v/v0.5.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.zip mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.zip mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 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.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.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.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.zip 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-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.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/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.zip 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.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.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-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.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/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/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.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/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.mod -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.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.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 mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 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.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.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//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//pack.ag/amqp/@v/v0.8.0.mod -> pack.ag%2Famqp%2F@v%2Fv0.8.0.mod mirror://goproxy//pack.ag/amqp/@v/v0.11.0.mod -> pack.ag%2Famqp%2F@v%2Fv0.11.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67a8b5abe5e8d6b1329aebff20c8c40f
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.2 b/metadata/md5-cache/www-apps/mediawiki-1.34.2
deleted file mode 100644
index 067d975f324f..000000000000
--- a/metadata/md5-cache/www-apps/mediawiki-1.34.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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.2
-SRC_URI=http://releases.wikimedia.org/mediawiki/1.34/mediawiki-1.34.2.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=0844ff21563a9ee4c66eaacccca88722
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.4 b/metadata/md5-cache/www-apps/mediawiki-1.34.4
index fa112d38d21a..b53c94985461 100644
--- a/metadata/md5-cache/www-apps/mediawiki-1.34.4
+++ b/metadata/md5-cache/www-apps/mediawiki-1.34.4
@@ -4,7 +4,7 @@ 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
+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 )
@@ -12,4 +12,4 @@ 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_=77328d58680f07a24e9ddfe654510975
+_md5_=0844ff21563a9ee4c66eaacccca88722
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 5003f8ff92e0..18e49a39251c 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-87.0.4278.0 b/metadata/md5-cache/www-client/chromium-87.0.4278.0
deleted file mode 100644
index 81e9480a7d85..000000000000
--- a/metadata/md5-cache/www-client/chromium-87.0.4278.0
+++ /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:= 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.4278.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-5/chromium-87-patchset-5.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_=cb21b0fd4f5dc50c83136ca27df57ac9
diff --git a/metadata/md5-cache/www-client/chromium-87.0.4280.11 b/metadata/md5-cache/www-client/chromium-87.0.4280.11
new file mode 100644
index 000000000000..c782467d80a3
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-87.0.4280.11
@@ -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.4280.11.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-6/chromium-87-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_=e3bd87796b2492e9a8f4f058104bc999
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 cfc560e27c4e..018e6a82f0e0 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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-68.12.0 b/metadata/md5-cache/www-client/firefox-68.12.0
deleted file mode 100644
index f62696317df0..000000000000
--- a/metadata/md5-cache/www-client/firefox-68.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.44.4 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=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 system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils virtual/pkgconfig >=virtual/rust-1.34.0 || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=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 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon +openh264 pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.44.4 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=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 system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=pgo? ( lto ) wifi? ( dbus )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ach.xpi -> firefox-68.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/af.xpi -> firefox-68.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/an.xpi -> firefox-68.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ar.xpi -> firefox-68.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ast.xpi -> firefox-68.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/az.xpi -> firefox-68.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/be.xpi -> firefox-68.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/bg.xpi -> firefox-68.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/bn.xpi -> firefox-68.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/br.xpi -> firefox-68.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/bs.xpi -> firefox-68.12.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ca.xpi -> firefox-68.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/cak.xpi -> firefox-68.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/cs.xpi -> firefox-68.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/cy.xpi -> firefox-68.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/da.xpi -> firefox-68.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/de.xpi -> firefox-68.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/el.xpi -> firefox-68.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/eo.xpi -> firefox-68.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/et.xpi -> firefox-68.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/eu.xpi -> firefox-68.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/fa.xpi -> firefox-68.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ff.xpi -> firefox-68.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/fi.xpi -> firefox-68.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/fr.xpi -> firefox-68.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/gd.xpi -> firefox-68.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/gl.xpi -> firefox-68.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/gn.xpi -> firefox-68.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/he.xpi -> firefox-68.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/hr.xpi -> firefox-68.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/hu.xpi -> firefox-68.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ia.xpi -> firefox-68.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/id.xpi -> firefox-68.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/is.xpi -> firefox-68.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/it.xpi -> firefox-68.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ja.xpi -> firefox-68.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ka.xpi -> firefox-68.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/kab.xpi -> firefox-68.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/kk.xpi -> firefox-68.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/km.xpi -> firefox-68.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/kn.xpi -> firefox-68.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ko.xpi -> firefox-68.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/lij.xpi -> firefox-68.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/lt.xpi -> firefox-68.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/lv.xpi -> firefox-68.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/mk.xpi -> firefox-68.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/mr.xpi -> firefox-68.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ms.xpi -> firefox-68.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/my.xpi -> firefox-68.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.12.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/nl.xpi -> firefox-68.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/oc.xpi -> firefox-68.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/pl.xpi -> firefox-68.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/rm.xpi -> firefox-68.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ro.xpi -> firefox-68.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ru.xpi -> firefox-68.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/si.xpi -> firefox-68.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/sk.xpi -> firefox-68.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/sl.xpi -> firefox-68.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/son.xpi -> firefox-68.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/sq.xpi -> firefox-68.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/sr.xpi -> firefox-68.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ta.xpi -> firefox-68.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/te.xpi -> firefox-68.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/th.xpi -> firefox-68.12.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/tr.xpi -> firefox-68.12.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/uk.xpi -> firefox-68.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/ur.xpi -> firefox-68.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/uz.xpi -> firefox-68.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/vi.xpi -> firefox-68.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/xh.xpi -> firefox-68.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.12.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/source/firefox-68.12.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-15.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozcoreconf-v6	7efde39c6e3b6ffe287e0c4b2eed5e65	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4e322f8ca0ca9ed86efc796ae532940
diff --git a/metadata/md5-cache/www-client/firefox-78.3.1 b/metadata/md5-cache/www-client/firefox-78.3.1
index 4b7016dc0a73..b61e88013cc0 100644
--- a/metadata/md5-cache/www-client/firefox-78.3.1
+++ b/metadata/md5-cache/www-client/firefox-78.3.1
@@ -10,6 +10,6 @@ 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.1esr/source/firefox-78.3.1esr.source.tar.xz https://dev.gentoo.org/~axs/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.1esr/linux-x86_64/xpi/ach.xpi -> firefox-78.3.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/af.xpi -> firefox-78.3.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/an.xpi -> firefox-78.3.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ar.xpi -> firefox-78.3.1esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ast.xpi -> firefox-78.3.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/az.xpi -> firefox-78.3.1esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/be.xpi -> firefox-78.3.1esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bg.xpi -> firefox-78.3.1esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bn.xpi -> firefox-78.3.1esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/br.xpi -> firefox-78.3.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bs.xpi -> firefox-78.3.1esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.3.1esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ca.xpi -> firefox-78.3.1esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cak.xpi -> firefox-78.3.1esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cs.xpi -> firefox-78.3.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cy.xpi -> firefox-78.3.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/da.xpi -> firefox-78.3.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/de.xpi -> firefox-78.3.1esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.3.1esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/el.xpi -> firefox-78.3.1esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.3.1esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.3.1esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/eo.xpi -> firefox-78.3.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.3.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.3.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.3.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.3.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/et.xpi -> firefox-78.3.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/eu.xpi -> firefox-78.3.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fa.xpi -> firefox-78.3.1esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ff.xpi -> firefox-78.3.1esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fi.xpi -> firefox-78.3.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fr.xpi -> firefox-78.3.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.3.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.3.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gd.xpi -> firefox-78.3.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gl.xpi -> firefox-78.3.1esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gn.xpi -> firefox-78.3.1esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.3.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/he.xpi -> firefox-78.3.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.3.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hr.xpi -> firefox-78.3.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.3.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hu.xpi -> firefox-78.3.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.3.1esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ia.xpi -> firefox-78.3.1esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/id.xpi -> firefox-78.3.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/is.xpi -> firefox-78.3.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/it.xpi -> firefox-78.3.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ja.xpi -> firefox-78.3.1esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ka.xpi -> firefox-78.3.1esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kab.xpi -> firefox-78.3.1esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kk.xpi -> firefox-78.3.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/km.xpi -> firefox-78.3.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kn.xpi -> firefox-78.3.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ko.xpi -> firefox-78.3.1esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lij.xpi -> firefox-78.3.1esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lt.xpi -> firefox-78.3.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lv.xpi -> firefox-78.3.1esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/mk.xpi -> firefox-78.3.1esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/mr.xpi -> firefox-78.3.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ms.xpi -> firefox-78.3.1esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/my.xpi -> firefox-78.3.1esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.3.1esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.3.1esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nl.xpi -> firefox-78.3.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.3.1esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/oc.xpi -> firefox-78.3.1esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.3.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pl.xpi -> firefox-78.3.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.3.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.3.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/rm.xpi -> firefox-78.3.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ro.xpi -> firefox-78.3.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ru.xpi -> firefox-78.3.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/si.xpi -> firefox-78.3.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sk.xpi -> firefox-78.3.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sl.xpi -> firefox-78.3.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/son.xpi -> firefox-78.3.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sq.xpi -> firefox-78.3.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sr.xpi -> firefox-78.3.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.3.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ta.xpi -> firefox-78.3.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/te.xpi -> firefox-78.3.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/th.xpi -> firefox-78.3.1esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/tl.xpi -> firefox-78.3.1esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/tr.xpi -> firefox-78.3.1esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/trs.xpi -> firefox-78.3.1esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/uk.xpi -> firefox-78.3.1esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ur.xpi -> firefox-78.3.1esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/uz.xpi -> firefox-78.3.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/vi.xpi -> firefox-78.3.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/xh.xpi -> firefox-78.3.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.3.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.3.1esr-zh-TW.xpi )
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/source/firefox-78.3.1esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-03.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ach.xpi -> firefox-78.3.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/af.xpi -> firefox-78.3.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/an.xpi -> firefox-78.3.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ar.xpi -> firefox-78.3.1esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ast.xpi -> firefox-78.3.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/az.xpi -> firefox-78.3.1esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/be.xpi -> firefox-78.3.1esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bg.xpi -> firefox-78.3.1esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bn.xpi -> firefox-78.3.1esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/br.xpi -> firefox-78.3.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bs.xpi -> firefox-78.3.1esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.3.1esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ca.xpi -> firefox-78.3.1esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cak.xpi -> firefox-78.3.1esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cs.xpi -> firefox-78.3.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cy.xpi -> firefox-78.3.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/da.xpi -> firefox-78.3.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/de.xpi -> firefox-78.3.1esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.3.1esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/el.xpi -> firefox-78.3.1esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.3.1esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.3.1esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/eo.xpi -> firefox-78.3.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.3.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.3.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.3.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.3.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/et.xpi -> firefox-78.3.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/eu.xpi -> firefox-78.3.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fa.xpi -> firefox-78.3.1esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ff.xpi -> firefox-78.3.1esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fi.xpi -> firefox-78.3.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fr.xpi -> firefox-78.3.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.3.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.3.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gd.xpi -> firefox-78.3.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gl.xpi -> firefox-78.3.1esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gn.xpi -> firefox-78.3.1esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.3.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/he.xpi -> firefox-78.3.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.3.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hr.xpi -> firefox-78.3.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.3.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hu.xpi -> firefox-78.3.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.3.1esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ia.xpi -> firefox-78.3.1esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/id.xpi -> firefox-78.3.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/is.xpi -> firefox-78.3.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/it.xpi -> firefox-78.3.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ja.xpi -> firefox-78.3.1esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ka.xpi -> firefox-78.3.1esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kab.xpi -> firefox-78.3.1esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kk.xpi -> firefox-78.3.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/km.xpi -> firefox-78.3.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kn.xpi -> firefox-78.3.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ko.xpi -> firefox-78.3.1esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lij.xpi -> firefox-78.3.1esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lt.xpi -> firefox-78.3.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lv.xpi -> firefox-78.3.1esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/mk.xpi -> firefox-78.3.1esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/mr.xpi -> firefox-78.3.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ms.xpi -> firefox-78.3.1esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/my.xpi -> firefox-78.3.1esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.3.1esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.3.1esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nl.xpi -> firefox-78.3.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.3.1esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/oc.xpi -> firefox-78.3.1esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.3.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pl.xpi -> firefox-78.3.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.3.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.3.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/rm.xpi -> firefox-78.3.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ro.xpi -> firefox-78.3.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ru.xpi -> firefox-78.3.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/si.xpi -> firefox-78.3.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sk.xpi -> firefox-78.3.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sl.xpi -> firefox-78.3.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/son.xpi -> firefox-78.3.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sq.xpi -> firefox-78.3.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sr.xpi -> firefox-78.3.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.3.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ta.xpi -> firefox-78.3.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/te.xpi -> firefox-78.3.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/th.xpi -> firefox-78.3.1esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/tl.xpi -> firefox-78.3.1esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/tr.xpi -> firefox-78.3.1esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/trs.xpi -> firefox-78.3.1esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/uk.xpi -> firefox-78.3.1esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ur.xpi -> firefox-78.3.1esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/uz.xpi -> firefox-78.3.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/vi.xpi -> firefox-78.3.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/xh.xpi -> firefox-78.3.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.3.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.3.1esr-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_=ee3a87a63f9f7561adc43f71e95c7e89
+_md5_=9eb77f710ca12efefd165ca5a8783281
diff --git a/metadata/md5-cache/www-client/firefox-80.0 b/metadata/md5-cache/www-client/firefox-80.0
deleted file mode 100644
index 9b50e3796fdd..000000000000
--- a/metadata/md5-cache/www-client/firefox-80.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.55 >=dev-libs/nspr-4.26 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 sys-apps/dbus dev-libs/dbus-glib >=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 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? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 >=sys-devel/binutils-2.30 sys-apps/findutils virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] ) >=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 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon +openh264 pgo pulseaudio screencast +screenshot selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.55 >=dev-libs/nspr-4.26 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 sys-apps/dbus dev-libs/dbus-glib >=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 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? ( 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=pgo? ( lto ) screencast? ( wayland )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ach.xpi -> firefox-80.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/af.xpi -> firefox-80.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/an.xpi -> firefox-80.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ar.xpi -> firefox-80.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ast.xpi -> firefox-80.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/az.xpi -> firefox-80.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/be.xpi -> firefox-80.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/bg.xpi -> firefox-80.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/bn.xpi -> firefox-80.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/br.xpi -> firefox-80.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/bs.xpi -> firefox-80.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ca.xpi -> firefox-80.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/cak.xpi -> firefox-80.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/cs.xpi -> firefox-80.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/cy.xpi -> firefox-80.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/da.xpi -> firefox-80.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/de.xpi -> firefox-80.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/dsb.xpi -> firefox-80.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/el.xpi -> firefox-80.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/en-CA.xpi -> firefox-80.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/en-GB.xpi -> firefox-80.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/eo.xpi -> firefox-80.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/es-AR.xpi -> firefox-80.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/es-CL.xpi -> firefox-80.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/es-ES.xpi -> firefox-80.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/es-MX.xpi -> firefox-80.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/et.xpi -> firefox-80.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/eu.xpi -> firefox-80.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/fa.xpi -> firefox-80.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ff.xpi -> firefox-80.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/fi.xpi -> firefox-80.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/fr.xpi -> firefox-80.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/fy-NL.xpi -> firefox-80.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ga-IE.xpi -> firefox-80.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/gd.xpi -> firefox-80.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/gl.xpi -> firefox-80.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/gn.xpi -> firefox-80.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/gu-IN.xpi -> firefox-80.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/he.xpi -> firefox-80.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/hi-IN.xpi -> firefox-80.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/hr.xpi -> firefox-80.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/hsb.xpi -> firefox-80.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/hu.xpi -> firefox-80.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/hy-AM.xpi -> firefox-80.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ia.xpi -> firefox-80.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/id.xpi -> firefox-80.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/is.xpi -> firefox-80.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/it.xpi -> firefox-80.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ja.xpi -> firefox-80.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ka.xpi -> firefox-80.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/kab.xpi -> firefox-80.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/kk.xpi -> firefox-80.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/km.xpi -> firefox-80.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/kn.xpi -> firefox-80.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ko.xpi -> firefox-80.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/lij.xpi -> firefox-80.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/lt.xpi -> firefox-80.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/lv.xpi -> firefox-80.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/mk.xpi -> firefox-80.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/mr.xpi -> firefox-80.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ms.xpi -> firefox-80.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/my.xpi -> firefox-80.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/nb-NO.xpi -> firefox-80.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/nl.xpi -> firefox-80.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/nn-NO.xpi -> firefox-80.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/oc.xpi -> firefox-80.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/pa-IN.xpi -> firefox-80.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/pl.xpi -> firefox-80.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/pt-BR.xpi -> firefox-80.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/pt-PT.xpi -> firefox-80.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/rm.xpi -> firefox-80.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ro.xpi -> firefox-80.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ru.xpi -> firefox-80.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/si.xpi -> firefox-80.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/sk.xpi -> firefox-80.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/sl.xpi -> firefox-80.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/son.xpi -> firefox-80.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/sq.xpi -> firefox-80.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/sr.xpi -> firefox-80.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/sv-SE.xpi -> firefox-80.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ta.xpi -> firefox-80.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/te.xpi -> firefox-80.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/th.xpi -> firefox-80.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/tr.xpi -> firefox-80.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/uk.xpi -> firefox-80.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/ur.xpi -> firefox-80.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/uz.xpi -> firefox-80.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/vi.xpi -> firefox-80.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/xh.xpi -> firefox-80.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/zh-CN.xpi -> firefox-80.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xpi/zh-TW.xpi -> firefox-80.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/80.0/source/firefox-80.0.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-80.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-80.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-80.0-patches-02.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozcoreconf-v6	7efde39c6e3b6ffe287e0c4b2eed5e65	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e0f928b442dc36149da64302d3b215d
diff --git a/metadata/md5-cache/www-client/firefox-80.0.1 b/metadata/md5-cache/www-client/firefox-80.0.1
deleted file mode 100644
index ecc1929580bc..000000000000
--- a/metadata/md5-cache/www-client/firefox-80.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.55 >=dev-libs/nspr-4.26 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 ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 >=sys-devel/binutils-2.30 sys-apps/findutils virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] ) >=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 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon +openh264 pgo pulseaudio screencast +screenshot selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.55 >=dev-libs/nspr-4.26 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=pgo? ( lto ) screencast? ( wayland )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ach.xpi -> firefox-80.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/af.xpi -> firefox-80.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/an.xpi -> firefox-80.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ar.xpi -> firefox-80.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ast.xpi -> firefox-80.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/az.xpi -> firefox-80.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/be.xpi -> firefox-80.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/bg.xpi -> firefox-80.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/bn.xpi -> firefox-80.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/br.xpi -> firefox-80.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/bs.xpi -> firefox-80.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ca.xpi -> firefox-80.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/cak.xpi -> firefox-80.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/cs.xpi -> firefox-80.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/cy.xpi -> firefox-80.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/da.xpi -> firefox-80.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/de.xpi -> firefox-80.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/dsb.xpi -> firefox-80.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/el.xpi -> firefox-80.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/en-CA.xpi -> firefox-80.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/en-GB.xpi -> firefox-80.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/eo.xpi -> firefox-80.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-AR.xpi -> firefox-80.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-CL.xpi -> firefox-80.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-ES.xpi -> firefox-80.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-MX.xpi -> firefox-80.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/et.xpi -> firefox-80.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/eu.xpi -> firefox-80.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fa.xpi -> firefox-80.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ff.xpi -> firefox-80.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fi.xpi -> firefox-80.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fr.xpi -> firefox-80.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-80.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-80.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gd.xpi -> firefox-80.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gl.xpi -> firefox-80.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gn.xpi -> firefox-80.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-80.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/he.xpi -> firefox-80.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-80.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hr.xpi -> firefox-80.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hsb.xpi -> firefox-80.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hu.xpi -> firefox-80.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-80.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ia.xpi -> firefox-80.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/id.xpi -> firefox-80.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/is.xpi -> firefox-80.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/it.xpi -> firefox-80.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ja.xpi -> firefox-80.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ka.xpi -> firefox-80.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/kab.xpi -> firefox-80.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/kk.xpi -> firefox-80.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/km.xpi -> firefox-80.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/kn.xpi -> firefox-80.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ko.xpi -> firefox-80.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/lij.xpi -> firefox-80.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/lt.xpi -> firefox-80.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/lv.xpi -> firefox-80.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/mk.xpi -> firefox-80.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/mr.xpi -> firefox-80.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ms.xpi -> firefox-80.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/my.xpi -> firefox-80.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-80.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/nl.xpi -> firefox-80.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-80.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/oc.xpi -> firefox-80.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-80.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pl.xpi -> firefox-80.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-80.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-80.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/rm.xpi -> firefox-80.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ro.xpi -> firefox-80.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ru.xpi -> firefox-80.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/si.xpi -> firefox-80.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sk.xpi -> firefox-80.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sl.xpi -> firefox-80.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/son.xpi -> firefox-80.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sq.xpi -> firefox-80.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sr.xpi -> firefox-80.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-80.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ta.xpi -> firefox-80.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/te.xpi -> firefox-80.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/th.xpi -> firefox-80.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/tr.xpi -> firefox-80.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/uk.xpi -> firefox-80.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ur.xpi -> firefox-80.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/uz.xpi -> firefox-80.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/vi.xpi -> firefox-80.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/xh.xpi -> firefox-80.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-80.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-80.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/80.0.1/source/firefox-80.0.1.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-80.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-80.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-80.0-patches-02.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozcoreconf-v6	7efde39c6e3b6ffe287e0c4b2eed5e65	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0287f4f82228900d825d939994164f79
diff --git a/metadata/md5-cache/www-client/firefox-80.0.1-r1 b/metadata/md5-cache/www-client/firefox-80.0.1-r1
deleted file mode 100644
index 1d770888fba0..000000000000
--- a/metadata/md5-cache/www-client/firefox-80.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.55 >=dev-libs/nspr-4.26 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 ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 >=sys-devel/binutils-2.30 sys-apps/findutils virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] ) >=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 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon +openh264 pgo pulseaudio screencast +screenshot selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.55 >=dev-libs/nspr-4.26 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=pgo? ( lto ) screencast? ( wayland )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ach.xpi -> firefox-80.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/af.xpi -> firefox-80.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/an.xpi -> firefox-80.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ar.xpi -> firefox-80.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ast.xpi -> firefox-80.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/az.xpi -> firefox-80.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/be.xpi -> firefox-80.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/bg.xpi -> firefox-80.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/bn.xpi -> firefox-80.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/br.xpi -> firefox-80.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/bs.xpi -> firefox-80.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ca.xpi -> firefox-80.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/cak.xpi -> firefox-80.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/cs.xpi -> firefox-80.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/cy.xpi -> firefox-80.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/da.xpi -> firefox-80.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/de.xpi -> firefox-80.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/dsb.xpi -> firefox-80.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/el.xpi -> firefox-80.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/en-CA.xpi -> firefox-80.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/en-GB.xpi -> firefox-80.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/eo.xpi -> firefox-80.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-AR.xpi -> firefox-80.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-CL.xpi -> firefox-80.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-ES.xpi -> firefox-80.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/es-MX.xpi -> firefox-80.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/et.xpi -> firefox-80.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/eu.xpi -> firefox-80.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fa.xpi -> firefox-80.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ff.xpi -> firefox-80.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fi.xpi -> firefox-80.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fr.xpi -> firefox-80.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-80.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-80.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gd.xpi -> firefox-80.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gl.xpi -> firefox-80.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gn.xpi -> firefox-80.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-80.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/he.xpi -> firefox-80.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-80.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hr.xpi -> firefox-80.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hsb.xpi -> firefox-80.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hu.xpi -> firefox-80.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-80.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ia.xpi -> firefox-80.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/id.xpi -> firefox-80.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/is.xpi -> firefox-80.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/it.xpi -> firefox-80.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ja.xpi -> firefox-80.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ka.xpi -> firefox-80.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/kab.xpi -> firefox-80.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/kk.xpi -> firefox-80.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/km.xpi -> firefox-80.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/kn.xpi -> firefox-80.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ko.xpi -> firefox-80.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/lij.xpi -> firefox-80.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/lt.xpi -> firefox-80.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/lv.xpi -> firefox-80.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/mk.xpi -> firefox-80.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/mr.xpi -> firefox-80.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ms.xpi -> firefox-80.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/my.xpi -> firefox-80.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-80.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/nl.xpi -> firefox-80.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-80.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/oc.xpi -> firefox-80.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-80.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pl.xpi -> firefox-80.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-80.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-80.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/rm.xpi -> firefox-80.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ro.xpi -> firefox-80.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ru.xpi -> firefox-80.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/si.xpi -> firefox-80.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sk.xpi -> firefox-80.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sl.xpi -> firefox-80.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/son.xpi -> firefox-80.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sq.xpi -> firefox-80.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sr.xpi -> firefox-80.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-80.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ta.xpi -> firefox-80.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/te.xpi -> firefox-80.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/th.xpi -> firefox-80.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/tr.xpi -> firefox-80.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/uk.xpi -> firefox-80.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/ur.xpi -> firefox-80.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/uz.xpi -> firefox-80.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/vi.xpi -> firefox-80.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/xh.xpi -> firefox-80.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-80.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-80.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/80.0.1/source/firefox-80.0.1.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-80.0-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-80.0-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-80.0-patches-03.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozcoreconf-v6	7efde39c6e3b6ffe287e0c4b2eed5e65	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bd5d0fcc621d88fb30f2b1a0693fb96
diff --git a/metadata/md5-cache/www-client/firefox-81.0.1-r1 b/metadata/md5-cache/www-client/firefox-81.0.1-r1
new file mode 100644
index 000000000000..7cff96b19876
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-81.0.1-r1
@@ -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] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( 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.1/source/firefox-81.0.1.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-81-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-81-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-81-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ach.xpi -> firefox-81.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/af.xpi -> firefox-81.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/an.xpi -> firefox-81.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ar.xpi -> firefox-81.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ast.xpi -> firefox-81.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/az.xpi -> firefox-81.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/be.xpi -> firefox-81.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/bg.xpi -> firefox-81.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/bn.xpi -> firefox-81.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/br.xpi -> firefox-81.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/bs.xpi -> firefox-81.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-81.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ca.xpi -> firefox-81.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/cak.xpi -> firefox-81.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/cs.xpi -> firefox-81.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/cy.xpi -> firefox-81.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/da.xpi -> firefox-81.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/de.xpi -> firefox-81.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-81.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/el.xpi -> firefox-81.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-81.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-81.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/eo.xpi -> firefox-81.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-81.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-81.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-81.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-81.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/et.xpi -> firefox-81.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/eu.xpi -> firefox-81.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fa.xpi -> firefox-81.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ff.xpi -> firefox-81.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fi.xpi -> firefox-81.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fr.xpi -> firefox-81.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-81.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-81.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gd.xpi -> firefox-81.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gl.xpi -> firefox-81.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gn.xpi -> firefox-81.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-81.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/he.xpi -> firefox-81.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-81.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hr.xpi -> firefox-81.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-81.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hu.xpi -> firefox-81.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-81.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ia.xpi -> firefox-81.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/id.xpi -> firefox-81.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/is.xpi -> firefox-81.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/it.xpi -> firefox-81.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ja.xpi -> firefox-81.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ka.xpi -> firefox-81.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/kab.xpi -> firefox-81.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/kk.xpi -> firefox-81.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/km.xpi -> firefox-81.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/kn.xpi -> firefox-81.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ko.xpi -> firefox-81.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/lij.xpi -> firefox-81.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/lt.xpi -> firefox-81.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/lv.xpi -> firefox-81.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/mk.xpi -> firefox-81.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/mr.xpi -> firefox-81.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ms.xpi -> firefox-81.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/my.xpi -> firefox-81.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-81.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-81.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/nl.xpi -> firefox-81.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-81.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/oc.xpi -> firefox-81.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-81.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pl.xpi -> firefox-81.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-81.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-81.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/rm.xpi -> firefox-81.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ro.xpi -> firefox-81.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ru.xpi -> firefox-81.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/si.xpi -> firefox-81.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sk.xpi -> firefox-81.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sl.xpi -> firefox-81.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/son.xpi -> firefox-81.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sq.xpi -> firefox-81.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sr.xpi -> firefox-81.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-81.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ta.xpi -> firefox-81.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/te.xpi -> firefox-81.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/th.xpi -> firefox-81.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/tl.xpi -> firefox-81.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/tr.xpi -> firefox-81.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/trs.xpi -> firefox-81.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/uk.xpi -> firefox-81.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ur.xpi -> firefox-81.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/uz.xpi -> firefox-81.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/vi.xpi -> firefox-81.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/xh.xpi -> firefox-81.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-81.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-81.0.1-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_=e14c4e7f525531a677909d09d36fa7e6
diff --git a/metadata/md5-cache/www-client/firefox-bin-68.12.0 b/metadata/md5-cache/www-client/firefox-bin-68.12.0
deleted file mode 100644
index 5b556fb17539..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-68.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf media-sound/apulse ) ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+alsa +ffmpeg +pulseaudio selinux startup-notification wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme alsa? ( !pulseaudio? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ach.xpi -> firefox-68.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/af.xpi -> firefox-68.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/an.xpi -> firefox-68.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ar.xpi -> firefox-68.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ast.xpi -> firefox-68.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/az.xpi -> firefox-68.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/be.xpi -> firefox-68.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/bg.xpi -> firefox-68.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/bn.xpi -> firefox-68.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/br.xpi -> firefox-68.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/bs.xpi -> firefox-68.12.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ca.xpi -> firefox-68.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/cak.xpi -> firefox-68.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/cs.xpi -> firefox-68.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/cy.xpi -> firefox-68.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/da.xpi -> firefox-68.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/de.xpi -> firefox-68.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/el.xpi -> firefox-68.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/eo.xpi -> firefox-68.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/et.xpi -> firefox-68.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/eu.xpi -> firefox-68.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/fa.xpi -> firefox-68.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ff.xpi -> firefox-68.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/fi.xpi -> firefox-68.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/fr.xpi -> firefox-68.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/gd.xpi -> firefox-68.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/gl.xpi -> firefox-68.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/gn.xpi -> firefox-68.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/he.xpi -> firefox-68.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/hr.xpi -> firefox-68.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/hu.xpi -> firefox-68.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ia.xpi -> firefox-68.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/id.xpi -> firefox-68.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/is.xpi -> firefox-68.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/it.xpi -> firefox-68.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ja.xpi -> firefox-68.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ka.xpi -> firefox-68.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/kab.xpi -> firefox-68.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/kk.xpi -> firefox-68.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/km.xpi -> firefox-68.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/kn.xpi -> firefox-68.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ko.xpi -> firefox-68.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/lij.xpi -> firefox-68.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/lt.xpi -> firefox-68.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/lv.xpi -> firefox-68.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/mk.xpi -> firefox-68.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/mr.xpi -> firefox-68.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ms.xpi -> firefox-68.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/my.xpi -> firefox-68.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.12.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/nl.xpi -> firefox-68.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/oc.xpi -> firefox-68.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/pl.xpi -> firefox-68.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/rm.xpi -> firefox-68.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ro.xpi -> firefox-68.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ru.xpi -> firefox-68.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/si.xpi -> firefox-68.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/sk.xpi -> firefox-68.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/sl.xpi -> firefox-68.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/son.xpi -> firefox-68.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/sq.xpi -> firefox-68.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/sr.xpi -> firefox-68.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ta.xpi -> firefox-68.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/te.xpi -> firefox-68.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/th.xpi -> firefox-68.12.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/tr.xpi -> firefox-68.12.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/uk.xpi -> firefox-68.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/ur.xpi -> firefox-68.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/uz.xpi -> firefox-68.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/vi.xpi -> firefox-68.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/xh.xpi -> firefox-68.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.12.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.12.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.12.0esr/linux-x86_64/en-US/firefox-68.12.0esr.tar.bz2 -> firefox-bin_x86_64-68.12.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.12.0esr/linux-i686/en-US/firefox-68.12.0esr.tar.bz2 -> firefox-bin_i686-68.12.0.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27f4992d32d2f920edb0972d9a4a84f3
diff --git a/metadata/md5-cache/www-client/firefox-bin-78.3.1-r1 b/metadata/md5-cache/www-client/firefox-bin-78.3.1-r1
index a5830112e3b4..29d0f7746632 100644
--- a/metadata/md5-cache/www-client/firefox-bin-78.3.1-r1
+++ b/metadata/md5-cache/www-client/firefox-bin-78.3.1-r1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0/esr78
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/en-US/firefox-78.3.1esr.tar.bz2 -> firefox-bin_x86_64-78.3.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-i686/en-US/firefox-78.3.1esr.tar.bz2 -> firefox-bin_i686-78.3.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ach.xpi -> firefox-78.3.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/af.xpi -> firefox-78.3.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/an.xpi -> firefox-78.3.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ar.xpi -> firefox-78.3.1esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ast.xpi -> firefox-78.3.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/az.xpi -> firefox-78.3.1esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/be.xpi -> firefox-78.3.1esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bg.xpi -> firefox-78.3.1esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bn.xpi -> firefox-78.3.1esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/br.xpi -> firefox-78.3.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/bs.xpi -> firefox-78.3.1esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.3.1esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ca.xpi -> firefox-78.3.1esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cak.xpi -> firefox-78.3.1esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cs.xpi -> firefox-78.3.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/cy.xpi -> firefox-78.3.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/da.xpi -> firefox-78.3.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/de.xpi -> firefox-78.3.1esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.3.1esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/el.xpi -> firefox-78.3.1esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.3.1esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.3.1esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/eo.xpi -> firefox-78.3.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.3.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.3.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.3.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.3.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/et.xpi -> firefox-78.3.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/eu.xpi -> firefox-78.3.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fa.xpi -> firefox-78.3.1esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ff.xpi -> firefox-78.3.1esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fi.xpi -> firefox-78.3.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fr.xpi -> firefox-78.3.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.3.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.3.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gd.xpi -> firefox-78.3.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gl.xpi -> firefox-78.3.1esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gn.xpi -> firefox-78.3.1esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.3.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/he.xpi -> firefox-78.3.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.3.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hr.xpi -> firefox-78.3.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.3.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hu.xpi -> firefox-78.3.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.3.1esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ia.xpi -> firefox-78.3.1esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/id.xpi -> firefox-78.3.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/is.xpi -> firefox-78.3.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/it.xpi -> firefox-78.3.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ja.xpi -> firefox-78.3.1esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ka.xpi -> firefox-78.3.1esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kab.xpi -> firefox-78.3.1esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kk.xpi -> firefox-78.3.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/km.xpi -> firefox-78.3.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/kn.xpi -> firefox-78.3.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ko.xpi -> firefox-78.3.1esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lij.xpi -> firefox-78.3.1esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lt.xpi -> firefox-78.3.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/lv.xpi -> firefox-78.3.1esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/mk.xpi -> firefox-78.3.1esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/mr.xpi -> firefox-78.3.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ms.xpi -> firefox-78.3.1esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/my.xpi -> firefox-78.3.1esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.3.1esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.3.1esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nl.xpi -> firefox-78.3.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.3.1esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/oc.xpi -> firefox-78.3.1esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.3.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pl.xpi -> firefox-78.3.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.3.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.3.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/rm.xpi -> firefox-78.3.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ro.xpi -> firefox-78.3.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ru.xpi -> firefox-78.3.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/si.xpi -> firefox-78.3.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sk.xpi -> firefox-78.3.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sl.xpi -> firefox-78.3.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/son.xpi -> firefox-78.3.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sq.xpi -> firefox-78.3.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sr.xpi -> firefox-78.3.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.3.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ta.xpi -> firefox-78.3.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/te.xpi -> firefox-78.3.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/th.xpi -> firefox-78.3.1esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/tl.xpi -> firefox-78.3.1esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/tr.xpi -> firefox-78.3.1esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/trs.xpi -> firefox-78.3.1esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/uk.xpi -> firefox-78.3.1esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/ur.xpi -> firefox-78.3.1esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/uz.xpi -> firefox-78.3.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/vi.xpi -> firefox-78.3.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/xh.xpi -> firefox-78.3.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.3.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.3.1esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.3.1esr-zh-TW.xpi )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a759ed2bdf44c68cfa998ab18393813
+_md5_=4a47bfc36255289424b230ebb7c86b2f
diff --git a/metadata/md5-cache/www-client/firefox-bin-80.0 b/metadata/md5-cache/www-client/firefox-bin-80.0
deleted file mode 100644
index 11d23c8629b9..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf media-sound/apulse ) ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+alsa +ffmpeg +pulseaudio selinux startup-notification wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme alsa? ( !pulseaudio? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ach.xpi -> firefox-80.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/af.xpi -> firefox-80.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/an.xpi -> firefox-80.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ar.xpi -> firefox-80.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ast.xpi -> firefox-80.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/az.xpi -> firefox-80.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/be.xpi -> firefox-80.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/bg.xpi -> firefox-80.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/bn.xpi -> firefox-80.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/br.xpi -> firefox-80.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/bs.xpi -> firefox-80.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ca.xpi -> firefox-80.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/cak.xpi -> firefox-80.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/cs.xpi -> firefox-80.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/cy.xpi -> firefox-80.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/da.xpi -> firefox-80.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/de.xpi -> firefox-80.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/dsb.xpi -> firefox-80.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/el.xpi -> firefox-80.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/en-CA.xpi -> firefox-80.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/en-GB.xpi -> firefox-80.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/eo.xpi -> firefox-80.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/es-AR.xpi -> firefox-80.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/es-CL.xpi -> firefox-80.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/es-ES.xpi -> firefox-80.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/es-MX.xpi -> firefox-80.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/et.xpi -> firefox-80.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/eu.xpi -> firefox-80.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/fa.xpi -> firefox-80.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ff.xpi -> firefox-80.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/fi.xpi -> firefox-80.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/fr.xpi -> firefox-80.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/fy-NL.xpi -> firefox-80.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ga-IE.xpi -> firefox-80.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/gd.xpi -> firefox-80.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/gl.xpi -> firefox-80.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/gn.xpi -> firefox-80.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/gu-IN.xpi -> firefox-80.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/he.xpi -> firefox-80.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/hi-IN.xpi -> firefox-80.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/hr.xpi -> firefox-80.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/hsb.xpi -> firefox-80.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/hu.xpi -> firefox-80.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/hy-AM.xpi -> firefox-80.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ia.xpi -> firefox-80.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/id.xpi -> firefox-80.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/is.xpi -> firefox-80.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/it.xpi -> firefox-80.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ja.xpi -> firefox-80.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ka.xpi -> firefox-80.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/kab.xpi -> firefox-80.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/kk.xpi -> firefox-80.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/km.xpi -> firefox-80.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/kn.xpi -> firefox-80.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ko.xpi -> firefox-80.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/lij.xpi -> firefox-80.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/lt.xpi -> firefox-80.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/lv.xpi -> firefox-80.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/mk.xpi -> firefox-80.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/mr.xpi -> firefox-80.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ms.xpi -> firefox-80.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/my.xpi -> firefox-80.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/nb-NO.xpi -> firefox-80.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/nl.xpi -> firefox-80.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/nn-NO.xpi -> firefox-80.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/oc.xpi -> firefox-80.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/pa-IN.xpi -> firefox-80.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/pl.xpi -> firefox-80.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/pt-BR.xpi -> firefox-80.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/pt-PT.xpi -> firefox-80.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/rm.xpi -> firefox-80.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ro.xpi -> firefox-80.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ru.xpi -> firefox-80.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/si.xpi -> firefox-80.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/sk.xpi -> firefox-80.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/sl.xpi -> firefox-80.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/son.xpi -> firefox-80.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/sq.xpi -> firefox-80.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/sr.xpi -> firefox-80.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/sv-SE.xpi -> firefox-80.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ta.xpi -> firefox-80.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/te.xpi -> firefox-80.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/th.xpi -> firefox-80.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/tr.xpi -> firefox-80.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/uk.xpi -> firefox-80.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/ur.xpi -> firefox-80.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/uz.xpi -> firefox-80.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/vi.xpi -> firefox-80.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/xh.xpi -> firefox-80.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/zh-CN.xpi -> firefox-80.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0/linux-i686/xpi/zh-TW.xpi -> firefox-80.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2 -> firefox-bin_x86_64-80.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2 -> firefox-bin_i686-80.0.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18d9676ff00776c7db994a537407128d
diff --git a/metadata/md5-cache/www-client/firefox-bin-80.0.1 b/metadata/md5-cache/www-client/firefox-bin-80.0.1
deleted file mode 100644
index 959e5d5309d5..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-80.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf media-sound/apulse ) ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+alsa +ffmpeg +pulseaudio selinux startup-notification wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme alsa? ( !pulseaudio? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ach.xpi -> firefox-80.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/af.xpi -> firefox-80.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/an.xpi -> firefox-80.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ar.xpi -> firefox-80.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ast.xpi -> firefox-80.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/az.xpi -> firefox-80.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/be.xpi -> firefox-80.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/bg.xpi -> firefox-80.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/bn.xpi -> firefox-80.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/br.xpi -> firefox-80.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/bs.xpi -> firefox-80.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ca.xpi -> firefox-80.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/cak.xpi -> firefox-80.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/cs.xpi -> firefox-80.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/cy.xpi -> firefox-80.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/da.xpi -> firefox-80.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/de.xpi -> firefox-80.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/dsb.xpi -> firefox-80.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/el.xpi -> firefox-80.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/en-CA.xpi -> firefox-80.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/en-GB.xpi -> firefox-80.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/eo.xpi -> firefox-80.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/es-AR.xpi -> firefox-80.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/es-CL.xpi -> firefox-80.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/es-ES.xpi -> firefox-80.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/es-MX.xpi -> firefox-80.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/et.xpi -> firefox-80.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/eu.xpi -> firefox-80.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/fa.xpi -> firefox-80.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ff.xpi -> firefox-80.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/fi.xpi -> firefox-80.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/fr.xpi -> firefox-80.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-80.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-80.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/gd.xpi -> firefox-80.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/gl.xpi -> firefox-80.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/gn.xpi -> firefox-80.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-80.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/he.xpi -> firefox-80.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-80.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/hr.xpi -> firefox-80.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/hsb.xpi -> firefox-80.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/hu.xpi -> firefox-80.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-80.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ia.xpi -> firefox-80.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/id.xpi -> firefox-80.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/is.xpi -> firefox-80.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/it.xpi -> firefox-80.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ja.xpi -> firefox-80.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ka.xpi -> firefox-80.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/kab.xpi -> firefox-80.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/kk.xpi -> firefox-80.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/km.xpi -> firefox-80.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/kn.xpi -> firefox-80.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ko.xpi -> firefox-80.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/lij.xpi -> firefox-80.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/lt.xpi -> firefox-80.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/lv.xpi -> firefox-80.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/mk.xpi -> firefox-80.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/mr.xpi -> firefox-80.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ms.xpi -> firefox-80.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/my.xpi -> firefox-80.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-80.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/nl.xpi -> firefox-80.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-80.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/oc.xpi -> firefox-80.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-80.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/pl.xpi -> firefox-80.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-80.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-80.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/rm.xpi -> firefox-80.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ro.xpi -> firefox-80.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ru.xpi -> firefox-80.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/si.xpi -> firefox-80.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/sk.xpi -> firefox-80.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/sl.xpi -> firefox-80.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/son.xpi -> firefox-80.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/sq.xpi -> firefox-80.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/sr.xpi -> firefox-80.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-80.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ta.xpi -> firefox-80.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/te.xpi -> firefox-80.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/th.xpi -> firefox-80.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/tr.xpi -> firefox-80.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/uk.xpi -> firefox-80.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/ur.xpi -> firefox-80.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/uz.xpi -> firefox-80.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/vi.xpi -> firefox-80.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/xh.xpi -> firefox-80.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-80.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//80.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-80.0.1-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/80.0.1/linux-x86_64/en-US/firefox-80.0.1.tar.bz2 -> firefox-bin_x86_64-80.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/80.0.1/linux-i686/en-US/firefox-80.0.1.tar.bz2 -> firefox-bin_i686-80.0.1.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18d9676ff00776c7db994a537407128d
diff --git a/metadata/md5-cache/www-client/firefox-bin-81.0.1-r1 b/metadata/md5-cache/www-client/firefox-bin-81.0.1-r1
index 01ce8b654c36..2d84465e1221 100644
--- a/metadata/md5-cache/www-client/firefox-bin-81.0.1-r1
+++ b/metadata/md5-cache/www-client/firefox-bin-81.0.1-r1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0/81
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/en-US/firefox-81.0.1.tar.bz2 -> firefox-bin_x86_64-81.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-i686/en-US/firefox-81.0.1.tar.bz2 -> firefox-bin_i686-81.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ach.xpi -> firefox-81.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/af.xpi -> firefox-81.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/an.xpi -> firefox-81.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ar.xpi -> firefox-81.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ast.xpi -> firefox-81.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/az.xpi -> firefox-81.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/be.xpi -> firefox-81.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/bg.xpi -> firefox-81.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/bn.xpi -> firefox-81.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/br.xpi -> firefox-81.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/bs.xpi -> firefox-81.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-81.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ca.xpi -> firefox-81.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/cak.xpi -> firefox-81.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/cs.xpi -> firefox-81.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/cy.xpi -> firefox-81.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/da.xpi -> firefox-81.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/de.xpi -> firefox-81.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-81.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/el.xpi -> firefox-81.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-81.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-81.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/eo.xpi -> firefox-81.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-81.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-81.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-81.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-81.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/et.xpi -> firefox-81.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/eu.xpi -> firefox-81.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fa.xpi -> firefox-81.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ff.xpi -> firefox-81.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fi.xpi -> firefox-81.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fr.xpi -> firefox-81.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-81.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-81.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gd.xpi -> firefox-81.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gl.xpi -> firefox-81.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gn.xpi -> firefox-81.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-81.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/he.xpi -> firefox-81.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-81.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hr.xpi -> firefox-81.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-81.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hu.xpi -> firefox-81.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-81.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ia.xpi -> firefox-81.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/id.xpi -> firefox-81.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/is.xpi -> firefox-81.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/it.xpi -> firefox-81.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ja.xpi -> firefox-81.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ka.xpi -> firefox-81.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/kab.xpi -> firefox-81.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/kk.xpi -> firefox-81.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/km.xpi -> firefox-81.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/kn.xpi -> firefox-81.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ko.xpi -> firefox-81.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/lij.xpi -> firefox-81.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/lt.xpi -> firefox-81.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/lv.xpi -> firefox-81.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/mk.xpi -> firefox-81.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/mr.xpi -> firefox-81.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ms.xpi -> firefox-81.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/my.xpi -> firefox-81.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-81.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-81.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/nl.xpi -> firefox-81.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-81.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/oc.xpi -> firefox-81.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-81.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pl.xpi -> firefox-81.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-81.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-81.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/rm.xpi -> firefox-81.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ro.xpi -> firefox-81.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ru.xpi -> firefox-81.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/si.xpi -> firefox-81.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sk.xpi -> firefox-81.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sl.xpi -> firefox-81.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/son.xpi -> firefox-81.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sq.xpi -> firefox-81.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sr.xpi -> firefox-81.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-81.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ta.xpi -> firefox-81.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/te.xpi -> firefox-81.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/th.xpi -> firefox-81.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/tl.xpi -> firefox-81.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/tr.xpi -> firefox-81.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/trs.xpi -> firefox-81.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/uk.xpi -> firefox-81.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/ur.xpi -> firefox-81.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/uz.xpi -> firefox-81.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/vi.xpi -> firefox-81.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/xh.xpi -> firefox-81.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-81.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/81.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-81.0.1-zh-TW.xpi )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b8e27ae3c0dec532b714b5201a53f34
+_md5_=4fa145a25ae4abe077e28f6306db2b58
diff --git a/metadata/md5-cache/www-client/opera-beta-72.0.3815.86 b/metadata/md5-cache/www-client/opera-beta-72.0.3815.86
new file mode 100644
index 000000000000..05115640f2fa
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-72.0.3815.86
@@ -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 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/72.0.3815.86/linux/opera-beta_72.0.3815.86_amd64.deb https://download2.operacdn.com/pub/opera-beta/72.0.3815.86/linux/opera-beta_72.0.3815.86_amd64.deb https://download3.operacdn.com/pub/opera-beta/72.0.3815.86/linux/opera-beta_72.0.3815.86_amd64.deb https://download4.operacdn.com/pub/opera-beta/72.0.3815.86/linux/opera-beta_72.0.3815.86_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_=9ad9039bbd4098e2ad37ae4bb2b3f606
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.37_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.37_p1
new file mode 100644
index 000000000000..1c3a490d203b
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.37_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.2066.37-1_amd64.deb -> vivaldi-snapshot-3.4.2066.37_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.37-1_arm64.deb -> vivaldi-snapshot-3.4.2066.37_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.37-1_armhf.deb -> vivaldi-snapshot-3.4.2066.37_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.37-1_i386.deb -> vivaldi-snapshot-3.4.2066.37_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-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 8eb7a6ea7b26..ab4fab05f5fa 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/cherokee-1.2.104-r2 b/metadata/md5-cache/www-servers/cherokee-1.2.104-r2
deleted file mode 100644
index 526495fbeef0..000000000000
--- a/metadata/md5-cache/www-servers/cherokee-1.2.104-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libpcre >=sys-libs/zlib-1.1.4-r1 ffmpeg? ( media-video/ffmpeg ) geoip? ( dev-libs/geoip ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) php? ( || ( dev-lang/php:*[fpm] dev-lang/php:*[cgi] ) ) ssl? ( !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=An extremely fast and tiny web server
-EAPI=7
-HOMEPAGE=https://www.cherokee-project.com/
-IUSE=admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libpcre >=sys-libs/zlib-1.1.4-r1 ffmpeg? ( media-video/ffmpeg ) geoip? ( dev-libs/geoip ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) php? ( || ( dev-lang/php:*[fpm] dev-lang/php:*[cgi] ) ) ssl? ( !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) rrdtool? ( net-analyzer/rrdtool )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cherokee/webserver/archive/v1.2.104.zip -> cherokee-1.2.104.zip
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=802d0dc938bf2aa775da336cbecd2d6e
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.20.0 b/metadata/md5-cache/www-servers/nginx-unit-1.20.0
new file mode 100644
index 000000000000..e8c0d4436e69
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=perl? ( dev-lang/perl:= ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) 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] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+DESCRIPTION=Dynamic web and application server
+EAPI=7
+HOMEPAGE=https://unit.nginx.org
+IUSE=perl python ruby php7-2 php7-3 php7-4 ssl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) 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] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+REQUIRED_USE=|| ( perl python ruby php7-2 php7-3 php7-4 ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.20.0.tar.gz -> nginx-unit-1.20.0.tar.gz
+_eclasses_=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_=b2927c11842fd6221530e84c8ac43ccb
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index c7266659f84f..a4f718eed595 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.12 b/metadata/md5-cache/x11-apps/xdm-1.1.12
index 08acce06213f..3dd84d19c968 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.12
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.12
@@ -11,4 +11,4 @@ RDEPEND=x11-apps/sessreg x11-apps/xconsole x11-apps/xinit x11-apps/xrdb x11-apps
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdm-1.1.12.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=1e50f59f840bf4c4171ece86b476695d
+_md5_=fb5ed19ce4c71afbb2976964f4ccba38
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 103a5c40e9db..e2da2a04a2df 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1 b/metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1
index 0ba5625c9c8d..b9ad97b9a094 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=7
 HOMEPAGE=https://github.com/intel/intel-vaapi-driver
 IUSE=wayland 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
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.52[video_cards_intel,abi_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/libva-2.4.0:=[X?,wayland?,drm,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(-)?] >=media-libs/mesa-9.1.6[egl,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
 SLOT=0
 SRC_URI=https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi-driver-2.4.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5150dd3584f530d48da6541adf0a811
+_md5_=aa6139200b0a724cd001e3fae99defd7
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5898301f8915..e09aa6b3f8aa 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/dsx-0.1-r1 b/metadata/md5-cache/x11-misc/dsx-0.1-r1
deleted file mode 100644
index e7579187da8e..000000000000
--- a/metadata/md5-cache/x11-misc/dsx-0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Command line selection of your X desktop environment
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ppc 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] ) x11-apps/xinit
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ab9aacaeae95f0d1bc6abdb9c43db8f
diff --git a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3 b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
index 62f9c7f8b4cb..c943e44463ef 100644
--- a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
+++ b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
@@ -9,4 +9,4 @@ RDEPEND=>=gnome-base/libglade-2.4 x11-libs/gtk+:2 x11-wm/e16
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16menuedit2-0.0.3.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	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_=97c62deffe159268ffe61ccf976a3c7c
+_md5_=2e74b9a59b14fb59affe2c492d503f82
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.3 b/metadata/md5-cache/x11-misc/kronometer-2.2.3
index 560b09fcb0a0..0c2e8a59ac1e 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	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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/lightdm-1.30.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
similarity index 100%
rename from metadata/md5-cache/x11-misc/lightdm-1.30.0-r1
rename to metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
deleted file mode 100644
index 4a1170c7b485..000000000000
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils >=dev-qt/linguist-tools-5.9.4:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] elogind? ( sys-auth/elogind ) pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) test? ( >=dev-qt/qttest-5.9.4:5 )
-DESCRIPTION=Simple Desktop Display Manager
-EAPI=7
-HOMEPAGE=https://github.com/sddm/sddm
-IUSE=elogind +pam systemd test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
-RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] elogind? ( sys-auth/elogind ) pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
-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	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_=0e15232c14518f83e91263fc4763fe89
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.6-r5 b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
index 201522d54ff4..988dbae7d326 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.6-r5
+++ b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
@@ -1,15 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
 DESCRIPTION=Simple Login Manager
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
-IUSE=branding pam consolekit
+IUSE=branding pam
 KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
-RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock )
-REQUIRED_USE=consolekit? ( pam )
+RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam !x11-misc/slimlock )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.3.6.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	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbafa9c923c6db1eff8148beddb05a54
+_md5_=7e75715e4adc1985bfc802dd5796e408
diff --git a/metadata/md5-cache/x11-misc/slim-9999 b/metadata/md5-cache/x11-misc/slim-9999
index 9304c387c298..46ff6d49a745 100644
--- a/metadata/md5-cache/x11-misc/slim-9999
+++ b/metadata/md5-cache/x11-misc/slim-9999
@@ -1,14 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Simple Login Manager
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
-IUSE=branding pam consolekit
+IUSE=branding pam
 LICENSE=GPL-2
 PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
 PROPERTIES=live
-RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock )
-REQUIRED_USE=consolekit? ( pam )
+RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam !x11-misc/slimlock )
 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	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d65263a733e128936b62bdaa0e583730
+_md5_=f91cb1804bea7fd44291ed814b061df0
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2 b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
new file mode 100644
index 000000000000..bca54e1a4a51
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile
+DESCRIPTION=X.Org autotools utility macros
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.19.2.tar.bz2
+_md5_=0d0097b77605c2b5ea3029c329cd4298
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08
deleted file mode 100644
index 7730cae9829d..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08
+++ /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.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/xlockmore-5.66_alpha09 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha09
deleted file mode 100644
index 30cd8be52ae9..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha09
+++ /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.66ALPHA09.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA09.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_alpha11 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11
new file mode 100644
index 000000000000..08d4f2993f78
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11
@@ -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.66ALPHA11.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA11.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-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 6995a2b41fed..f296e462f0e5 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r3 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r3
index a0a89ddf898d..e5090236d6cf 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r3
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r3
@@ -5,11 +5,11 @@ DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
 IUSE=256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel +perl startup-notification unicode3 +utmp +wtmp xft
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender gdk-pixbuf? ( x11-libs/gdk-pixbuf ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.22.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5998cd81723bc382a136c8d84f5f0e26
+_md5_=36278cb1b6c7a6ae7a542e9e8816691d
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index c637de2729b3..8d3cb1d8714a 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
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 6c865de8559d..5be9929507ac 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 88ba7dba90bf..5542498ef232 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	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
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	16ab706e1b049cfaa65425a0c0e28cac	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 de3bb2739170..ef00935b161c 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/e16-1.0.20 b/metadata/md5-cache/x11-wm/e16-1.0.20
deleted file mode 100644
index 6086e341f5f1..000000000000
--- a/metadata/md5-cache/x11-wm/e16-1.0.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=media-libs/freetype:2 media-libs/imlib2[X] virtual/libiconv x11-libs/libX11 x11-libs/libXext x11-misc/xbitmaps dbus? ( sys-apps/dbus ) opengl? ( media-libs/glu media-libs/mesa ) pango? ( dev-libs/glib:2 x11-libs/pango[X] ) sound? ( || ( media-sound/apulse[sdk] media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) audiofile? ( media-libs/audiofile:= ) ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpresent? ( x11-libs/libXpresent ) xrandr? ( x11-libs/libXrandr ) xrender? ( x11-libs/libXrender ) xsm? ( x11-libs/libICE x11-libs/libSM ) zoom? ( x11-libs/libXxf86vm ) x11-base/xorg-proto
-DESCRIPTION=Enlightenment Window Manager (E16)
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/
-IUSE=audiofile container dbus debug +dialogs doc examples gnome libhack modules nls opengl +pango sndfile sound +themes xcomposite +xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=media-libs/freetype:2 media-libs/imlib2[X] virtual/libiconv x11-libs/libX11 x11-libs/libXext x11-misc/xbitmaps dbus? ( sys-apps/dbus ) opengl? ( media-libs/glu media-libs/mesa ) pango? ( dev-libs/glib:2 x11-libs/pango[X] ) sound? ( || ( media-sound/apulse[sdk] media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) audiofile? ( media-libs/audiofile:= ) ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpresent? ( x11-libs/libXpresent ) xrandr? ( x11-libs/libXrandr ) xrender? ( x11-libs/libXrender ) xsm? ( x11-libs/libICE x11-libs/libSM ) zoom? ( x11-libs/libXxf86vm ) doc? ( app-doc/e16-docs ) nls? ( virtual/libintl ) themes? ( x11-themes/e16-themes ) !x11-wm/enlightenment:0
-REQUIRED_USE=audiofile? ( sound ) opengl? ( xcomposite ) sndfile? ( sound ) sound? ( ^^ ( sndfile audiofile ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16-1.0.20.tar.xz
-_md5_=d0bcdc1c8c345cc72a73bfa2b406ee1d
diff --git a/metadata/md5-cache/x11-wm/e16-1.0.21 b/metadata/md5-cache/x11-wm/e16-1.0.21
index 8772042a181a..a581598ced2a 100644
--- a/metadata/md5-cache/x11-wm/e16-1.0.21
+++ b/metadata/md5-cache/x11-wm/e16-1.0.21
@@ -8,7 +8,7 @@ IUSE=audiofile container dbus debug +dialogs doc examples gnome libhack modules
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=media-libs/freetype:2 media-libs/imlib2[X] virtual/libiconv x11-libs/libX11 x11-libs/libXext x11-misc/xbitmaps dbus? ( sys-apps/dbus ) opengl? ( media-libs/glu media-libs/mesa ) pango? ( dev-libs/glib:2 x11-libs/pango[X] ) sound? ( || ( media-sound/apulse[sdk] media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) audiofile? ( media-libs/audiofile:= ) ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpresent? ( x11-libs/libXpresent ) xrandr? ( x11-libs/libXrandr ) xrender? ( x11-libs/libXrender ) xsm? ( x11-libs/libICE x11-libs/libSM ) zoom? ( x11-libs/libXxf86vm ) doc? ( app-doc/e16-docs ) nls? ( virtual/libintl ) themes? ( x11-themes/e16-themes ) !x11-wm/enlightenment:0
-REQUIRED_USE=audiofile? ( sound ) opengl? ( xcomposite ) sndfile? ( sound ) sound? ( ^^ ( sndfile audiofile ) )
+REQUIRED_USE=audiofile? ( sound ) opengl? ( xcomposite ) pango? ( xft ) sndfile? ( sound ) sound? ( ^^ ( sndfile audiofile ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16-1.0.21.tar.xz
-_md5_=d0bcdc1c8c345cc72a73bfa2b406ee1d
+_md5_=2df925ebd114c996c84f2bc96e613f9a
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
index 515df1d67679..5b57c2b6e57c 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8558e407965043dba9fb53da3aa49337
+_md5_=8ae4e3769d4910f566eda066a1ec4a56
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index ed0e6c0b54b8..41283bedc39a 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6
deleted file mode 100644
index 1d96d02dbf90..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Power manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
-IUSE=kernel_linux networkmanager +panel-plugin policykit
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-1.6.6.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f42bf4855b4463564367f2b43c994da6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6-r1 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6-r1
new file mode 100644
index 000000000000..13dfdc24b165
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Power manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
+IUSE=kernel_linux networkmanager +panel-plugin policykit
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-1.6.6.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b30eeee6beb523a0259aa74f4a6fdf01
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0
deleted file mode 100644
index d6c39f560200..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Power manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
-IUSE=kernel_linux networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/1.7/xfce4-power-manager-1.7.0.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ecf65afeceba9fa6e075c726af4ded7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0-r1
new file mode 100644
index 000000000000..178a18000d0b
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Power manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
+IUSE=kernel_linux networkmanager +panel-plugin policykit
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/1.7/xfce4-power-manager-1.7.0.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea75b52a3abe3ce75034f962af262c78
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 70b25f3d35c2..0769980932ba 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12077 BLAKE2B 2f3ed2165704c3f21cd4304fe3c7b1c7220549685a7eaa2b3e7c032afad54f4636d2f0b3a9ec4d5d71d15b7b035403e2ef7a90326cff0da0eaf8ffd7e4fac1aa SHA512 f30fcba11723fbc57f0bea029403880a3ba6f50c0d547ae57a3947cb791df5cb0e16dcf31a4810562ece91b1fc646aa82b76a7ef6f7a60e3a0bdd95f0bc0a165
-TIMESTAMP 2020-10-08T13:38:39Z
+TIMESTAMP 2020-10-12T05:08:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9/Fl9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+D5NlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAI0hAAoXBPq8dxxLbRAcZePdX4WLXY7LlM6zrj83k5c/7Z3YPg/9Jd64DUSB0r
-bGiKr3LgU0TM8x4GeH62Vq5kjjzqJxgAWHfE1XYY3MVE+HKjLhz/te1ZIpqk0i9A
-Dc7IFkoV8Fc7moK7DhoarXGhhGu37p0ZxJeICq+Fds0Cqu7H7L50wQEwuzaHAXxy
-vqLcHLTvZaGH+t9lvg1p/aNwt8r9g/CBSt3saY9e5kLsf2horp/wKPPZw5cmlUSn
-1LRvmrX/C8+qgA6P0WLycnp3IwNuUYwElbxd9Cy6jZ38Psa3PQHx94T7xiMg7v3+
-08IotyyTjLiKJZIgdIQ9SKB9poowhgJIxJ4Q2yjPuT3rK7x6iTgQMeAGWXM8hyq2
-YK+iWN7UxIkGBRHXU+BRE58LBo7bo0YCmh6zdvO7u/CpqFHtLZwjBB4/RSqCW0fC
-ou9SW9k7TWAmJcveVe6ByecVUE58QYJubS+hicIw+VknVA6vOoDmU+THcbut99vH
-Rm7A7hHe58RCTz2pxE/U+aE1yI0bwvji1iaOl/sWd2In2maV+V/OS11edYgqYpH4
-lVxBzSFJnnzGjyehl+AHEJHEJAuAr8PbMAZjWyi60+Qjqqqz5DMgidgZpAybeUt7
-IyU3qUQFQqSRzf+rc+z+kAuHQs7GwRUAo7qqO1lipsjA0NArMrY=
-=cJA6
+klCPiQ/8CRQ+waxNhcKO84h4NORuXFhw4FFQzq7d9t+xsM/NvJ0cAYt4KgosV2iG
+IGt0eDqnaYbaWce23/ugWXKhNUgXkHaJ8sk/TB9EY2rEVo6NWZUtLaERFIoQD13p
+uA93Rw7GePWc1a2MmdGJnULj3o5QjuAGxzCfS3QR/xsIkmiG3S23QDt7SFGOK1DC
+j5lMtjerCM7AqVaSI1pGarMZijGFVJpE8I/ufNCkNLhJASTdeZTRlmSI+CI3qAbr
+iCBNZVIjWALzn0nsWKrQOVZeP7+61lX9GIdBjUOtPQh3NDTPpWU5Zs8zomBdJcrG
+6Pa+BExmyBsYq0T+bAJuM33AHCGSCFLME2JmBSVf4w7JEwcJivN0LDtIh+O+b44u
+45ofgRpn/vy3lmD6aFX2/nfY9UMTvFAyBRQtRdCetFJ8jtF8I6uDCI71L0Y14euF
+PhmgFFLGlStr3XVsszWn/8DsAynGyG9Hj0tLZB8jsd2WB1Z7T9YHepoOjeq55XVC
+K/OthmZssX16cUEqeO3QH8BE1zw0U0hEjUnyUFMlS1LEiE+ezYQTq+/9r3SpJTWo
+czJo6tn0k1vqRHODQVJToPvVLUBguiWGIjuU248aaaIMLlQSN4KsoW4m/LMkzdmt
+Yu/oqWFEkKBZfp9BNyoOZKXg4cQI1KjPBLskRaVvG31FVt+QUPw=
+=Rch5
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 197a7573e11a..f1baf1c687c4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 08 Oct 2020 13:38:36 +0000
+Mon, 12 Oct 2020 05:08:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 35e66b4814fb..620346221f51 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu 08 Oct 2020 01:38:36 PM UTC
+Mon 12 Oct 2020 05:08:37 AM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 9badc806705e..9124063035e0 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -242,6 +242,8 @@
 2010031839 ./acct-group/sancp/sancp-0.ebuild
 2010040039 ./acct-group/nzbget/nzbget-0.ebuild
 2010051809 ./acct-group/croc/croc-0.ebuild
+2010120139 ./acct-group/jabber/jabber-0.ebuild
+2010090209 ./acct-group/sks/sks-0.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -466,6 +468,8 @@
 2010040039 ./acct-user/nzbget/nzbget-0.ebuild
 2010051809 ./acct-user/croc/croc-0.ebuild
 2010080609 ./acct-user/pgbouncer/pgbouncer-0.ebuild
+2010120139 ./acct-user/jabber/jabber-0.ebuild
+2010090209 ./acct-user/sks/sks-0.ebuild
 2007201009 ./app-accessibility/accerciser/accerciser-3.36.2.ebuild
 2007290809 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
 2007290809 ./app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
@@ -593,7 +597,7 @@
 2005062039 ./app-admin/eselect/eselect-1.4.16.ebuild
 2005062039 ./app-admin/eselect/eselect-9999.ebuild
 1910042139 ./app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
-2009241639 ./app-admin/exo/exo-1.18.0.ebuild
+2010091739 ./app-admin/exo/exo-1.19.0.ebuild
 2004032241 ./app-admin/fam/fam-2.7.0_p17_p2.ebuild
 2006221638 ./app-admin/fam/fam-2.7.0_p17_p3.ebuild
 1907151839 ./app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -848,8 +852,8 @@
 2006260408 ./app-admin/vault/vault-1.4.2-r1.ebuild
 2008020209 ./app-admin/vault/vault-1.4.3.ebuild
 2008021039 ./app-admin/vault/vault-1.5.0.ebuild
-2008280109 ./app-admin/vault/vault-1.4.5.ebuild
 2008280109 ./app-admin/vault/vault-1.5.2.ebuild
+2010091439 ./app-admin/vault/vault-1.4.5.ebuild
 2002230040 ./app-admin/verynice/verynice-1.1-r3.ebuild
 1810141609 ./app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
 2002112050 ./app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -865,6 +869,8 @@
 2010072239 ./app-admin/ansible-base/ansible-base-2.10.2.ebuild
 2010011509 ./app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
 2010020009 ./app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
+2010120539 ./app-admin/selint/selint-1.1.0.ebuild
+2010120539 ./app-admin/selint/selint-9999.ebuild
 2007171839 ./app-antivirus/clamav/clamav-0.102.4.ebuild
 2009301439 ./app-antivirus/clamav/clamav-0.103.0-r1.ebuild
 2009181139 ./app-antivirus/clamtk/clamtk-6.05.ebuild
@@ -1034,8 +1040,9 @@
 2008011739 ./app-backup/bareos/bareos-18.2.9.ebuild
 2008011739 ./app-backup/bareos/bareos-19.2.8.ebuild
 2006141739 ./app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
-2006141739 ./app-backup/borgbackup/borgbackup-9999.ebuild
 2008292109 ./app-backup/borgbackup/borgbackup-1.1.13.ebuild
+2010101809 ./app-backup/borgbackup/borgbackup-1.1.14.ebuild
+2010101809 ./app-backup/borgbackup/borgbackup-9999.ebuild
 2009020309 ./app-backup/borgweb/borgweb-0.2.0-r2.ebuild
 2009020309 ./app-backup/borgweb/borgweb-0.3.0.ebuild
 2006300939 ./app-backup/btrbk/btrbk-0.29.1.ebuild
@@ -1082,9 +1089,8 @@
 1810092039 ./app-backup/rear/rear-2.4.ebuild
 2010050909 ./app-backup/rear/rear-2.6.ebuild
 2002122139 ./app-backup/reoback/reoback-1.0_p3-r1.ebuild
-1911061839 ./app-backup/restic/restic-0.9.5.ebuild
-1912110241 ./app-backup/restic/restic-0.9.4.ebuild
 2001271609 ./app-backup/restic/restic-0.9.6.ebuild
+2010101039 ./app-backup/restic/restic-0.10.0.ebuild
 2002112050 ./app-backup/rsnapshot/rsnapshot-1.4.2.ebuild
 2006221609 ./app-backup/rsnapshot/rsnapshot-1.4.3.ebuild
 1712281839 ./app-backup/sarab/sarab-1.0.0.ebuild
@@ -1096,8 +1102,8 @@
 1911081009 ./app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
 1702282250 ./app-backup/tarsnap/tarsnap-1.0.37.ebuild
 1812292339 ./app-backup/tarsnap/tarsnap-1.0.39.ebuild
-2007131539 ./app-backup/tsm/tsm-7.1.8.0-r1.ebuild
-2007131539 ./app-backup/tsm/tsm-8.1.6.0.ebuild
+2010092139 ./app-backup/tsm/tsm-8.1.6.0-r1.ebuild
+2010091839 ./app-backup/tsm/tsm-8.1.6.0.ebuild
 2005121409 ./app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild
 1907151839 ./app-backup/vzdump/vzdump-1.2.ebuild
 1712281839 ./app-backup/zbackup/zbackup-1.4.4-r1.ebuild
@@ -1204,20 +1210,16 @@
 1905191409 ./app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
 2002222009 ./app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild
 2004230939 ./app-cdr/xfburn/xfburn-0.6.2.ebuild
-2009031539 ./app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.1.ebuild
+2010092209 ./app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.2.ebuild
 2002230040 ./app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
 1708121939 ./app-crypt/acme-client/acme-client-0.1.16.ebuild
 1910090839 ./app-crypt/acme-sh/acme-sh-9999.ebuild
 2009231439 ./app-crypt/acme-sh/acme-sh-2.8.7.ebuild
 2002111509 ./app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
 2002111509 ./app-crypt/acme-tiny/acme-tiny-9999.ebuild
-2010020039 ./app-crypt/acme/acme-1.7.0.ebuild
-2010020039 ./app-crypt/acme/acme-1.8.0.ebuild
 2010020039 ./app-crypt/acme/acme-9999.ebuild
 2010071839 ./app-crypt/acme/acme-1.9.0.ebuild
-2001051415 ./app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
-2001051415 ./app-crypt/acmebot/acmebot-9999.ebuild
-2008160809 ./app-crypt/acmebot/acmebot-2.7.0.ebuild
+2010102239 ./app-crypt/acme/acme-1.8.0.ebuild
 1809280333 ./app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
 1809280333 ./app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
 1809280333 ./app-crypt/aespipe/aespipe-2.4e.ebuild
@@ -1236,19 +1238,16 @@
 2007091108 ./app-crypt/ccid/ccid-1.4.33.ebuild
 1904282339 ./app-crypt/ccrypt/ccrypt-1.11.ebuild
 2007201609 ./app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
-2010020039 ./app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
-2010020039 ./app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
 2010071839 ./app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild
 2010071839 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
+2010102239 ./app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
 2002180109 ./app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
-2010020039 ./app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
-2010020039 ./app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
 2010020039 ./app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
 2010071839 ./app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild
-2010020039 ./app-crypt/certbot/certbot-1.7.0.ebuild
-2010020039 ./app-crypt/certbot/certbot-1.8.0.ebuild
+2010102239 ./app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
 2010071839 ./app-crypt/certbot/certbot-1.9.0.ebuild
 2010071839 ./app-crypt/certbot/certbot-9999.ebuild
+2010102239 ./app-crypt/certbot/certbot-1.8.0.ebuild
 2005060209 ./app-crypt/cfssl/cfssl-1.4.1.ebuild
 2003182039 ./app-crypt/chntpw/chntpw-140201.ebuild
 1702282250 ./app-crypt/ckpass/ckpass-0.2-r1.ebuild
@@ -1393,8 +1392,8 @@
 2002140109 ./app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
 2002140109 ./app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
 2008091039 ./app-crypt/scdrand/scdrand-0.3.5.ebuild
-2009142139 ./app-crypt/scrypt/scrypt-1.3.1.ebuild
 2009181139 ./app-crypt/scrypt/scrypt-1.3.0.ebuild
+2010091209 ./app-crypt/scrypt/scrypt-1.3.1.ebuild
 1809280333 ./app-crypt/scute/scute-1.5.0.ebuild
 2002291639 ./app-crypt/scute/scute-1.6.0.ebuild
 2001271309 ./app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
@@ -1421,8 +1420,8 @@
 2010021209 ./app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
 2008051539 ./app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc1.ebuild
 2007020109 ./app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
-2009060909 ./app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
-2009060909 ./app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild
+2010111239 ./app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
+2010111239 ./app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild
 2009010339 ./app-crypt/trousers/trousers-0.3.14-r3.ebuild
 1809201939 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
 1912261609 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
@@ -1444,6 +1443,7 @@
 2004290939 ./app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild
 2010081009 ./app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild
 2010081009 ./app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild
+2010102139 ./app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
 2009041409 ./app-dicts/aspell-af/aspell-af-0.50.0.ebuild
 2009041409 ./app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
 2009041409 ./app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
@@ -2022,10 +2022,8 @@
 2009280512 ./app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
 1912111539 ./app-doc/halibut/halibut-1.2.ebuild
 2004032241 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
-1809070609 ./app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
-1807091909 ./app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
-2001070009 ./app-doc/kicad-doc/kicad-doc-5.1.5.ebuild
-2006062109 ./app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
+2010111239 ./app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
+2010111239 ./app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
 2006111539 ./app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
 2004032241 ./app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
 2004032241 ./app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
@@ -2388,7 +2386,7 @@
 1909041309 ./app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
 1910022239 ./app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
 2004051339 ./app-emacs/lua-mode/lua-mode-20151025.ebuild
-2009201209 ./app-emacs/lua-mode/lua-mode-20151025_p20200513.ebuild
+2010111539 ./app-emacs/lua-mode/lua-mode-20201010.ebuild
 1807230339 ./app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild
 2003301539 ./app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20200226.ebuild
 1912131109 ./app-emacs/magit-popup/magit-popup-2.13.0.ebuild
@@ -2598,8 +2596,7 @@
 2004290239 ./app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
 2004290239 ./app-emulation/fs-uae/fs-uae-3.0.5.ebuild
 2008161109 ./app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
-2008161109 ./app-emulation/fuse/fuse-1.5.6.ebuild
-2008161109 ./app-emulation/fuse/fuse-1.5.7.ebuild
+2010101039 ./app-emulation/fuse/fuse-1.5.7.ebuild
 2008222309 ./app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
 2008222309 ./app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
 1908281739 ./app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
@@ -2736,19 +2733,20 @@
 2004132009 ./app-emulation/wine-mono/wine-mono-4.9.4.ebuild
 2004260039 ./app-emulation/wine-mono/wine-mono-5.0.0.ebuild
 2006200709 ./app-emulation/wine-mono/wine-mono-5.1.0.ebuild
-2008161909 ./app-emulation/wine-staging/wine-staging-5.15.ebuild
+2010112339 ./app-emulation/wine-mono/wine-mono-5.1.1.ebuild
 2008301809 ./app-emulation/wine-staging/wine-staging-5.16.ebuild
 2009130209 ./app-emulation/wine-staging/wine-staging-5.17.ebuild
 2009280609 ./app-emulation/wine-staging/wine-staging-5.18.ebuild
-2009280609 ./app-emulation/wine-staging/wine-staging-9999.ebuild
+2010112339 ./app-emulation/wine-staging/wine-staging-5.19.ebuild
+2010112339 ./app-emulation/wine-staging/wine-staging-9999.ebuild
 2002231739 ./app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
 2006291709 ./app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
 2008080239 ./app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
-2008160609 ./app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild
 2008301809 ./app-emulation/wine-vanilla/wine-vanilla-5.16.ebuild
 2009130209 ./app-emulation/wine-vanilla/wine-vanilla-5.17.ebuild
 2009280609 ./app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild
-2009280609 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+2010112339 ./app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
+2010112339 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
 1912110241 ./app-emulation/winetricks/winetricks-20190912.ebuild
 1912250339 ./app-emulation/winetricks/winetricks-20191224.ebuild
 2007140339 ./app-emulation/winetricks/winetricks-20200412.ebuild
@@ -2760,14 +2758,14 @@
 2009181809 ./app-emulation/xen-pvgrub/xen-pvgrub-4.13.1.ebuild
 2009181809 ./app-emulation/xen-tools/xen-tools-4.13.1-r3.ebuild
 2009292309 ./app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild
-2010071039 ./app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild
+2010091139 ./app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild
 2009181809 ./app-emulation/xen/xen-4.13.1-r3.ebuild
-2009292309 ./app-emulation/xen/xen-4.13.1-r4.ebuild
 2009292309 ./app-emulation/xen/xen-4.14.0-r2.ebuild
+2010091139 ./app-emulation/xen/xen-4.13.1-r4.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2009230439 ./app-emulation/crun/crun-0.14.1.ebuild
 2010071239 ./app-emulation/crun/crun-0.15.ebuild
-2008231509 ./app-emulation/pcem/pcem-16.ebuild
+2010101639 ./app-emulation/pcem/pcem-16-r1.ebuild
 1912120239 ./app-emulation/aranym/aranym-1.1.0.ebuild
 2004221309 ./app-emulation/protontricks/protontricks-1.4.1.ebuild
 2009212339 ./app-emulation/protontricks/protontricks-1.4.2.ebuild
@@ -2940,7 +2938,7 @@
 2009111739 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild
 2009111739 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
 1708121738 ./app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
-2009050509 ./app-i18n/ibus/ibus-1.5.22.ebuild
+2010112339 ./app-i18n/ibus/ibus-1.5.22.ebuild
 1707231537 ./app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
 1707231535 ./app-i18n/im-canna/im-canna-0.3.2.2.ebuild
 1906051009 ./app-i18n/im-chooser/im-chooser-1.7.0.ebuild
@@ -3017,7 +3015,7 @@
 2009021739 ./app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
 1808081709 ./app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
 1808081709 ./app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
-2009050509 ./app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+2010111209 ./app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
 1910042209 ./app-i18n/tagainijisho/tagainijisho-9999.ebuild
 2007041709 ./app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
 2010022109 ./app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
@@ -3300,7 +3298,7 @@
 2004032241 ./app-misc/devtodo/devtodo-0.1.20-r3.ebuild
 1910100839 ./app-misc/dfshow/dfshow-0.8.2_beta.ebuild
 1912111539 ./app-misc/digitemp/digitemp-3.7.1.ebuild
-2009181139 ./app-misc/dtach/dtach-0.9.ebuild
+2010112109 ./app-misc/dtach/dtach-0.9.ebuild
 2009131114 ./app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
 1702282250 ./app-misc/dvorakng/dvorakng-0.6.0.ebuild
 2006041239 ./app-misc/dvtm/dvtm-0.15-r2.ebuild
@@ -3374,8 +3372,7 @@
 1807081439 ./app-misc/grabcartoons/grabcartoons-9999.ebuild
 2007291438 ./app-misc/gramps/gramps-5.1.2-r1.ebuild
 2008242039 ./app-misc/gramps/gramps-5.1.3.ebuild
-2009290139 ./app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild
-2010071039 ./app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
+2010091139 ./app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
 2002102339 ./app-misc/grc/grc-1.11-r1.ebuild
 2006211209 ./app-misc/grc/grc-1.11.3.ebuild
 2009160539 ./app-misc/gtk-sunlight/gtk-sunlight-0.4.2-r1.ebuild
@@ -3411,8 +3408,7 @@
 2009181139 ./app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild
 2009040839 ./app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
 2010032139 ./app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
-2005120109 ./app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
-2010071039 ./app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
+2010101639 ./app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
 1712171939 ./app-misc/leave/leave-20100918-r1.ebuild
 1912131839 ./app-misc/ledit/ledit-2.03.ebuild
 2004011809 ./app-misc/ledit/ledit-2.04.ebuild
@@ -3448,9 +3444,6 @@
 2007240239 ./app-misc/mosquitto/mosquitto-1.6.10.ebuild
 2008250009 ./app-misc/mosquitto/mosquitto-1.6.12.ebuild
 1702282250 ./app-misc/mouseremote/mouseremote-0.90-r2.ebuild
-1704231420 ./app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild
-1809050109 ./app-misc/mtail/mtail-1.2.0.ebuild
-2002112051 ./app-misc/mtail/mtail-1.1.1-r3.ebuild
 1702282250 ./app-misc/muttprint/muttprint-0.73-r4.ebuild
 1805212238 ./app-misc/mvcase/mvcase-0.1-r2.ebuild
 2008272109 ./app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
@@ -3530,7 +3523,7 @@
 2009301539 ./app-misc/reptyr/reptyr-0.8.0.ebuild
 2009271939 ./app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
 2010032039 ./app-misc/resolve-march-native/resolve-march-native-1.0.0.ebuild
-2001211409 ./app-misc/rioutil/rioutil-1.5.4.ebuild
+2010111209 ./app-misc/rioutil/rioutil-1.5.4.ebuild
 2004032241 ./app-misc/rl/rl-0.2.7-r1.ebuild
 1705030952 ./app-misc/rlwrap/rlwrap-0.42-r1.ebuild
 1707262252 ./app-misc/rlwrap/rlwrap-0.43.ebuild
@@ -3594,7 +3587,7 @@
 2004281909 ./app-misc/tmuxp/tmuxp-1.5.4.ebuild
 2007310709 ./app-misc/tmuxp/tmuxp-1.5.5.ebuild
 2003100009 ./app-misc/todo/todo-2.11.0.ebuild
-2009170009 ./app-misc/todo/todo-2.12.0.ebuild
+2010092309 ./app-misc/todo/todo-2.12.0-r1.ebuild
 1911171639 ./app-misc/toilet/toilet-0.3-r1.ebuild
 2002112051 ./app-misc/towitoko/towitoko-2.0.7-r3.ebuild
 1902241409 ./app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
@@ -3640,8 +3633,7 @@
 2007151539 ./app-misc/zygrib/zygrib-8.0.1-r1.ebuild
 2006151839 ./app-misc/rpick/rpick-0.6.1.ebuild
 2009231339 ./app-misc/rpick/rpick-0.7.0.ebuild
-2001211409 ./app-misc/fr24feed/fr24feed-1.0.24_p5.ebuild
-2010071039 ./app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
+2010091139 ./app-misc/fr24feed/fr24feed-1.0.25_p3.ebuild
 2006291709 ./app-misc/transfolio/transfolio-1.0.1-r1.ebuild
 2001042109 ./app-misc/hodie/hodie-1.5.ebuild
 2006180309 ./app-misc/asciicast-tools/asciicast-tools-0.0_pre20190410.ebuild
@@ -3669,7 +3661,6 @@
 1805222109 ./app-mobilephone/scmxx/scmxx-0.9.0.ebuild
 2002140109 ./app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
 2006221009 ./app-mobilephone/smstools/smstools-3.1.21-r1.ebuild
-1811080209 ./app-mobilephone/sobexsrv/sobexsrv-1.0.1-r2.ebuild
 2009241009 ./app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
 1711251740 ./app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
 1702282250 ./app-office/abiword-docs/abiword-docs-3.0.2.ebuild
@@ -3719,8 +3710,7 @@
 2009130310 ./app-office/lyx/lyx-2.3.5.2-r1.ebuild
 1912210209 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
 2004032241 ./app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
-1905201509 ./app-office/moneydance/moneydance-2017.10.ebuild
-2008230239 ./app-office/moneydance/moneydance-2020.0.1919.ebuild
+2010101409 ./app-office/moneydance/moneydance-2020.2.1929.ebuild
 2002241609 ./app-office/moneyguru/moneyguru-3.0.1-r2.ebuild
 1702282250 ./app-office/multitalk/multitalk-1.4-r1.ebuild
 2007151739 ./app-office/orage/orage-4.12.1-r2.ebuild
@@ -3800,7 +3790,6 @@
 2004211009 ./app-portage/elt-patches/elt-patches-20170317.ebuild
 2004211009 ./app-portage/elt-patches/elt-patches-20170422.ebuild
 2004211009 ./app-portage/elt-patches/elt-patches-20170815.ebuild
-2004032241 ./app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
 2004032241 ./app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
 1905181309 ./app-portage/epkg/epkg-0.4-r1.ebuild
 2010042209 ./app-portage/esearch/esearch-1.3-r3.ebuild
@@ -3831,8 +3820,8 @@
 2003261841 ./app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
 2004032241 ./app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
 2004220039 ./app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
-2010071309 ./app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
 2010071309 ./app-portage/gentoolkit/gentoolkit-9999.ebuild
+2010090939 ./app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
 2005301039 ./app-portage/gentoopm/gentoopm-0.3.1.ebuild
 2005301039 ./app-portage/gentoopm/gentoopm-9999.ebuild
 2009271939 ./app-portage/gentoopm/gentoopm-0.3.2.ebuild
@@ -3942,6 +3931,7 @@
 1912111539 ./app-shells/localshell/localshell-1.3.4-r1.ebuild
 2006100009 ./app-shells/loksh/loksh-6.7.2.ebuild
 2010030939 ./app-shells/loksh/loksh-6.7.4.ebuild
+2010100439 ./app-shells/loksh/loksh-6.7.5.ebuild
 1912272309 ./app-shells/mcfly/mcfly-0.3.6.ebuild
 2003272009 ./app-shells/mksh/mksh-58.ebuild
 2004071339 ./app-shells/mksh/mksh-57-r2.ebuild
@@ -3961,8 +3951,7 @@
 1702282250 ./app-shells/psh/psh-1.8.1-r3.ebuild
 2004032241 ./app-shells/push/push-2.0-r1.ebuild
 2009071239 ./app-shells/push/push-3.4.ebuild
-2004032241 ./app-shells/quoter/quoter-3.0_p2-r1.ebuild
-2009270039 ./app-shells/quoter/quoter-4.2.ebuild
+2010091139 ./app-shells/quoter/quoter-4.2.ebuild
 2002222009 ./app-shells/rc/rc-1.7.4-r1.ebuild
 2006222338 ./app-shells/rrs/rrs-1.70-r2.ebuild
 1907092339 ./app-shells/rush/rush-2.0.ebuild
@@ -3999,6 +3988,7 @@
 1702282250 ./app-text/an/an-1.2.ebuild
 2001051939 ./app-text/an/an-1.2_p6.ebuild
 2007160709 ./app-text/ansifilter/ansifilter-2.16.ebuild
+2010101109 ./app-text/ansifilter/ansifilter-2.17.ebuild
 2002112051 ./app-text/antiword/antiword-0.37-r1.ebuild
 1801051609 ./app-text/antixls/antixls-0.3b.ebuild
 2002112051 ./app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -4120,12 +4110,9 @@
 2002291009 ./app-text/fictionup/fictionup-0.2.1.ebuild
 2006280009 ./app-text/flpsed/flpsed-0.7.3.ebuild
 2008292139 ./app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
-2009112309 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild
-2009162239 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild
-2009261309 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
-2010011509 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
+2010120009 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild
 2004301039 ./app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
-2007230839 ./app-text/gocr/gocr-0.50.ebuild
+2010112239 ./app-text/gocr/gocr-0.50.ebuild
 2004252109 ./app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
 2010051809 ./app-text/grip/grip-4.5.2-r1.ebuild
 2005172009 ./app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -4179,7 +4166,8 @@
 2004240139 ./app-text/kjots/kjots-5.0.2-r1.ebuild
 2009201209 ./app-text/kjots/kjots-5.0.2-r2.ebuild
 2004251639 ./app-text/krop/krop-0.5.1-r1.ebuild
-2004251639 ./app-text/krop/krop-9999.ebuild
+2010092209 ./app-text/krop/krop-0.6.0.ebuild
+2010092209 ./app-text/krop/krop-9999.ebuild
 1905091139 ./app-text/languagetool/languagetool-4.5.ebuild
 1907090209 ./app-text/languagetool/languagetool-4.6.ebuild
 2003261841 ./app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -4315,7 +4303,7 @@
 2007292209 ./app-text/recode/recode-3.7.6-r1.ebuild
 1702282250 ./app-text/reed/reed-5.4.ebuild
 2002230040 ./app-text/refbase/refbase-0.9.6_p20180223.ebuild
-2002111509 ./app-text/restview/restview-2.9.2.ebuild
+2010111239 ./app-text/restview/restview-2.9.2.ebuild
 2004032241 ./app-text/rman/rman-3.2-r1.ebuild
 1804060238 ./app-text/rnv/rnv-1.7.11-r1.ebuild
 2002222009 ./app-text/robodoc/robodoc-4.99.43.ebuild
@@ -4337,7 +4325,6 @@
 1805221938 ./app-text/sgrep/sgrep-1.94a.ebuild
 2007201009 ./app-text/sigil/sigil-1.2.1-r1.ebuild
 2008051609 ./app-text/sigil/sigil-1.3.0.ebuild
-1910111840 ./app-text/silvercity/silvercity-0.9.7-r1.ebuild
 1912252009 ./app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
 2001220109 ./app-text/sloccount/sloccount-2.26-r3.ebuild
 2002112051 ./app-text/spellutils/spellutils-0.7.ebuild
@@ -4375,7 +4362,8 @@
 2006151609 ./app-text/txt2man/txt2man-1.7.0.ebuild
 2006291309 ./app-text/txt2man/txt2man-1.7.1.ebuild
 1702282250 ./app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
-2008051739 ./app-text/txt2tags/txt2tags-3.3.ebuild
+2010111239 ./app-text/txt2tags/txt2tags-3.3.ebuild
+2010111239 ./app-text/txt2tags/txt2tags-3.7.ebuild
 1912222309 ./app-text/u2ps/u2ps-0.8.4.ebuild
 1912222309 ./app-text/u2ps/u2ps-1.1.ebuild
 2001122039 ./app-text/unac/unac-1.8.0.ebuild
@@ -4408,10 +4396,11 @@
 2008201639 ./app-text/xhtml1/xhtml1-20020801-r6.ebuild
 2009181139 ./app-text/xiphos/xiphos-4.2.1.ebuild
 2002122139 ./app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
-2009121609 ./app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+2010111239 ./app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
 2001220109 ./app-text/xml2/xml2-0.5.ebuild
 2004032241 ./app-text/xml2doc/xml2doc-20030510-r1.ebuild
 2008011239 ./app-text/xmldiff/xmldiff-2.3.ebuild
+2010101039 ./app-text/xmldiff/xmldiff-2.4.ebuild
 2004280809 ./app-text/xmlformat/xmlformat-1.04.ebuild
 2003261841 ./app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
 2007242309 ./app-text/xmlto/xmlto-0.0.28-r3.ebuild
@@ -4447,8 +4436,8 @@
 2004072239 ./app-text/nuspell/nuspell-3.1.0.ebuild
 2005061739 ./app-text/nuspell/nuspell-3.1.1.ebuild
 2007020109 ./app-text/nuspell/nuspell-3.1.2.ebuild
-2009290309 ./app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
 2009290309 ./app-text/xournalpp/xournalpp-9999.ebuild
+2010110309 ./app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
 2004061139 ./app-text/rnc2rng/rnc2rng-2.6.1.ebuild
 2004061139 ./app-text/rnc2rng/rnc2rng-2.6.2.ebuild
 2007201839 ./app-text/foliate/foliate-2.4.2-r1.ebuild
@@ -4486,7 +4475,6 @@
 2004051339 ./app-vim/colorschemes/colorschemes-20140623-r1.ebuild
 2004032241 ./app-vim/colorsel/colorsel-20100406.ebuild
 1904170009 ./app-vim/command-t/command-t-5.0.3.ebuild
-2004041609 ./app-vim/conque/conque-2.3-r1.ebuild
 1708220030 ./app-vim/csound-syntax/csound-syntax-20160804.ebuild
 1908291509 ./app-vim/csscomplete/csscomplete-1.0.ebuild
 1803060108 ./app-vim/csv/csv-0.31-r1.ebuild
@@ -5075,6 +5063,7 @@
 2009231339 ./dev-cpp/ctemplate/ctemplate-2.4.ebuild
 2007211909 ./dev-cpp/eigen/eigen-3.3.7.ebuild
 2009031539 ./dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+2010120039 ./dev-cpp/eigen/eigen-3.3.8.ebuild
 2004032241 ./dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
 2003261841 ./dev-cpp/gflags/gflags-2.2.1-r1.ebuild
 2003261841 ./dev-cpp/gflags/gflags-9999.ebuild
@@ -5083,7 +5072,6 @@
 2007121239 ./dev-cpp/glog/glog-0.3.4-r1.ebuild
 2007121239 ./dev-cpp/glog/glog-0.4.0.ebuild
 1912110241 ./dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
-2005160139 ./dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
 2007191409 ./dev-cpp/gtest/gtest-9999.ebuild
 2009202339 ./dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
 2004032241 ./dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
@@ -5115,6 +5103,7 @@
 1912312039 ./dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
 1912312039 ./dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
 2010071039 ./dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+2010112339 ./dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
 2007290809 ./dev-cpp/pangomm/pangomm-2.42.1.ebuild
 1702282250 ./dev-cpp/picojson/picojson-1.3.0.ebuild
 1702282250 ./dev-cpp/pngpp/pngpp-0.2.9.ebuild
@@ -5149,7 +5138,7 @@
 2007280338 ./dev-cpp/kokkos/kokkos-3.1.01.ebuild
 2008080439 ./dev-cpp/kokkos/kokkos-3.0.00.ebuild
 2004242309 ./dev-cpp/abseil-cpp/abseil-cpp-20200225.2.ebuild
-2009252309 ./dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
+2010120809 ./dev-cpp/abseil-cpp/abseil-cpp-20200923.1.ebuild
 2005250639 ./dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild
 2009041939 ./dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild
 2007211409 ./dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
@@ -5158,6 +5147,8 @@
 2009260209 ./dev-cpp/benchmark/benchmark-1.5.2.ebuild
 2009130915 ./dev-cpp/prometheus-cpp/prometheus-cpp-0.9.0.ebuild
 2010081309 ./dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.ebuild
+2010090039 ./dev-cpp/robin-map/robin-map-0.6.3.ebuild
+2010090039 ./dev-cpp/robin-map/robin-map-9999.ebuild
 1912111539 ./dev-db/4store/4store-1.1.5-r1.ebuild
 1805250908 ./dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
 1811172139 ./dev-db/aerospike-server-community/aerospike-server-community-9999.ebuild
@@ -5272,7 +5263,7 @@
 2010020339 ./dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
 2007261638 ./dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild
 2007261638 ./dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild
-2007261638 ./dev-db/percona-server/percona-server-8.0.20.11-r1.ebuild
+2010090309 ./dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
 1804180139 ./dev-db/percona-toolkit/percona-toolkit-2.2.20.ebuild
 1904182339 ./dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild
 1805070108 ./dev-db/percona-toolkit/percona-toolkit-3.0.9.ebuild
@@ -5349,8 +5340,9 @@
 2002151310 ./dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
 2009151739 ./dev-db/sqlcl-bin/sqlcl-bin-20.2.0.174.1557.ebuild
 1902050109 ./dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
+2010101039 ./dev-db/sqldeveloper/sqldeveloper-20.2.0.175.1842.ebuild
 2008051709 ./dev-db/sqlite/sqlite-3.32.3-r1.ebuild
-2010071009 ./dev-db/sqlite/sqlite-3.33.0.ebuild
+2010111509 ./dev-db/sqlite/sqlite-3.33.0.ebuild
 2002112051 ./dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
 1711201845 ./dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
 2006261938 ./dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -5400,6 +5392,7 @@
 2002140109 ./dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
 2008251609 ./dev-embedded/esptool/esptool-2.8.ebuild
 2010050039 ./dev-embedded/esptool/esptool-2.8-r1.ebuild
+2010111239 ./dev-embedded/esptool/esptool-2.8-r2.ebuild
 2008160609 ./dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild
 2009201709 ./dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
 1709051022 ./dev-embedded/gpsim/gpsim-0.30.0.ebuild
@@ -5590,8 +5583,8 @@
 2002230040 ./dev-games/libmt_client/libmt_client-0.1.98.ebuild
 1707090132 ./dev-games/libnw/libnw-1.30.02.ebuild
 2002151310 ./dev-games/mercator/mercator-0.3.3.ebuild
-1912110241 ./dev-games/mygui/mygui-3.2.2.ebuild
 2002130209 ./dev-games/mygui/mygui-3.4.0.ebuild
+2010111339 ./dev-games/mygui/mygui-3.2.2.ebuild
 2002112051 ./dev-games/newton/newton-3.14.ebuild
 2002151310 ./dev-games/ode/ode-0.11.1.ebuild
 2002151310 ./dev-games/ode/ode-0.12.ebuild
@@ -5818,7 +5811,7 @@
 1911101840 ./dev-haskell/data-endian/data-endian-0.1.1.ebuild
 2010081109 ./dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
 2010081109 ./dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
-2010081109 ./dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+2010082139 ./dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
 2010081109 ./dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
 2008011139 ./dev-haskell/dav/dav-1.3.4.ebuild
 2008011139 ./dev-haskell/dbus/dbus-1.2.16.ebuild
@@ -5836,47 +5829,46 @@
 2008182039 ./dev-haskell/dns/dns-4.0.1.ebuild
 2008011139 ./dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
 2008011139 ./dev-haskell/doctest/doctest-0.16.3.ebuild
-2004132310 ./dev-haskell/easy-file/easy-file-0.2.1.ebuild
+2010082139 ./dev-haskell/easy-file/easy-file-0.2.2.ebuild
 2008011139 ./dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
 1912150309 ./dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
-1911101840 ./dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
 1912150309 ./dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
-1911101840 ./dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+2010082139 ./dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
 2008031039 ./dev-haskell/editline/editline-0.2.1.1-r1.ebuild
 2008011139 ./dev-haskell/either/either-5.0.1.1.ebuild
 1912150309 ./dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
 1912150309 ./dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
 2009021039 ./dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
-2004132310 ./dev-haskell/email-validate/email-validate-2.0.1.ebuild
+2010082139 ./dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
 1912150309 ./dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
 2008291639 ./dev-haskell/encoding/encoding-0.8.5.ebuild
 2008011139 ./dev-haskell/entropy/entropy-0.4.1.6.ebuild
 2008050039 ./dev-haskell/enumerator/enumerator-0.4.20.ebuild
 2008051039 ./dev-haskell/equivalence/equivalence-0.3.5.ebuild
 2006062109 ./dev-haskell/erf/erf-2.0.0.0-r1.ebuild
-2008182039 ./dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
+2010082139 ./dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
 2008182039 ./dev-haskell/errors/errors-2.3.0.ebuild
 2009191339 ./dev-haskell/esqueleto/esqueleto-3.3.4.0.ebuild
 2008011139 ./dev-haskell/exceptions/exceptions-0.10.4.ebuild
 1912150309 ./dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
-2008080209 ./dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+2010082139 ./dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
 2009150139 ./dev-haskell/extra/extra-1.7.8.ebuild
 2008011139 ./dev-haskell/fail/fail-4.9.0.0.ebuild
-2005172009 ./dev-haskell/failure/failure-0.2.0.3.ebuild
+2010101239 ./dev-haskell/failure/failure-0.2.0.3.ebuild
 2008011139 ./dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
 1912150209 ./dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
-2008231509 ./dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+2010101239 ./dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
 2008011139 ./dev-haskell/feed/feed-1.3.0.1.ebuild
 2006072109 ./dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
 2008182039 ./dev-haskell/fgl/fgl-5.7.0.2.ebuild
 2008011139 ./dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
 1912150209 ./dev-haskell/file-location/file-location-0.4.9.1.ebuild
 2008071009 ./dev-haskell/filelock/filelock-0.1.1.5.ebuild
-2004132310 ./dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+2010101239 ./dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
 2008301109 ./dev-haskell/filestore/filestore-0.6.5.ebuild
-2008080209 ./dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+2010101239 ./dev-haskell/findbin/findbin-0.0.5-r1.ebuild
 2006072109 ./dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
-1911101840 ./dev-haskell/fixed/fixed-0.2.1.1.ebuild
+2010101239 ./dev-haskell/fixed/fixed-0.3.ebuild
 1912150209 ./dev-haskell/fmlist/fmlist-0.9.3.ebuild
 2008182039 ./dev-haskell/foldl/foldl-1.4.7.ebuild
 2008011139 ./dev-haskell/free/free-5.1.3.ebuild
@@ -5884,21 +5876,21 @@
 2008011139 ./dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
 2008182039 ./dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
 2008161639 ./dev-haskell/geniplate-mirror/geniplate-mirror-0.7.7.ebuild
-2006062109 ./dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
+2010101239 ./dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
 1912150209 ./dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
 2008182039 ./dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
-1911101840 ./dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
+2010111809 ./dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild
 2008150009 ./dev-haskell/gio/gio-0.13.8.1.ebuild
 1911101840 ./dev-haskell/gitrev/gitrev-1.3.1.ebuild
 2008140239 ./dev-haskell/glib/glib-0.13.8.1.ebuild
 2008011139 ./dev-haskell/glob/glob-0.9.3.ebuild
 2005172009 ./dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
 2005172009 ./dev-haskell/glut/glut-2.7.0.15.ebuild
-1912150209 ./dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
-1911101840 ./dev-haskell/gnutls/gnutls-0.2.ebuild
+2010111809 ./dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
+2010111809 ./dev-haskell/gnutls/gnutls-0.2.ebuild
 2008011139 ./dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
-1911101840 ./dev-haskell/groupoids/groupoids-4.0.ebuild
-1911101840 ./dev-haskell/gsasl/gsasl-0.3.6.ebuild
+2010111809 ./dev-haskell/groupoids/groupoids-4.0.ebuild
+2010111809 ./dev-haskell/gsasl/gsasl-0.3.7.ebuild
 2008080209 ./dev-haskell/gtk/gtk-0.14.10-r3.ebuild
 2008231309 ./dev-haskell/gtk/gtk-0.15.5-r1.ebuild
 2008040209 ./dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild
@@ -5997,9 +5989,9 @@
 2008011139 ./dev-haskell/hunit/hunit-1.6.0.0.ebuild
 2008080209 ./dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
 2008080209 ./dev-haskell/hunit/hunit-1.2.5.2.ebuild
-1911101840 ./dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
+2010112139 ./dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
 2005172009 ./dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
-1911101840 ./dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
+2010112139 ./dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
 2008021439 ./dev-haskell/hxt/hxt-9.3.1.18.ebuild
 2008301339 ./dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
 2006062109 ./dev-haskell/iconv/iconv-0.4.1.3.ebuild
@@ -6661,7 +6653,7 @@
 2007200439 ./dev-java/bcprov/bcprov-1.54.ebuild
 2007250538 ./dev-java/bcprov/bcprov-1.50-r4.ebuild
 2007250538 ./dev-java/bcprov/bcprov-1.52-r3.ebuild
-2009241009 ./dev-java/bcprov/bcprov-1.66.ebuild
+2010091139 ./dev-java/bcprov/bcprov-1.66.ebuild
 1702282250 ./dev-java/bctsp/bctsp-1.45-r1.ebuild
 1709062352 ./dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
 1702282250 ./dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -7319,6 +7311,7 @@
 1910152339 ./dev-lang/duktape/duktape-2.4.0.ebuild
 2009231339 ./dev-lang/duktape/duktape-2.5.0-r1.ebuild
 2009050609 ./dev-lang/elixir/elixir-1.10.4.ebuild
+2010090109 ./dev-lang/elixir/elixir-1.11.0.ebuild
 2007020109 ./dev-lang/erlang/erlang-22.3.2.ebuild
 2007020109 ./dev-lang/erlang/erlang-22.3.4.ebuild
 2010071039 ./dev-lang/erlang/erlang-23.0.3.ebuild
@@ -7331,6 +7324,7 @@
 1810090339 ./dev-lang/execline/execline-2.5.0.1.ebuild
 1906221109 ./dev-lang/execline/execline-2.5.1.0.ebuild
 1911290109 ./dev-lang/execline/execline-2.5.3.0.ebuild
+2010112109 ./dev-lang/execline/execline-2.6.1.1.ebuild
 2006111539 ./dev-lang/f2c/f2c-20100827-r1.ebuild
 2006150539 ./dev-lang/ferite/ferite-1.1.17-r1.ebuild
 1803171008 ./dev-lang/fpc/fpc-2.6.4.ebuild
@@ -7490,7 +7484,7 @@
 1912111539 ./dev-lang/polyml/polyml-5.6.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.8.ebuild
 2004211009 ./dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
-2010081609 ./dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
+2010102109 ./dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
 2007212039 ./dev-lang/python/python-2.7.18-r1.ebuild
 2007222309 ./dev-lang/python/python-3.8.4-r1.ebuild
 2008181109 ./dev-lang/python/python-3.6.11-r2.ebuild
@@ -7505,7 +7499,7 @@
 2010040209 ./dev-lang/python/python-2.7.18-r2.ebuild
 2010060109 ./dev-lang/python/python-3.10.0_alpha1.ebuild
 2010060109 ./dev-lang/python/python-3.9.0.ebuild
-2010081609 ./dev-lang/python/python-2.7.18-r4.ebuild
+2010102109 ./dev-lang/python/python-2.7.18-r4.ebuild
 2006251009 ./dev-lang/qu-prolog/qu-prolog-10.5.ebuild
 2007191109 ./dev-lang/qu-prolog/qu-prolog-10.4.ebuild
 2009111824 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
@@ -7527,10 +7521,12 @@
 2010030839 ./dev-lang/ruby/ruby-2.7.2.ebuild
 2008251139 ./dev-lang/rust-bin/rust-bin-1.44.1.ebuild
 2009020409 ./dev-lang/rust-bin/rust-bin-1.45.2.ebuild
-2010071139 ./dev-lang/rust-bin/rust-bin-1.46.0.ebuild
+2010091209 ./dev-lang/rust-bin/rust-bin-1.46.0.ebuild
+2010090939 ./dev-lang/rust-bin/rust-bin-1.47.0.ebuild
 2007190509 ./dev-lang/rust/rust-1.44.1.ebuild
-2010071139 ./dev-lang/rust/rust-1.45.2.ebuild
-2010071139 ./dev-lang/rust/rust-1.46.0.ebuild
+2010091239 ./dev-lang/rust/rust-1.45.2.ebuild
+2010091239 ./dev-lang/rust/rust-1.46.0.ebuild
+2010091239 ./dev-lang/rust/rust-1.47.0.ebuild
 2001272309 ./dev-lang/sassc/sassc-3.6.0.ebuild
 2006201809 ./dev-lang/scala-bin/scala-bin-2.13.1.ebuild
 2005172009 ./dev-lang/scala/scala-2.12.10.ebuild
@@ -7540,12 +7536,10 @@
 1911092209 ./dev-lang/spark/spark-2018-r1.ebuild
 1912012109 ./dev-lang/spark/spark-2019.ebuild
 2009201409 ./dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
-2009201409 ./dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
 2009201409 ./dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
 2009201709 ./dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
-2009201839 ./dev-lang/spidermonkey/spidermonkey-78.2.0.ebuild
-2009300439 ./dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
-2010070409 ./dev-lang/spidermonkey/spidermonkey-78.3.1.ebuild
+2010111509 ./dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
+2010102109 ./dev-lang/spidermonkey/spidermonkey-78.3.1.ebuild
 2008112209 ./dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
 2002122139 ./dev-lang/srf/srf-1.0-r2.ebuild
 2006041239 ./dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild
@@ -7555,7 +7549,7 @@
 2009181139 ./dev-lang/swi-prolog/swi-prolog-8.2.1.ebuild
 2004032241 ./dev-lang/swig/swig-3.0.12.ebuild
 2009071209 ./dev-lang/swig/swig-4.0.0.ebuild
-2010071039 ./dev-lang/swig/swig-4.0.2.ebuild
+2010101709 ./dev-lang/swig/swig-4.0.2.ebuild
 1912110241 ./dev-lang/tcc/tcc-9999.ebuild
 2002150209 ./dev-lang/tcc/tcc-0.9.27.ebuild
 2004211009 ./dev-lang/tcl/tcl-8.5.17-r1.ebuild
@@ -7577,12 +7571,14 @@
 2007041909 ./dev-lang/vala/vala-0.48.7.ebuild
 2007312139 ./dev-lang/vala/vala-0.46.12.ebuild
 2007312139 ./dev-lang/vala/vala-0.48.8.ebuild
-2008231909 ./dev-lang/vala/vala-0.49.91.ebuild
 2009112009 ./dev-lang/vala/vala-0.46.13.ebuild
 2009112009 ./dev-lang/vala/vala-0.48.9.ebuild
 2009181139 ./dev-lang/vala/vala-0.40.23.ebuild
 2009181139 ./dev-lang/vala/vala-0.46.10.ebuild
 2009181139 ./dev-lang/vala/vala-0.48.6.ebuild
+2010120039 ./dev-lang/vala/vala-0.40.24.ebuild
+2010120039 ./dev-lang/vala/vala-0.48.11.ebuild
+2010120109 ./dev-lang/vala/vala-0.50.1.ebuild
 1911101840 ./dev-lang/whitespace/whitespace-0.4.ebuild
 2009121639 ./dev-lang/xsb/xsb-3.8.0.ebuild
 2005112139 ./dev-lang/yap/yap-6.3.3-r1.ebuild
@@ -7642,6 +7638,7 @@
 2009252339 ./dev-libs/boost/boost-1.74.0-r1.ebuild
 2005302239 ./dev-libs/botan/botan-2.14.0-r1.ebuild
 2009181139 ./dev-libs/botan/botan-2.15.0.ebuild
+2010090239 ./dev-libs/botan/botan-2.16.0.ebuild
 1911180209 ./dev-libs/busybee/busybee-0.7.0.ebuild
 2009082239 ./dev-libs/c-blosc/c-blosc-1.20.1.ebuild
 2009181139 ./dev-libs/c-blosc/c-blosc-1.20.0.ebuild
@@ -7661,8 +7658,8 @@
 2002112051 ./dev-libs/cl/cl-1.2.3.ebuild
 2002112051 ./dev-libs/cl/cl-1.2.4.ebuild
 2007211239 ./dev-libs/clhpp/clhpp-2.0.12.ebuild
-2003261841 ./dev-libs/cloog/cloog-9999.ebuild
-2004032241 ./dev-libs/cloog/cloog-0.18.4.ebuild
+2010100809 ./dev-libs/cloog/cloog-0.20.0.ebuild
+2010100809 ./dev-libs/cloog/cloog-9999.ebuild
 1802192308 ./dev-libs/collada-dom/collada-dom-2.5.0.ebuild
 1802192308 ./dev-libs/collada-dom/collada-dom-9999.ebuild
 1705071543 ./dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
@@ -7720,7 +7717,7 @@
 2009301339 ./dev-libs/efl/efl-1.24.4.ebuild
 2010081339 ./dev-libs/efl/efl-1.25.1.ebuild
 2009041509 ./dev-libs/elfutils/elfutils-0.180.ebuild
-2009091039 ./dev-libs/elfutils/elfutils-0.181.ebuild
+2010111839 ./dev-libs/elfutils/elfutils-0.181.ebuild
 2003291409 ./dev-libs/ell/ell-0.28.ebuild
 2003291509 ./dev-libs/ell/ell-9999.ebuild
 2006071209 ./dev-libs/ell/ell-0.31.ebuild
@@ -7763,7 +7760,7 @@
 2009072139 ./dev-libs/glib/glib-2.64.4.ebuild
 2009271309 ./dev-libs/glib/glib-2.64.5.ebuild
 2004032241 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
-2005132039 ./dev-libs/gmime/gmime-3.2.7.ebuild
+2010112109 ./dev-libs/gmime/gmime-3.2.7.ebuild
 2006102139 ./dev-libs/gmp/gmp-6.2.0-r1.ebuild
 1910111840 ./dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
 1712231939 ./dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -7772,9 +7769,9 @@
 2002122139 ./dev-libs/go-fuse/go-fuse-9999.ebuild
 1912111539 ./dev-libs/go-usb/go-usb-9999.ebuild
 2006080009 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
-2009072139 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+2010111509 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
 2006132027 ./dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
-2009072139 ./dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+2010111509 ./dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
 2004202139 ./dev-libs/gom/gom-0.4.ebuild
 1901020039 ./dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
 1901020039 ./dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -7784,6 +7781,7 @@
 2004131939 ./dev-libs/gumbo/gumbo-0.10.1.ebuild
 1909152040 ./dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
 2007232039 ./dev-libs/hiredis/hiredis-0.14.1.ebuild
+2010082209 ./dev-libs/hiredis/hiredis-1.0.0.ebuild
 2002112051 ./dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
 1806172339 ./dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
 2006101739 ./dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild
@@ -7809,7 +7807,7 @@
 2004032241 ./dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
 2007241139 ./dev-libs/jansson/jansson-2.12.ebuild
-2010071009 ./dev-libs/jansson/jansson-2.13.1.ebuild
+2010091209 ./dev-libs/jansson/jansson-2.13.1.ebuild
 1805281008 ./dev-libs/jemalloc/jemalloc-4.4.0.ebuild
 1805281008 ./dev-libs/jemalloc/jemalloc-4.5.0.ebuild
 1908072339 ./dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -7852,10 +7850,6 @@
 2003261841 ./dev-libs/libaio/libaio-9999.ebuild
 2009181139 ./dev-libs/libaio/libaio-0.3.112.ebuild
 2006132027 ./dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
-2002091942 ./dev-libs/libarcus/libarcus-3.4.1.ebuild
-2002091942 ./dev-libs/libarcus/libarcus-3.6.0.ebuild
-2002091942 ./dev-libs/libarcus/libarcus-4.2.0.ebuild
-2002091942 ./dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
 2005260027 ./dev-libs/libarcus/libarcus-4.6.1.ebuild
 2009191939 ./dev-libs/libarcus/libarcus-4.7.0.ebuild
 2009201709 ./dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -7906,10 +7900,6 @@
 2008242109 ./dev-libs/libcec/libcec-4.0.7.ebuild
 1910122209 ./dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
 2002151310 ./dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
-2001051415 ./dev-libs/libcharon/libcharon-3.4.1.ebuild
-2001051415 ./dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
-2001120309 ./dev-libs/libcharon/libcharon-4.2.0.ebuild
-2001120309 ./dev-libs/libcharon/libcharon-4.3.0.ebuild
 2005252309 ./dev-libs/libcharon/libcharon-4.6.1.ebuild
 2009191939 ./dev-libs/libcharon/libcharon-4.7.0.ebuild
 2008031509 ./dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -7935,8 +7925,8 @@
 2002112051 ./dev-libs/libdnet/libdnet-1.12-r1.ebuild
 2004032241 ./dev-libs/libdnet/libdnet-1.12.ebuild
 2009261239 ./dev-libs/libdnet/libdnet-9999.ebuild
-2009271339 ./dev-libs/libdnet/libdnet-1.14-r1.ebuild
 2009270039 ./dev-libs/libdnet/libdnet-1.14.ebuild
+2010111909 ./dev-libs/libdnet/libdnet-1.14-r1.ebuild
 1805061738 ./dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
 2001051839 ./dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
 2002182239 ./dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
@@ -8080,8 +8070,8 @@
 2004032241 ./dev-libs/liboil/liboil-0.3.17-r2.ebuild
 2005282039 ./dev-libs/liborcus/liborcus-9999.ebuild
 2005311909 ./dev-libs/liborcus/liborcus-0.15.4.ebuild
-2003261841 ./dev-libs/libotf/libotf-0.9.16.ebuild
 2004032241 ./dev-libs/libotf/libotf-0.9.13.ebuild
+2010111209 ./dev-libs/libotf/libotf-0.9.16.ebuild
 2002112051 ./dev-libs/libowfat/libowfat-0.32-r1.ebuild
 2002230040 ./dev-libs/libowfat/libowfat-0.31-r1.ebuild
 2004032241 ./dev-libs/libp11/libp11-0.4.10.ebuild
@@ -8117,7 +8107,7 @@
 2007262138 ./dev-libs/librdkafka/librdkafka-1.5.0.ebuild
 2007231709 ./dev-libs/librelp/librelp-1.6.0.ebuild
 2009302109 ./dev-libs/librelp/librelp-1.8.0.ebuild
-2010061909 ./dev-libs/librelp/librelp-1.7.0.ebuild
+2010101209 ./dev-libs/librelp/librelp-1.7.0.ebuild
 2004032241 ./dev-libs/librep/librep-0.92.6.ebuild
 2005151009 ./dev-libs/librep/librep-0.92.7.ebuild
 2001271309 ./dev-libs/libreport/libreport-2.10.0.ebuild
@@ -8135,10 +8125,6 @@
 2001070739 ./dev-libs/libsass/libsass-9999.ebuild
 2001272309 ./dev-libs/libsass/libsass-3.6.1.ebuild
 2005021509 ./dev-libs/libsass/libsass-3.6.4.ebuild
-2002091942 ./dev-libs/libsavitar/libsavitar-3.4.1.ebuild
-2002091942 ./dev-libs/libsavitar/libsavitar-3.6.0.ebuild
-2002091942 ./dev-libs/libsavitar/libsavitar-4.2.0.ebuild
-2002091942 ./dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
 2005252309 ./dev-libs/libsavitar/libsavitar-4.6.1.ebuild
 2009191939 ./dev-libs/libsavitar/libsavitar-4.7.0.ebuild
 2002112051 ./dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
@@ -8182,8 +8168,7 @@
 2002230040 ./dev-libs/libuev/libuev-2.2.0.ebuild
 2002230040 ./dev-libs/libuev/libuev-2.3.0.ebuild
 2002271709 ./dev-libs/libuev/libuev-2.3.1.ebuild
-1905191909 ./dev-libs/libugpio/libugpio-0.0.6.ebuild
-2010071039 ./dev-libs/libugpio/libugpio-0.0.7.ebuild
+2010091139 ./dev-libs/libugpio/libugpio-0.0.7.ebuild
 1804130008 ./dev-libs/libunibreak/libunibreak-4.0.ebuild
 1811111739 ./dev-libs/libunibreak/libunibreak-4.1.ebuild
 2001311709 ./dev-libs/libunibreak/libunibreak-4.2.ebuild
@@ -8290,10 +8275,11 @@
 1912291239 ./dev-libs/msgpack/msgpack-3.2.0.ebuild
 2009300609 ./dev-libs/msgpack/msgpack-3.3.0.ebuild
 1912242309 ./dev-libs/mxml/mxml-3.1.ebuild
+2010112339 ./dev-libs/mxml/mxml-3.2.ebuild
 2005250944 ./dev-libs/nanomsg/nanomsg-1.1.5.ebuild
 2004032241 ./dev-libs/nettle/nettle-3.4.1.ebuild
 2005062039 ./dev-libs/nettle/nettle-3.5.1-r1.ebuild
-2007091239 ./dev-libs/nettle/nettle-3.6-r2.ebuild
+2010101709 ./dev-libs/nettle/nettle-3.6-r2.ebuild
 2007071739 ./dev-libs/newt/newt-0.52.21-r1.ebuild
 2008250139 ./dev-libs/nmeap/nmeap-0.3-r1.ebuild
 2010070339 ./dev-libs/npth/npth-1.6-r1.ebuild
@@ -8358,7 +8344,7 @@
 2009152139 ./dev-libs/protobuf/protobuf-3.13.0.ebuild
 2009152139 ./dev-libs/protobuf/protobuf-9999.ebuild
 2009302139 ./dev-libs/protobuf/protobuf-3.12.4.ebuild
-2010050309 ./dev-libs/protobuf/protobuf-3.12.2.ebuild
+2010091209 ./dev-libs/protobuf/protobuf-3.12.2.ebuild
 1805090108 ./dev-libs/pslib/pslib-0.4.5.ebuild
 2005311939 ./dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
 1912312039 ./dev-libs/pugixml/pugixml-9999.ebuild
@@ -8371,8 +8357,6 @@
 2002151310 ./dev-libs/qqwing/qqwing-1.3.4.ebuild
 1702282250 ./dev-libs/qrosscore/qrosscore-0.3.2.ebuild
 1707301215 ./dev-libs/qrosscore/qrosscore-9999.ebuild
-1702282250 ./dev-libs/qrosspython/qrosspython-0.3.2.ebuild
-1707301215 ./dev-libs/qrosspython/qrosspython-9999.ebuild
 2008040239 ./dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
 2009181139 ./dev-libs/quazip/quazip-0.9.1.ebuild
 1912110241 ./dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
@@ -8405,10 +8389,9 @@
 2008250139 ./dev-libs/satyr/satyr-0.31.ebuild
 1906261739 ./dev-libs/sdformat/sdformat-6.2.0.ebuild
 2005151939 ./dev-libs/sdformat/sdformat-9.2.0.ebuild
-2006092309 ./dev-libs/serd/serd-0.30.2.ebuild
 2010021209 ./dev-libs/serd/serd-0.30.6.ebuild
-2010071039 ./dev-libs/serd/serd-0.30.4.ebuild
-2008231139 ./dev-libs/serdisplib/serdisplib-2.02.ebuild
+2010091139 ./dev-libs/serd/serd-0.30.4.ebuild
+2010101639 ./dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
 1904070139 ./dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
 2001162139 ./dev-libs/sink/sink-0.8.0-r2.ebuild
 1702282250 ./dev-libs/skalibs/skalibs-2.3.2.0.ebuild
@@ -8418,6 +8401,7 @@
 1810090339 ./dev-libs/skalibs/skalibs-2.7.0.0.ebuild
 1906221109 ./dev-libs/skalibs/skalibs-2.8.1.0.ebuild
 1911290109 ./dev-libs/skalibs/skalibs-2.9.1.0.ebuild
+2010112109 ./dev-libs/skalibs/skalibs-2.9.3.0.ebuild
 1702282250 ./dev-libs/smack/smack-0.5.0.ebuild
 2004032241 ./dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
 1912110241 ./dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -8458,8 +8442,8 @@
 2006051909 ./dev-libs/udis86/udis86-1.7.2.ebuild
 2008080909 ./dev-libs/unibilium/unibilium-2.0.0.ebuild
 2009300339 ./dev-libs/unibilium/unibilium-2.1.0.ebuild
-2008152109 ./dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
 2008152109 ./dev-libs/unittest++/unittest++-2.0.0.ebuild
+2010101809 ./dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
 1811272039 ./dev-libs/univalue/univalue-9999.ebuild
 2007171109 ./dev-libs/univalue/univalue-1.0.5.ebuild
 2008101339 ./dev-libs/urdfdom/urdfdom-1.0.4.ebuild
@@ -8487,9 +8471,10 @@
 2006080009 ./dev-libs/vala-common/vala-common-0.46.7.ebuild
 2007041909 ./dev-libs/vala-common/vala-common-0.48.7.ebuild
 2007312139 ./dev-libs/vala-common/vala-common-0.48.8.ebuild
-2008231909 ./dev-libs/vala-common/vala-common-0.49.91.ebuild
 2009112009 ./dev-libs/vala-common/vala-common-0.48.9.ebuild
 2009181139 ./dev-libs/vala-common/vala-common-0.48.6.ebuild
+2010120039 ./dev-libs/vala-common/vala-common-0.48.11.ebuild
+2010120109 ./dev-libs/vala-common/vala-common-0.50.1.ebuild
 2006021208 ./dev-libs/vc/vc-1.3.0.ebuild
 2006021208 ./dev-libs/vc/vc-1.3.3.ebuild
 2006021208 ./dev-libs/vc/vc-1.4.1.ebuild
@@ -8581,6 +8566,7 @@
 2009130915 ./dev-libs/date/date-3.0.0.ebuild
 2009131839 ./dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
 2009281439 ./dev-libs/inih/inih-51.ebuild
+2010101039 ./dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
 1912111539 ./dev-lisp/abcl/abcl-1.5.0.ebuild
 1710302307 ./dev-lisp/alexandria/alexandria-20171029.ebuild
 1911181939 ./dev-lisp/asdf/asdf-3.3.1.ebuild
@@ -8594,7 +8580,7 @@
 1710031710 ./dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
 1808271739 ./dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild
 1710081038 ./dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
-2004032241 ./dev-lisp/clisp/clisp-2.49.92.ebuild
+2010102109 ./dev-lisp/clisp/clisp-2.49.92.ebuild
 2002122139 ./dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
 1802041338 ./dev-lisp/clx/clx-0.7.5.ebuild
 1912111539 ./dev-lisp/cmucl/cmucl-21c.ebuild
@@ -8643,8 +8629,8 @@
 2004240009 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0.ebuild
 1905250209 ./dev-lua/lua-term/lua-term-0.3.ebuild
 2003160339 ./dev-lua/lua-term/lua-term-0.7.ebuild
-1902042339 ./dev-lua/lua-zlib/lua-zlib-1.1.ebuild
-2009011909 ./dev-lua/lua-zlib/lua-zlib-1.2.ebuild
+2010120239 ./dev-lua/lua-zlib/lua-zlib-1.1.ebuild
+2010120239 ./dev-lua/lua-zlib/lua-zlib-1.2.ebuild
 1702282250 ./dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
 1905250209 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
 2003160339 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
@@ -8652,13 +8638,15 @@
 2009050239 ./dev-lua/luacheck/luacheck-0.23.0.ebuild
 1702282250 ./dev-lua/luacov/luacov-0.8.ebuild
 2002151310 ./dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
-1702282250 ./dev-lua/luadbi/luadbi-0.5-r5.ebuild
-1902072139 ./dev-lua/luadbi/luadbi-0.5-r6.ebuild
+2010120309 ./dev-lua/luadbi/luadbi-0.5-r5.ebuild
+2010120309 ./dev-lua/luadbi/luadbi-0.5-r6.ebuild
 1911101439 ./dev-lua/luadoc/luadoc-3.0.1.ebuild
-1912111539 ./dev-lua/luaevent/luaevent-0.4.4.ebuild
-1912111539 ./dev-lua/luaevent/luaevent-0.4.6.ebuild
-2008241809 ./dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+2010120239 ./dev-lua/luaevent/luaevent-0.4.4.ebuild
+2010120239 ./dev-lua/luaevent/luaevent-0.4.6.ebuild
 2010060039 ./dev-lua/luaexpat/luaexpat-1.3.3-r1.ebuild
+2010082239 ./dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+2010082239 ./dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
+2010082239 ./dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
 1910111840 ./dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
 1910111840 ./dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
 1912111539 ./dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
@@ -8671,9 +8659,9 @@
 1910221909 ./dev-lua/luaossl/luaossl-20190731.ebuild
 2009291009 ./dev-lua/luaposix/luaposix-35.0.ebuild
 2009131009 ./dev-lua/luarocks/luarocks-3.3.1.ebuild
-1811030009 ./dev-lua/luasec/luasec-9999.ebuild
-2007091108 ./dev-lua/luasec/luasec-0.7.ebuild
-2007091108 ./dev-lua/luasec/luasec-0.9.ebuild
+2010120239 ./dev-lua/luasec/luasec-0.7.ebuild
+2010120239 ./dev-lua/luasec/luasec-0.9.ebuild
+2010120239 ./dev-lua/luasec/luasec-9999.ebuild
 2007091108 ./dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
 2008120909 ./dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
 1704271330 ./dev-lua/luassert/luassert-1.7.9.ebuild
@@ -8695,7 +8683,7 @@
 2002112051 ./dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
 2009050239 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
 2009050239 ./dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
-2008241809 ./dev-lua/lua-bit32/lua-bit32-5.3.5.ebuild
+2010101839 ./dev-lua/lua-bit32/lua-bit32-5.3.5-r1.ebuild
 1912110241 ./dev-ml/alcotest/alcotest-0.8.2.ebuild
 2006041239 ./dev-ml/astring/astring-0.8.3.ebuild
 1709231543 ./dev-ml/async/async-0.9.0.ebuild
@@ -8725,7 +8713,7 @@
 1702282250 ./dev-ml/camlidl/camlidl-1.05-r1.ebuild
 2010031709 ./dev-ml/camlp4/camlp4-4.04_p1.ebuild
 2010031709 ./dev-ml/camlp4/camlp4-4.05_p1.ebuild
-2010031709 ./dev-ml/camlp4/camlp4-4.08_p1.ebuild
+2010091209 ./dev-ml/camlp4/camlp4-4.08_p1.ebuild
 2005140909 ./dev-ml/camlp5/camlp5-7.11.ebuild
 1911190109 ./dev-ml/camlpdf/camlpdf-2.3.ebuild
 1912272239 ./dev-ml/camlpdf/camlpdf-2.3.1.ebuild
@@ -9022,7 +9010,7 @@
 2008251339 ./dev-perl/Authen-DigestMD5/Authen-DigestMD5-0.40.0-r2.ebuild
 2008242239 ./dev-perl/Authen-Htpasswd/Authen-Htpasswd-0.171.0-r2.ebuild
 2008160439 ./dev-perl/Authen-Libwrap/Authen-Libwrap-0.230.0-r2.ebuild
-2008311739 ./dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
+2010112109 ./dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
 2008311739 ./dev-perl/Authen-PAM/Authen-PAM-0.160.0-r3.ebuild
 2008242239 ./dev-perl/Authen-Radius/Authen-Radius-0.310.0.ebuild
 1912110241 ./dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0.ebuild
@@ -9393,7 +9381,7 @@
 1702282250 ./dev-perl/Data-Utilities/Data-Utilities-0.40.0-r1.ebuild
 2007240609 ./dev-perl/Data-Utilities/Data-Utilities-0.40.0-r2.ebuild
 1912110241 ./dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.140.0.ebuild
-2004032241 ./dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
+2010111309 ./dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
 2008071809 ./dev-perl/Data-Visitor/Data-Visitor-0.310.0.ebuild
 2004032241 ./dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
 2007240809 ./dev-perl/Date-Calc/Date-Calc-6.400.0-r1.ebuild
@@ -9695,8 +9683,8 @@
 2008310939 ./dev-perl/File-Path-Expand/File-Path-Expand-1.20.0-r2.ebuild
 2004032241 ./dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r1.ebuild
 2008310939 ./dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r2.ebuild
-2004032241 ./dev-perl/File-Remove/File-Remove-1.570.0.ebuild
 2008311009 ./dev-perl/File-Remove/File-Remove-1.580.0.ebuild
+2010112109 ./dev-perl/File-Remove/File-Remove-1.570.0.ebuild
 2004032241 ./dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
 2008311039 ./dev-perl/File-RsyncP/File-RsyncP-0.740.0-r1.ebuild
 2010011209 ./dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
@@ -10028,7 +10016,7 @@
 1912110241 ./dev-perl/MIME-EncWords/MIME-EncWords-1.14.3.ebuild
 1912110241 ./dev-perl/MIME-Lite-HTML/MIME-Lite-HTML-1.240.0.ebuild
 1711191521 ./dev-perl/MIME-Lite/MIME-Lite-3.30.0.ebuild
-2008250509 ./dev-perl/MIME-Types/MIME-Types-2.130.0.ebuild
+2010112109 ./dev-perl/MIME-Types/MIME-Types-2.130.0.ebuild
 2004032241 ./dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
 1912110241 ./dev-perl/MLDBM-Sync/MLDBM-Sync-0.300.0-r1.ebuild
 2004032241 ./dev-perl/MLDBM/MLDBM-2.50.0.ebuild
@@ -10038,25 +10026,25 @@
 2004141739 ./dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
 1702282250 ./dev-perl/Mac-Pasteboard/Mac-Pasteboard-0.3.0.ebuild
 1912110241 ./dev-perl/Mail-Audit/Mail-Audit-2.228.0-r1.ebuild
-2008250509 ./dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
-2008250509 ./dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
-2008250509 ./dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
+2010112109 ./dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
+2010112109 ./dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
+2010112109 ./dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
 1912110241 ./dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r1.ebuild
 1912110241 ./dev-perl/Mail-Builder/Mail-Builder-2.130.0.ebuild
 2008171209 ./dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
 1912110241 ./dev-perl/Mail-DMARC/Mail-DMARC-1.201.709.110.ebuild
 1912110241 ./dev-perl/Mail-DomainKeys/Mail-DomainKeys-1.0.0-r1.ebuild
-2008250509 ./dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
+2010112109 ./dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
 1702282250 ./dev-perl/Mail-ListDetector/Mail-ListDetector-1.40.0-r1.ebuild
 1912110241 ./dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.510.500.ebuild
-2008250509 ./dev-perl/Mail-Message/Mail-Message-3.2.0.ebuild
+2010112109 ./dev-perl/Mail-Message/Mail-Message-3.2.0.ebuild
 2002112051 ./dev-perl/Mail-POP3Client/Mail-POP3Client-2.190.0.ebuild
 1702282250 ./dev-perl/Mail-Procmail/Mail-Procmail-1.80.0-r1.ebuild
 2004032241 ./dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild
 1912110241 ./dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild
 1912110241 ./dev-perl/Mail-Sender/Mail-Sender-0.903.0.ebuild
 2004032241 ./dev-perl/Mail-Sendmail/Mail-Sendmail-0.800.0.ebuild
-2008250509 ./dev-perl/Mail-Transport/Mail-Transport-3.0.0.ebuild
+2010112109 ./dev-perl/Mail-Transport/Mail-Transport-3.0.0.ebuild
 2007210009 ./dev-perl/MailTools/MailTools-2.190.0.ebuild
 1910111840 ./dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0.ebuild
 1912110241 ./dev-perl/Math-Base36/Math-Base36-0.140.0.ebuild
@@ -10278,7 +10266,7 @@
 1912110241 ./dev-perl/Object-Enum/Object-Enum-0.75.0.ebuild
 1912110241 ./dev-perl/Object-Event/Object-Event-1.230.0.ebuild
 1702282250 ./dev-perl/Object-MultiType/Object-MultiType-0.50.0.ebuild
-2008250509 ./dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
+2010112109 ./dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
 1804040808 ./dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.0.0-r2.ebuild
 2004160109 ./dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.50.0-r1.ebuild
 1912110241 ./dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild
@@ -10500,7 +10488,7 @@
 1912110241 ./dev-perl/String-Formatter/String-Formatter-0.102.84.ebuild
 1912110241 ./dev-perl/String-Print/String-Print-0.930.0.ebuild
 1912110241 ./dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
-2008250509 ./dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild
+2010112109 ./dev-perl/String-ShellQuote/String-ShellQuote-1.40.0-r1.ebuild
 1912110241 ./dev-perl/String-Tokenizer/String-Tokenizer-0.60.0.ebuild
 1912110241 ./dev-perl/String-Truncate/String-Truncate-1.100.602.ebuild
 1702282250 ./dev-perl/Struct-Compare/Struct-Compare-1.0.1.ebuild
@@ -10636,7 +10624,7 @@
 1912110241 ./dev-perl/Test-Strict/Test-Strict-0.470.0.ebuild
 2002112051 ./dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild
 2007210009 ./dev-perl/Test-TCP/Test-TCP-2.190.0-r1.ebuild
-2009040439 ./dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
+2010111309 ./dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
 1912110241 ./dev-perl/Test-TempDir-Tiny/Test-TempDir-Tiny-0.17.0.ebuild
 2004032241 ./dev-perl/Test-Time/Test-Time-0.50.0.ebuild
 1912110241 ./dev-perl/Test-Timer/Test-Timer-2.100.0.ebuild
@@ -10768,7 +10756,7 @@
 1808200609 ./dev-perl/Unix-Getrusage/Unix-Getrusage-0.30.0-r1.ebuild
 2004141709 ./dev-perl/Unix-Mknod/Unix-Mknod-0.40.0.ebuild
 2004032241 ./dev-perl/Unix-Syslog/Unix-Syslog-1.100.0-r2.ebuild
-2008250509 ./dev-perl/User-Identity/User-Identity-0.990.0.ebuild
+2010112109 ./dev-perl/User-Identity/User-Identity-0.990.0.ebuild
 1702282250 ./dev-perl/VM-EC2-Security-CredentialCache/VM-EC2-Security-CredentialCache-0.250.0.ebuild
 1702282250 ./dev-perl/VM-EC2/VM-EC2-1.280.0.ebuild
 2002112051 ./dev-perl/Validate-Net/Validate-Net-0.600.0-r1.ebuild
@@ -11207,6 +11195,7 @@
 2004032241 ./dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
 1912110241 ./dev-php/geos-php/geos-php-1.0.0.ebuild
 2009051839 ./dev-php/igbinary/igbinary-3.1.5.ebuild
+2010090209 ./dev-php/igbinary/igbinary-3.1.6.ebuild
 1910132209 ./dev-php/jpgraph/jpgraph-4.0.2.ebuild
 1803201638 ./dev-php/jpgraph/jpgraph-4.2.0.ebuild
 1908161739 ./dev-php/json-schema/json-schema-5.2.8.ebuild
@@ -11289,6 +11278,7 @@
 1912111539 ./dev-php/pecl-translit/pecl-translit-0.6.3.ebuild
 2005211939 ./dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild
 2001060239 ./dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild
+2010090209 ./dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
 1911291639 ./dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
 1911291639 ./dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
 2007081609 ./dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
@@ -11444,7 +11434,6 @@
 2008030639 ./dev-python/QtPy/QtPy-1.9.0-r2.ebuild
 2006021039 ./dev-python/Rx/Rx-3.1.0.ebuild
 2006201739 ./dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
-1805191109 ./dev-python/SchemaObject/SchemaObject-0.5.8.ebuild
 2001131309 ./dev-python/WSME/WSME-0.9.3.ebuild
 1912172009 ./dev-python/XenAPI/XenAPI-2.14.ebuild
 2010071039 ./dev-python/absl-py/absl-py-0.10.0.ebuild
@@ -11511,7 +11500,6 @@
 2004181309 ./dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
 2008020109 ./dev-python/backports-os/backports-os-0.1.1.ebuild
 2008180909 ./dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
-2008020109 ./dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
 2008180909 ./dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
 2009201909 ./dev-python/backports/backports-1.0-r1.ebuild
 2003131309 ./dev-python/bandit/bandit-1.5.1-r1.ebuild
@@ -11534,11 +11522,11 @@
 2009181139 ./dev-python/bitstring/bitstring-3.1.7.ebuild
 2007251138 ./dev-python/bleach/bleach-3.1.5.ebuild
 2009171139 ./dev-python/bleach/bleach-3.2.0.ebuild
-2009191039 ./dev-python/bleach/bleach-3.2.1.ebuild
+2010082209 ./dev-python/bleach/bleach-3.2.1.ebuild
 2006021508 ./dev-python/blessings/blessings-1.7-r1.ebuild
 2009201339 ./dev-python/blinker/blinker-1.4-r2.ebuild
 2008201909 ./dev-python/blockdiag/blockdiag-1.5.4.ebuild
-2010070409 ./dev-python/blockdiag/blockdiag-2.0.1.ebuild
+2010101209 ./dev-python/blockdiag/blockdiag-2.0.1.ebuild
 2008220909 ./dev-python/blosc/blosc-1.9.1-r1.ebuild
 2009091439 ./dev-python/blosc/blosc-1.9.2.ebuild
 2006011638 ./dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -11564,6 +11552,8 @@
 2010060109 ./dev-python/boto3/boto3-1.15.12.ebuild
 2010071039 ./dev-python/boto3/boto3-1.15.13.ebuild
 2010080639 ./dev-python/boto3/boto3-1.15.14.ebuild
+2010090039 ./dev-python/boto3/boto3-1.15.15.ebuild
+2010100909 ./dev-python/boto3/boto3-1.15.16.ebuild
 2007300909 ./dev-python/botocore/botocore-9999.ebuild
 2009111039 ./dev-python/botocore/botocore-1.17.59.ebuild
 2009171139 ./dev-python/botocore/botocore-1.17.63.ebuild
@@ -11583,6 +11573,8 @@
 2010060109 ./dev-python/botocore/botocore-1.18.12.ebuild
 2010071039 ./dev-python/botocore/botocore-1.18.13.ebuild
 2010080639 ./dev-python/botocore/botocore-1.18.14.ebuild
+2010090039 ./dev-python/botocore/botocore-1.18.15.ebuild
+2010100909 ./dev-python/botocore/botocore-1.18.16.ebuild
 2009201139 ./dev-python/bottle/bottle-0.12.18-r1.ebuild
 2009181339 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2006032038 ./dev-python/bpython/bpython-0.19.ebuild
@@ -11711,6 +11703,7 @@
 2009112009 ./dev-python/dbusmock/dbusmock-0.19.ebuild
 2006010008 ./dev-python/ddt/ddt-1.2.2.ebuild
 2003162209 ./dev-python/debtcollector/debtcollector-1.21.0.ebuild
+2010110439 ./dev-python/debtcollector/debtcollector-2.2.0.ebuild
 2009201339 ./dev-python/decorator/decorator-4.4.2-r1.ebuild
 2010060839 ./dev-python/defcon/defcon-0.6.0-r1.ebuild
 2008020209 ./dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
@@ -11823,7 +11816,7 @@
 2004270410 ./dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
 2004040839 ./dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
 2007132009 ./dev-python/flake8/flake8-3.8.1.ebuild
-2010041739 ./dev-python/flake8/flake8-3.8.3-r1.ebuild
+2010101709 ./dev-python/flake8/flake8-3.8.3-r1.ebuild
 2009201909 ./dev-python/flaky/flaky-3.7.0-r1.ebuild
 2009231439 ./dev-python/flask-api/flask-api-2.0.ebuild
 2010010439 ./dev-python/flask-babel/flask-babel-2.0.0.ebuild
@@ -11915,7 +11908,7 @@
 2006081039 ./dev-python/grpcio-tools/grpcio-tools-1.28.1.ebuild
 2009260209 ./dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
 2009202339 ./dev-python/grpcio/grpcio-1.28.1.ebuild
-2009260209 ./dev-python/grpcio/grpcio-1.32.0.ebuild
+2010100109 ./dev-python/grpcio/grpcio-1.32.0-r1.ebuild
 2001160839 ./dev-python/gsd/gsd-1.5.3-r1.ebuild
 2008020039 ./dev-python/gst-python/gst-python-1.14.1-r1.ebuild
 2009070909 ./dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -11932,8 +11925,7 @@
 2010010309 ./dev-python/hpack/hpack-4.0.0.ebuild
 2005032209 ./dev-python/html2text/html2text-2020.1.16-r1.ebuild
 2003192109 ./dev-python/html5-parser/html5-parser-0.4.9.ebuild
-2007271308 ./dev-python/html5lib/html5lib-1.0.1-r2.ebuild
-2009041409 ./dev-python/html5lib/html5lib-1.1.ebuild
+2010082209 ./dev-python/html5lib/html5lib-1.1.ebuild
 2004231209 ./dev-python/httmock/httmock-1.2.5.ebuild
 2007132139 ./dev-python/http-parser/http-parser-0.9.0.ebuild
 2009050239 ./dev-python/httpauth/httpauth-0.3.ebuild
@@ -11980,6 +11972,7 @@
 2009211840 ./dev-python/inflect/inflect-4.1.0.ebuild
 2008241639 ./dev-python/inflection/inflection-0.5.1.ebuild
 2003201209 ./dev-python/iniparse/iniparse-0.4-r2.ebuild
+2010120039 ./dev-python/iniparse/iniparse-0.5.ebuild
 2007041239 ./dev-python/intelhex/intelhex-2.2.1-r1.ebuild
 2009181139 ./dev-python/intervaltree/intervaltree-3.0.2.ebuild
 2006031008 ./dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12004,6 +11997,7 @@
 2006182139 ./dev-python/isodate/isodate-0.6.0-r1.ebuild
 2004032241 ./dev-python/isort/isort-4.3.15.ebuild
 2009220939 ./dev-python/isort/isort-4.3.21_p2-r1.ebuild
+2010120309 ./dev-python/isort/isort-5.6.3.ebuild
 2009201339 ./dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
 2002051809 ./dev-python/itypes/itypes-1.1.0.ebuild
 2009062039 ./dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -12028,6 +12022,7 @@
 2006011008 ./dev-python/joblib/joblib-0.14.1.ebuild
 2008051739 ./dev-python/joblib/joblib-0.15.1.ebuild
 2008220909 ./dev-python/joblib/joblib-0.16.0.ebuild
+2010110409 ./dev-python/joblib/joblib-0.17.0.ebuild
 2008021139 ./dev-python/josepy/josepy-1.3.0.ebuild
 2009172109 ./dev-python/josepy/josepy-1.4.0.ebuild
 2003201209 ./dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -12059,6 +12054,7 @@
 2001311209 ./dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
 2010010239 ./dev-python/keyring/keyring-21.4.0.ebuild
 2007190139 ./dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
+2010110239 ./dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
 2001131309 ./dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
 2008072239 ./dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
 2005302109 ./dev-python/kombu/kombu-4.6.8.ebuild
@@ -12086,14 +12082,14 @@
 2008021139 ./dev-python/lit/lit-9.0.1.ebuild
 2009230009 ./dev-python/lit/lit-11.0.0_rc3.ebuild
 2009290109 ./dev-python/lit/lit-11.0.0_rc4.ebuild
-2010061709 ./dev-python/lit/lit-10.0.1.ebuild
 2010072209 ./dev-python/lit/lit-11.0.0_rc6.ebuild
+2010110939 ./dev-python/lit/lit-10.0.1.ebuild
 2005091109 ./dev-python/livereload/livereload-2.6.1.ebuild
 2008292109 ./dev-python/llfuse/llfuse-1.3.6.ebuild
 2006111109 ./dev-python/llvmlite/llvmlite-0.33.0.ebuild
 2009190539 ./dev-python/llvmlite/llvmlite-0.34.0.ebuild
 2008180909 ./dev-python/lmdb/lmdb-0.92.ebuild
-2010051409 ./dev-python/lmdb/lmdb-1.0.0.ebuild
+2010091609 ./dev-python/lmdb/lmdb-1.0.0.ebuild
 2008180909 ./dev-python/locket/locket-0.2.0-r1.ebuild
 2008070439 ./dev-python/lockfile/lockfile-0.12.2-r2.ebuild
 2010061139 ./dev-python/logbook/logbook-1.5.3.ebuild
@@ -12124,7 +12120,7 @@
 2009181339 ./dev-python/matplotlib/matplotlib-3.3.2.ebuild
 2010071039 ./dev-python/matterhook/matterhook-0.2.ebuild
 2004032241 ./dev-python/mccabe/mccabe-0.6.1-r1.ebuild
-2010041739 ./dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+2010101709 ./dev-python/mccabe/mccabe-0.6.1-r2.ebuild
 2008111609 ./dev-python/mecab-python/mecab-python-0.996.ebuild
 2003272009 ./dev-python/mechanize/mechanize-0.4.5.ebuild
 2001051415 ./dev-python/mediafile/mediafile-0.2.0.ebuild
@@ -12137,7 +12133,7 @@
 2005311639 ./dev-python/mimerender/mimerender-0.6.0.ebuild
 2008241709 ./dev-python/minidb/minidb-2.0.4.ebuild
 2004232109 ./dev-python/minimock/minimock-1.2.8-r1.ebuild
-2002241439 ./dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
+2010102139 ./dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
 2006292239 ./dev-python/misaka/misaka-2.1.1.ebuild
 2009201909 ./dev-python/mistune/mistune-0.8.4-r1.ebuild
 2005091439 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
@@ -12166,7 +12162,7 @@
 2010071039 ./dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
 2008071509 ./dev-python/mysql-connector-python/mysql-connector-python-8.0.21.ebuild
 2004032241 ./dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
-2009270039 ./dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+2010111209 ./dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
 2009050139 ./dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
 2009251339 ./dev-python/namespace-google/namespace-google-1-r1.ebuild
 2009251039 ./dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
@@ -12185,6 +12181,7 @@
 2010040039 ./dev-python/nbconvert/nbconvert-6.0.7.ebuild
 2009050939 ./dev-python/nbdime/nbdime-2.0.0-r1.ebuild
 2008030639 ./dev-python/nbformat/nbformat-5.0.7.ebuild
+2010112109 ./dev-python/nbformat/nbformat-5.0.8.ebuild
 2009051839 ./dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
 2009060409 ./dev-python/nbval/nbval-0.9.1-r1.ebuild
 2003261841 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -12224,18 +12221,18 @@
 2006171439 ./dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
 2004242339 ./dev-python/ntplib/ntplib-0.3.3.ebuild
 2009071209 ./dev-python/nuitka/nuitka-0.6.8.ebuild
-2008180909 ./dev-python/numexpr/numexpr-2.7.1.ebuild
-2010071039 ./dev-python/numexpr/numexpr-2.7.2.ebuild
+2010101039 ./dev-python/nuitka/nuitka-0.6.9.1.ebuild
+2010091139 ./dev-python/numexpr/numexpr-2.7.2.ebuild
 2008051709 ./dev-python/numpy/numpy-1.19.0.ebuild
 2009102309 ./dev-python/numpy/numpy-1.19.2.ebuild
-2010062039 ./dev-python/numpy/numpy-1.19.1.ebuild
+2010091139 ./dev-python/numpy/numpy-1.19.1.ebuild
 2003251639 ./dev-python/numpydoc/numpydoc-0.9.1.ebuild
 2008140839 ./dev-python/numpydoc/numpydoc-1.1.0.ebuild
-2001051415 ./dev-python/oauth/oauth-1.0.1-r1.ebuild
 2004211139 ./dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
 2007151509 ./dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
 2008192309 ./dev-python/oauthlib/oauthlib-3.1.0.ebuild
 2007140239 ./dev-python/objgraph/objgraph-3.4.1.ebuild
+2010111809 ./dev-python/objgraph/objgraph-3.5.0.ebuild
 2009181339 ./dev-python/oct2py/oct2py-5.2.0-r1.ebuild
 2009050939 ./dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
 2002052009 ./dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -12247,11 +12244,13 @@
 2008021139 ./dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
 2010041539 ./dev-python/openstackdocstheme/openstackdocstheme-2.2.5.ebuild
 2007190139 ./dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
+2010110239 ./dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
 2002221109 ./dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
 2009251509 ./dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
 2001131309 ./dev-python/os-brick/os-brick-2.8.2.ebuild
 2005302109 ./dev-python/os-brick/os-brick-3.0.1.ebuild
 2001131309 ./dev-python/os-client-config/os-client-config-1.32.0.ebuild
+2010110439 ./dev-python/os-client-config/os-client-config-2.1.0.ebuild
 2001131309 ./dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
 2001131309 ./dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
 2001131309 ./dev-python/os-ken/os-ken-0.3.1.ebuild
@@ -12263,13 +12262,18 @@
 2001131309 ./dev-python/os-win/os-win-4.2.0.ebuild
 2001131309 ./dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
 2007190139 ./dev-python/osc-lib/osc-lib-2.0.0.ebuild
+2010110439 ./dev-python/osc-lib/osc-lib-2.2.1.ebuild
 2007030309 ./dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
 2007030309 ./dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
 2007030309 ./dev-python/oslo-config/oslo-config-8.0.3.ebuild
+2010110439 ./dev-python/oslo-config/oslo-config-8.3.2.ebuild
 2001131309 ./dev-python/oslo-context/oslo-context-2.22.1.ebuild
+2010110439 ./dev-python/oslo-context/oslo-context-3.1.1.ebuild
 2007030309 ./dev-python/oslo-db/oslo-db-8.1.0.ebuild
 2001131309 ./dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
+2010110439 ./dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
 2007030309 ./dev-python/oslo-log/oslo-log-4.1.2.ebuild
+2010110439 ./dev-python/oslo-log/oslo-log-4.4.0.ebuild
 2007190139 ./dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
 2007030309 ./dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
 2007030309 ./dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
@@ -12277,10 +12281,12 @@
 2001131309 ./dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
 2001131309 ./dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
 2007030309 ./dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
+2010110439 ./dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
 2007030309 ./dev-python/oslo-service/oslo-service-2.1.1.ebuild
 2003261841 ./dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
 2007030309 ./dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
 2007190139 ./dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
+2010110439 ./dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
 2007030309 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
 2001131309 ./dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
 2005302109 ./dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
@@ -12312,6 +12318,7 @@
 2008030109 ./dev-python/parver/parver-0.3.ebuild
 2009290539 ./dev-python/parver/parver-0.3.1.ebuild
 2008221239 ./dev-python/passlib/passlib-1.7.2.ebuild
+2010090009 ./dev-python/passlib/passlib-1.7.4.ebuild
 2009090309 ./dev-python/paste/paste-3.4.3.ebuild
 2009100139 ./dev-python/paste/paste-3.4.4.ebuild
 2009251109 ./dev-python/paste/paste-3.4.5.ebuild
@@ -12339,6 +12346,7 @@
 2009030109 ./dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
 2009181139 ./dev-python/phonenumbers/phonenumbers-8.12.8.ebuild
 2009291639 ./dev-python/phonenumbers/phonenumbers-8.12.10.ebuild
+2010101939 ./dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
 2006082109 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
 2002112309 ./dev-python/pid/pid-2.2.5.ebuild
 2005210409 ./dev-python/piexif/piexif-1.1.3.ebuild
@@ -12359,6 +12367,7 @@
 2009252309 ./dev-python/ply/ply-3.11-r1.ebuild
 2004251239 ./dev-python/plyr/plyr-1.0.6.ebuild
 2009050139 ./dev-python/plyvel/plyvel-1.2.0.ebuild
+2010102239 ./dev-python/plyvel/plyvel-1.3.0.ebuild
 2004032241 ./dev-python/pmw/pmw-2.0.1-r2.ebuild
 2006062239 ./dev-python/pocketlint/pocketlint-0.20.ebuild
 2005140039 ./dev-python/pockets/pockets-0.9.1.ebuild
@@ -12373,9 +12382,9 @@
 2008180839 ./dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
 2008021209 ./dev-python/prettytable/prettytable-0.7.2-r1.ebuild
 2009041409 ./dev-python/priority/priority-1.3.0.ebuild
-2008021209 ./dev-python/process-tests/process-tests-2.0.2.ebuild
-2009300509 ./dev-python/process-tests/process-tests-2.1.1.ebuild
+2010091139 ./dev-python/process-tests/process-tests-2.1.1.ebuild
 2004032241 ./dev-python/progress/progress-1.3.ebuild
+2010100939 ./dev-python/progress/progress-1.5.ebuild
 2009181309 ./dev-python/progressbar/progressbar-2.5.ebuild
 2001182209 ./dev-python/progressbar2/progressbar2-3.39.3.ebuild
 2007310409 ./dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
@@ -12385,7 +12394,7 @@
 2009251339 ./dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
 2009251339 ./dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
 2009251339 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
-2010050309 ./dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
+2010091209 ./dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
 2003271839 ./dev-python/prov/prov-1.5.3.ebuild
 2009181339 ./dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
 2009201339 ./dev-python/psutil/psutil-5.7.0-r1.ebuild
@@ -12413,6 +12422,7 @@
 2004182109 ./dev-python/pyGPG/pyGPG-9999.ebuild
 2006110539 ./dev-python/pyTenable/pyTenable-1.1.3.ebuild
 1912080209 ./dev-python/pyacoustid/pyacoustid-1.1.7.ebuild
+2010101039 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
 2007300309 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
 2005042009 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
 2009181339 ./dev-python/pyamg/pyamg-3.2.1-r1.ebuild
@@ -12464,7 +12474,7 @@
 2008142109 ./dev-python/pygame/pygame-1.9.6-r1.ebuild
 2010061639 ./dev-python/pygame/pygame-2.0.0_pre12.ebuild
 2010061709 ./dev-python/pygame/pygame-9999.ebuild
-2010071039 ./dev-python/pygame/pygame-2.0.0_pre10.ebuild
+2010091139 ./dev-python/pygame/pygame-2.0.0_pre10.ebuild
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
@@ -12478,10 +12488,9 @@
 2009122209 ./dev-python/pygments/pygments-2.7.0.ebuild
 2009181139 ./dev-python/pygments/pygments-2.7.1.ebuild
 2009252309 ./dev-python/pygobject/pygobject-3.34.0-r1.ebuild
-2009252309 ./dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+2010120009 ./dev-python/pygobject/pygobject-3.36.1-r1.ebuild
 2008021239 ./dev-python/pygpgme/pygpgme-0.3-r2.ebuild
-2008180909 ./dev-python/pygraphviz/pygraphviz-1.5.ebuild
-2009241009 ./dev-python/pygraphviz/pygraphviz-1.6.ebuild
+2010091139 ./dev-python/pygraphviz/pygraphviz-1.6.ebuild
 2008140409 ./dev-python/pygresql/pygresql-5.1.ebuild
 2009071139 ./dev-python/pygresql/pygresql-5.2.ebuild
 2009221309 ./dev-python/pyh2o/pyh2o-1.ebuild
@@ -12495,7 +12504,7 @@
 2001051415 ./dev-python/pykwalify/pykwalify-9999.ebuild
 2007091209 ./dev-python/pykwalify/pykwalify-1.7.0.ebuild
 2004040939 ./dev-python/pylama/pylama-7.7.1.ebuild
-2010080039 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
+2010120309 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
 2009282109 ./dev-python/pylast/pylast-3.3.0.ebuild
 2010072209 ./dev-python/pylast/pylast-4.0.0.ebuild
 2004222009 ./dev-python/pylibacl/pylibacl-0.5.4_p20191217.ebuild
@@ -12513,9 +12522,7 @@
 2007171039 ./dev-python/pymountboot/pymountboot-0.2.3.ebuild
 2004032241 ./dev-python/pympler/pympler-0.6.ebuild
 2008021239 ./dev-python/pymssql/pymssql-2.1.3.ebuild
-2006112339 ./dev-python/pymysql/pymysql-0.9.3.ebuild
-2008180909 ./dev-python/pymysql/pymysql-0.10.0.ebuild
-2010021809 ./dev-python/pymysql/pymysql-0.10.1.ebuild
+2010091209 ./dev-python/pymysql/pymysql-0.10.1.ebuild
 2008221239 ./dev-python/pynacl/pynacl-1.4.0.ebuild
 2004191539 ./dev-python/pyocr/pyocr-0.7.2.ebuild
 2004032241 ./dev-python/pyogg/pyogg-1.3-r2.ebuild
@@ -12558,7 +12565,6 @@
 2009140639 ./dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
 2002281939 ./dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
 2009071209 ./dev-python/pyscard/pyscard-1.9.9.ebuild
-2009101309 ./dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
 2009041409 ./dev-python/pyserial/pyserial-3.4.ebuild
 2004180139 ./dev-python/pysmi/pysmi-0.3.4.ebuild
 2003251039 ./dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -12592,7 +12598,8 @@
 2009211939 ./dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
 2009211939 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
 2002052339 ./dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
-2009211939 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+2010100239 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+2010100239 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
 2007140139 ./dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
 2009211939 ./dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild
 2009211939 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -12610,8 +12617,8 @@
 2009201909 ./dev-python/pytest/pytest-4.6.11-r1.ebuild
 2009262209 ./dev-python/pytest/pytest-6.0.2.ebuild
 2009262339 ./dev-python/pytest/pytest-6.1.0.ebuild
-2010020139 ./dev-python/pytest/pytest-6.0.1.ebuild
 2010040039 ./dev-python/pytest/pytest-6.1.1.ebuild
+2010091139 ./dev-python/pytest/pytest-6.0.1.ebuild
 2007111109 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
 2008250139 ./dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
 2008250139 ./dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild
@@ -12622,6 +12629,7 @@
 2010060109 ./dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild
 2002112239 ./dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r2.ebuild
 2004232309 ./dev-python/python-cinderclient/python-cinderclient-4.2.2.ebuild
+2010110439 ./dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
 2009211840 ./dev-python/python-cstruct/python-cstruct-1.8.ebuild
 2009080309 ./dev-python/python-ctags/python-ctags-1.5.0.ebuild
 2004252339 ./dev-python/python-daemon/python-daemon-2.1.2.ebuild
@@ -12656,9 +12664,11 @@
 2005302109 ./dev-python/python-ironicclient/python-ironicclient-4.1.0.ebuild
 2009181139 ./dev-python/python-jose/python-jose-3.2.0-r1.ebuild
 2007190139 ./dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
+2010110439 ./dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
 2008021239 ./dev-python/python-ldap/python-ldap-3.2.0.ebuild
 2008021239 ./dev-python/python-ldap/python-ldap-9999.ebuild
-2002060439 ./dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
+2010100239 ./dev-python/python-ldap/python-ldap-3.3.1.ebuild
+2010120039 ./dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
 2004201209 ./dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
 2002060009 ./dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
 2007201209 ./dev-python/python-ly/python-ly-0.9.6.ebuild
@@ -12679,8 +12689,10 @@
 2003182039 ./dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
 2005302109 ./dev-python/python-neutronclient/python-neutronclient-7.1.1.ebuild
 2007190139 ./dev-python/python-novaclient/python-novaclient-17.0.0.ebuild
+2010110439 ./dev-python/python-novaclient/python-novaclient-17.2.1.ebuild
 2003162209 ./dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
 2007190139 ./dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild
+2010110439 ./dev-python/python-openstackclient/python-openstackclient-5.4.0.ebuild
 2001200009 ./dev-python/python-podman/python-podman-1.6.0.ebuild
 2006150539 ./dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
 2001182209 ./dev-python/python-prctl/python-prctl-1.7.ebuild
@@ -12691,6 +12703,7 @@
 2008201639 ./dev-python/python-slip/python-slip-0.6.5.ebuild
 2009181139 ./dev-python/python-stdnum/python-stdnum-1.14.ebuild
 2003162209 ./dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
+2010102339 ./dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild
 2004162109 ./dev-python/python-systemd/python-systemd-234.ebuild
 2002060009 ./dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
 2001131309 ./dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
@@ -12701,6 +12714,7 @@
 2005302109 ./dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
 2002060009 ./dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
 2005302109 ./dev-python/python-zunclient/python-zunclient-4.0.1.ebuild
+2010110439 ./dev-python/python-zunclient/python-zunclient-4.1.1.ebuild
 2006261209 ./dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
 2006041239 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
 2007291808 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -12743,19 +12757,18 @@
 2004261339 ./dev-python/ratelimit/ratelimit-1.4.1.ebuild
 2007302339 ./dev-python/rdflib/rdflib-5.0.0.ebuild
 2007251138 ./dev-python/readme_renderer/readme_renderer-26.0.ebuild
+2010100909 ./dev-python/readme_renderer/readme_renderer-27.0.ebuild
 2008021009 ./dev-python/rebulk/rebulk-2.0.1.ebuild
 2005171109 ./dev-python/recommonmark/recommonmark-0.6.0.ebuild
 2003291009 ./dev-python/redis-py/redis-py-3.3.11.ebuild
 2009040409 ./dev-python/redis-py/redis-py-3.5.3.ebuild
-2001051415 ./dev-python/redlock-py/redlock-py-1.0.8.ebuild
 2001182209 ./dev-python/rednose/rednose-0.4.3.ebuild
 2006090639 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
 2009201309 ./dev-python/regex/regex-2020.4.4-r1.ebuild
 2007171039 ./dev-python/rencode/rencode-1.0.6.ebuild
 2008061509 ./dev-python/reno/reno-2.11.3.ebuild
 2010042239 ./dev-python/reno/reno-3.2.0.ebuild
-2008290739 ./dev-python/reportlab/reportlab-3.5.42.ebuild
-2010010109 ./dev-python/reportlab/reportlab-3.5.48.ebuild
+2010091139 ./dev-python/reportlab/reportlab-3.5.48.ebuild
 2007140239 ./dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
 2005090239 ./dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
 2009181839 ./dev-python/requests-cache/requests-cache-0.5.2.ebuild
@@ -12768,7 +12781,7 @@
 2007251138 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
 2009201339 ./dev-python/requests/requests-2.24.0-r1.ebuild
 2006110539 ./dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
-2007170509 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+2010102339 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
 2009181139 ./dev-python/responses/responses-0.10.16.ebuild
 2009260809 ./dev-python/responses/responses-0.12.0.ebuild
 2007111139 ./dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -12778,8 +12791,6 @@
 2009062039 ./dev-python/rfc3986/rfc3986-1.4.0.ebuild
 2008021239 ./dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
 2005121009 ./dev-python/roman/roman-3.2.ebuild
-2003201309 ./dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
-2002092309 ./dev-python/rootpy/rootpy-1.0.1-r1.ebuild
 2002171909 ./dev-python/rope/rope-0.16.0.ebuild
 2009181139 ./dev-python/rope/rope-0.17.0.ebuild
 2004040939 ./dev-python/ropemode/ropemode-0.5.ebuild
@@ -12792,7 +12803,7 @@
 2008150239 ./dev-python/rpy/rpy-2.9.0.ebuild
 2003251909 ./dev-python/rpyc/rpyc-4.1.4.ebuild
 2009040409 ./dev-python/rq/rq-1.5.0.ebuild
-2009100639 ./dev-python/rq/rq-1.5.2.ebuild
+2010120039 ./dev-python/rq/rq-1.5.2.ebuild
 2009010739 ./dev-python/rsa/rsa-4.2.ebuild
 2009211840 ./dev-python/rst-linker/rst-linker-2.0.0.ebuild
 2008250139 ./dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -12926,7 +12937,7 @@
 2009271039 ./dev-python/svg-path/svg-path-4.0.2.ebuild
 2005181339 ./dev-python/svgwrite/svgwrite-1.4.ebuild
 2003120209 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.5.0.ebuild
-2009181139 ./dev-python/sybil/sybil-1.4.0.ebuild
+2010091039 ./dev-python/sybil/sybil-1.4.0.ebuild
 2009181909 ./dev-python/symengine/symengine-0.6.1-r1.ebuild
 2009181139 ./dev-python/sympy/sympy-1.6.2.ebuild
 2009181139 ./dev-python/tabulate/tabulate-0.8.7.ebuild
@@ -12948,6 +12959,7 @@
 2007300909 ./dev-python/terminaltables/terminaltables-9999.ebuild
 2007071839 ./dev-python/testfixtures/testfixtures-6.14.1.ebuild
 2009050939 ./dev-python/testfixtures/testfixtures-6.14.2.ebuild
+2010091039 ./dev-python/testfixtures/testfixtures-6.15.0.ebuild
 2008011209 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
 2004032241 ./dev-python/testrepository/testrepository-0.0.20.ebuild
 2005311909 ./dev-python/testresources/testresources-2.0.1.ebuild
@@ -12968,18 +12980,22 @@
 2009240709 ./dev-python/toolz/toolz-0.11.0.ebuild
 2009251109 ./dev-python/toolz/toolz-0.11.1.ebuild
 2003162209 ./dev-python/tooz/tooz-1.60.1.ebuild
-2009021009 ./dev-python/tox/tox-3.20.0.ebuild
 2009090339 ./dev-python/tox/tox-3.19.0.ebuild
+2010091409 ./dev-python/tox/tox-3.20.0-r1.ebuild
+2010100909 ./dev-python/tox/tox-3.20.1.ebuild
 2007251138 ./dev-python/tqdm/tqdm-9999.ebuild
 2009090339 ./dev-python/tqdm/tqdm-4.48.2.ebuild
 2009131039 ./dev-python/tqdm/tqdm-4.49.0.ebuild
 2010072209 ./dev-python/tqdm/tqdm-4.50.1.ebuild
+2010090039 ./dev-python/tqdm/tqdm-4.50.2.ebuild
 2009210939 ./dev-python/traceback2/traceback2-1.4.0-r1.ebuild
 2008030639 ./dev-python/traitlets/traitlets-4.3.3.ebuild
 2009071239 ./dev-python/traitlets/traitlets-5.0.4.ebuild
 2008250139 ./dev-python/transitions/transitions-0.8.2-r1.ebuild
 2007211239 ./dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+2010120039 ./dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
 2005130139 ./dev-python/treq/treq-20.4.1.ebuild
+2010102209 ./dev-python/treq/treq-20.9.0.ebuild
 2009201409 ./dev-python/trustme/trustme-0.6.0-r1.ebuild
 2009201139 ./dev-python/ttystatus/ttystatus-0.36.ebuild
 2005291109 ./dev-python/tvdb_api/tvdb_api-2.0-r1.ebuild
@@ -12999,10 +13015,11 @@
 2007111239 ./dev-python/tzlocal/tzlocal-2.1.ebuild
 2008011339 ./dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
 2009041409 ./dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
-2009082239 ./dev-python/ujson/ujson-3.2.0.ebuild
 2009181139 ./dev-python/ujson/ujson-1.35-r1.ebuild
 2009181139 ./dev-python/ujson/ujson-3.1.0.ebuild
 2010072209 ./dev-python/ujson/ujson-4.0.0.ebuild
+2010102039 ./dev-python/ujson/ujson-3.2.0.ebuild
+2010100909 ./dev-python/ujson/ujson-4.0.1.ebuild
 2006071409 ./dev-python/uncertainties/uncertainties-3.1.4.ebuild
 2008021239 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
 2003272009 ./dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -13019,9 +13036,10 @@
 2008021239 ./dev-python/urwid/urwid-2.1.0.ebuild
 2009181139 ./dev-python/urwid/urwid-2.1.1.ebuild
 2008091039 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
-2009201309 ./dev-python/utidylib/utidylib-0.6-r1.ebuild
+2010120139 ./dev-python/utidylib/utidylib-0.6-r1.ebuild
 2007201509 ./dev-python/uvloop/uvloop-0.14.0.ebuild
 2009090339 ./dev-python/vcrpy/vcrpy-4.1.0.ebuild
+2010100909 ./dev-python/vcrpy/vcrpy-4.1.1.ebuild
 2008171609 ./dev-python/vcstools/vcstools-0.1.42.ebuild
 2008021239 ./dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
 2006160909 ./dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
@@ -13099,7 +13117,7 @@
 2009211840 ./dev-python/zipp/zipp-3.1.0.ebuild
 2009231509 ./dev-python/zipp/zipp-3.2.0.ebuild
 2010040109 ./dev-python/zipp/zipp-3.3.0.ebuild
-2008021239 ./dev-python/zope-component/zope-component-4.4.1.ebuild
+2010091039 ./dev-python/zope-component/zope-component-4.4.1.ebuild
 2008181839 ./dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
 2002112309 ./dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
 2009201909 ./dev-python/zope-event/zope-event-4.4-r1.ebuild
@@ -13124,6 +13142,7 @@
 2009062039 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
 2009041409 ./dev-python/pypiserver/pypiserver-1.3.2.ebuild
 2010060109 ./dev-python/pypiserver/pypiserver-1.4.0.ebuild
+2010101939 ./dev-python/pypiserver/pypiserver-1.4.2.ebuild
 2009211939 ./dev-python/pytest-services/pytest-services-2.1.0.ebuild
 2009251109 ./dev-python/pytest-services/pytest-services-2.2.0.ebuild
 2008021239 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -13185,7 +13204,6 @@
 2004231109 ./dev-python/patch-ng/patch-ng-1.17.4.ebuild
 2009181339 ./dev-python/pweave/pweave-0.30.3-r1.ebuild
 2001242209 ./dev-python/snaketrace/snaketrace-0.1.1.ebuild
-2008020239 ./dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
 2009212109 ./dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
 2006150309 ./dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
 2007022239 ./dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -13209,7 +13227,7 @@
 2009301039 ./dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
 2009181339 ./dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
 2008021239 ./dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
-2010080009 ./dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+2010120309 ./dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
 2009151139 ./dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
 2009151139 ./dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
 2009151139 ./dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild
@@ -13224,6 +13242,7 @@
 2003081509 ./dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
 2008211639 ./dev-python/sqlparse/sqlparse-0.3.1.ebuild
 2010072209 ./dev-python/sqlparse/sqlparse-0.4.0.ebuild
+2010090039 ./dev-python/sqlparse/sqlparse-0.4.1.ebuild
 2003102139 ./dev-python/django-pglocks/django-pglocks-1.0.4.ebuild
 2008190739 ./dev-python/GitPython/GitPython-3.1.7.ebuild
 2009040639 ./dev-python/GitPython/GitPython-3.1.8.ebuild
@@ -13257,10 +13276,10 @@
 2009202339 ./dev-python/csv23/csv23-0.3.2-r1.ebuild
 2007260139 ./dev-python/aiofiles/aiofiles-0.5.0.ebuild
 2008300839 ./dev-python/asgiref/asgiref-3.2.10.ebuild
+2010100909 ./dev-python/asgiref/asgiref-3.3.0.ebuild
 2005070339 ./dev-python/snapshottest/snapshottest-0.5.1.ebuild
 2005070339 ./dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
-2007180509 ./dev-python/cbor2/cbor2-5.1.0.ebuild
-2010071039 ./dev-python/cbor2/cbor2-5.1.2.ebuild
+2010091139 ./dev-python/cbor2/cbor2-5.1.2.ebuild
 2007180509 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
 2005151109 ./dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
 2008021209 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
@@ -13275,7 +13294,7 @@
 2008190439 ./dev-python/pyside2/pyside2-5.14.2.ebuild
 2005222039 ./dev-python/shiboken2/shiboken2-5.14.2.ebuild
 2005270009 ./dev-python/sphinx-prompt/sphinx-prompt-1.2.0.ebuild
-2010041739 ./dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+2010101709 ./dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
 2009151139 ./dev-python/spyder-vim/spyder-vim-0_pre20200721.ebuild
 2009201909 ./dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
 2010070409 ./dev-python/black/black-20.8_beta1.ebuild
@@ -13288,6 +13307,7 @@
 2009160439 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
 2009181139 ./dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
 2008180909 ./dev-python/spur/spur-0.3.21.ebuild
+2010111809 ./dev-python/spur/spur-0.3.22.ebuild
 2008072239 ./dev-python/fsspec/fsspec-0.7.4.ebuild
 2010042109 ./dev-python/fsspec/fsspec-0.8.0.ebuild
 2010042109 ./dev-python/fsspec/fsspec-0.8.2.ebuild
@@ -13308,7 +13328,7 @@
 2009202339 ./dev-python/quantities/quantities-0.12.4.ebuild
 2009211840 ./dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
 2008051739 ./dev-python/PyICU/PyICU-2.5.ebuild
-2010020139 ./dev-python/iniconfig/iniconfig-1.0.0.ebuild
+2010091139 ./dev-python/iniconfig/iniconfig-1.0.0.ebuild
 2008121539 ./dev-python/osrf_pycommon/osrf_pycommon-0.1.10.ebuild
 2008300439 ./dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
 2008300439 ./dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
@@ -13362,6 +13382,8 @@
 2009181339 ./dev-python/scipy/scipy-1.4.1.ebuild
 2009181339 ./dev-python/scipy/scipy-1.5.2.ebuild
 2009211909 ./dev-python/python-socks/python-socks-1.1.0.ebuild
+2010112109 ./dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
+2010082309 ./dev-python/pydantic/pydantic-1.6.1.ebuild
 2005201639 ./dev-qt/assistant/assistant-5.14.2.ebuild
 2009102109 ./dev-qt/assistant/assistant-5.15.1.ebuild
 2005302239 ./dev-qt/designer/designer-5.14.2.ebuild
@@ -13394,6 +13416,7 @@
 2009102109 ./dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
 2005302239 ./dev-qt/qtcore/qtcore-5.14.2.ebuild
 2009102109 ./dev-qt/qtcore/qtcore-5.15.1.ebuild
+2010102109 ./dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
 2005201639 ./dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
 2009102109 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild
 2005302239 ./dev-qt/qtdbus/qtdbus-5.14.2.ebuild
@@ -13407,7 +13430,6 @@
 2005302239 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
 2009102109 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
 2008310309 ./dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
-2009102109 ./dev-qt/qtgui/qtgui-5.15.1.ebuild
 2010041939 ./dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
 2005302239 ./dev-qt/qthelp/qthelp-5.14.2.ebuild
 2009102109 ./dev-qt/qthelp/qthelp-5.15.1.ebuild
@@ -13463,8 +13485,8 @@
 2009102109 ./dev-qt/qtwayland/qtwayland-5.15.1.ebuild
 2005201639 ./dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
 2009102109 ./dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
-2009102109 ./dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
 2009131709 ./dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+2010102239 ./dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
 2008182109 ./dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
 2005201639 ./dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
 2009102109 ./dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
@@ -13797,8 +13819,8 @@
 2007161609 ./dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
 2007161939 ./dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
 2007161939 ./dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
-2007301639 ./dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
 2007301639 ./dev-ros/pcl_ros/pcl_ros-9999.ebuild
+2010111509 ./dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
 2008071839 ./dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
 2008071839 ./dev-ros/pluginlib/pluginlib-9999.ebuild
 2007082039 ./dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
@@ -14960,7 +14982,6 @@
 2009110839 ./dev-ruby/puppet_forge/puppet_forge-2.3.4.ebuild
 2009280039 ./dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
 2003031039 ./dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
-2007270539 ./dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
 2004122139 ./dev-ruby/qed/qed-2.9.2.ebuild
 2005101209 ./dev-ruby/racc/racc-1.4.14.ebuild
 2005101209 ./dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -15368,6 +15389,7 @@
 2004122139 ./dev-ruby/tins/tins-1.22.2.ebuild
 2004122139 ./dev-ruby/tins/tins-1.24.1.ebuild
 2007270539 ./dev-ruby/tins/tins-1.25.0.ebuild
+2010100909 ./dev-ruby/tins/tins-1.26.0.ebuild
 2006280009 ./dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
 2006061109 ./dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
 2001031009 ./dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
@@ -15595,7 +15617,6 @@
 2004032241 ./dev-tex/detex/detex-2.8-r1.ebuild
 2004032241 ./dev-tex/dot2tex/dot2tex-2.11.3.ebuild
 2006111539 ./dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild
-2004032241 ./dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
 2002112051 ./dev-tex/dvipost/dvipost-1.1-r3.ebuild
 2002230040 ./dev-tex/foiltex/foiltex-2.1.4b.ebuild
 1909082039 ./dev-tex/frakturx/frakturx-20070103-r1.ebuild
@@ -15767,7 +15788,7 @@
 2008080209 ./dev-util/bnfc/bnfc-2.8.1.ebuild
 2004090009 ./dev-util/boost-build/boost-build-1.72.0.ebuild
 2005021739 ./dev-util/boost-build/boost-build-1.73.0.ebuild
-2008160239 ./dev-util/boost-build/boost-build-1.74.0.ebuild
+2010091809 ./dev-util/boost-build/boost-build-1.74.0.ebuild
 2006202239 ./dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
 2008250339 ./dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
 2008250339 ./dev-util/bpftrace/bpftrace-9999.ebuild
@@ -15776,26 +15797,31 @@
 2006041239 ./dev-util/btyacc/btyacc-3.0-r3.ebuild
 1804140239 ./dev-util/build/build-0.3.10.ebuild
 2006280409 ./dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
 2006280409 ./dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
 2006280409 ./dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
 2006280409 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
 2006020209 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
 2006280409 ./dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
 2006280409 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
 2006280409 ./dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
-2007232139 ./dev-util/buildbot/buildbot-9999.ebuild
+2010102209 ./dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
 2007250041 ./dev-util/buildbot/buildbot-2.8.2-r1.ebuild
+2010102209 ./dev-util/buildbot/buildbot-2.8.4.ebuild
+2010102209 ./dev-util/buildbot/buildbot-9999.ebuild
 2008182039 ./dev-util/bustle/bustle-0.5.4.ebuild
 2009111009 ./dev-util/byacc/byacc-20200910.ebuild
 2009181139 ./dev-util/byacc/byacc-20200330.ebuild
 1911160409 ./dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
 2005090009 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
 2008130139 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
-2004241039 ./dev-util/catalyst/catalyst-3.0.9.ebuild
-2005190708 ./dev-util/catalyst/catalyst-9999.ebuild
-2005232339 ./dev-util/catalyst/catalyst-3.0.12.ebuild
-2009192139 ./dev-util/catalyst/catalyst-3.0.13.ebuild
-2010031939 ./dev-util/catalyst/catalyst-3.0.14.ebuild
+2010090109 ./dev-util/catalyst/catalyst-3.0.14.ebuild
+2010090109 ./dev-util/catalyst/catalyst-9999.ebuild
 2003152212 ./dev-util/catfish/catfish-1.4.13.ebuild
 2008171609 ./dev-util/catkin/catkin-0.8.3-r1.ebuild
 2008171609 ./dev-util/catkin/catkin-0.8.8-r1.ebuild
@@ -15830,8 +15856,8 @@
 2005221739 ./dev-util/cmake/cmake-3.13.5.ebuild
 2008140339 ./dev-util/cmake/cmake-3.16.5.ebuild
 2009231239 ./dev-util/cmake/cmake-3.18.3.ebuild
-2010070009 ./dev-util/cmake/cmake-3.17.4-r1.ebuild
 2010062139 ./dev-util/cmake/cmake-3.18.4.ebuild
+2010091209 ./dev-util/cmake/cmake-3.17.4-r1.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
 2003061539 ./dev-util/codeblocks/codeblocks-17.12-r302.ebuild
 2004080939 ./dev-util/codeblocks/codeblocks-20.03.ebuild
@@ -15927,7 +15953,6 @@
 2010010409 ./dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
 2010060809 ./dev-util/docker-ls/docker-ls-0.3.1.ebuild
 2006040939 ./dev-util/dogtail/dogtail-0.9.11.ebuild
-2002112051 ./dev-util/doxy-coverage/doxy-coverage-151229.ebuild
 2003181409 ./dev-util/dput-ng/dput-ng-1.28-r1.ebuild
 2002091639 ./dev-util/drone-cli/drone-cli-0.8.6.ebuild
 2002091639 ./dev-util/drone-cli/drone-cli-1.1.4.ebuild
@@ -15963,8 +15988,8 @@
 1702282250 ./dev-util/fuzz/fuzz-0.6-r1.ebuild
 2003162209 ./dev-util/gcovr/gcovr-4.2.ebuild
 2006080009 ./dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
-2009072139 ./dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
 2009112009 ./dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
+2010111509 ./dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
 2004132009 ./dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
 2002222009 ./dev-util/geany/geany-9999.ebuild
 2004132009 ./dev-util/geany/geany-1.36.ebuild
@@ -15974,14 +15999,14 @@
 2006080009 ./dev-util/glade/glade-3.22.2.ebuild
 2009112009 ./dev-util/glade/glade-3.36.0.ebuild
 2006080009 ./dev-util/glib-utils/glib-utils-2.62.6.ebuild
-2009072139 ./dev-util/glib-utils/glib-utils-2.64.4.ebuild
 2010060709 ./dev-util/glib-utils/glib-utils-2.64.5.ebuild
+2010111509 ./dev-util/glib-utils/glib-utils-2.64.4.ebuild
 2008111809 ./dev-util/global/global-6.6.4.ebuild
 2002270739 ./dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
 2003160039 ./dev-util/glslang/glslang-8.13.3559.ebuild
 2006160239 ./dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
 2006160239 ./dev-util/glslang/glslang-9999.ebuild
-2010080539 ./dev-util/glslang/glslang-8.13.3743-r1.ebuild
+2010091209 ./dev-util/glslang/glslang-8.13.3743-r1.ebuild
 2007201509 ./dev-util/gn/gn-0.1726.ebuild
 2008150809 ./dev-util/gn/gn-0.1807.ebuild
 2008150009 ./dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
@@ -16000,7 +16025,7 @@
 2009271909 ./dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
 2007051239 ./dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
 2007051239 ./dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
-2009072139 ./dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+2010111509 ./dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
 2004112039 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild
 2009112009 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
 2009181139 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
@@ -16013,6 +16038,7 @@
 2004201209 ./dev-util/howdoi/howdoi-1.2.1.ebuild
 2009061339 ./dev-util/howdoi/howdoi-2.0.5.ebuild
 2009181309 ./dev-util/howdoi/howdoi-2.0.6.ebuild
+2010101309 ./dev-util/howdoi/howdoi-2.0.7.ebuild
 2002230040 ./dev-util/huc/huc-0.1-r1.ebuild
 1907151840 ./dev-util/hxd/hxd-0.70.02-r2.ebuild
 1804032208 ./dev-util/hxtools/hxtools-20180301.ebuild
@@ -16049,7 +16075,7 @@
 2010080339 ./dev-util/jenkins-bin/jenkins-bin-2.260.ebuild
 1904201709 ./dev-util/kbuild/kbuild-9999.ebuild
 2005230409 ./dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
-2009251209 ./dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
+2010091139 ./dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
 1711280410 ./dev-util/kcov/kcov-34.ebuild
 1702282250 ./dev-util/kcov/kcov-9999.ebuild
 2005210139 ./dev-util/kdbg/kdbg-3.0.1.ebuild
@@ -16106,12 +16132,10 @@
 2004222009 ./dev-util/meld/meld-3.20.2-r1.ebuild
 2002151310 ./dev-util/memprof/memprof-0.6.2-r1.ebuild
 2008142209 ./dev-util/meson/meson-9999.ebuild
-2009181139 ./dev-util/meson/meson-0.54.3.ebuild
-2010071039 ./dev-util/meson/meson-0.55.3.ebuild
+2010082039 ./dev-util/meson/meson-0.55.3.ebuild
 1904081939 ./dev-util/min-cscope/min-cscope-16.1.0.ebuild
 2002140109 ./dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild
 2009302139 ./dev-util/mingw64-runtime/mingw64-runtime-8.0.0.ebuild
-1907151840 ./dev-util/mpatch/mpatch-0.8-r1.ebuild
 1907151840 ./dev-util/mutrace/mutrace-0.2-r1.ebuild
 1708131410 ./dev-util/nemiver/nemiver-0.9.6.ebuild
 2005131639 ./dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
@@ -16228,8 +16252,7 @@
 1712281509 ./dev-util/rats/rats-2.4.ebuild
 2002071539 ./dev-util/rbtools/rbtools-1.0.2.ebuild
 2009020839 ./dev-util/rbtools/rbtools-1.0.3.ebuild
-2004211339 ./dev-util/re2c/re2c-1.3-r1.ebuild
-2010071039 ./dev-util/re2c/re2c-2.0.3.ebuild
+2010091139 ./dev-util/re2c/re2c-2.0.3.ebuild
 2007201209 ./dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
 2007201209 ./dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
 1912071709 ./dev-util/rebar/rebar-2.6.4.ebuild
@@ -16251,6 +16274,7 @@
 2008171609 ./dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
 2008171609 ./dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
 2009061309 ./dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
+2010101209 ./dev-util/rpmdevtools/rpmdevtools-9.2.ebuild
 2010020109 ./dev-util/rr/rr-5.3.0-r2.ebuild
 2007201609 ./dev-util/sasm/sasm-2.2-r1.ebuild
 2007201609 ./dev-util/sasm/sasm-3.10.1.ebuild
@@ -16265,8 +16289,6 @@
 2002230040 ./dev-util/sel/sel-0.08.4-r2.ebuild
 2005042039 ./dev-util/serialtalk/serialtalk-9999.ebuild
 2007171109 ./dev-util/serialtalk/serialtalk-1.2-r1.ebuild
-1904171112 ./dev-util/setconf/setconf-0.6.6.ebuild
-2005071839 ./dev-util/setconf/setconf-0.6.7.ebuild
 2004060109 ./dev-util/sgb/sgb-20030623-r1.ebuild
 2004060109 ./dev-util/sgb/sgb-20090810.ebuild
 1708261636 ./dev-util/shadowman/shadowman-9999.ebuild
@@ -16283,19 +16305,19 @@
 2009071209 ./dev-util/smem/smem-1.5-r1.ebuild
 2008271009 ./dev-util/source-highlight/source-highlight-3.1.9.ebuild
 2003160039 ./dev-util/spirv-headers/spirv-headers-9999.ebuild
-2010080539 ./dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+2010091209 ./dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
 2003112239 ./dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild
 2004270039 ./dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
 2009131639 ./dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild
 2004300109 ./dev-util/spirv-tools/spirv-tools-9999.ebuild
-2010080539 ./dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+2010091209 ./dev-util/spirv-tools/spirv-tools-2020.3.ebuild
 1703161501 ./dev-util/splint/splint-3.1.2-r1.ebuild
 1905212109 ./dev-util/splint/splint-3.1.2-r2.ebuild
 2001051839 ./dev-util/squashdelta/squashdelta-0.1.1.ebuild
 2001051839 ./dev-util/squashdelta/squashdelta-9999.ebuild
 2001051839 ./dev-util/squashmerge/squashmerge-0.1.ebuild
 2001051839 ./dev-util/squashmerge/squashmerge-9999.ebuild
-2009241009 ./dev-util/statifier/statifier-1.7.4-r1.ebuild
+2010101409 ./dev-util/statifier/statifier-1.7.4-r1.ebuild
 1807171939 ./dev-util/stepman/stepman-0.10.0.ebuild
 1808201309 ./dev-util/stepman/stepman-0.10.2.ebuild
 1810222339 ./dev-util/stepman/stepman-0.10.4.ebuild
@@ -16347,7 +16369,7 @@
 1903120409 ./dev-util/vmtouch/vmtouch-1.3.1.ebuild
 1702282250 ./dev-util/vtable-dumper/vtable-dumper-1.2.ebuild
 2003160039 ./dev-util/vulkan-headers/vulkan-headers-9999.ebuild
-2010080539 ./dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+2010091209 ./dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
 2003160039 ./dev-util/vulkan-tools/vulkan-tools-9999.ebuild
 2007272109 ./dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
 1702282250 ./dev-util/weka/weka-3.8.0.ebuild
@@ -16381,7 +16403,7 @@
 2010032009 ./dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
 2005150039 ./dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
 2006191739 ./dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
-2010080539 ./dev-util/cargo-c/cargo-c-0.6.2.ebuild
+2010091209 ./dev-util/cargo-c/cargo-c-0.6.2.ebuild
 2009241009 ./dev-util/cvise/cvise-1.6.0.ebuild
 2009301109 ./dev-util/cvise/cvise-1.7.0-r1.ebuild
 2005310739 ./dev-util/github-cli/github-cli-0.8.0.ebuild
@@ -16392,6 +16414,7 @@
 2009171739 ./dev-util/github-cli/github-cli-1.0.0.ebuild
 2005210809 ./dev-util/webhook/webhook-2.7.0.ebuild
 2006280409 ./dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
+2010102209 ./dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
 2006051209 ./dev-util/cargo-license/cargo-license-0.3.0.ebuild
 2006071239 ./dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.0.ebuild
 2006270909 ./dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
@@ -16413,8 +16436,6 @@
 2005242039 ./dev-vcs/cvs-fast-export/cvs-fast-export-1.55.ebuild
 2004032241 ./dev-vcs/cvs/cvs-1.12.12-r12.ebuild
 1902111809 ./dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
-1912110241 ./dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
-2004032241 ./dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
 2002230040 ./dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
 2004032241 ./dev-vcs/cvsps/cvsps-3.13-r2.ebuild
 2006081939 ./dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -16898,9 +16919,9 @@
 1909080209 ./games-engines/box2d/box2d-2.1.2.ebuild
 1909080209 ./games-engines/box2d/box2d-2.2.1.ebuild
 1909080209 ./games-engines/box2d/box2d-2.3.1.ebuild
-2001021509 ./games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
 2003091239 ./games-engines/devilutionx/devilutionx-1.0.1.ebuild
-2003231839 ./games-engines/devilutionx/devilutionx-9999.ebuild
+2010111039 ./games-engines/devilutionx/devilutionx-1.0.3.ebuild
+2010101909 ./games-engines/devilutionx/devilutionx-9999.ebuild
 1807120009 ./games-engines/exult/exult-9999.ebuild
 1712012239 ./games-engines/frobtads/frobtads-1.2.3-r1.ebuild
 1903221939 ./games-engines/frobtads/frobtads-1.2.4.ebuild
@@ -17205,9 +17226,8 @@
 2003291509 ./games-roguelike/nethack/nethack-3.6.6.ebuild
 1710230047 ./games-roguelike/powder/powder-117-r1.ebuild
 1806251739 ./games-roguelike/scourge/scourge-0.21.1-r1.ebuild
-2006190439 ./games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
-2006190439 ./games-roguelike/stone-soup/stone-soup-0.24.0.ebuild
-2006190439 ./games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+2010101809 ./games-roguelike/stone-soup/stone-soup-0.25.0.ebuild
+2010101809 ./games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
 1711182327 ./games-roguelike/tome/tome-2.3.5.ebuild
 1805120008 ./games-roguelike/tomenet/tomenet-4.6.1a.ebuild
 1902100639 ./games-roguelike/tomenet/tomenet-4.7.2.ebuild
@@ -17271,8 +17291,7 @@
 1908300039 ./games-server/monopd/monopd-0.10.2-r1.ebuild
 2006211339 ./games-server/mtavc/mtavc-0.5-r2.ebuild
 1902111939 ./games-server/pvpgn/pvpgn-1.8.5-r2.ebuild
-1912152109 ./games-server/steamcmd/steamcmd-1.0-r2.ebuild
-2010071039 ./games-server/steamcmd/steamcmd-1.0-r3.ebuild
+2010091139 ./games-server/steamcmd/steamcmd-1.0-r3.ebuild
 2008101539 ./games-server/bedrock-server/bedrock-server-1.16.1.02.ebuild
 2009250009 ./games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
 1912270339 ./games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
@@ -17336,8 +17355,8 @@
 2002151310 ./games-strategy/freeciv/freeciv-2.5.12.ebuild
 2006142009 ./games-strategy/freeciv/freeciv-2.6.2.ebuild
 1904140039 ./games-strategy/freecol/freecol-0.11.6-r1.ebuild
-2010062139 ./games-strategy/freeorion/freeorion-0.4.10.1.ebuild
 2010062139 ./games-strategy/freeorion/freeorion-9999.ebuild
+2010120639 ./games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
 1807010309 ./games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
 1805022239 ./games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
 1805022239 ./games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
@@ -17453,6 +17472,7 @@
 2006291909 ./gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
 2007130039 ./gnome-base/gnome-desktop/gnome-desktop-3.36.4.ebuild
 2008302139 ./gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild
+2010120039 ./gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
 2004202139 ./gnome-base/gnome-extra-apps/gnome-extra-apps-3.34.4.ebuild
 2008302139 ./gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild
 2007130039 ./gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
@@ -17773,646 +17793,647 @@
 2002112051 ./java-virtuals/transaction-api/transaction-api-1.1.ebuild
 2002112051 ./java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
 2008040239 ./kde-apps/akonadi-calendar/akonadi-calendar-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi-calendar/akonadi-calendar-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi-calendar/akonadi-calendar-20.08.2.ebuild
 2008040239 ./kde-apps/akonadi-contacts/akonadi-contacts-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi-contacts/akonadi-contacts-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi-contacts/akonadi-contacts-20.08.2.ebuild
 2008040239 ./kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.2.ebuild
 2008040239 ./kde-apps/akonadi-mime/akonadi-mime-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi-mime/akonadi-mime-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi-mime/akonadi-mime-20.08.2.ebuild
 2008040239 ./kde-apps/akonadi-notes/akonadi-notes-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi-notes/akonadi-notes-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi-notes/akonadi-notes-20.08.2.ebuild
 2008040239 ./kde-apps/akonadi-search/akonadi-search-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi-search/akonadi-search-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi-search/akonadi-search-20.08.2.ebuild
 2008040239 ./kde-apps/akonadi/akonadi-20.04.3.ebuild
-2009031539 ./kde-apps/akonadi/akonadi-20.08.1.ebuild
+2010092209 ./kde-apps/akonadi/akonadi-20.08.2.ebuild
 2008040239 ./kde-apps/akonadiconsole/akonadiconsole-20.04.3.ebuild
-2009031539 ./kde-apps/akonadiconsole/akonadiconsole-20.08.1.ebuild
+2010092209 ./kde-apps/akonadiconsole/akonadiconsole-20.08.2.ebuild
 2008040239 ./kde-apps/akregator/akregator-20.04.3.ebuild
-2009031539 ./kde-apps/akregator/akregator-20.08.1.ebuild
+2010092209 ./kde-apps/akregator/akregator-20.08.2.ebuild
 2008040239 ./kde-apps/analitza/analitza-20.04.3.ebuild
-2009031539 ./kde-apps/analitza/analitza-20.08.1.ebuild
-2009290039 ./kde-apps/ark/ark-20.08.1.ebuild
+2010092209 ./kde-apps/analitza/analitza-20.08.2.ebuild
 2010030039 ./kde-apps/ark/ark-20.04.3-r2.ebuild
+2010092209 ./kde-apps/ark/ark-20.08.2.ebuild
 2008040239 ./kde-apps/artikulate/artikulate-20.04.3.ebuild
-2009031539 ./kde-apps/artikulate/artikulate-20.08.1.ebuild
+2010092209 ./kde-apps/artikulate/artikulate-20.08.2.ebuild
 2008040239 ./kde-apps/audiocd-kio/audiocd-kio-20.04.3.ebuild
-2009031539 ./kde-apps/audiocd-kio/audiocd-kio-20.08.1.ebuild
+2010092209 ./kde-apps/audiocd-kio/audiocd-kio-20.08.2.ebuild
 2008040239 ./kde-apps/baloo-widgets/baloo-widgets-20.04.3.ebuild
-2009031539 ./kde-apps/baloo-widgets/baloo-widgets-20.08.1.ebuild
+2010092209 ./kde-apps/baloo-widgets/baloo-widgets-20.08.2.ebuild
 2008040239 ./kde-apps/blinken/blinken-20.04.3.ebuild
-2009031539 ./kde-apps/blinken/blinken-20.08.1.ebuild
+2010092209 ./kde-apps/blinken/blinken-20.08.2.ebuild
 2008040239 ./kde-apps/bomber/bomber-20.04.3.ebuild
-2009031539 ./kde-apps/bomber/bomber-20.08.1.ebuild
+2010092209 ./kde-apps/bomber/bomber-20.08.2.ebuild
 2008040239 ./kde-apps/bovo/bovo-20.04.3.ebuild
-2009031539 ./kde-apps/bovo/bovo-20.08.1.ebuild
+2010092209 ./kde-apps/bovo/bovo-20.08.2.ebuild
 2008040239 ./kde-apps/calendarjanitor/calendarjanitor-20.04.3.ebuild
-2009031539 ./kde-apps/calendarjanitor/calendarjanitor-20.08.1.ebuild
+2010092209 ./kde-apps/calendarjanitor/calendarjanitor-20.08.2.ebuild
 2008040239 ./kde-apps/calendarsupport/calendarsupport-20.04.3.ebuild
-2009031539 ./kde-apps/calendarsupport/calendarsupport-20.08.1.ebuild
+2010092209 ./kde-apps/calendarsupport/calendarsupport-20.08.2.ebuild
 2008301109 ./kde-apps/cantor/cantor-20.04.3-r1.ebuild
-2009031539 ./kde-apps/cantor/cantor-20.08.1.ebuild
+2010120039 ./kde-apps/cantor/cantor-20.08.2.ebuild
 2008040239 ./kde-apps/cervisia/cervisia-20.04.3.ebuild
-2009031539 ./kde-apps/cervisia/cervisia-20.08.1.ebuild
+2010092209 ./kde-apps/cervisia/cervisia-20.08.2.ebuild
 2007301039 ./kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.04.3.ebuild
-2009031539 ./kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.1.ebuild
+2010092209 ./kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.2.ebuild
 2008040239 ./kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.04.3.ebuild
-2009031539 ./kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.1.ebuild
+2010092209 ./kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.2.ebuild
 2008040239 ./kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.3.ebuild
-2009031539 ./kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.1.ebuild
+2010092209 ./kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.2.ebuild
 2008040239 ./kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.04.3.ebuild
-2009031539 ./kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.1.ebuild
+2010092209 ./kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.2.ebuild
 2008040239 ./kde-apps/dolphin/dolphin-20.04.3.ebuild
-2009031539 ./kde-apps/dolphin/dolphin-20.08.1.ebuild
+2010092209 ./kde-apps/dolphin/dolphin-20.08.2.ebuild
 2008040239 ./kde-apps/dragon/dragon-20.04.3.ebuild
-2009031539 ./kde-apps/dragon/dragon-20.08.1.ebuild
+2010092209 ./kde-apps/dragon/dragon-20.08.2.ebuild
 2008040239 ./kde-apps/eventviews/eventviews-20.04.3.ebuild
-2009031539 ./kde-apps/eventviews/eventviews-20.08.1.ebuild
+2010092209 ./kde-apps/eventviews/eventviews-20.08.2.ebuild
 2008040239 ./kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.3.ebuild
-2009031539 ./kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.1.ebuild
+2010092209 ./kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.2.ebuild
 2008040239 ./kde-apps/filelight/filelight-20.04.3.ebuild
-2009031539 ./kde-apps/filelight/filelight-20.08.1.ebuild
+2010092209 ./kde-apps/filelight/filelight-20.08.2.ebuild
 2008040239 ./kde-apps/granatier/granatier-20.04.3.ebuild
-2009031539 ./kde-apps/granatier/granatier-20.08.1.ebuild
+2010092209 ./kde-apps/granatier/granatier-20.08.2.ebuild
 2008040239 ./kde-apps/grantlee-editor/grantlee-editor-20.04.3.ebuild
-2009031539 ./kde-apps/grantlee-editor/grantlee-editor-20.08.1.ebuild
+2010092209 ./kde-apps/grantlee-editor/grantlee-editor-20.08.2.ebuild
 2008040239 ./kde-apps/grantleetheme/grantleetheme-20.04.3.ebuild
-2009031539 ./kde-apps/grantleetheme/grantleetheme-20.08.1.ebuild
+2010092209 ./kde-apps/grantleetheme/grantleetheme-20.08.2.ebuild
 2008040239 ./kde-apps/gwenview/gwenview-20.04.3.ebuild
-2009031539 ./kde-apps/gwenview/gwenview-20.08.1.ebuild
+2010092209 ./kde-apps/gwenview/gwenview-20.08.2.ebuild
 2008040239 ./kde-apps/incidenceeditor/incidenceeditor-20.04.3.ebuild
-2009031539 ./kde-apps/incidenceeditor/incidenceeditor-20.08.1.ebuild
+2010092209 ./kde-apps/incidenceeditor/incidenceeditor-20.08.2.ebuild
 2008040239 ./kde-apps/juk/juk-20.04.3.ebuild
-2009031539 ./kde-apps/juk/juk-20.08.1.ebuild
+2010092209 ./kde-apps/juk/juk-20.08.2.ebuild
 2008040239 ./kde-apps/k3b/k3b-20.04.3.ebuild
-2009031539 ./kde-apps/k3b/k3b-20.08.1.ebuild
+2010092209 ./kde-apps/k3b/k3b-20.08.2.ebuild
 2008040239 ./kde-apps/kaccounts-integration/kaccounts-integration-20.04.3.ebuild
-2009031539 ./kde-apps/kaccounts-integration/kaccounts-integration-20.08.1.ebuild
+2010092209 ./kde-apps/kaccounts-integration/kaccounts-integration-20.08.2.ebuild
 2008040239 ./kde-apps/kaccounts-providers/kaccounts-providers-20.04.3.ebuild
-2009031539 ./kde-apps/kaccounts-providers/kaccounts-providers-20.08.1.ebuild
+2010092209 ./kde-apps/kaccounts-providers/kaccounts-providers-20.08.2.ebuild
 2008040239 ./kde-apps/kaddressbook/kaddressbook-20.04.3.ebuild
-2009031539 ./kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild
+2010092209 ./kde-apps/kaddressbook/kaddressbook-20.08.2.ebuild
 2008040239 ./kde-apps/kajongg/kajongg-20.04.3.ebuild
-2009031539 ./kde-apps/kajongg/kajongg-20.08.1.ebuild
+2010120039 ./kde-apps/kajongg/kajongg-20.08.2.ebuild
 2008040239 ./kde-apps/kalarm/kalarm-20.04.3.ebuild
-2009031539 ./kde-apps/kalarm/kalarm-20.08.1.ebuild
+2010092209 ./kde-apps/kalarm/kalarm-20.08.2.ebuild
 2008040239 ./kde-apps/kalarmcal/kalarmcal-20.04.3.ebuild
-2009031539 ./kde-apps/kalarmcal/kalarmcal-20.08.1.ebuild
+2010092209 ./kde-apps/kalarmcal/kalarmcal-20.08.2.ebuild
 2008040239 ./kde-apps/kalgebra/kalgebra-20.04.3.ebuild
-2009031539 ./kde-apps/kalgebra/kalgebra-20.08.1.ebuild
+2010092209 ./kde-apps/kalgebra/kalgebra-20.08.2.ebuild
 2008040239 ./kde-apps/kalzium/kalzium-20.04.3.ebuild
-2009031539 ./kde-apps/kalzium/kalzium-20.08.1.ebuild
+2010092209 ./kde-apps/kalzium/kalzium-20.08.2.ebuild
 2008040239 ./kde-apps/kamera/kamera-20.04.3.ebuild
-2009031539 ./kde-apps/kamera/kamera-20.08.1.ebuild
+2010092209 ./kde-apps/kamera/kamera-20.08.2.ebuild
 2008040239 ./kde-apps/kamoso/kamoso-20.04.3.ebuild
-2009031539 ./kde-apps/kamoso/kamoso-20.08.1.ebuild
+2010092209 ./kde-apps/kamoso/kamoso-20.08.2.ebuild
 2008302209 ./kde-apps/kanagram/kanagram-20.04.3.ebuild
-2009031539 ./kde-apps/kanagram/kanagram-20.08.1.ebuild
+2010092209 ./kde-apps/kanagram/kanagram-20.08.2.ebuild
 2008040239 ./kde-apps/kapman/kapman-20.04.3.ebuild
-2009031539 ./kde-apps/kapman/kapman-20.08.1.ebuild
+2010092209 ./kde-apps/kapman/kapman-20.08.2.ebuild
 2008040239 ./kde-apps/kapptemplate/kapptemplate-20.04.3.ebuild
-2009031539 ./kde-apps/kapptemplate/kapptemplate-20.08.1.ebuild
+2010092209 ./kde-apps/kapptemplate/kapptemplate-20.08.2.ebuild
 2008040239 ./kde-apps/kate/kate-20.04.3.ebuild
-2009031539 ./kde-apps/kate/kate-20.08.1.ebuild
+2010092209 ./kde-apps/kate/kate-20.08.2.ebuild
 2008040239 ./kde-apps/katomic/katomic-20.04.3.ebuild
-2009031539 ./kde-apps/katomic/katomic-20.08.1.ebuild
+2010092209 ./kde-apps/katomic/katomic-20.08.2.ebuild
 2008040239 ./kde-apps/kbackup/kbackup-20.04.3.ebuild
-2009031539 ./kde-apps/kbackup/kbackup-20.08.1.ebuild
+2010092209 ./kde-apps/kbackup/kbackup-20.08.2.ebuild
 2008040239 ./kde-apps/kblackbox/kblackbox-20.04.3.ebuild
-2009031539 ./kde-apps/kblackbox/kblackbox-20.08.1.ebuild
+2010092209 ./kde-apps/kblackbox/kblackbox-20.08.2.ebuild
 2008040239 ./kde-apps/kblocks/kblocks-20.04.3.ebuild
-2009031539 ./kde-apps/kblocks/kblocks-20.08.1.ebuild
+2010092209 ./kde-apps/kblocks/kblocks-20.08.2.ebuild
 2008040239 ./kde-apps/kbounce/kbounce-20.04.3.ebuild
-2009031539 ./kde-apps/kbounce/kbounce-20.08.1.ebuild
+2010092209 ./kde-apps/kbounce/kbounce-20.08.2.ebuild
 2008040239 ./kde-apps/kbreakout/kbreakout-20.04.3.ebuild
-2009031539 ./kde-apps/kbreakout/kbreakout-20.08.1.ebuild
+2010092209 ./kde-apps/kbreakout/kbreakout-20.08.2.ebuild
 2008040239 ./kde-apps/kbruch/kbruch-20.04.3.ebuild
-2009031539 ./kde-apps/kbruch/kbruch-20.08.1.ebuild
+2010092209 ./kde-apps/kbruch/kbruch-20.08.2.ebuild
 2008040239 ./kde-apps/kcachegrind/kcachegrind-20.04.3.ebuild
-2009031539 ./kde-apps/kcachegrind/kcachegrind-20.08.1.ebuild
+2010092209 ./kde-apps/kcachegrind/kcachegrind-20.08.2.ebuild
 2008040239 ./kde-apps/kcalc/kcalc-20.04.3.ebuild
-2009031539 ./kde-apps/kcalc/kcalc-20.08.1.ebuild
+2010092209 ./kde-apps/kcalc/kcalc-20.08.2.ebuild
 2008040239 ./kde-apps/kcalutils/kcalutils-20.04.3.ebuild
-2009031539 ./kde-apps/kcalutils/kcalutils-20.08.1.ebuild
+2010092209 ./kde-apps/kcalutils/kcalutils-20.08.2.ebuild
 2008040239 ./kde-apps/kcharselect/kcharselect-20.04.3.ebuild
-2009031539 ./kde-apps/kcharselect/kcharselect-20.08.1.ebuild
+2010092209 ./kde-apps/kcharselect/kcharselect-20.08.2.ebuild
 2008040239 ./kde-apps/kcolorchooser/kcolorchooser-20.04.3.ebuild
-2009031539 ./kde-apps/kcolorchooser/kcolorchooser-20.08.1.ebuild
+2010092209 ./kde-apps/kcolorchooser/kcolorchooser-20.08.2.ebuild
 2008040239 ./kde-apps/kcron/kcron-20.04.3.ebuild
-2009031539 ./kde-apps/kcron/kcron-20.08.1.ebuild
+2010092209 ./kde-apps/kcron/kcron-20.08.2.ebuild
 2008040239 ./kde-apps/kdav/kdav-20.04.3.ebuild
 2008040239 ./kde-apps/kde-apps-meta/kde-apps-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kde-apps-meta/kde-apps-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kde-apps-meta/kde-apps-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kde-dev-scripts/kde-dev-scripts-20.04.3.ebuild
-2009031539 ./kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.1.ebuild
+2010092209 ./kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.2.ebuild
 2008040239 ./kde-apps/kde-dev-utils/kde-dev-utils-20.04.3.ebuild
-2009031539 ./kde-apps/kde-dev-utils/kde-dev-utils-20.08.1.ebuild
+2010092209 ./kde-apps/kde-dev-utils/kde-dev-utils-20.08.2.ebuild
 2008040239 ./kde-apps/kde-meta/kde-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kde-meta/kde-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kde-meta/kde-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdeadmin-meta/kdeadmin-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdebase-meta/kdebase-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdebase-meta/kdebase-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdebase-meta/kdebase-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdebugsettings/kdebugsettings-20.04.3.ebuild
-2009031539 ./kde-apps/kdebugsettings/kdebugsettings-20.08.1.ebuild
+2010092209 ./kde-apps/kdebugsettings/kdebugsettings-20.08.2.ebuild
 2008040239 ./kde-apps/kdecore-meta/kdecore-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdecore-meta/kdecore-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdecore-meta/kdecore-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdeedu-data/kdeedu-data-20.04.3.ebuild
-2009031539 ./kde-apps/kdeedu-data/kdeedu-data-20.08.1.ebuild
+2010092209 ./kde-apps/kdeedu-data/kdeedu-data-20.08.2.ebuild
 2008040239 ./kde-apps/kdeedu-meta/kdeedu-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdeedu-meta/kdeedu-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdeedu-meta/kdeedu-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdegames-meta/kdegames-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdegames-meta/kdegames-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdegames-meta/kdegames-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdegraphics-meta/kdegraphics-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.04.3.ebuild
-2009031539 ./kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.1.ebuild
+2010092209 ./kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.2.ebuild
 2008040239 ./kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.04.3.ebuild
-2009031539 ./kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.1.ebuild
+2010092209 ./kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.2.ebuild
 2008040239 ./kde-apps/kdenetwork-meta/kdenetwork-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdenlive/kdenlive-20.04.3.ebuild
-2009031539 ./kde-apps/kdenlive/kdenlive-20.08.1.ebuild
+2010092209 ./kde-apps/kdenlive/kdenlive-20.08.2.ebuild
 2008040239 ./kde-apps/kdepim-addons/kdepim-addons-20.04.3.ebuild
-2009031539 ./kde-apps/kdepim-addons/kdepim-addons-20.08.1.ebuild
+2010092209 ./kde-apps/kdepim-addons/kdepim-addons-20.08.2.ebuild
 2008040239 ./kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.04.3.ebuild
-2009031539 ./kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.1.ebuild
+2010092209 ./kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.08.2.ebuild
 2008040239 ./kde-apps/kdepim-meta/kdepim-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdepim-meta/kdepim-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdepim-meta/kdepim-meta-20.08.2.ebuild
 2008061509 ./kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
-2009031539 ./kde-apps/kdepim-runtime/kdepim-runtime-20.08.1.ebuild
+2010092209 ./kde-apps/kdepim-runtime/kdepim-runtime-20.08.2.ebuild
 2008040239 ./kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.04.3.ebuild
-2009031539 ./kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.1.ebuild
+2010092209 ./kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.2.ebuild
 2008040239 ./kde-apps/kdesdk-meta/kdesdk-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdesdk-meta/kdesdk-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdesdk-meta/kdesdk-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.04.3.ebuild
-2009031539 ./kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.1.ebuild
+2010092209 ./kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.2.ebuild
 2008040239 ./kde-apps/kdeutils-meta/kdeutils-meta-20.04.3.ebuild
-2009031539 ./kde-apps/kdeutils-meta/kdeutils-meta-20.08.1.ebuild
+2010092209 ./kde-apps/kdeutils-meta/kdeutils-meta-20.08.2.ebuild
 2008040239 ./kde-apps/kdf/kdf-20.04.3.ebuild
-2009031539 ./kde-apps/kdf/kdf-20.08.1.ebuild
+2010092209 ./kde-apps/kdf/kdf-20.08.2.ebuild
 2008040239 ./kde-apps/kdialog/kdialog-20.04.3.ebuild
-2009031539 ./kde-apps/kdialog/kdialog-20.08.1.ebuild
+2010092209 ./kde-apps/kdialog/kdialog-20.08.2.ebuild
 2008040239 ./kde-apps/kdiamond/kdiamond-20.04.3.ebuild
-2009031539 ./kde-apps/kdiamond/kdiamond-20.08.1.ebuild
+2010092209 ./kde-apps/kdiamond/kdiamond-20.08.2.ebuild
 2008040239 ./kde-apps/keditbookmarks/keditbookmarks-20.04.3.ebuild
-2009031539 ./kde-apps/keditbookmarks/keditbookmarks-20.08.1.ebuild
+2010092209 ./kde-apps/keditbookmarks/keditbookmarks-20.08.2.ebuild
 2008040239 ./kde-apps/kfind/kfind-20.04.3.ebuild
-2009031539 ./kde-apps/kfind/kfind-20.08.1.ebuild
+2010092209 ./kde-apps/kfind/kfind-20.08.2.ebuild
 2008040239 ./kde-apps/kfloppy/kfloppy-20.04.3.ebuild
-2009031539 ./kde-apps/kfloppy/kfloppy-20.08.1.ebuild
+2010092209 ./kde-apps/kfloppy/kfloppy-20.08.2.ebuild
 2008040239 ./kde-apps/kfourinline/kfourinline-20.04.3.ebuild
-2009031539 ./kde-apps/kfourinline/kfourinline-20.08.1.ebuild
+2010092209 ./kde-apps/kfourinline/kfourinline-20.08.2.ebuild
 2008040239 ./kde-apps/kgeography/kgeography-20.04.3.ebuild
-2009031539 ./kde-apps/kgeography/kgeography-20.08.1.ebuild
+2010092209 ./kde-apps/kgeography/kgeography-20.08.2.ebuild
 2008040239 ./kde-apps/kget/kget-20.04.3.ebuild
-2009031539 ./kde-apps/kget/kget-20.08.1.ebuild
+2010092209 ./kde-apps/kget/kget-20.08.2.ebuild
 2008040239 ./kde-apps/kgoldrunner/kgoldrunner-20.04.3.ebuild
-2009031539 ./kde-apps/kgoldrunner/kgoldrunner-20.08.1.ebuild
+2010092209 ./kde-apps/kgoldrunner/kgoldrunner-20.08.2.ebuild
 2008040239 ./kde-apps/kgpg/kgpg-20.04.3.ebuild
-2009031539 ./kde-apps/kgpg/kgpg-20.08.1.ebuild
+2010092209 ./kde-apps/kgpg/kgpg-20.08.2.ebuild
 2008040239 ./kde-apps/khangman/khangman-20.04.3.ebuild
-2009031539 ./kde-apps/khangman/khangman-20.08.1.ebuild
+2010092209 ./kde-apps/khangman/khangman-20.08.2.ebuild
 2008040239 ./kde-apps/khelpcenter/khelpcenter-20.04.3.ebuild
-2009031539 ./kde-apps/khelpcenter/khelpcenter-20.08.1.ebuild
+2010092209 ./kde-apps/khelpcenter/khelpcenter-20.08.2.ebuild
 2008040239 ./kde-apps/kidentitymanagement/kidentitymanagement-20.04.3.ebuild
-2009031539 ./kde-apps/kidentitymanagement/kidentitymanagement-20.08.1.ebuild
+2010092209 ./kde-apps/kidentitymanagement/kidentitymanagement-20.08.2.ebuild
 2008040239 ./kde-apps/kig/kig-20.04.3.ebuild
-2009031539 ./kde-apps/kig/kig-20.08.1.ebuild
+2010120039 ./kde-apps/kig/kig-20.08.2.ebuild
 2008040239 ./kde-apps/kigo/kigo-20.04.3.ebuild
-2009031539 ./kde-apps/kigo/kigo-20.08.1.ebuild
+2010092209 ./kde-apps/kigo/kigo-20.08.2.ebuild
 2008040239 ./kde-apps/killbots/killbots-20.04.3.ebuild
-2009031539 ./kde-apps/killbots/killbots-20.08.1.ebuild
+2010092209 ./kde-apps/killbots/killbots-20.08.2.ebuild
 2008040239 ./kde-apps/kimagemapeditor/kimagemapeditor-20.04.3.ebuild
-2009031539 ./kde-apps/kimagemapeditor/kimagemapeditor-20.08.1.ebuild
+2010092209 ./kde-apps/kimagemapeditor/kimagemapeditor-20.08.2.ebuild
 2008040239 ./kde-apps/kimap/kimap-20.04.3.ebuild
-2009031539 ./kde-apps/kimap/kimap-20.08.1.ebuild
+2010092209 ./kde-apps/kimap/kimap-20.08.2.ebuild
 2008040239 ./kde-apps/kio-extras/kio-extras-20.04.3.ebuild
-2009031539 ./kde-apps/kio-extras/kio-extras-20.08.1.ebuild
+2010092209 ./kde-apps/kio-extras/kio-extras-20.08.2.ebuild
 2008040239 ./kde-apps/kipi-plugins/kipi-plugins-20.04.3.ebuild
-2009031539 ./kde-apps/kipi-plugins/kipi-plugins-20.08.1.ebuild
+2010092209 ./kde-apps/kipi-plugins/kipi-plugins-20.08.2.ebuild
 2008040239 ./kde-apps/kiriki/kiriki-20.04.3.ebuild
-2009031539 ./kde-apps/kiriki/kiriki-20.08.1.ebuild
+2010092209 ./kde-apps/kiriki/kiriki-20.08.2.ebuild
 2008040239 ./kde-apps/kiten/kiten-20.04.3.ebuild
-2009031539 ./kde-apps/kiten/kiten-20.08.1.ebuild
+2010092209 ./kde-apps/kiten/kiten-20.08.2.ebuild
 2008182109 ./kde-apps/kitinerary/kitinerary-20.04.3.ebuild
-2009031539 ./kde-apps/kitinerary/kitinerary-20.08.1.ebuild
+2010092209 ./kde-apps/kitinerary/kitinerary-20.08.2.ebuild
 2008040239 ./kde-apps/kjumpingcube/kjumpingcube-20.04.3.ebuild
-2009031539 ./kde-apps/kjumpingcube/kjumpingcube-20.08.1.ebuild
+2010092209 ./kde-apps/kjumpingcube/kjumpingcube-20.08.2.ebuild
 2008040239 ./kde-apps/kldap/kldap-20.04.3.ebuild
-2009031539 ./kde-apps/kldap/kldap-20.08.1.ebuild
+2010092209 ./kde-apps/kldap/kldap-20.08.2.ebuild
 2008302339 ./kde-apps/kleopatra/kleopatra-20.04.3-r1.ebuild
-2009031539 ./kde-apps/kleopatra/kleopatra-20.08.1.ebuild
+2010092209 ./kde-apps/kleopatra/kleopatra-20.08.2.ebuild
 2008040239 ./kde-apps/klettres/klettres-20.04.3.ebuild
-2009031539 ./kde-apps/klettres/klettres-20.08.1.ebuild
+2010092209 ./kde-apps/klettres/klettres-20.08.2.ebuild
 2008040239 ./kde-apps/klickety/klickety-20.04.3.ebuild
-2009031539 ./kde-apps/klickety/klickety-20.08.1.ebuild
+2010092209 ./kde-apps/klickety/klickety-20.08.2.ebuild
 2008040239 ./kde-apps/klines/klines-20.04.3.ebuild
-2009031539 ./kde-apps/klines/klines-20.08.1.ebuild
+2010092209 ./kde-apps/klines/klines-20.08.2.ebuild
 2008040239 ./kde-apps/kmag/kmag-20.04.3.ebuild
-2009031539 ./kde-apps/kmag/kmag-20.08.1.ebuild
+2010092209 ./kde-apps/kmag/kmag-20.08.2.ebuild
 2008040239 ./kde-apps/kmahjongg/kmahjongg-20.04.3.ebuild
-2009031539 ./kde-apps/kmahjongg/kmahjongg-20.08.1.ebuild
+2010092209 ./kde-apps/kmahjongg/kmahjongg-20.08.2.ebuild
 2008061509 ./kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
-2009031539 ./kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.1.ebuild
+2010092209 ./kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.2.ebuild
 2008040239 ./kde-apps/kmail/kmail-20.04.3.ebuild
-2009031539 ./kde-apps/kmail/kmail-20.08.1.ebuild
+2010092209 ./kde-apps/kmail/kmail-20.08.2.ebuild
 2008040239 ./kde-apps/kmailtransport/kmailtransport-20.04.3.ebuild
-2009031539 ./kde-apps/kmailtransport/kmailtransport-20.08.1.ebuild
+2010092209 ./kde-apps/kmailtransport/kmailtransport-20.08.2.ebuild
 2008040239 ./kde-apps/kmbox/kmbox-20.04.3.ebuild
-2009031539 ./kde-apps/kmbox/kmbox-20.08.1.ebuild
+2010092209 ./kde-apps/kmbox/kmbox-20.08.2.ebuild
 2008040239 ./kde-apps/kmime/kmime-20.04.3.ebuild
-2009031539 ./kde-apps/kmime/kmime-20.08.1.ebuild
+2010092209 ./kde-apps/kmime/kmime-20.08.2.ebuild
 2008040239 ./kde-apps/kmines/kmines-20.04.3.ebuild
-2009031539 ./kde-apps/kmines/kmines-20.08.1.ebuild
+2010092209 ./kde-apps/kmines/kmines-20.08.2.ebuild
 2008040239 ./kde-apps/kmix/kmix-20.04.3.ebuild
-2009031539 ./kde-apps/kmix/kmix-20.08.1.ebuild
+2010092209 ./kde-apps/kmix/kmix-20.08.2.ebuild
 2008040239 ./kde-apps/kmousetool/kmousetool-20.04.3.ebuild
-2009031539 ./kde-apps/kmousetool/kmousetool-20.08.1.ebuild
+2010092209 ./kde-apps/kmousetool/kmousetool-20.08.2.ebuild
 2008040239 ./kde-apps/kmouth/kmouth-20.04.3.ebuild
-2009031539 ./kde-apps/kmouth/kmouth-20.08.1.ebuild
+2010092209 ./kde-apps/kmouth/kmouth-20.08.2.ebuild
 2008040239 ./kde-apps/kmplot/kmplot-20.04.3.ebuild
-2009031539 ./kde-apps/kmplot/kmplot-20.08.1.ebuild
+2010092209 ./kde-apps/kmplot/kmplot-20.08.2.ebuild
 2008040239 ./kde-apps/knavalbattle/knavalbattle-20.04.3.ebuild
-2009031539 ./kde-apps/knavalbattle/knavalbattle-20.08.1.ebuild
+2010092209 ./kde-apps/knavalbattle/knavalbattle-20.08.2.ebuild
 2008040239 ./kde-apps/knetwalk/knetwalk-20.04.3.ebuild
-2009031539 ./kde-apps/knetwalk/knetwalk-20.08.1.ebuild
+2010092209 ./kde-apps/knetwalk/knetwalk-20.08.2.ebuild
 2008040239 ./kde-apps/knights/knights-20.04.3.ebuild
-2009031539 ./kde-apps/knights/knights-20.08.1.ebuild
+2010092209 ./kde-apps/knights/knights-20.08.2.ebuild
 2008040239 ./kde-apps/knotes/knotes-20.04.3.ebuild
-2009031539 ./kde-apps/knotes/knotes-20.08.1.ebuild
+2010092209 ./kde-apps/knotes/knotes-20.08.2.ebuild
 2008040239 ./kde-apps/kolf/kolf-20.04.3.ebuild
-2009031539 ./kde-apps/kolf/kolf-20.08.1.ebuild
+2010092209 ./kde-apps/kolf/kolf-20.08.2.ebuild
 2008040239 ./kde-apps/kollision/kollision-20.04.3.ebuild
-2009031539 ./kde-apps/kollision/kollision-20.08.1.ebuild
+2010092209 ./kde-apps/kollision/kollision-20.08.2.ebuild
 2008040239 ./kde-apps/kolourpaint/kolourpaint-20.04.3.ebuild
-2009031539 ./kde-apps/kolourpaint/kolourpaint-20.08.1.ebuild
+2010092209 ./kde-apps/kolourpaint/kolourpaint-20.08.2.ebuild
 2008040239 ./kde-apps/kompare/kompare-20.04.3.ebuild
-2009031539 ./kde-apps/kompare/kompare-20.08.1.ebuild
+2010092209 ./kde-apps/kompare/kompare-20.08.2.ebuild
 2008040239 ./kde-apps/konqueror/konqueror-20.04.3.ebuild
-2009031539 ./kde-apps/konqueror/konqueror-20.08.1.ebuild
+2010092209 ./kde-apps/konqueror/konqueror-20.08.2.ebuild
 2008040239 ./kde-apps/konquest/konquest-20.04.3.ebuild
-2009031539 ./kde-apps/konquest/konquest-20.08.1.ebuild
+2010092209 ./kde-apps/konquest/konquest-20.08.2.ebuild
 2008040239 ./kde-apps/konsole/konsole-20.04.3.ebuild
-2009031539 ./kde-apps/konsole/konsole-20.08.1.ebuild
+2010092209 ./kde-apps/konsole/konsole-20.08.2.ebuild
 2008040239 ./kde-apps/konsolekalendar/konsolekalendar-20.04.3.ebuild
-2009031539 ./kde-apps/konsolekalendar/konsolekalendar-20.08.1.ebuild
+2010092209 ./kde-apps/konsolekalendar/konsolekalendar-20.08.2.ebuild
 2008040239 ./kde-apps/kontact/kontact-20.04.3.ebuild
-2009031539 ./kde-apps/kontact/kontact-20.08.1.ebuild
+2010092209 ./kde-apps/kontact/kontact-20.08.2.ebuild
 2008040239 ./kde-apps/kontactinterface/kontactinterface-20.04.3.ebuild
-2009031539 ./kde-apps/kontactinterface/kontactinterface-20.08.1.ebuild
+2010092209 ./kde-apps/kontactinterface/kontactinterface-20.08.2.ebuild
 2008040239 ./kde-apps/kopete/kopete-20.04.3.ebuild
-2009031539 ./kde-apps/kopete/kopete-20.08.1.ebuild
+2010092209 ./kde-apps/kopete/kopete-20.08.2.ebuild
 2008040239 ./kde-apps/korganizer/korganizer-20.04.3.ebuild
-2009031539 ./kde-apps/korganizer/korganizer-20.08.1.ebuild
+2010092209 ./kde-apps/korganizer/korganizer-20.08.2.ebuild
 2008040239 ./kde-apps/kpat/kpat-20.04.3.ebuild
-2009031539 ./kde-apps/kpat/kpat-20.08.1.ebuild
+2010092209 ./kde-apps/kpat/kpat-20.08.2.ebuild
 2008040239 ./kde-apps/kpimtextedit/kpimtextedit-20.04.3.ebuild
-2009031539 ./kde-apps/kpimtextedit/kpimtextedit-20.08.1.ebuild
+2010092209 ./kde-apps/kpimtextedit/kpimtextedit-20.08.2.ebuild
 2008040239 ./kde-apps/kpkpass/kpkpass-20.04.3.ebuild
-2009031539 ./kde-apps/kpkpass/kpkpass-20.08.1.ebuild
+2010092209 ./kde-apps/kpkpass/kpkpass-20.08.2.ebuild
 2008040239 ./kde-apps/kqtquickcharts/kqtquickcharts-20.04.3.ebuild
-2009031539 ./kde-apps/kqtquickcharts/kqtquickcharts-20.08.1.ebuild
+2010092209 ./kde-apps/kqtquickcharts/kqtquickcharts-20.08.2.ebuild
 2008040239 ./kde-apps/krdc/krdc-20.04.3.ebuild
-2009031539 ./kde-apps/krdc/krdc-20.08.1.ebuild
+2010092209 ./kde-apps/krdc/krdc-20.08.2.ebuild
 2008040239 ./kde-apps/kreversi/kreversi-20.04.3.ebuild
-2009031539 ./kde-apps/kreversi/kreversi-20.08.1.ebuild
+2010092209 ./kde-apps/kreversi/kreversi-20.08.2.ebuild
 2008040239 ./kde-apps/krfb/krfb-20.04.3.ebuild
-2009031539 ./kde-apps/krfb/krfb-20.08.1.ebuild
+2010092209 ./kde-apps/krfb/krfb-20.08.2.ebuild
 2008040239 ./kde-apps/kross-interpreters/kross-interpreters-20.04.3.ebuild
-2009031539 ./kde-apps/kross-interpreters/kross-interpreters-20.08.1.ebuild
+2010092209 ./kde-apps/kross-interpreters/kross-interpreters-20.08.2.ebuild
 2008040239 ./kde-apps/kruler/kruler-20.04.3.ebuild
-2009031539 ./kde-apps/kruler/kruler-20.08.1.ebuild
+2010092209 ./kde-apps/kruler/kruler-20.08.2.ebuild
 2008040239 ./kde-apps/kshisen/kshisen-20.04.3.ebuild
-2009031539 ./kde-apps/kshisen/kshisen-20.08.1.ebuild
+2010092209 ./kde-apps/kshisen/kshisen-20.08.2.ebuild
 2008040239 ./kde-apps/ksirk/ksirk-20.04.3.ebuild
-2009031539 ./kde-apps/ksirk/ksirk-20.08.1.ebuild
+2010092209 ./kde-apps/ksirk/ksirk-20.08.2.ebuild
 2008040239 ./kde-apps/ksmtp/ksmtp-20.04.3.ebuild
-2009031539 ./kde-apps/ksmtp/ksmtp-20.08.1.ebuild
+2010092209 ./kde-apps/ksmtp/ksmtp-20.08.2.ebuild
 2008040239 ./kde-apps/ksnakeduel/ksnakeduel-20.04.3.ebuild
-2009031539 ./kde-apps/ksnakeduel/ksnakeduel-20.08.1.ebuild
+2010092209 ./kde-apps/ksnakeduel/ksnakeduel-20.08.2.ebuild
 2008040239 ./kde-apps/kspaceduel/kspaceduel-20.04.3.ebuild
-2009031539 ./kde-apps/kspaceduel/kspaceduel-20.08.1.ebuild
+2010092209 ./kde-apps/kspaceduel/kspaceduel-20.08.2.ebuild
 2008040239 ./kde-apps/ksquares/ksquares-20.04.3.ebuild
-2009031539 ./kde-apps/ksquares/ksquares-20.08.1.ebuild
+2010092209 ./kde-apps/ksquares/ksquares-20.08.2.ebuild
 2008040239 ./kde-apps/ksudoku/ksudoku-20.04.3.ebuild
-2009031539 ./kde-apps/ksudoku/ksudoku-20.08.1.ebuild
+2010092209 ./kde-apps/ksudoku/ksudoku-20.08.2.ebuild
 2009192339 ./kde-apps/ksystemlog/ksystemlog-20.04.3-r1.ebuild
-2009192339 ./kde-apps/ksystemlog/ksystemlog-20.08.1-r1.ebuild
+2010092209 ./kde-apps/ksystemlog/ksystemlog-20.08.2.ebuild
 2008040239 ./kde-apps/kteatime/kteatime-20.04.3.ebuild
-2009031539 ./kde-apps/kteatime/kteatime-20.08.1.ebuild
+2010092209 ./kde-apps/kteatime/kteatime-20.08.2.ebuild
 2008040239 ./kde-apps/ktimer/ktimer-20.04.3.ebuild
-2009031539 ./kde-apps/ktimer/ktimer-20.08.1.ebuild
+2010092209 ./kde-apps/ktimer/ktimer-20.08.2.ebuild
 2008040239 ./kde-apps/ktouch/ktouch-20.04.3.ebuild
-2009031539 ./kde-apps/ktouch/ktouch-20.08.1.ebuild
+2010092209 ./kde-apps/ktouch/ktouch-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-approver/ktp-approver-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-approver/ktp-approver-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-approver/ktp-approver-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-auth-handler/ktp-auth-handler-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-call-ui/ktp-call-ui-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-call-ui/ktp-call-ui-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-call-ui/ktp-call-ui-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-common-internals/ktp-common-internals-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-common-internals/ktp-common-internals-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-common-internals/ktp-common-internals-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-contact-list/ktp-contact-list-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-contact-list/ktp-contact-list-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-contact-list/ktp-contact-list-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-contact-runner/ktp-contact-runner-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-kded-module/ktp-kded-module-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-kded-module/ktp-kded-module-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-kded-module/ktp-kded-module-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-send-file/ktp-send-file-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-send-file/ktp-send-file-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-send-file/ktp-send-file-20.08.2.ebuild
 2008040239 ./kde-apps/ktp-text-ui/ktp-text-ui-20.04.3.ebuild
-2009031539 ./kde-apps/ktp-text-ui/ktp-text-ui-20.08.1.ebuild
+2010092209 ./kde-apps/ktp-text-ui/ktp-text-ui-20.08.2.ebuild
 2008040239 ./kde-apps/ktuberling/ktuberling-20.04.3.ebuild
-2009031539 ./kde-apps/ktuberling/ktuberling-20.08.1.ebuild
+2010092209 ./kde-apps/ktuberling/ktuberling-20.08.2.ebuild
 2008040239 ./kde-apps/kturtle/kturtle-20.04.3.ebuild
-2009031539 ./kde-apps/kturtle/kturtle-20.08.1.ebuild
+2010092209 ./kde-apps/kturtle/kturtle-20.08.2.ebuild
 2008040239 ./kde-apps/kubrick/kubrick-20.04.3.ebuild
-2009031539 ./kde-apps/kubrick/kubrick-20.08.1.ebuild
+2010092209 ./kde-apps/kubrick/kubrick-20.08.2.ebuild
 2008040239 ./kde-apps/kwalletmanager/kwalletmanager-20.04.3.ebuild
-2009031539 ./kde-apps/kwalletmanager/kwalletmanager-20.08.1.ebuild
+2010092209 ./kde-apps/kwalletmanager/kwalletmanager-20.08.2.ebuild
 2008040239 ./kde-apps/kwave/kwave-20.04.3.ebuild
-2009031539 ./kde-apps/kwave/kwave-20.08.1.ebuild
+2010092209 ./kde-apps/kwave/kwave-20.08.2.ebuild
 2008040239 ./kde-apps/kwordquiz/kwordquiz-20.04.3.ebuild
-2009031539 ./kde-apps/kwordquiz/kwordquiz-20.08.1.ebuild
+2010092209 ./kde-apps/kwordquiz/kwordquiz-20.08.2.ebuild
 2008040239 ./kde-apps/kwrite/kwrite-20.04.3.ebuild
-2009031539 ./kde-apps/kwrite/kwrite-20.08.1.ebuild
+2010092209 ./kde-apps/kwrite/kwrite-20.08.2.ebuild
 2008040239 ./kde-apps/libgravatar/libgravatar-20.04.3.ebuild
-2009031539 ./kde-apps/libgravatar/libgravatar-20.08.1.ebuild
+2010092209 ./kde-apps/libgravatar/libgravatar-20.08.2.ebuild
 2008040239 ./kde-apps/libkcddb/libkcddb-20.04.3.ebuild
-2009031539 ./kde-apps/libkcddb/libkcddb-20.08.1.ebuild
+2010092209 ./kde-apps/libkcddb/libkcddb-20.08.2.ebuild
 2008040239 ./kde-apps/libkcompactdisc/libkcompactdisc-20.04.3.ebuild
-2009031539 ./kde-apps/libkcompactdisc/libkcompactdisc-20.08.1.ebuild
+2010092209 ./kde-apps/libkcompactdisc/libkcompactdisc-20.08.2.ebuild
 2008040239 ./kde-apps/libkdcraw/libkdcraw-20.04.3.ebuild
-2009031539 ./kde-apps/libkdcraw/libkdcraw-20.08.1.ebuild
+2010092209 ./kde-apps/libkdcraw/libkdcraw-20.08.2.ebuild
 2008040239 ./kde-apps/libkdegames/libkdegames-20.04.3.ebuild
-2009031539 ./kde-apps/libkdegames/libkdegames-20.08.1.ebuild
+2010092209 ./kde-apps/libkdegames/libkdegames-20.08.2.ebuild
 2008040239 ./kde-apps/libkdepim/libkdepim-20.04.3.ebuild
-2009031539 ./kde-apps/libkdepim/libkdepim-20.08.1.ebuild
+2010092209 ./kde-apps/libkdepim/libkdepim-20.08.2.ebuild
 2008040239 ./kde-apps/libkeduvocdocument/libkeduvocdocument-20.04.3.ebuild
-2009031539 ./kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.1.ebuild
+2010092209 ./kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.2.ebuild
 2008040239 ./kde-apps/libkexiv2/libkexiv2-20.04.3.ebuild
-2009031539 ./kde-apps/libkexiv2/libkexiv2-20.08.1.ebuild
+2010092209 ./kde-apps/libkexiv2/libkexiv2-20.08.2.ebuild
 2008040239 ./kde-apps/libkgapi/libkgapi-20.04.3.ebuild
-2009031539 ./kde-apps/libkgapi/libkgapi-20.08.1.ebuild
+2010092209 ./kde-apps/libkgapi/libkgapi-20.08.2.ebuild
 2008040239 ./kde-apps/libkipi/libkipi-20.04.3.ebuild
-2009031539 ./kde-apps/libkipi/libkipi-20.08.1.ebuild
+2010092209 ./kde-apps/libkipi/libkipi-20.08.2.ebuild
 2008040239 ./kde-apps/libkleo/libkleo-20.04.3.ebuild
-2009031539 ./kde-apps/libkleo/libkleo-20.08.1.ebuild
+2010092209 ./kde-apps/libkleo/libkleo-20.08.2.ebuild
 2008040239 ./kde-apps/libkmahjongg/libkmahjongg-20.04.3.ebuild
-2009031539 ./kde-apps/libkmahjongg/libkmahjongg-20.08.1.ebuild
+2010092209 ./kde-apps/libkmahjongg/libkmahjongg-20.08.2.ebuild
 2008040239 ./kde-apps/libkomparediff2/libkomparediff2-20.04.3.ebuild
-2009031539 ./kde-apps/libkomparediff2/libkomparediff2-20.08.1.ebuild
+2010092209 ./kde-apps/libkomparediff2/libkomparediff2-20.08.2.ebuild
 2008040239 ./kde-apps/libksane/libksane-20.04.3.ebuild
-2009031539 ./kde-apps/libksane/libksane-20.08.1.ebuild
+2010092209 ./kde-apps/libksane/libksane-20.08.2.ebuild
 2008040239 ./kde-apps/libksieve/libksieve-20.04.3.ebuild
-2009031539 ./kde-apps/libksieve/libksieve-20.08.1.ebuild
+2010092209 ./kde-apps/libksieve/libksieve-20.08.2.ebuild
 2008040239 ./kde-apps/libktnef/libktnef-20.04.3.ebuild
-2009031539 ./kde-apps/libktnef/libktnef-20.08.1.ebuild
-2008040239 ./kde-apps/lokalize/lokalize-20.04.3.ebuild
-2009031539 ./kde-apps/lokalize/lokalize-20.08.1.ebuild
+2010092209 ./kde-apps/libktnef/libktnef-20.08.2.ebuild
+2010120039 ./kde-apps/lokalize/lokalize-20.04.3-r1.ebuild
+2010120039 ./kde-apps/lokalize/lokalize-20.08.2.ebuild
 2008040239 ./kde-apps/lskat/lskat-20.04.3.ebuild
-2009031539 ./kde-apps/lskat/lskat-20.08.1.ebuild
+2010092209 ./kde-apps/lskat/lskat-20.08.2.ebuild
 2008040239 ./kde-apps/mailcommon/mailcommon-20.04.3.ebuild
-2009031539 ./kde-apps/mailcommon/mailcommon-20.08.1.ebuild
+2010092209 ./kde-apps/mailcommon/mailcommon-20.08.2.ebuild
 2008040239 ./kde-apps/mailimporter/mailimporter-20.04.3.ebuild
-2009031539 ./kde-apps/mailimporter/mailimporter-20.08.1.ebuild
-2009031539 ./kde-apps/marble/marble-20.08.1.ebuild
+2010092209 ./kde-apps/mailimporter/mailimporter-20.08.2.ebuild
 2009272209 ./kde-apps/marble/marble-20.04.3.ebuild
+2010092209 ./kde-apps/marble/marble-20.08.2.ebuild
 2008040239 ./kde-apps/mbox-importer/mbox-importer-20.04.3.ebuild
-2009031539 ./kde-apps/mbox-importer/mbox-importer-20.08.1.ebuild
+2010092209 ./kde-apps/mbox-importer/mbox-importer-20.08.2.ebuild
 2008040239 ./kde-apps/messagelib/messagelib-20.04.3.ebuild
-2009031539 ./kde-apps/messagelib/messagelib-20.08.1.ebuild
+2010092209 ./kde-apps/messagelib/messagelib-20.08.2.ebuild
 2008040239 ./kde-apps/minuet/minuet-20.04.3.ebuild
-2009031539 ./kde-apps/minuet/minuet-20.08.1.ebuild
+2010092209 ./kde-apps/minuet/minuet-20.08.2.ebuild
 2008040239 ./kde-apps/okular/okular-20.04.3.ebuild
-2009031539 ./kde-apps/okular/okular-20.08.1.ebuild
+2010092209 ./kde-apps/okular/okular-20.08.2.ebuild
 2008040239 ./kde-apps/palapeli/palapeli-20.04.3.ebuild
-2009031539 ./kde-apps/palapeli/palapeli-20.08.1.ebuild
+2010092209 ./kde-apps/palapeli/palapeli-20.08.2.ebuild
 2008040239 ./kde-apps/parley/parley-20.04.3.ebuild
-2009031539 ./kde-apps/parley/parley-20.08.1.ebuild
+2010092209 ./kde-apps/parley/parley-20.08.2.ebuild
 2008040239 ./kde-apps/picmi/picmi-20.04.3.ebuild
-2009031539 ./kde-apps/picmi/picmi-20.08.1.ebuild
+2010092209 ./kde-apps/picmi/picmi-20.08.2.ebuild
 2008040239 ./kde-apps/pim-data-exporter/pim-data-exporter-20.04.3.ebuild
-2009031539 ./kde-apps/pim-data-exporter/pim-data-exporter-20.08.1.ebuild
+2010092209 ./kde-apps/pim-data-exporter/pim-data-exporter-20.08.2.ebuild
 2008040239 ./kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.3.ebuild
-2009031539 ./kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.1.ebuild
+2010092209 ./kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.2.ebuild
 2008040239 ./kde-apps/pimcommon/pimcommon-20.04.3.ebuild
-2009031539 ./kde-apps/pimcommon/pimcommon-20.08.1.ebuild
+2010092209 ./kde-apps/pimcommon/pimcommon-20.08.2.ebuild
 2008040239 ./kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.04.3.ebuild
-2009031539 ./kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.1.ebuild
+2010092209 ./kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.2.ebuild
 2008040239 ./kde-apps/poxml/poxml-20.04.3.ebuild
-2009031539 ./kde-apps/poxml/poxml-20.08.1.ebuild
+2010092209 ./kde-apps/poxml/poxml-20.08.2.ebuild
 2008040239 ./kde-apps/print-manager/print-manager-20.04.3.ebuild
-2009031539 ./kde-apps/print-manager/print-manager-20.08.1.ebuild
+2010092209 ./kde-apps/print-manager/print-manager-20.08.2.ebuild
 2008040239 ./kde-apps/rocs/rocs-20.04.3.ebuild
-2009031539 ./kde-apps/rocs/rocs-20.08.1.ebuild
+2010092209 ./kde-apps/rocs/rocs-20.08.2.ebuild
 2008040239 ./kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.04.3.ebuild
-2009031539 ./kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.1.ebuild
+2010092209 ./kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.2.ebuild
 2008040239 ./kde-apps/spectacle/spectacle-20.04.3.ebuild
-2009031539 ./kde-apps/spectacle/spectacle-20.08.1.ebuild
+2010092209 ./kde-apps/spectacle/spectacle-20.08.2.ebuild
 2008040239 ./kde-apps/step/step-20.04.3.ebuild
-2009031539 ./kde-apps/step/step-20.08.1.ebuild
+2010092209 ./kde-apps/step/step-20.08.2.ebuild
 2008040239 ./kde-apps/svgpart/svgpart-20.04.3.ebuild
-2009031539 ./kde-apps/svgpart/svgpart-20.08.1.ebuild
+2010092209 ./kde-apps/svgpart/svgpart-20.08.2.ebuild
 2008040239 ./kde-apps/sweeper/sweeper-20.04.3.ebuild
-2009031539 ./kde-apps/sweeper/sweeper-20.08.1.ebuild
+2010092209 ./kde-apps/sweeper/sweeper-20.08.2.ebuild
 2008040239 ./kde-apps/thumbnailers/thumbnailers-20.04.3.ebuild
-2009031539 ./kde-apps/thumbnailers/thumbnailers-20.08.1.ebuild
+2010092209 ./kde-apps/thumbnailers/thumbnailers-20.08.2.ebuild
 2008040239 ./kde-apps/umbrello/umbrello-20.04.3.ebuild
-2009031539 ./kde-apps/umbrello/umbrello-20.08.1.ebuild
+2010092209 ./kde-apps/umbrello/umbrello-20.08.2.ebuild
 2008301109 ./kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
-2009031539 ./kde-apps/yakuake/yakuake-20.08.1.ebuild
+2010092209 ./kde-apps/yakuake/yakuake-20.08.2.ebuild
 2008040239 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.04.3.ebuild
-2009031539 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.1.ebuild
-2005311909 ./kde-frameworks/attica/attica-5.70.0.ebuild
+2010092209 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.2.ebuild
 2010080539 ./kde-frameworks/attica/attica-5.74.0.ebuild
-2005311909 ./kde-frameworks/baloo/baloo-5.70.0.ebuild
+2010101909 ./kde-frameworks/attica/attica-5.75.0.ebuild
 2010080539 ./kde-frameworks/baloo/baloo-5.74.0.ebuild
-2005311909 ./kde-frameworks/bluez-qt/bluez-qt-5.70.0.ebuild
+2010101909 ./kde-frameworks/baloo/baloo-5.75.0.ebuild
 2010080539 ./kde-frameworks/bluez-qt/bluez-qt-5.74.0.ebuild
-2005311909 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.70.0.ebuild
+2010101909 ./kde-frameworks/bluez-qt/bluez-qt-5.75.0.ebuild
 2010080539 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.74.0.ebuild
-2007130239 ./kde-frameworks/breeze-icons/breeze-icons-5.70.0.ebuild
+2010101909 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.75.0.ebuild
 2010080539 ./kde-frameworks/breeze-icons/breeze-icons-5.74.0.ebuild
-2006010039 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild
+2010101909 ./kde-frameworks/breeze-icons/breeze-icons-5.75.0.ebuild
 2010081609 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild
-2005311909 ./kde-frameworks/frameworkintegration/frameworkintegration-5.70.0.ebuild
+2010101909 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.75.0.ebuild
 2010080539 ./kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild
-2005311909 ./kde-frameworks/kactivities-stats/kactivities-stats-5.70.0.ebuild
+2010101909 ./kde-frameworks/frameworkintegration/frameworkintegration-5.75.0.ebuild
 2010080539 ./kde-frameworks/kactivities-stats/kactivities-stats-5.74.0.ebuild
-2005311909 ./kde-frameworks/kactivities/kactivities-5.70.0.ebuild
+2010101909 ./kde-frameworks/kactivities-stats/kactivities-stats-5.75.0.ebuild
 2010080539 ./kde-frameworks/kactivities/kactivities-5.74.0.ebuild
-2005311909 ./kde-frameworks/kapidox/kapidox-5.70.0.ebuild
+2010101909 ./kde-frameworks/kactivities/kactivities-5.75.0.ebuild
 2010080539 ./kde-frameworks/kapidox/kapidox-5.74.0.ebuild
-2005311909 ./kde-frameworks/karchive/karchive-5.70.0-r1.ebuild
+2010120039 ./kde-frameworks/kapidox/kapidox-5.75.0.ebuild
 2010080539 ./kde-frameworks/karchive/karchive-5.74.0.ebuild
-2005311909 ./kde-frameworks/kauth/kauth-5.70.0.ebuild
-2010080539 ./kde-frameworks/kauth/kauth-5.74.0.ebuild
-2005311909 ./kde-frameworks/kbookmarks/kbookmarks-5.70.0.ebuild
+2010101909 ./kde-frameworks/karchive/karchive-5.75.0.ebuild
+2010101509 ./kde-frameworks/kauth/kauth-5.74.0.ebuild
+2010101909 ./kde-frameworks/kauth/kauth-5.75.0.ebuild
 2010080539 ./kde-frameworks/kbookmarks/kbookmarks-5.74.0.ebuild
-2005311909 ./kde-frameworks/kcalendarcore/kcalendarcore-5.70.0.ebuild
+2010101909 ./kde-frameworks/kbookmarks/kbookmarks-5.75.0.ebuild
 2010080539 ./kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
-2005311909 ./kde-frameworks/kcmutils/kcmutils-5.70.0.ebuild
+2010101909 ./kde-frameworks/kcalendarcore/kcalendarcore-5.75.0.ebuild
 2010080539 ./kde-frameworks/kcmutils/kcmutils-5.74.0.ebuild
-2005311909 ./kde-frameworks/kcodecs/kcodecs-5.70.0.ebuild
-2010080539 ./kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
-2005311909 ./kde-frameworks/kcompletion/kcompletion-5.70.0.ebuild
-2010080539 ./kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
-2005311909 ./kde-frameworks/kconfig/kconfig-5.70.0.ebuild
-2010080539 ./kde-frameworks/kconfig/kconfig-5.74.0.ebuild
-2005311909 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.70.0.ebuild
-2010080539 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
-2005311909 ./kde-frameworks/kcontacts/kcontacts-5.70.0.ebuild
+2010101909 ./kde-frameworks/kcmutils/kcmutils-5.75.0.ebuild
+2010101509 ./kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
+2010101909 ./kde-frameworks/kcodecs/kcodecs-5.75.0.ebuild
+2010101509 ./kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
+2010101909 ./kde-frameworks/kcompletion/kcompletion-5.75.0.ebuild
+2010101509 ./kde-frameworks/kconfig/kconfig-5.74.0.ebuild
+2010101909 ./kde-frameworks/kconfig/kconfig-5.75.0.ebuild
+2010101509 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
+2010101909 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.75.0.ebuild
 2010080539 ./kde-frameworks/kcontacts/kcontacts-5.74.0.ebuild
-2008040139 ./kde-frameworks/kcoreaddons/kcoreaddons-5.70.0.ebuild
-2010080539 ./kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
-2005311909 ./kde-frameworks/kcrash/kcrash-5.70.0.ebuild
+2010101909 ./kde-frameworks/kcontacts/kcontacts-5.75.0.ebuild
+2010101509 ./kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
+2010101909 ./kde-frameworks/kcoreaddons/kcoreaddons-5.75.0.ebuild
 2010080539 ./kde-frameworks/kcrash/kcrash-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdbusaddons/kdbusaddons-5.70.0.ebuild
-2010080539 ./kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdeclarative/kdeclarative-5.70.0.ebuild
+2010101909 ./kde-frameworks/kcrash/kcrash-5.75.0.ebuild
+2010101509 ./kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
+2010101909 ./kde-frameworks/kdbusaddons/kdbusaddons-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
-2005311909 ./kde-frameworks/kded/kded-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdeclarative/kdeclarative-5.75.0.ebuild
 2010080539 ./kde-frameworks/kded/kded-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdelibs4support/kdelibs4support-5.70.0.ebuild
+2010101909 ./kde-frameworks/kded/kded-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdesignerplugin/kdesignerplugin-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdelibs4support/kdelibs4support-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdesignerplugin/kdesignerplugin-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdesu/kdesu-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdesignerplugin/kdesignerplugin-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdesu/kdesu-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdewebkit/kdewebkit-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdesu/kdesu-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdewebkit/kdewebkit-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdnssd/kdnssd-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdewebkit/kdewebkit-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdnssd/kdnssd-5.74.0.ebuild
-2005311909 ./kde-frameworks/kdoctools/kdoctools-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdnssd/kdnssd-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdoctools/kdoctools-5.74.0.ebuild
-2005311909 ./kde-frameworks/kemoticons/kemoticons-5.70.0.ebuild
+2010101909 ./kde-frameworks/kdoctools/kdoctools-5.75.0.ebuild
 2010080539 ./kde-frameworks/kemoticons/kemoticons-5.74.0.ebuild
+2010101909 ./kde-frameworks/kemoticons/kemoticons-5.75.0.ebuild
 1905280009 ./kde-frameworks/kf-env/kf-env-5.ebuild
-2005311909 ./kde-frameworks/kfilemetadata/kfilemetadata-5.70.0.ebuild
 2010080539 ./kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
-2005311909 ./kde-frameworks/kglobalaccel/kglobalaccel-5.70.0.ebuild
+2010101909 ./kde-frameworks/kfilemetadata/kfilemetadata-5.75.0.ebuild
 2010080539 ./kde-frameworks/kglobalaccel/kglobalaccel-5.74.0.ebuild
-2005311909 ./kde-frameworks/kguiaddons/kguiaddons-5.70.0.ebuild
-2010080539 ./kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
-2005311909 ./kde-frameworks/kholidays/kholidays-5.70.0.ebuild
+2010101909 ./kde-frameworks/kglobalaccel/kglobalaccel-5.75.0.ebuild
+2010101509 ./kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
+2010101909 ./kde-frameworks/kguiaddons/kguiaddons-5.75.0.ebuild
 2010080539 ./kde-frameworks/kholidays/kholidays-5.74.0.ebuild
-2005311909 ./kde-frameworks/khtml/khtml-5.70.0.ebuild
+2010101909 ./kde-frameworks/kholidays/kholidays-5.75.0.ebuild
 2010080539 ./kde-frameworks/khtml/khtml-5.74.0.ebuild
-2005311909 ./kde-frameworks/ki18n/ki18n-5.70.0.ebuild
-2010080539 ./kde-frameworks/ki18n/ki18n-5.74.0.ebuild
-2005311909 ./kde-frameworks/kiconthemes/kiconthemes-5.70.0.ebuild
+2010101909 ./kde-frameworks/khtml/khtml-5.75.0.ebuild
+2010101509 ./kde-frameworks/ki18n/ki18n-5.74.0.ebuild
+2010101909 ./kde-frameworks/ki18n/ki18n-5.75.0.ebuild
 2010080539 ./kde-frameworks/kiconthemes/kiconthemes-5.74.0.ebuild
-2005311909 ./kde-frameworks/kidletime/kidletime-5.70.0.ebuild
+2010101909 ./kde-frameworks/kiconthemes/kiconthemes-5.75.0.ebuild
 2010080539 ./kde-frameworks/kidletime/kidletime-5.74.0.ebuild
-2005311909 ./kde-frameworks/kimageformats/kimageformats-5.70.0.ebuild
+2010101909 ./kde-frameworks/kidletime/kidletime-5.75.0.ebuild
 2010080539 ./kde-frameworks/kimageformats/kimageformats-5.74.0.ebuild
-2005311909 ./kde-frameworks/kinit/kinit-5.70.0.ebuild
+2010101909 ./kde-frameworks/kimageformats/kimageformats-5.75.0.ebuild
 2010080539 ./kde-frameworks/kinit/kinit-5.74.0.ebuild
-2005311909 ./kde-frameworks/kio/kio-5.70.1-r1.ebuild
+2010101909 ./kde-frameworks/kinit/kinit-5.75.0.ebuild
 2010080539 ./kde-frameworks/kio/kio-5.74.1-r1.ebuild
-2005311909 ./kde-frameworks/kirigami/kirigami-5.70.0.ebuild
+2010101909 ./kde-frameworks/kio/kio-5.75.0.ebuild
 2010080539 ./kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
-2005311909 ./kde-frameworks/kitemmodels/kitemmodels-5.70.0.ebuild
-2010080539 ./kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
-2005311909 ./kde-frameworks/kitemviews/kitemviews-5.70.0.ebuild
-2010080539 ./kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
-2005311909 ./kde-frameworks/kjobwidgets/kjobwidgets-5.70.0.ebuild
-2010080539 ./kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
-2005311909 ./kde-frameworks/kjs/kjs-5.70.0.ebuild
+2010101909 ./kde-frameworks/kirigami/kirigami-5.75.0.ebuild
+2010101509 ./kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
+2010101909 ./kde-frameworks/kitemmodels/kitemmodels-5.75.0.ebuild
+2010101509 ./kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
+2010101909 ./kde-frameworks/kitemviews/kitemviews-5.75.0.ebuild
+2010101509 ./kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
+2010101909 ./kde-frameworks/kjobwidgets/kjobwidgets-5.75.0.ebuild
 2010080539 ./kde-frameworks/kjs/kjs-5.74.0.ebuild
-2005311909 ./kde-frameworks/kjsembed/kjsembed-5.70.0.ebuild
+2010101909 ./kde-frameworks/kjs/kjs-5.75.0.ebuild
 2010080539 ./kde-frameworks/kjsembed/kjsembed-5.74.0.ebuild
-2005311909 ./kde-frameworks/kmediaplayer/kmediaplayer-5.70.0.ebuild
+2010101909 ./kde-frameworks/kjsembed/kjsembed-5.75.0.ebuild
 2010080539 ./kde-frameworks/kmediaplayer/kmediaplayer-5.74.0.ebuild
-2005311909 ./kde-frameworks/knewstuff/knewstuff-5.70.0.ebuild
+2010101909 ./kde-frameworks/kmediaplayer/kmediaplayer-5.75.0.ebuild
 2010080539 ./kde-frameworks/knewstuff/knewstuff-5.74.0.ebuild
-2005311909 ./kde-frameworks/knotifications/knotifications-5.70.0.ebuild
+2010101909 ./kde-frameworks/knewstuff/knewstuff-5.75.0.ebuild
 2010080539 ./kde-frameworks/knotifications/knotifications-5.74.0.ebuild
-2005311909 ./kde-frameworks/knotifyconfig/knotifyconfig-5.70.0.ebuild
+2010101909 ./kde-frameworks/knotifications/knotifications-5.75.0.ebuild
 2010080539 ./kde-frameworks/knotifyconfig/knotifyconfig-5.74.0.ebuild
-2005311909 ./kde-frameworks/kpackage/kpackage-5.70.0.ebuild
+2010101909 ./kde-frameworks/knotifyconfig/knotifyconfig-5.75.0.ebuild
 2010080539 ./kde-frameworks/kpackage/kpackage-5.74.0.ebuild
-2005311909 ./kde-frameworks/kparts/kparts-5.70.0.ebuild
+2010101909 ./kde-frameworks/kpackage/kpackage-5.75.0.ebuild
 2010080539 ./kde-frameworks/kparts/kparts-5.74.0.ebuild
-2005311909 ./kde-frameworks/kpeople/kpeople-5.70.0.ebuild
+2010101909 ./kde-frameworks/kparts/kparts-5.75.0.ebuild
 2010080539 ./kde-frameworks/kpeople/kpeople-5.74.0.ebuild
-2005311909 ./kde-frameworks/kplotting/kplotting-5.70.0.ebuild
+2010101909 ./kde-frameworks/kpeople/kpeople-5.75.0.ebuild
 2010080539 ./kde-frameworks/kplotting/kplotting-5.74.0.ebuild
-2005311909 ./kde-frameworks/kpty/kpty-5.70.0.ebuild
+2010101909 ./kde-frameworks/kplotting/kplotting-5.75.0.ebuild
 2010080539 ./kde-frameworks/kpty/kpty-5.74.0.ebuild
-2005311909 ./kde-frameworks/kross/kross-5.70.0.ebuild
+2010101909 ./kde-frameworks/kpty/kpty-5.75.0.ebuild
 2010080539 ./kde-frameworks/kross/kross-5.74.0.ebuild
-2005311909 ./kde-frameworks/krunner/krunner-5.70.0.ebuild
+2010101909 ./kde-frameworks/kross/kross-5.75.0.ebuild
 2010080539 ./kde-frameworks/krunner/krunner-5.74.0.ebuild
-2005311909 ./kde-frameworks/kservice/kservice-5.70.0.ebuild
+2010101909 ./kde-frameworks/krunner/krunner-5.75.0.ebuild
 2010080539 ./kde-frameworks/kservice/kservice-5.74.0.ebuild
-2005311909 ./kde-frameworks/ktexteditor/ktexteditor-5.70.1.ebuild
+2010101909 ./kde-frameworks/kservice/kservice-5.75.0.ebuild
 2010080539 ./kde-frameworks/ktexteditor/ktexteditor-5.74.0.ebuild
-2005311909 ./kde-frameworks/ktextwidgets/ktextwidgets-5.70.0.ebuild
+2010101909 ./kde-frameworks/ktexteditor/ktexteditor-5.75.0.ebuild
 2010080539 ./kde-frameworks/ktextwidgets/ktextwidgets-5.74.0.ebuild
-2005311909 ./kde-frameworks/kunitconversion/kunitconversion-5.70.0.ebuild
+2010101909 ./kde-frameworks/ktextwidgets/ktextwidgets-5.75.0.ebuild
 2010080539 ./kde-frameworks/kunitconversion/kunitconversion-5.74.0.ebuild
-2005311909 ./kde-frameworks/kwallet/kwallet-5.70.0.ebuild
+2010101909 ./kde-frameworks/kunitconversion/kunitconversion-5.75.0.ebuild
 2010080539 ./kde-frameworks/kwallet/kwallet-5.74.0.ebuild
-2005311909 ./kde-frameworks/kwayland/kwayland-5.70.0.ebuild
+2010101909 ./kde-frameworks/kwallet/kwallet-5.75.0.ebuild
 2010080539 ./kde-frameworks/kwayland/kwayland-5.74.0.ebuild
-2005311909 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.70.0.ebuild
-2010080539 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
-2005311909 ./kde-frameworks/kwindowsystem/kwindowsystem-5.70.0.ebuild
+2010101909 ./kde-frameworks/kwayland/kwayland-5.75.0.ebuild
+2010101509 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
+2010101909 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.75.0.ebuild
 2010080539 ./kde-frameworks/kwindowsystem/kwindowsystem-5.74.0.ebuild
-2005311909 ./kde-frameworks/kxmlgui/kxmlgui-5.70.0.ebuild
+2010101909 ./kde-frameworks/kwindowsystem/kwindowsystem-5.75.0.ebuild
 2010080539 ./kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
-2005311909 ./kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.70.0.ebuild
+2010101909 ./kde-frameworks/kxmlgui/kxmlgui-5.75.0.ebuild
 2010080539 ./kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.74.0.ebuild
-2005311909 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.70.0.ebuild
+2010101909 ./kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.75.0.ebuild
 2010080539 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.74.0.ebuild
-2005311909 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.70.0.ebuild
+2010101909 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.75.0.ebuild
 2010080539 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.74.0.ebuild
-2007130239 ./kde-frameworks/oxygen-icons/oxygen-icons-5.70.0.ebuild
+2010101909 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.75.0.ebuild
 2010080539 ./kde-frameworks/oxygen-icons/oxygen-icons-5.74.0.ebuild
-2005311909 ./kde-frameworks/plasma/plasma-5.70.1.ebuild
+2010101909 ./kde-frameworks/oxygen-icons/oxygen-icons-5.75.0.ebuild
 2010080539 ./kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
-2009031539 ./kde-frameworks/prison/prison-5.70.0.ebuild
+2010101909 ./kde-frameworks/plasma/plasma-5.75.0.ebuild
 2010080539 ./kde-frameworks/prison/prison-5.74.0.ebuild
-2005311909 ./kde-frameworks/purpose/purpose-5.70.0.ebuild
+2010101909 ./kde-frameworks/prison/prison-5.75.0.ebuild
 2010080539 ./kde-frameworks/purpose/purpose-5.74.0.ebuild
-2005311909 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.70.0.ebuild
+2010101909 ./kde-frameworks/purpose/purpose-5.75.0.ebuild
 2010080539 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
-2006282109 ./kde-frameworks/solid/solid-5.70.0.ebuild
+2010101909 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.75.0.ebuild
 2010080539 ./kde-frameworks/solid/solid-5.74.0.ebuild
-2005311909 ./kde-frameworks/sonnet/sonnet-5.70.0.ebuild
+2010101909 ./kde-frameworks/solid/solid-5.75.0.ebuild
 2010080539 ./kde-frameworks/sonnet/sonnet-5.74.0.ebuild
-2005311909 ./kde-frameworks/syndication/syndication-5.70.0.ebuild
+2010101909 ./kde-frameworks/sonnet/sonnet-5.75.0.ebuild
 2010080539 ./kde-frameworks/syndication/syndication-5.74.0.ebuild
-2005311909 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.70.0.ebuild
+2010101909 ./kde-frameworks/syndication/syndication-5.75.0.ebuild
 2010080539 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild
-2005311909 ./kde-frameworks/threadweaver/threadweaver-5.70.0.ebuild
+2010101909 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.75.0.ebuild
 2010080539 ./kde-frameworks/threadweaver/threadweaver-5.74.0.ebuild
-2005311909 ./kde-frameworks/kquickcharts/kquickcharts-5.70.0.ebuild
+2010101909 ./kde-frameworks/threadweaver/threadweaver-5.75.0.ebuild
 2010080539 ./kde-frameworks/kquickcharts/kquickcharts-5.74.0.ebuild
+2010101909 ./kde-frameworks/kquickcharts/kquickcharts-5.75.0.ebuild
 2010080539 ./kde-frameworks/kdav/kdav-5.74.0.ebuild
+2010101909 ./kde-frameworks/kdav/kdav-5.75.0.ebuild
 2003020109 ./kde-misc/basket/basket-2.49b.ebuild
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
-2010041939 ./kde-misc/kdeconnect/kdeconnect-20.08.1-r1.ebuild
 2010071039 ./kde-misc/kdeconnect/kdeconnect-20.04.3-r1.ebuild
+2010092209 ./kde-misc/kdeconnect/kdeconnect-20.08.2.ebuild
 2007301039 ./kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
 2009031539 ./kde-misc/kdiff3/kdiff3-1.8.4.ebuild
 2005111509 ./kde-misc/kdirstat/kdirstat-3.2.1.ebuild
 1912250439 ./kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
 2008040239 ./kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
-2009031539 ./kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild
+2010092209 ./kde-misc/kio-gdrive/kio-gdrive-20.08.2.ebuild
 2002182339 ./kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
 2002182339 ./kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild
 2005162209 ./kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
@@ -18440,104 +18461,53 @@
 2006201809 ./kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild
 2005132239 ./kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
 2009220139 ./kde-misc/markdownpart/markdownpart-0.1.1.ebuild
-2005211709 ./kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
 2010080539 ./kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
-2005211709 ./kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
 2010080539 ./kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
-2005211709 ./kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
 2010080539 ./kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
-2005211709 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
 2010080539 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
-2005211709 ./kde-plasma/breeze/breeze-5.18.5.ebuild
 2010080539 ./kde-plasma/breeze/breeze-5.19.5-r1.ebuild
-2005211709 ./kde-plasma/discover/discover-5.18.5.ebuild
 2010080539 ./kde-plasma/discover/discover-5.19.5.ebuild
-2005211709 ./kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
 2010080539 ./kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
-2005211709 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
 2010080539 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
-2005211709 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
 2010080539 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
-2005211709 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
 2010080539 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
-2005211709 ./kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
 2010080539 ./kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
-2005211709 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
 2010080539 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
-2005211709 ./kde-plasma/kgamma/kgamma-5.18.5.ebuild
 2010080539 ./kde-plasma/kgamma/kgamma-5.19.5.ebuild
-2005211709 ./kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
 2010080539 ./kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
-2005211709 ./kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
 2010080539 ./kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
-2005211709 ./kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
 2010080539 ./kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
-2005211709 ./kde-plasma/kscreen/kscreen-5.18.5.ebuild
 2010080539 ./kde-plasma/kscreen/kscreen-5.19.5.ebuild
-2010062109 ./kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
 2010080539 ./kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
-2005211709 ./kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
 2010080539 ./kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
-2005211709 ./kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
 2010080539 ./kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
-2005211709 ./kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
 2010080539 ./kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
-2005211709 ./kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
 2010080539 ./kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
-2005211709 ./kde-plasma/kwin/kwin-5.18.5-r1.ebuild
-2006080009 ./kde-plasma/kwin/kwin-5.18.5-r3.ebuild
 2010080539 ./kde-plasma/kwin/kwin-5.19.5-r1.ebuild
-2005211709 ./kde-plasma/kwrited/kwrited-5.18.5.ebuild
 2010080539 ./kde-plasma/kwrited/kwrited-5.19.5.ebuild
-2005211709 ./kde-plasma/libkscreen/libkscreen-5.18.5.ebuild
 2010080539 ./kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
-2005211709 ./kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
 2010080539 ./kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
-2005211709 ./kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
 2010080539 ./kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
-2005211709 ./kde-plasma/milou/milou-5.18.5.ebuild
 2010080539 ./kde-plasma/milou/milou-5.19.5.ebuild
-2005211709 ./kde-plasma/oxygen/oxygen-5.18.5.ebuild
 2010080539 ./kde-plasma/oxygen/oxygen-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
-2005311909 ./kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
-2008182109 ./kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
 2010080539 ./kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
-2007060209 ./kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild
 2010080539 ./kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
-2005162209 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
 2010071409 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
-2005211709 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
 2010080539 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
-2005311909 ./kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
 2010080539 ./kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
-2005211709 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
 2010080539 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
-2005211709 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
 2010080539 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
-2005211709 ./kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
-2006231839 ./kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
 2010080539 ./kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
-2005211709 ./kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
 2010080539 ./kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
-2005211709 ./kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
 2010080539 ./kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
-2005211709 ./kde-plasma/user-manager/user-manager-5.18.5.ebuild
 2010080539 ./kde-plasma/user-manager/user-manager-5.19.5.ebuild
-2005211709 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild
 2010080539 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
-2005211709 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
 2010080539 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
 2010080539 ./kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
 1804072008 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
@@ -18607,7 +18577,7 @@
 2008302139 ./mail-client/evolution/evolution-3.36.5.ebuild
 2008291139 ./mail-client/geary/geary-3.36.3.1.ebuild
 2002091509 ./mail-client/hap/hap-3.7-r1.ebuild
-1912291610 ./mail-client/kube/kube-0.7.0-r1.ebuild
+2010101909 ./mail-client/kube/kube-0.7.0-r1.ebuild
 2008210639 ./mail-client/mailx-support/mailx-support-20060102-r2.ebuild
 2004032241 ./mail-client/mailx/mailx-8.1.2.20160123.ebuild
 2008210639 ./mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -18624,12 +18594,8 @@
 2002230040 ./mail-client/s-nail/s-nail-14.9.16.ebuild
 2006122039 ./mail-client/s-nail/s-nail-14.9.19.ebuild
 2008111639 ./mail-client/sylpheed/sylpheed-3.7.0-r1.ebuild
-2008270009 ./mail-client/thunderbird-bin/thunderbird-bin-68.12.0.ebuild
-2010052009 ./mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
-2010070439 ./mail-client/thunderbird-bin/thunderbird-bin-78.3.2.ebuild
-2008270339 ./mail-client/thunderbird/thunderbird-68.12.0.ebuild
-2010051909 ./mail-client/thunderbird/thunderbird-78.3.1.ebuild
-2010070439 ./mail-client/thunderbird/thunderbird-78.3.2.ebuild
+2010112309 ./mail-client/thunderbird-bin/thunderbird-bin-78.3.2.ebuild
+2010112209 ./mail-client/thunderbird/thunderbird-78.3.2.ebuild
 2009031539 ./mail-client/trojita/trojita-0.7-r5.ebuild
 2009031539 ./mail-client/trojita/trojita-9999.ebuild
 2009071209 ./mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
@@ -18688,8 +18654,8 @@
 2005251309 ./mail-filter/razor/razor-2.85-r3.ebuild
 2002230040 ./mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
 2010021039 ./mail-filter/rspamd/rspamd-2.5.ebuild
-2010071909 ./mail-filter/rspamd/rspamd-2.6.ebuild
-2010071909 ./mail-filter/rspamd/rspamd-9999.ebuild
+2010082309 ./mail-filter/rspamd/rspamd-2.6-r1.ebuild
+2010082309 ./mail-filter/rspamd/rspamd-9999.ebuild
 2005271639 ./mail-filter/scmail/scmail-1.3.ebuild
 1902152139 ./mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
 2004261709 ./mail-filter/sieve-connect/sieve-connect-0.90.ebuild
@@ -18712,7 +18678,7 @@
 2009091239 ./mail-filter/zdkimfilter/zdkimfilter-2.2.ebuild
 2005240509 ./mail-filter/opensmtpd-filter-rspamd/opensmtpd-filter-rspamd-0.1.6.ebuild
 2003081139 ./mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
-2009270039 ./mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+2010111209 ./mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
 2005261709 ./mail-filter/spf-engine/spf-engine-2.0.2-r1.ebuild
 2005261709 ./mail-filter/spf-engine/spf-engine-2.9.2.ebuild
 2004032241 ./mail-mta/courier/courier-1.0.5.ebuild
@@ -18779,8 +18745,8 @@
 2009252339 ./mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild
 2009020939 ./mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild
 2009260039 ./mate-extra/mate-power-manager/mate-power-manager-1.24.2.ebuild
-2008070639 ./mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
-2009252339 ./mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
+2010082309 ./mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
+2010082309 ./mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
 2008070639 ./mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
 2009252339 ./mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
 2008070639 ./mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
@@ -18848,9 +18814,8 @@
 2004032241 ./media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
 2002230040 ./media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
 1912152339 ./media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
-2006090639 ./media-fonts/fira-code/fira-code-3.1.ebuild
-2006121839 ./media-fonts/fira-code/fira-code-5.2.ebuild
 2009070839 ./media-fonts/fira-code/fira-code-4.ebuild
+2010091139 ./media-fonts/fira-code/fira-code-5.2.ebuild
 1702282250 ./media-fonts/fira-mono/fira-mono-3.205.ebuild
 1702282250 ./media-fonts/fira-sans/fira-sans-4.002.ebuild
 1702282250 ./media-fonts/fira-sans/fira-sans-4.105.ebuild
@@ -19069,15 +19034,15 @@
 2005060209 ./media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
 2005060009 ./media-gfx/argyllcms/argyllcms-2.1.2.ebuild
 1702282250 ./media-gfx/arss/arss-0.2.3-r1.ebuild
-2001192139 ./media-gfx/asymptote/asymptote-2.61.ebuild
-2002290939 ./media-gfx/asymptote/asymptote-2.62.ebuild
-2008161509 ./media-gfx/asymptote/asymptote-2.67.ebuild
-2008181439 ./media-gfx/asymptote/asymptote-2.65.ebuild
+2010091709 ./media-gfx/asymptote/asymptote-2.61.ebuild
+2010091709 ./media-gfx/asymptote/asymptote-2.62.ebuild
+2010091709 ./media-gfx/asymptote/asymptote-2.65.ebuild
+2010091709 ./media-gfx/asymptote/asymptote-2.67.ebuild
 1905202039 ./media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
 1912131839 ./media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
-2008241709 ./media-gfx/blender/blender-2.79b-r2.ebuild
-2008241709 ./media-gfx/blender/blender-2.83.4.ebuild
-2010060539 ./media-gfx/blender/blender-2.90.1.ebuild
+2010101109 ./media-gfx/blender/blender-2.79b-r3.ebuild
+2010101109 ./media-gfx/blender/blender-2.83.4-r1.ebuild
+2010101109 ./media-gfx/blender/blender-2.90.1-r1.ebuild
 2005032209 ./media-gfx/cairosvg/cairosvg-2.4.2.ebuild
 1805010009 ./media-gfx/cellwriter/cellwriter-1.3.5.ebuild
 1906102309 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -19088,16 +19053,9 @@
 2003231009 ./media-gfx/cropgui/cropgui-0.4.1.ebuild
 2009071009 ./media-gfx/cropgui/cropgui-0.5.ebuild
 2004032241 ./media-gfx/crwinfo/crwinfo-0.2.ebuild
-2002091942 ./media-gfx/cura/cura-3.4.1.ebuild
-2002091942 ./media-gfx/cura/cura-3.6.0.ebuild
-2002091942 ./media-gfx/cura/cura-4.2.1.ebuild
-2002091942 ./media-gfx/cura/cura-4.3.0-r1.ebuild
 2010070409 ./media-gfx/cura/cura-4.6.1-r1.ebuild
 2010070409 ./media-gfx/cura/cura-4.7.0.ebuild
-1912110241 ./media-gfx/curaengine/curaengine-3.4.1.ebuild
-1912110241 ./media-gfx/curaengine/curaengine-3.6.0.ebuild
-2002112051 ./media-gfx/curaengine/curaengine-4.2.0.ebuild
-2002112051 ./media-gfx/curaengine/curaengine-4.3.0.ebuild
+2010111439 ./media-gfx/cura/cura-4.7.0-r1.ebuild
 2005252309 ./media-gfx/curaengine/curaengine-4.6.1.ebuild
 2009191939 ./media-gfx/curaengine/curaengine-4.7.0.ebuild
 2008311709 ./media-gfx/darktable/darktable-2.6.2.ebuild
@@ -19141,11 +19099,6 @@
 2009030009 ./media-gfx/fbida/fbida-2.12.ebuild
 2009051239 ./media-gfx/fbida/fbida-2.14-r2.ebuild
 2009051239 ./media-gfx/fbida/fbida-9999.ebuild
-1807162039 ./media-gfx/fdm-materials/fdm-materials-3.4.1.ebuild
-1901030109 ./media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
-2002112051 ./media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
-2002112051 ./media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
-2005252309 ./media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
 2009191939 ./media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
 2009271339 ./media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
 2004121909 ./media-gfx/feh/feh-3.4.ebuild
@@ -19200,7 +19153,7 @@
 2007301139 ./media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
 2006062039 ./media-gfx/graphite2/graphite2-1.3.14.ebuild
 2008202339 ./media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
-2008202339 ./media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+2010120039 ./media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
 1910111911 ./media-gfx/grub-splashes/grub-splashes-20091109.ebuild
 2009071209 ./media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
 2009071209 ./media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
@@ -19219,6 +19172,8 @@
 2006150239 ./media-gfx/imagemagick/imagemagick-9999.ebuild
 2010050009 ./media-gfx/imagemagick/imagemagick-6.9.11.31.ebuild
 2010050009 ./media-gfx/imagemagick/imagemagick-7.0.10.31.ebuild
+2010112209 ./media-gfx/imagemagick/imagemagick-6.9.11.34.ebuild
+2010112209 ./media-gfx/imagemagick/imagemagick-7.0.10.34.ebuild
 2002151310 ./media-gfx/imageworsener/imageworsener-1.3.2.ebuild
 2002151310 ./media-gfx/imageworsener/imageworsener-1.3.3.ebuild
 2006172009 ./media-gfx/img2pdf/img2pdf-0.3.6.ebuild
@@ -19273,8 +19228,7 @@
 2002231739 ./media-gfx/mscgen/mscgen-0.20.ebuild
 2009251209 ./media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
 2009251209 ./media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
-2007171839 ./media-gfx/nomacs/nomacs-3.14.2.ebuild
-2010042009 ./media-gfx/nomacs/nomacs-3.16.224.ebuild
+2010091209 ./media-gfx/nomacs/nomacs-3.16.224.ebuild
 2002182339 ./media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
 1902152139 ./media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
 2009071609 ./media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -19298,6 +19252,7 @@
 1803131609 ./media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
 2001291909 ./media-gfx/pencil/pencil-0.6.4.ebuild
 2006150239 ./media-gfx/pencil/pencil-0.6.4-r1.ebuild
+2010111809 ./media-gfx/pencil/pencil-0.6.5.ebuild
 1802221208 ./media-gfx/peps/peps-2.0-r1.ebuild
 1702282250 ./media-gfx/photopc/photopc-3.07.ebuild
 1912091539 ./media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
@@ -19342,10 +19297,10 @@
 1910102139 ./media-gfx/ristretto/ristretto-0.10.0.ebuild
 1805290208 ./media-gfx/rotoscope/rotoscope-0.2.ebuild
 2004032241 ./media-gfx/sam2p/sam2p-0.49.3.ebuild
-2010042039 ./media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
+2010120309 ./media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
 2009071209 ./media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
-2001281139 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
 2002112051 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+2010112239 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
 2005310309 ./media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
 2010060809 ./media-gfx/scour/scour-0.37.ebuild
 2003261841 ./media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -19360,7 +19315,8 @@
 2008302139 ./media-gfx/simple-scan/simple-scan-3.36.4.ebuild
 1912110241 ./media-gfx/slic3r/slic3r-1.1.7.ebuild
 1912110241 ./media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
-2008011409 ./media-gfx/slic3r/slic3r-9999.ebuild
+2010111839 ./media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
+2010111839 ./media-gfx/slic3r/slic3r-9999.ebuild
 1811092309 ./media-gfx/solvespace/solvespace-2.3.ebuild
 1911091539 ./media-gfx/springgraph/springgraph-88.ebuild
 2006070509 ./media-gfx/sxiv/sxiv-9999.ebuild
@@ -19388,19 +19344,20 @@
 2005211139 ./media-gfx/viewnior/viewnior-1.7-r1.ebuild
 2006160909 ./media-gfx/viewnior/viewnior-1.7-r2.ebuild
 1810201939 ./media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
-1810221409 ./media-gfx/wings/wings-2.1.5.ebuild
-1810221409 ./media-gfx/wings/wings-2.1.6.ebuild
-1810221409 ./media-gfx/wings/wings-2.1.7.ebuild
-1912101239 ./media-gfx/wings/wings-2.2.5.ebuild
-2005171209 ./media-gfx/wings/wings-2.2.6.1.ebuild
+2010100209 ./media-gfx/wings/wings-2.1.5.ebuild
+2010100209 ./media-gfx/wings/wings-2.1.6.ebuild
+2010100209 ./media-gfx/wings/wings-2.1.7.ebuild
+2010100209 ./media-gfx/wings/wings-2.2.5.ebuild
+2010101439 ./media-gfx/wings/wings-2.2.6.1.ebuild
 1809121839 ./media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild
 2007180039 ./media-gfx/xdot/xdot-1.1.ebuild
 2007180039 ./media-gfx/xdot/xdot-9999.ebuild
 2009031339 ./media-gfx/xfig/xfig-3.2.6a-r1.ebuild
-2004032241 ./media-gfx/xli/xli-1.17.0-r5.ebuild
+2010101039 ./media-gfx/xfig/xfig-3.2.7b.ebuild
+2010112239 ./media-gfx/xli/xli-1.17.0-r5.ebuild
 2004032241 ./media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
 1903190509 ./media-gfx/xpaint/xpaint-2.10.2.ebuild
-2007230839 ./media-gfx/xsane/xsane-0.999-r2.ebuild
+2010112239 ./media-gfx/xsane/xsane-0.999-r2.ebuild
 2004032241 ./media-gfx/xv/xv-3.10a-r19.ebuild
 1702282250 ./media-gfx/xzgv/xzgv-0.9.1.ebuild
 2010031709 ./media-gfx/yafaray/yafaray-3.4.1.ebuild
@@ -19432,8 +19389,8 @@
 2004032241 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
 2005311939 ./media-libs/alure/alure-1.2-r1.ebuild
 2005311939 ./media-libs/alure/alure-1.2-r2.ebuild
-1804240038 ./media-libs/ampache_browser/ampache_browser-1.0.1.ebuild
 1911121409 ./media-libs/ampache_browser/ampache_browser-1.0.2.ebuild
+2010101039 ./media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
 1902170139 ./media-libs/aribb24/aribb24-1.0.3-r1.ebuild
 1905280009 ./media-libs/aribb24/aribb24-1.0.3.ebuild
 2005011709 ./media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -19466,12 +19423,12 @@
 2004202139 ./media-libs/cogl/cogl-1.22.6.ebuild
 2008302139 ./media-libs/cogl/cogl-1.22.8.ebuild
 2004140109 ./media-libs/coin/coin-3.1.3-r2.ebuild
-2010071039 ./media-libs/coin/coin-4.0.0.ebuild
+2010091139 ./media-libs/coin/coin-4.0.0.ebuild
 2005161809 ./media-libs/compface/compface-1.5.2.ebuild
 2004032241 ./media-libs/ctl/ctl-1.5.2-r1.ebuild
 1912292239 ./media-libs/dav1d/dav1d-9999.ebuild
 2005011709 ./media-libs/dav1d/dav1d-0.5.2.ebuild
-2005212339 ./media-libs/dav1d/dav1d-0.7.0.ebuild
+2010091209 ./media-libs/dav1d/dav1d-0.7.0.ebuild
 1908281139 ./media-libs/devil/devil-1.7.8-r2.ebuild
 1805291638 ./media-libs/dssi/dssi-1.1.1-r1.ebuild
 2004032241 ./media-libs/dumb/dumb-0.9.3-r3.ebuild
@@ -19503,11 +19460,9 @@
 2004032241 ./media-libs/freeglut/freeglut-3.2.1.ebuild
 2006150009 ./media-libs/freeimage/freeimage-3.18.0-r1.ebuild
 2007191509 ./media-libs/freeimage/freeimage-3.18.0-r2.ebuild
-2003261841 ./media-libs/freetype/freetype-2.10.1.ebuild
-2003261841 ./media-libs/freetype/freetype-2.9.1-r4.ebuild
-2004032241 ./media-libs/freetype/freetype-2.9.1-r3.ebuild
-2005101309 ./media-libs/freetype/freetype-9999.ebuild
 2008051739 ./media-libs/freetype/freetype-2.10.2-r1.ebuild
+2010111039 ./media-libs/freetype/freetype-2.10.3.ebuild
+2010111039 ./media-libs/freetype/freetype-9999.ebuild
 2003250139 ./media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild
 2006150009 ./media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
 2008182039 ./media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -19531,7 +19486,7 @@
 2004032241 ./media-libs/glew/glew-2.1.0-r1.ebuild
 2008051739 ./media-libs/glew/glew-2.2.0.ebuild
 2001090239 ./media-libs/glfw/glfw-3.2.1.ebuild
-2010071039 ./media-libs/glfw/glfw-3.3.2.ebuild
+2010091139 ./media-libs/glfw/glfw-3.3.2.ebuild
 2002181439 ./media-libs/glm/glm-0.9.9.5.ebuild
 2006172239 ./media-libs/glm/glm-0.9.9.7.ebuild
 2007071009 ./media-libs/glm/glm-0.9.9.8.ebuild
@@ -19603,14 +19558,14 @@
 1805290208 ./media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
 2007220239 ./media-libs/lcms/lcms-2.10.ebuild
 2007220239 ./media-libs/lcms/lcms-2.9.ebuild
-2010071039 ./media-libs/lcms/lcms-2.11.ebuild
+2010091139 ./media-libs/lcms/lcms-2.11.ebuild
 2009201309 ./media-libs/lensfun/lensfun-0.3.2-r1.ebuild
 2002151310 ./media-libs/leptonica/leptonica-1.74.4.ebuild
 2008190209 ./media-libs/leptonica/leptonica-1.80.0.ebuild
 1910030009 ./media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
 1708271834 ./media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
-2010071039 ./media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
-2010071039 ./media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+2010091139 ./media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+2010091139 ./media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
 1902221409 ./media-libs/libXcm/libXcm-0.5.4.ebuild
 1904040039 ./media-libs/libXcm/libXcm-9999.ebuild
 2002151310 ./media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
@@ -19622,8 +19577,8 @@
 2004032241 ./media-libs/libafterimage/libafterimage-1.20-r3.ebuild
 2007310009 ./media-libs/libao/libao-1.2.2-r1.ebuild
 2004032241 ./media-libs/libaom/libaom-1.0.0-r2.ebuild
-2006091709 ./media-libs/libaom/libaom-2.0.0.ebuild
 2006091139 ./media-libs/libaom/libaom-9999.ebuild
+2010111839 ./media-libs/libaom/libaom-2.0.0.ebuild
 2006132027 ./media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
 2007220239 ./media-libs/libass/libass-0.14.0.ebuild
 1905052209 ./media-libs/libbdplus/libbdplus-0.1.2.ebuild
@@ -19646,7 +19601,7 @@
 2004032241 ./media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
 2008311239 ./media-libs/libdc1394/libdc1394-2.2.6.ebuild
 2004032241 ./media-libs/libdca/libdca-0.0.5-r3.ebuild
-2008221939 ./media-libs/libdca/libdca-0.0.7.ebuild
+2010111839 ./media-libs/libdca/libdca-0.0.7.ebuild
 2004261239 ./media-libs/libde265/libde265-1.0.3.ebuild
 2007271839 ./media-libs/libde265/libde265-9999.ebuild
 2007300709 ./media-libs/libde265/libde265-1.0.5.ebuild
@@ -19745,7 +19700,7 @@
 2009061109 ./media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
 2002231739 ./media-libs/libmpd/libmpd-11.8.17-r1.ebuild
 2002112051 ./media-libs/libmpdclient/libmpdclient-2.16.ebuild
-2008221939 ./media-libs/libmpdclient/libmpdclient-2.19.ebuild
+2010111909 ./media-libs/libmpdclient/libmpdclient-2.19.ebuild
 2004032241 ./media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
 2004032241 ./media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
 1801060809 ./media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
@@ -19794,7 +19749,7 @@
 2007121309 ./media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
 2009210009 ./media-libs/libprojectm/libprojectm-3.1.8.ebuild
 2009210009 ./media-libs/libprojectm/libprojectm-9999.ebuild
-2010060739 ./media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
+2010090239 ./media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
 2006132027 ./media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
 2006132027 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
 2006132027 ./media-libs/libquvi/libquvi-0.9.4-r1.ebuild
@@ -19802,12 +19757,12 @@
 2003192109 ./media-libs/libreplaygain/libreplaygain-477-r1.ebuild
 2008151509 ./media-libs/librosprite/librosprite-0.1.3-r2.ebuild
 2004032241 ./media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
-2009041939 ./media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
 2009041939 ./media-libs/libsamplerate/libsamplerate-9999.ebuild
+2010111839 ./media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
 2008060539 ./media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
 2008081209 ./media-libs/libsdl/libsdl-1.2.15-r9.ebuild
 2009071209 ./media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
-2010071039 ./media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
+2010091139 ./media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
 1902211339 ./media-libs/libsfml/libsfml-2.5.1.ebuild
 2006280009 ./media-libs/libshout/libshout-2.4.1-r2.ebuild
 2006280009 ./media-libs/libshout/libshout-2.4.2.ebuild
@@ -19827,7 +19782,7 @@
 2004032241 ./media-libs/libtheora/libtheora-1.1.1-r2.ebuild
 2006132027 ./media-libs/libtiger/libtiger-0.3.4-r1.ebuild
 1904290139 ./media-libs/libtimidity/libtimidity-0.2.4.ebuild
-2008221939 ./media-libs/libtimidity/libtimidity-0.2.6.ebuild
+2010111509 ./media-libs/libtimidity/libtimidity-0.2.6.ebuild
 2004032241 ./media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
 1905261839 ./media-libs/libuvc/libuvc-0.0.6-r1.ebuild
 2003261841 ./media-libs/libv4l/libv4l-1.16.6.ebuild
@@ -19853,8 +19808,8 @@
 2005070709 ./media-libs/libzen/libzen-0.4.38.ebuild
 1912110241 ./media-libs/libzmf/libzmf-0.0.2.ebuild
 1912110241 ./media-libs/libzmf/libzmf-9999.ebuild
-2008030809 ./media-libs/lilv/lilv-0.24.6-r2.ebuild
-2010071039 ./media-libs/lilv/lilv-0.24.8-r1.ebuild
+2010091539 ./media-libs/lilv/lilv-0.24.10.ebuild
+2010091139 ./media-libs/lilv/lilv-0.24.8-r1.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
@@ -19874,6 +19829,7 @@
 2006042339 ./media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
 2009201309 ./media-libs/mutagen/mutagen-1.43.0-r1.ebuild
 2009241009 ./media-libs/mutagen/mutagen-1.44.0.ebuild
+2010091509 ./media-libs/mutagen/mutagen-1.45.1.ebuild
 2005152139 ./media-libs/nas/nas-1.9.4-r2.ebuild
 2004032241 ./media-libs/netpbm/netpbm-10.70.00.ebuild
 2004032241 ./media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -19886,11 +19842,12 @@
 2002162339 ./media-libs/opencollada/opencollada-1.6.63-r1.ebuild
 2006172009 ./media-libs/opencollada/opencollada-1.6.68.ebuild
 2006060309 ./media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
+2010101709 ./media-libs/opencolorio/opencolorio-1.1.1.ebuild
 1910111911 ./media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
 2004032241 ./media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
 2002140109 ./media-libs/openctm/openctm-1.0.3.ebuild
 2006222209 ./media-libs/opencv/opencv-4.1.2-r3.ebuild
-2010072109 ./media-libs/opencv/opencv-4.4.0.ebuild
+2010112239 ./media-libs/opencv/opencv-4.4.0-r1.ebuild
 2007020909 ./media-libs/openexr/openexr-2.3.0.ebuild
 2010072139 ./media-libs/openexr/openexr-2.5.2-r1.ebuild
 2004032241 ./media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -19898,6 +19855,7 @@
 2007222309 ./media-libs/openh264/openh264-2.1.1.ebuild
 1912302209 ./media-libs/openicc/openicc-0.1.0.ebuild
 2003012209 ./media-libs/openimageio/openimageio-1.8.17-r2.ebuild
+2010100739 ./media-libs/openimageio/openimageio-2.2.7.0.ebuild
 2004032241 ./media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
 2004032241 ./media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
 2006081109 ./media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
@@ -19918,7 +19876,7 @@
 1912030240 ./media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
 1912030240 ./media-libs/phonon/phonon-4.11.1-r1.ebuild
 2002112051 ./media-libs/plib/plib-1.8.5-r1.ebuild
-2010071039 ./media-libs/plib/plib-1.8.5-r2.ebuild
+2010091139 ./media-libs/plib/plib-1.8.5-r2.ebuild
 2004032241 ./media-libs/plotutils/plotutils-2.6-r2.ebuild
 1702282250 ./media-libs/pnglite/pnglite-0.1.17.ebuild
 2003261841 ./media-libs/portaudio/portaudio-19.06.00-r2.ebuild
@@ -19945,7 +19903,8 @@
 2009271309 ./media-libs/rubberband/rubberband-1.9.0.ebuild
 2004032241 ./media-libs/sbc/sbc-1.4.ebuild
 2004111339 ./media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
-2010071039 ./media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+2010101139 ./media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
+2010091139 ./media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
 2008081209 ./media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
 2008081209 ./media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
 2004111339 ./media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -19955,12 +19914,12 @@
 2008081209 ./media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
 1809161639 ./media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
 1907282009 ./media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
-2010071039 ./media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
+2010091139 ./media-libs/sdl2-image/sdl2-image-2.0.5.ebuild
 2003210109 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
 2010061639 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
 2007190209 ./media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
 1805041339 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
-2010071039 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
+2010091139 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
 2002091409 ./media-libs/sg/sg-1.5.ebuild
 1910111911 ./media-libs/sge/sge-030809.ebuild
 2002101639 ./media-libs/shaderc/shaderc-2018.0.ebuild
@@ -19992,8 +19951,7 @@
 1805292338 ./media-libs/tse3/tse3-0.3.1-r1.ebuild
 2005172009 ./media-libs/urt/urt-3.1b-r1.ebuild
 2005172009 ./media-libs/urt/urt-3.1b-r3.ebuild
-2008241309 ./media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1-r1.ebuild
-2010071039 ./media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
+2010091139 ./media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
 2002112051 ./media-libs/vidstab/vidstab-9999.ebuild
 2005011709 ./media-libs/vidstab/vidstab-1.1.0-r2.ebuild
 2004170309 ./media-libs/vigra/vigra-9999.ebuild
@@ -20008,9 +19966,9 @@
 2004032241 ./media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
 1905151509 ./media-libs/volpack/volpack-1.0_p7-r1.ebuild
 2004300109 ./media-libs/vulkan-layers/vulkan-layers-9999.ebuild
-2010080539 ./media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
+2010091209 ./media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
 2007100339 ./media-libs/vulkan-loader/vulkan-loader-9999.ebuild
-2010080539 ./media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
+2010091209 ./media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
 2004062339 ./media-libs/waffle/waffle-9999.ebuild
 2006151839 ./media-libs/waffle/waffle-1.6.1-r1.ebuild
 1902201609 ./media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1.ebuild
@@ -20038,7 +19996,7 @@
 2010071039 ./media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
 2004032241 ./media-libs/zvbi/zvbi-0.2.35-r1.ebuild
 2004100109 ./media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
-2010010609 ./media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
+2010120039 ./media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
 2005062039 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
 2006101209 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
 2005062039 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
@@ -20066,8 +20024,7 @@
 2007281739 ./media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
 1903110209 ./media-plugins/calf/calf-9999.ebuild
 2001171409 ./media-plugins/calf/calf-0.90.3.ebuild
-1811082009 ./media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
-2010071039 ./media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
+2010091139 ./media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
 1910071209 ./media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild
 2001261339 ./media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
 1702282250 ./media-plugins/g2reverb/g2reverb-0.7.1.ebuild
@@ -20338,11 +20295,13 @@
 2007292139 ./media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
 2008292339 ./media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.6.1.ebuild
 2009092009 ./media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.0.ebuild
+2010082309 ./media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.1.ebuild
 2007292139 ./media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
 1812230739 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.4.ebuild
 2005170009 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.6.ebuild
 2007312209 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
-2007312209 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+2010082309 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild
+2010082309 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
 2002112051 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
@@ -20377,6 +20336,7 @@
 2010011639 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.2.ebuild
 2010011639 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
 2010061739 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.0.ebuild
+2010082309 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild
 1901200139 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.5.16.ebuild
 1901301839 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.5.17.ebuild
 2008020439 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
@@ -20395,8 +20355,9 @@
 2005210709 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.20.ebuild
 2007040409 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.21.ebuild
 2009212039 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild
-2009212039 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
 2010070609 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild
+2010082309 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild
+2010082309 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
 2002112051 ./media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
 2007292139 ./media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild
 2007292139 ./media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
@@ -20410,6 +20371,7 @@
 2008020439 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
 2010081639 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild
 2010081639 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+2010082309 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild
 1811180639 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.6.ebuild
 1812230739 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.7.ebuild
 1901151809 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.8.ebuild
@@ -20420,6 +20382,7 @@
 2010011639 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.1.ebuild
 2010011639 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
 2010051709 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.2.ebuild
+2010082309 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild
 1811130439 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.2.ebuild
 1902081739 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3.ebuild
 2002112051 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
@@ -20570,19 +20533,17 @@
 2009231339 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
 1702282250 ./media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
 2007091609 ./media-plugins/live/live-2020.03.06.ebuild
-2007091609 ./media-plugins/live/live-2020.05.15.ebuild
+2010091209 ./media-plugins/live/live-2020.05.15.ebuild
 1912221509 ./media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
 2001231539 ./media-plugins/mda-lv2/mda-lv2-1.2.4.ebuild
 2009202339 ./media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.4.0.ebuild
 1803140138 ./media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild
 1912111539 ./media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild
-2002222009 ./media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
-2010071039 ./media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
-1912221509 ./media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
+2010091139 ./media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
 2008241409 ./media-plugins/tap-plugins/tap-plugins-9999.ebuild
-2010071039 ./media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
+2010091139 ./media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
 1805240409 ./media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
-2007300109 ./media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
+2010091139 ./media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
 1905030409 ./media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
 1911180309 ./media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild
 1912280009 ./media-plugins/vdr-actuator/vdr-actuator-1.2.1.ebuild
@@ -20727,8 +20688,7 @@
 1803300609 ./media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild
 1803300609 ./media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild
 1912152010 ./media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
-1911101439 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.2.ebuild
-1911101439 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
+2010091139 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
 2007041239 ./media-plugins/mythplugins/mythplugins-31.0.ebuild
 2005151539 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
 2006111109 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.2.ebuild
@@ -20815,7 +20775,6 @@
 2009052039 ./media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
 1904081809 ./media-sound/amsynth/amsynth-1.8.0.ebuild
 2009231339 ./media-sound/apetag/apetag-1.12-r3.ebuild
-2006272109 ./media-sound/apulse/apulse-0.1.12-r4.ebuild
 2009202339 ./media-sound/apulse/apulse-0.1.13.ebuild
 2008302039 ./media-sound/aqualung/aqualung-1.0-r5.ebuild
 2009260109 ./media-sound/aqualung/aqualung-1.1.ebuild
@@ -20873,7 +20832,6 @@
 1901072239 ./media-sound/cmusfm/cmusfm-0.2.5.ebuild
 1702282250 ./media-sound/cmusfm/cmusfm-0.3.1.ebuild
 1805060038 ./media-sound/cmusfm/cmusfm-0.3.3.ebuild
-1702282250 ./media-sound/codecgraph/codecgraph-20120114-r2.ebuild
 1806030209 ./media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
 2008221939 ./media-sound/coquillo/coquillo-2.0.1.ebuild
 2008141139 ./media-sound/csound/csound-9999.ebuild
@@ -20900,7 +20858,7 @@
 2003210109 ./media-sound/easytag/easytag-2.4.3-r1.ebuild
 2009042139 ./media-sound/ecasound/ecasound-2.9.3.ebuild
 2009291711 ./media-sound/elisa/elisa-20.04.3.ebuild
-2009291711 ./media-sound/elisa/elisa-20.08.1.ebuild
+2010092209 ./media-sound/elisa/elisa-20.08.2.ebuild
 1911100109 ./media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
 2006211639 ./media-sound/erec/erec-2.2.0.1-r1.ebuild
 2008111209 ./media-sound/exaile/exaile-4.1.0_alpha1.ebuild
@@ -20919,7 +20877,6 @@
 2006211639 ./media-sound/fmdrv/fmdrv-1.0.7.ebuild
 2004032340 ./media-sound/fmit/fmit-1.0.15-r3.ebuild
 1805132239 ./media-sound/fmtools/fmtools-2.0.7.ebuild
-1702282250 ./media-sound/freebirth/freebirth-0.3.2-r1.ebuild
 2003091609 ./media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
 1702282250 ./media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
 1912131439 ./media-sound/gigedit/gigedit-9999.ebuild
@@ -20947,9 +20904,8 @@
 1912100409 ./media-sound/gstreamripper/gstreamripper-0.2.ebuild
 2006290009 ./media-sound/gtick/gtick-0.5.5.ebuild
 2002112051 ./media-sound/gtkguitune/gtkguitune-0.8.ebuild
-2007040239 ./media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
 2008291909 ./media-sound/guayadeque/guayadeque-9999.ebuild
-2010071039 ./media-sound/guayadeque/guayadeque-0.4.6.ebuild
+2010091139 ./media-sound/guayadeque/guayadeque-0.4.6.ebuild
 2006251139 ./media-sound/guitarix/guitarix-0.39.0.ebuild
 2006251139 ./media-sound/guitarix/guitarix-0.40.0.ebuild
 2008151239 ./media-sound/guitarix/guitarix-0.41.0.ebuild
@@ -20967,7 +20923,7 @@
 1910111911 ./media-sound/id3v2/id3v2-0.1.12-r1.ebuild
 1912241439 ./media-sound/jaaa/jaaa-0.9.2.ebuild
 2008091909 ./media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
-2010071039 ./media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+2010091139 ./media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
 2009181139 ./media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
 2006021939 ./media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
 1811250239 ./media-sound/jack-smf-utils/jack-smf-utils-1.0-r1.ebuild
@@ -20989,7 +20945,6 @@
 1912131439 ./media-sound/linuxsampler/linuxsampler-9999.ebuild
 2006101039 ./media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
 1910161509 ./media-sound/litestream/litestream-1.3_rc3.ebuild
-1708011128 ./media-sound/lltag/lltag-0.14.5.ebuild
 2008221939 ./media-sound/lltag/lltag-0.14.6.ebuild
 2008091509 ./media-sound/lmms/lmms-9999.ebuild
 2008111739 ./media-sound/lmms/lmms-1.2.2.ebuild
@@ -21094,8 +21049,7 @@
 2005160139 ./media-sound/pianobar/pianobar-9999.ebuild
 2006091709 ./media-sound/pianobar/pianobar-2020.04.05.ebuild
 2008261739 ./media-sound/picard/picard-9999.ebuild
-2008301109 ./media-sound/picard/picard-2.3.1.ebuild
-2009241009 ./media-sound/picard/picard-2.4.2.ebuild
+2010091139 ./media-sound/picard/picard-2.4.2.ebuild
 1910171339 ./media-sound/picoxine/picoxine-0.0.7.ebuild
 2008082009 ./media-sound/pitchtune/pitchtune-0.0.4.ebuild
 2005020339 ./media-sound/pithos/pithos-1.5.0.ebuild
@@ -21127,8 +21081,7 @@
 2008152309 ./media-sound/pulseeffects/pulseeffects-9999.ebuild
 2009212209 ./media-sound/pulseeffects/pulseeffects-4.8.2.ebuild
 2008082009 ./media-sound/pwavecat/pwavecat-0.4.5.ebuild
-2007171109 ./media-sound/qastools/qastools-0.22.0.ebuild
-2010042009 ./media-sound/qastools/qastools-0.23.0.ebuild
+2010091209 ./media-sound/qastools/qastools-0.23.0.ebuild
 2009171109 ./media-sound/qjackctl/qjackctl-9999.ebuild
 2009231339 ./media-sound/qjackctl/qjackctl-0.6.3.ebuild
 2008221939 ./media-sound/qmidiarp/qmidiarp-0.6.5.ebuild
@@ -21212,7 +21165,7 @@
 1702282250 ./media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
 2002140109 ./media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
 2008271839 ./media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
-2008271839 ./media-sound/teamspeak-client/teamspeak-client-5.0.0_beta24.ebuild
+2010092339 ./media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild
 2005211139 ./media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
 1810131209 ./media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
 2008091509 ./media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
@@ -21275,6 +21228,7 @@
 2007140209 ./media-sound/strawberry/strawberry-0.6.13.ebuild
 2008150509 ./media-sound/strawberry/strawberry-9999.ebuild
 2008191209 ./media-sound/strawberry/strawberry-0.7.2.ebuild
+2010101909 ./media-sound/strawberry/strawberry-0.8.1.ebuild
 2009042339 ./media-sound/jack/jack-4.0.0_pre20200706.ebuild
 2010020039 ./media-sound/deadbeef/deadbeef-1.8.4.ebuild
 2005181609 ./media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
@@ -21332,8 +21286,8 @@
 2006211509 ./media-video/avidemux/avidemux-2.7.4-r1.ebuild
 2008130409 ./media-video/avidemux/avidemux-2.7.6-r1.ebuild
 1904221409 ./media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild
-2001212239 ./media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
 2001212239 ./media-video/baka-mplayer/baka-mplayer-9999.ebuild
+2010100439 ./media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
 2001050939 ./media-video/bashnapi/bashnapi-2.0.0.ebuild
 1912131639 ./media-video/bbtools/bbtools-1.9.ebuild
 1706250120 ./media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild
@@ -21370,7 +21324,7 @@
 2007281739 ./media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
 2007230839 ./media-video/ffmpeg/ffmpeg-4.2.4.ebuild
 2010040409 ./media-video/ffmpeg/ffmpeg-9999.ebuild
-2010080539 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+2010091209 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
 2009261609 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
 2004261339 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
 1808181139 ./media-video/flvstreamer/flvstreamer-2.1c.ebuild
@@ -21380,8 +21334,8 @@
 1708301113 ./media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild
 1702282250 ./media-video/google2srt/google2srt-0.5.6-r1.ebuild
 2008300739 ./media-video/gpac/gpac-0.8.1.ebuild
-2009130109 ./media-video/gpac/gpac-1.0.1.ebuild
 2009130109 ./media-video/gpac/gpac-9999.ebuild
+2010091209 ./media-video/gpac/gpac-1.0.1.ebuild
 2005212308 ./media-video/guvcview/guvcview-2.0.6-r1.ebuild
 1910261809 ./media-video/gxine/gxine-0.5.907-r1.ebuild
 2002112051 ./media-video/gxine/gxine-0.5.909.ebuild
@@ -21460,6 +21414,7 @@
 1911092239 ./media-video/pgmfindclip/pgmfindclip-1.13.ebuild
 2006281909 ./media-video/pipewire/pipewire-0.2.7.ebuild
 2010080539 ./media-video/pipewire/pipewire-0.3.10.ebuild
+2010111709 ./media-video/pipewire/pipewire-0.3.13.ebuild
 2005121009 ./media-video/pitivi/pitivi-0.999-r3.ebuild
 2005181609 ./media-video/projectx/projectx-0.91.0.10-r2.ebuild
 2004261409 ./media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
@@ -21536,7 +21491,7 @@
 2004032241 ./media-video/xvid4conf/xvid4conf-1.12.ebuild
 2009071209 ./media-video/yle-dl/yle-dl-20200807.ebuild
 2007140139 ./media-video/rav1e/rav1e-9999.ebuild
-2010080539 ./media-video/rav1e/rav1e-0.3.3.ebuild
+2010091209 ./media-video/rav1e/rav1e-0.3.3.ebuild
 1912021109 ./media-video/celluloid/celluloid-0.16.ebuild
 2004171539 ./media-video/celluloid/celluloid-0.19.ebuild
 2004181239 ./media-video/celluloid/celluloid-0.18.ebuild
@@ -21639,7 +21594,7 @@
 1702282250 ./net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
 1702282250 ./net-analyzer/dosdetector/dosdetector-20060621.ebuild
 1909152040 ./net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
-2009261339 ./net-analyzer/driftnet/driftnet-1.3.0.ebuild
+2010101709 ./net-analyzer/driftnet/driftnet-1.3.0.ebuild
 2001312009 ./net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
 2002151310 ./net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
 2002151310 ./net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
@@ -21679,7 +21634,6 @@
 1711051837 ./net-analyzer/goaccess/goaccess-1.2.ebuild
 1812050209 ./net-analyzer/goaccess/goaccess-9999.ebuild
 2002112051 ./net-analyzer/goaccess/goaccess-1.3.ebuild
-2006020009 ./net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
 2006020009 ./net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
 2006020009 ./net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
 2005091339 ./net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -21763,7 +21717,7 @@
 2007071139 ./net-analyzer/lft/lft-3.91-r1.ebuild
 1702282250 ./net-analyzer/lilac/lilac-1.0.3.ebuild
 2009071209 ./net-analyzer/linkchecker/linkchecker-9999.ebuild
-2010071039 ./net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
+2010091139 ./net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
 1702282250 ./net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
 1702282250 ./net-analyzer/macchanger/macchanger-1.7.0.ebuild
 2008192239 ./net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
@@ -21772,10 +21726,6 @@
 1702282250 ./net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
 2002131339 ./net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
 1910021809 ./net-analyzer/mdns-scan/mdns-scan-0.5.ebuild
-1912110241 ./net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
-2001281539 ./net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
-2002082009 ./net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
-2002112051 ./net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
 1811180009 ./net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
 1903030409 ./net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
 2004171939 ./net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -21997,11 +21947,13 @@
 2008292109 ./net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
 2009212039 ./net-analyzer/sslscan/sslscan-2.0.1.ebuild
 2010050839 ./net-analyzer/sslscan/sslscan-2.0.2.ebuild
+2010091139 ./net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
 2006151409 ./net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
 2006151409 ./net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
 2006151409 ./net-analyzer/sslsplit/sslsplit-9999.ebuild
 1702282250 ./net-analyzer/ssmping/ssmping-0.9.1.ebuild
-2007172339 ./net-analyzer/suricata/suricata-5.0.3.ebuild
+2010091509 ./net-analyzer/suricata/suricata-5.0.4.ebuild
+2010091539 ./net-analyzer/suricata/suricata-6.0.0.ebuild
 1805061738 ./net-analyzer/symon/symon-2.87.ebuild
 1805061738 ./net-analyzer/symon/symon-2.88.ebuild
 1702282250 ./net-analyzer/synscan/synscan-5.01.ebuild
@@ -22056,26 +22008,25 @@
 1912110241 ./net-analyzer/vnstat/vnstat-2.4.ebuild
 1912110241 ./net-analyzer/vnstat/vnstat-9999.ebuild
 2001161639 ./net-analyzer/vnstat/vnstat-2.5.ebuild
-2001202309 ./net-analyzer/vnstat/vnstat-2.6.ebuild
+2010120639 ./net-analyzer/vnstat/vnstat-2.6.ebuild
 2004200209 ./net-analyzer/wapiti/wapiti-9999.ebuild
 2004201339 ./net-analyzer/wapiti/wapiti-3.0.3.ebuild
 1702282250 ./net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
 2001301739 ./net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
 2009191139 ./net-analyzer/wireshark/wireshark-3.3.0.ebuild
-2009231339 ./net-analyzer/wireshark/wireshark-3.2.6.ebuild
 2010021439 ./net-analyzer/wireshark/wireshark-99999999.ebuild
-2010071039 ./net-analyzer/wireshark/wireshark-3.2.7.ebuild
+2010091139 ./net-analyzer/wireshark/wireshark-3.2.7.ebuild
 2002112051 ./net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
 1702282250 ./net-analyzer/xprobe/xprobe-0.3.ebuild
 2009061409 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
 1702282250 ./net-analyzer/yersinia/yersinia-0.7.3.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-9999.ebuild
-2007202039 ./net-analyzer/zabbix/zabbix-5.0.2.ebuild
 2008051739 ./net-analyzer/zabbix/zabbix-3.0.31-r1.ebuild
-2009181139 ./net-analyzer/zabbix/zabbix-4.0.23.ebuild
-2010071039 ./net-analyzer/zabbix/zabbix-4.0.24.ebuild
-2010071039 ./net-analyzer/zabbix/zabbix-5.0.3.ebuild
+2010091139 ./net-analyzer/zabbix/zabbix-4.0.24.ebuild
+2010091939 ./net-analyzer/zabbix/zabbix-4.0.25.ebuild
+2010091139 ./net-analyzer/zabbix/zabbix-5.0.3.ebuild
+2010091909 ./net-analyzer/zabbix/zabbix-5.0.4.ebuild
 2010021709 ./net-analyzer/zmap/zmap-9999.ebuild
 2010071039 ./net-analyzer/zmap/zmap-2.1.1-r2.ebuild
 1702282250 ./net-analyzer/zniper/zniper-1.0-r1.ebuild
@@ -22144,7 +22095,7 @@
 2005260039 ./net-dns/c-ares/c-ares-1.16.1.ebuild
 2004291509 ./net-dns/coredns/coredns-1.6.9.ebuild
 2007221109 ./net-dns/coredns/coredns-1.7.0.ebuild
-2009232339 ./net-dns/ddclient/ddclient-3.9.1.ebuild
+2010112339 ./net-dns/ddclient/ddclient-3.9.1.ebuild
 2002230040 ./net-dns/djbdns/djbdns-1.05-r33.ebuild
 1810200209 ./net-dns/dnrd/dnrd-2.20.3-r2.ebuild
 1909191939 ./net-dns/dnscap/dnscap-1.10.2.ebuild
@@ -22160,7 +22111,7 @@
 2007231609 ./net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
 1911080209 ./net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
 2009291339 ./net-dns/dnssec-tools/dnssec-tools-2.2.3-r2.ebuild
-2001281539 ./net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
+2010112339 ./net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
 1702282250 ./net-dns/dnstop/dnstop-20140915.ebuild
 2005091109 ./net-dns/dnstop/dnstop-20140915-r2.ebuild
 2009071209 ./net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
@@ -22190,8 +22141,8 @@
 2004171939 ./net-dns/mydns/mydns-1.2.8.31-r1.ebuild
 2002230040 ./net-dns/ndu/ndu-0.4-r4.ebuild
 2003220409 ./net-dns/nsd/nsd-4.2.4.ebuild
-2004171039 ./net-dns/nsd/nsd-4.3.1.ebuild
 2007151139 ./net-dns/nsd/nsd-4.3.2.ebuild
+2010081909 ./net-dns/nsd/nsd-4.3.3.ebuild
 1912111540 ./net-dns/odsclient/odsclient-1.03-r1.ebuild
 2006041239 ./net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
 2009291711 ./net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
@@ -22201,7 +22152,6 @@
 2008171339 ./net-dns/openresolv/openresolv-3.10.0.ebuild
 2009140510 ./net-dns/openresolv/openresolv-3.11.0.ebuild
 2009140510 ./net-dns/openresolv/openresolv-3.9.0.ebuild
-2009140510 ./net-dns/openresolv/openresolv-3.9.2.ebuild
 2008301439 ./net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild
 2009082109 ./net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild
 2010062139 ./net-dns/pdns-recursor/pdns-recursor-4.4.0_rc2.ebuild
@@ -22217,10 +22167,12 @@
 1810090339 ./net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
 1906221109 ./net-dns/s6-dns/s6-dns-2.3.0.2.ebuild
 1911290109 ./net-dns/s6-dns/s6-dns-2.3.1.1.ebuild
+2010112109 ./net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
 1912111540 ./net-dns/sheerdns/sheerdns-1.0.3.ebuild
 2001182109 ./net-dns/totd/totd-1.5.1.ebuild
 2008061709 ./net-dns/unbound/unbound-1.10.1-r1.ebuild
 2009181139 ./net-dns/unbound/unbound-1.11.0.ebuild
+2010090209 ./net-dns/unbound/unbound-1.12.0.ebuild
 2002231739 ./net-dns/updatedd/updatedd-2.6-r5.ebuild
 2007230739 ./net-dns/valtz/valtz-0.7-r3.ebuild
 2005121009 ./net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
@@ -22309,7 +22261,7 @@
 1702282250 ./net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
 1910122239 ./net-fs/openafs/openafs-1.6.22.1.ebuild
 1910122239 ./net-fs/openafs/openafs-1.6.22.2.ebuild
-2009131309 ./net-fs/openafs/openafs-1.8.6.ebuild
+2010091839 ./net-fs/openafs/openafs-1.8.6.ebuild
 1803201012 ./net-fs/s3backer/s3backer-1.4.5.ebuild
 1803201012 ./net-fs/s3fs/s3fs-1.83.ebuild
 1911120909 ./net-fs/s3fs/s3fs-1.85.ebuild
@@ -22318,8 +22270,8 @@
 2008151239 ./net-fs/samba/samba-4.11.11.ebuild
 2008151239 ./net-fs/samba/samba-4.12.6.ebuild
 2009231109 ./net-fs/samba/samba-4.12.7.ebuild
-2009260109 ./net-fs/samba/samba-4.11.13.ebuild
 2009281039 ./net-fs/samba/samba-4.13.0.ebuild
+2010091139 ./net-fs/samba/samba-4.11.13.ebuild
 2003280339 ./net-fs/smbnetfs/smbnetfs-0.6.2.ebuild
 1808262039 ./net-fs/smbtad/smbtad-1.2.6.ebuild
 2007271709 ./net-fs/sshfs/sshfs-3.7.0.ebuild
@@ -22386,7 +22338,8 @@
 1702282250 ./net-im/gg-transport/gg-transport-2.2.6.ebuild
 1907151840 ./net-im/gitter-bin/gitter-bin-3.1.0.ebuild
 1902140139 ./net-im/gitter-bin/gitter-bin-4.1.0.ebuild
-2002112051 ./net-im/jabber-base/jabber-base-0.01-r1.ebuild
+2010120139 ./net-im/jabber-base/jabber-base-0.01-r1.ebuild
+2010120139 ./net-im/jabber-base/jabber-base-0.01-r2.ebuild
 2002022239 ./net-im/kadu/kadu-4.3-r2.ebuild
 1702282250 ./net-im/kouchat/kouchat-1.1.0.ebuild
 2008111739 ./net-im/libcommuni/libcommuni-3.5.0_p20200711.ebuild
@@ -22407,7 +22360,7 @@
 1910142209 ./net-im/profanity/profanity-0.7.1.ebuild
 2009141039 ./net-im/profanity/profanity-0.9.5.ebuild
 2010031709 ./net-im/prosody/prosody-0.11.5-r1.ebuild
-2010032139 ./net-im/prosody/prosody-0.11.7.ebuild
+2010101909 ./net-im/prosody/prosody-0.11.7-r1.ebuild
 2004211139 ./net-im/psi/psi-9999.ebuild
 2009071209 ./net-im/psi/psi-1.5.ebuild
 2002151310 ./net-im/purple-events/purple-events-0.99.1.ebuild
@@ -22416,7 +22369,7 @@
 2007281739 ./net-im/ricochet/ricochet-1.1.4.ebuild
 2007281739 ./net-im/ricochet/ricochet-9999.ebuild
 1902221239 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
-2009300139 ./net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild
+2010101109 ./net-im/signal-desktop-bin/signal-desktop-bin-1.36.3.ebuild
 2002110039 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2010011409 ./net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild
 2009020209 ./net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -22437,6 +22390,7 @@
 2007270609 ./net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2009221109 ./net-im/teams/teams-1.3.00.16851-r2.ebuild
+2010101809 ./net-im/teams/teams-1.3.00.25560.ebuild
 2009101939 ./net-im/zoom/zoom-5.2.458699.0906.ebuild
 2009272139 ./net-im/zoom/zoom-5.3.465578.0920-r1.ebuild
 2009282139 ./net-im/zoom/zoom-5.3.469451.0927.ebuild
@@ -22460,7 +22414,7 @@
 2001051415 ./net-irc/hexchat/hexchat-9999.ebuild
 2006051039 ./net-irc/hexchat/hexchat-2.14.3.ebuild
 1709110046 ./net-irc/ii/ii-9999.ebuild
-2009272039 ./net-irc/ii/ii-1.8.ebuild
+2010091139 ./net-irc/ii/ii-1.8.ebuild
 2004091609 ./net-irc/inspircd/inspircd-3.4.0-r1.ebuild
 2005042039 ./net-irc/inspircd/inspircd-2.0.29.ebuild
 2008130139 ./net-irc/inspircd/inspircd-3.7.0.ebuild
@@ -22506,7 +22460,7 @@
 2009100039 ./net-irc/znc/znc-1.8.2.ebuild
 2009100039 ./net-irc/znc/znc-9999.ebuild
 2006250409 ./net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild
-2008290409 ./net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+2010091139 ./net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
 2008302209 ./net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
 2008302209 ./net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild
 2008302209 ./net-irc/znc-playback/znc-playback-20200510.ebuild
@@ -22539,14 +22493,16 @@
 2004202139 ./net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
 2004202139 ./net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
 2004202009 ./net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
-1801032209 ./net-libs/enet/enet-1.2.2-r1.ebuild
-2009050339 ./net-libs/enet/enet-1.3.13.ebuild
+2010101039 ./net-libs/enet/enet-1.2.2-r1.ebuild
+2010101039 ./net-libs/enet/enet-1.3.13.ebuild
+2010101039 ./net-libs/enet/enet-1.3.16.ebuild
 2009191439 ./net-libs/farstream/farstream-0.2.8-r2.ebuild
 1903300009 ./net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-1.0.8_p20190329.ebuild
 1903300009 ./net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild
 2006201709 ./net-libs/glib-networking/glib-networking-2.62.4.ebuild
 2009072139 ./net-libs/glib-networking/glib-networking-2.64.3.ebuild
 2009050339 ./net-libs/gloox/gloox-1.0.22.ebuild
+2010101039 ./net-libs/gloox/gloox-1.0.24.ebuild
 2004032241 ./net-libs/gnet/gnet-2.0.8-r2.ebuild
 2007190239 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
 2008302139 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
@@ -22634,8 +22590,7 @@
 2004032241 ./net-libs/libgssglue/libgssglue-0.4-r1.ebuild
 2006060309 ./net-libs/libhackrf/libhackrf-2018.01.1.ebuild
 2006060309 ./net-libs/libhackrf/libhackrf-9999.ebuild
-2005230009 ./net-libs/libhtp/libhtp-0.5.33.ebuild
-2009212339 ./net-libs/libhtp/libhtp-0.5.34.ebuild
+2010091509 ./net-libs/libhtp/libhtp-0.5.35.ebuild
 2008151509 ./net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
 2009082009 ./net-libs/libhubbub/libhubbub-0.3.6.ebuild
 2010071209 ./net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -22730,6 +22685,7 @@
 1911201539 ./net-libs/libprotoident/libprotoident-2.0.14_p1.ebuild
 2002151310 ./net-libs/libprotoident/libprotoident-2.0.12.ebuild
 2006132027 ./net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+2010111239 ./net-libs/libproxy/libproxy-0.4.15-r2.ebuild
 2010061839 ./net-libs/libpsl/libpsl-0.21.0.ebuild
 2010061839 ./net-libs/libpsl/libpsl-0.21.1.ebuild
 1708172003 ./net-libs/libqmi/libqmi-1.12.6.ebuild
@@ -22795,7 +22751,7 @@
 2006290939 ./net-libs/libvncserver/libvncserver-0.9.13.ebuild
 2001230639 ./net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
 2010070339 ./net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
-2010071939 ./net-libs/libwebsockets/libwebsockets-4.1.2.ebuild
+2010101709 ./net-libs/libwebsockets/libwebsockets-4.1.2.ebuild
 2007190239 ./net-libs/libzapojit/libzapojit-0.0.3.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -22808,7 +22764,7 @@
 2009130310 ./net-libs/mbedtls/mbedtls-2.16.8.ebuild
 2009130310 ./net-libs/mbedtls/mbedtls-2.24.0.ebuild
 2004032241 ./net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
-2003211239 ./net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
+2010102139 ./net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
 1908200909 ./net-libs/nDPI/nDPI-2.8.ebuild
 1912281339 ./net-libs/nDPI/nDPI-3.0-r1.ebuild
 2001281509 ./net-libs/nDPI/nDPI-3.0-r2.ebuild
@@ -22839,7 +22795,7 @@
 2010081039 ./net-libs/nodejs/nodejs-14.13.1.ebuild
 2010081039 ./net-libs/nodejs/nodejs-14.2.0.ebuild
 2010081039 ./net-libs/nodejs/nodejs-14.4.0.ebuild
-2010081039 ./net-libs/nodejs/nodejs-99999999.ebuild
+2010091239 ./net-libs/nodejs/nodejs-99999999.ebuild
 2008132139 ./net-libs/ntirpc/ntirpc-1.7.4.ebuild
 2008132139 ./net-libs/ntirpc/ntirpc-1.8.1.ebuild
 2008132139 ./net-libs/ntirpc/ntirpc-3.2.ebuild
@@ -22870,7 +22826,7 @@
 1811180709 ./net-libs/shairplay/shairplay-0_pre20180824.ebuild
 1811182309 ./net-libs/shairplay/shairplay-9999.ebuild
 2007150209 ./net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
-2010060739 ./net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+2010090239 ./net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
 1907282009 ./net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
 2006300939 ./net-libs/signond/signond-8.60-r2.ebuild
 2005091209 ./net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
@@ -22906,7 +22862,7 @@
 2007081009 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
 2008021509 ./net-libs/xrootd/xrootd-4.12.0.ebuild
 2009182109 ./net-libs/xrootd/xrootd-5.0.2.ebuild
-2010071039 ./net-libs/xrootd/xrootd-4.12.4.ebuild
+2010091439 ./net-libs/xrootd/xrootd-4.12.4.ebuild
 1912110241 ./net-libs/zeromq/zeromq-3.2.5.ebuild
 2004032241 ./net-libs/zeromq/zeromq-4.3.2.ebuild
 2005062039 ./net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -22920,8 +22876,8 @@
 2009241009 ./net-libs/libnma/libnma-1.8.30.ebuild
 2008300439 ./net-libs/libslirp/libslirp-4.3.1.ebuild
 2006251009 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
-2009182109 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
 2009182109 ./net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild
+2010091439 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
 2002230040 ./net-mail/altermime/altermime-0.3.11.ebuild
 1904081739 ./net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
 1910071209 ./net-mail/asmail/asmail-2.1-r1.ebuild
@@ -23166,8 +23122,8 @@
 2005242239 ./net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
 2002171209 ./net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild
 1909090909 ./net-misc/electrum/electrum-3.3.8.ebuild
-2007201209 ./net-misc/electrum/electrum-4.0.2.ebuild
 2009251039 ./net-misc/electrum/electrum-4.0.3-r1.ebuild
+2010091439 ./net-misc/electrum/electrum-4.0.2.ebuild
 2008081539 ./net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild
 2008081539 ./net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild
 2006212339 ./net-misc/endlessh/endlessh-1.1-r1.ebuild
@@ -23244,8 +23200,7 @@
 2008180039 ./net-misc/iperf/iperf-3.9.ebuild
 2008181439 ./net-misc/iperf/iperf-2.0.14a.ebuild
 2008181439 ./net-misc/iperf/iperf-2.99999.99999.ebuild
-1903110209 ./net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
-2008091909 ./net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+2010102239 ./net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
 2009030209 ./net-misc/iprange/iprange-1.0.4.ebuild
 2002081739 ./net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
 1801012010 ./net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
@@ -23307,9 +23262,9 @@
 2008042139 ./net-misc/mikutter/mikutter-9999.ebuild
 2004261539 ./net-misc/minidlna/minidlna-1.2.1-r1.ebuild
 2002230040 ./net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
-2009290539 ./net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
+2010102139 ./net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
 2005140939 ./net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
-2009290539 ./net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
+2010102139 ./net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
 2004032241 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
 1910261809 ./net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
 2004142009 ./net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -23347,14 +23302,9 @@
 1910051539 ./net-misc/netsed/netsed-0.01b-r1.ebuild
 2007201209 ./net-misc/netsed/netsed-1.3.ebuild
 1702282250 ./net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
-2004261139 ./net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild
-2006132027 ./net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
-2006132027 ./net-misc/networkmanager/networkmanager-1.18.6.ebuild
-2006132027 ./net-misc/networkmanager/networkmanager-1.20.12.ebuild
-2006132027 ./net-misc/networkmanager/networkmanager-1.22.14.ebuild
-2006132027 ./net-misc/networkmanager/networkmanager-1.24.2.ebuild
-2008221039 ./net-misc/networkmanager/networkmanager-1.26.2.ebuild
-2009241009 ./net-misc/networkmanager/networkmanager-1.26.0.ebuild
+2010082239 ./net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
+2010090709 ./net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
+2010090709 ./net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
 2008201009 ./net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild
 2008300439 ./net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
 2009030009 ./net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
@@ -23422,7 +23372,6 @@
 2009092239 ./net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild
 2009092239 ./net-misc/proxytunnel/proxytunnel-9999.ebuild
 2009201709 ./net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
-2002092009 ./net-misc/pssh/pssh-2.3.1-r2.ebuild
 1702282250 ./net-misc/ptpd/ptpd-2.3.1-r1.ebuild
 1809162309 ./net-misc/ptpd/ptpd-2.3.1-r2.ebuild
 1705171647 ./net-misc/puf/puf-1.0.0-r1.ebuild
@@ -23444,8 +23393,7 @@
 2008081539 ./net-misc/r8168/r8168-8.048.00-r1.ebuild
 2008081539 ./net-misc/r8168/r8168-8.048.02-r1.ebuild
 2008081639 ./net-misc/r8168/r8168-8.048.03-r1.ebuild
-2008181439 ./net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
-2010071039 ./net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
+2010091139 ./net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
 2002222009 ./net-misc/radvd/radvd-2.14.ebuild
 2002222009 ./net-misc/radvd/radvd-2.17-r1.ebuild
 2002222009 ./net-misc/radvd/radvd-2.17-r2.ebuild
@@ -23467,7 +23415,6 @@
 2009071209 ./net-misc/remmina/remmina-1.4.8.ebuild
 2010071039 ./net-misc/remmina/remmina-1.4.8-r1.ebuild
 1908151909 ./net-misc/rinetd/rinetd-0.62-r2.ebuild
-2006041239 ./net-misc/ris-linux/ris-linux-0.4-r1.ebuild
 2009181409 ./net-misc/rsync/rsync-3.2.3.ebuild
 2009181409 ./net-misc/rsync/rsync-9999.ebuild
 1702282250 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
@@ -23479,6 +23426,7 @@
 1810090339 ./net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
 1906221109 ./net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
 1911290109 ./net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
+2010112109 ./net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
 2002112051 ./net-misc/samplicator/samplicator-1.3.6.ebuild
 2002112051 ./net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
 1911191939 ./net-misc/scponly/scponly-4.8-r6.ebuild
@@ -23497,8 +23445,7 @@
 1912111540 ./net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
 1810201509 ./net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
 1912110241 ./net-misc/sks/sks-1.1.6-r2.ebuild
-1912110241 ./net-misc/sks/sks-1.1.6-r4.ebuild
-1912110241 ./net-misc/sks/sks-1.1.6-r5.ebuild
+2010090209 ./net-misc/sks/sks-1.1.6_p20200624.ebuild
 2006290009 ./net-misc/smb4k/smb4k-3.0.6.ebuild
 1906040809 ./net-misc/smbc/smbc-1.2.2-r3.ebuild
 2002112051 ./net-misc/snarf/snarf-7.0-r4.ebuild
@@ -23590,7 +23537,7 @@
 2004201339 ./net-misc/whois/whois-9999.ebuild
 2009181139 ./net-misc/whois/whois-5.5.6-r1.ebuild
 2010041439 ./net-misc/whois/whois-5.5.7.ebuild
-2008280009 ./net-misc/wol/wol-0.7.1-r2.ebuild
+2010112339 ./net-misc/wol/wol-0.7.1-r2.ebuild
 1804170039 ./net-misc/wput/wput-0.6.1-r1.ebuild
 2001292109 ./net-misc/wput/wput-0.6.2.ebuild
 2006181539 ./net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -23618,8 +23565,7 @@
 2004131109 ./net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0.ebuild
 2010072009 ./net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
 2010072009 ./net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
-2008232139 ./net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
-2010071039 ./net-misc/sntpd/sntpd-3.0-r1.ebuild
+2010091139 ./net-misc/sntpd/sntpd-3.0-r1.ebuild
 2010051809 ./net-misc/croc/croc-8.4.0.ebuild
 2008291539 ./net-nds/adtool/adtool-1.3.3-r1.ebuild
 2004032241 ./net-nds/gssproxy/gssproxy-0.8.2.ebuild
@@ -23630,8 +23576,8 @@
 1805091839 ./net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
 1911091712 ./net-nds/led/led-1.111.ebuild
 2006291539 ./net-nds/nsscache/nsscache-0.39.ebuild
-2008262209 ./net-nds/openldap/openldap-2.4.50.ebuild
-2009111209 ./net-nds/openldap/openldap-2.4.53.ebuild
+2010091909 ./net-nds/openldap/openldap-2.4.50.ebuild
+2010091909 ./net-nds/openldap/openldap-2.4.53.ebuild
 1912052009 ./net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild
 2003261841 ./net-nds/rpcbind/rpcbind-9999.ebuild
 2004032241 ./net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -23715,9 +23661,8 @@
 2008161009 ./net-p2p/freenet/freenet-0.7.5_p1486.ebuild
 1907151840 ./net-p2p/gnut/gnut-0.4.28-r1.ebuild
 2006132239 ./net-p2p/go-ethereum/go-ethereum-1.9.15.ebuild
-1903110209 ./net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.19.ebuild
-1904191439 ./net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild
 1909281009 ./net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
+2010101039 ./net-p2p/go-ipfs-bin/go-ipfs-bin-0.7.0.ebuild
 2003031809 ./net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
 2008211209 ./net-p2p/gtk-gnutella/gtk-gnutella-1.2.0.ebuild
 1910111911 ./net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild
@@ -23862,7 +23807,7 @@
 2007302139 ./net-proxy/hatop/hatop-0.8.0.ebuild
 1702282250 ./net-proxy/havp/havp-0.92a-r2.ebuild
 2008020739 ./net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
-2009030209 ./net-proxy/mitmproxy/mitmproxy-5.2.ebuild
+2010091039 ./net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.2.4.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.3.0.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
@@ -23907,7 +23852,7 @@
 1907141109 ./net-voip/yate/yate-6.1.0.ebuild
 1802110038 ./net-voip/yate/yate-9999.ebuild
 2006172009 ./net-vpn/6tunnel/6tunnel-0.12.ebuild
-2010071209 ./net-vpn/6tunnel/6tunnel-0.13.ebuild
+2010091209 ./net-vpn/6tunnel/6tunnel-0.13.ebuild
 1805270804 ./net-vpn/badvpn/badvpn-1.999.127.ebuild
 1805270804 ./net-vpn/badvpn/badvpn-1.999.129.ebuild
 1703171656 ./net-vpn/badvpn/badvpn-1.999.130.ebuild
@@ -23961,7 +23906,7 @@
 1703171656 ./net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
 1908230109 ./net-vpn/vtun/vtun-3.0.3-r1.ebuild
 1703171738 ./net-vpn/vtun/vtun-3.0.3.ebuild
-2009081939 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
+2010091139 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
 2008061839 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
 2009081939 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200827.ebuild
 2002271709 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.0.ebuild
@@ -23974,7 +23919,7 @@
 2001280039 ./net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
 2002142309 ./net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
 2007230539 ./net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
-2010031809 ./net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+2010091209 ./net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
 1912040339 ./net-wireless/airspy/airspy-1.0.9.ebuild
 1912040339 ./net-wireless/airspy/airspy-9999.ebuild
 2002230040 ./net-wireless/airtraf/airtraf-1.1-r3.ebuild
@@ -24005,8 +23950,6 @@
 2006020009 ./net-wireless/dump1090/dump1090-3.7.2.ebuild
 2006020009 ./net-wireless/dump1090/dump1090-9999.ebuild
 2004202139 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild
-2009181339 ./net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
-2009181339 ./net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
 2009181339 ./net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
 2009181339 ./net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
 2009181339 ./net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -24019,20 +23962,15 @@
 2002091942 ./net-wireless/gr-baz/gr-baz-9999.ebuild
 2002091942 ./net-wireless/gr-doa/gr-doa-9999.ebuild
 2002091942 ./net-wireless/gr-foo/gr-foo-9999.ebuild
-2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
 2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
 2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
-2006020009 ./net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
 2006022109 ./net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
 2006022109 ./net-wireless/gr-iio/gr-iio-9999.ebuild
-2006020009 ./net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
 2009212109 ./net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
 2009212109 ./net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
-2006020009 ./net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
 2006020009 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
 2009041939 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
 2009041939 ./net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
-2006020009 ./net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
 2006020009 ./net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
 2006020009 ./net-wireless/gr-paint/gr-paint-9999.ebuild
 2008300539 ./net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
@@ -24048,7 +23986,7 @@
 2006041239 ./net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
 2004220139 ./net-wireless/hostapd/hostapd-9999.ebuild
 2009272009 ./net-wireless/hostapd/hostapd-2.9-r1.ebuild
-2010032009 ./net-wireless/hostapd/hostapd-2.9-r3.ebuild
+2010091209 ./net-wireless/hostapd/hostapd-2.9-r3.ebuild
 2006221739 ./net-wireless/inspectrum/inspectrum-0.2.2.ebuild
 2006221739 ./net-wireless/inspectrum/inspectrum-9999.ebuild
 2003261841 ./net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
@@ -24072,11 +24010,10 @@
 1910111911 ./net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
 1910111911 ./net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
 2002142309 ./net-wireless/lorcon/lorcon-9999.ebuild
-2010071039 ./net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
+2010091139 ./net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
 1708061641 ./net-wireless/madwimax/madwimax-0.1.1-r1.ebuild
 2002112051 ./net-wireless/mdk/mdk-3.6-r1.ebuild
 2007020109 ./net-wireless/mfoc/mfoc-0.10.7-r1.ebuild
-2002091942 ./net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
 2010062009 ./net-wireless/nanovna-saver/nanovna-saver-0.3.7-r1.ebuild
 2010062009 ./net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
 1910052209 ./net-wireless/neard/neard-0.15-r1.ebuild
@@ -24088,7 +24025,6 @@
 1806052039 ./net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
 1905080439 ./net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild
 1808172339 ./net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild
-2004032241 ./net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
 1902042109 ./net-wireless/qradiolink/qradiolink-9999.ebuild
 2002112051 ./net-wireless/reaver/reaver-1.6.5.ebuild
 1710231547 ./net-wireless/rfkill/rfkill-0.5-r3.ebuild
@@ -24378,8 +24314,8 @@
 1702282250 ./sci-astronomy/sofa_c/sofa_c-20150209a.ebuild
 1702282250 ./sci-astronomy/sofa_c/sofa_c-20160503c.ebuild
 1707070031 ./sci-astronomy/sofa_c/sofa_c-20170420.ebuild
-2006290009 ./sci-astronomy/stellarium/stellarium-0.20.1.ebuild
 2009181139 ./sci-astronomy/stellarium/stellarium-0.20.2.ebuild
+2010101039 ./sci-astronomy/stellarium/stellarium-0.20.3.ebuild
 2002230040 ./sci-astronomy/stiff/stiff-2.4.0.ebuild
 2010040239 ./sci-astronomy/stuff/stuff-1.26.0.ebuild
 2002230040 ./sci-astronomy/swarp/swarp-2.38.0.ebuild
@@ -24396,7 +24332,6 @@
 1806091739 ./sci-biology/aaindex/aaindex-9.1-r1.ebuild
 2006212009 ./sci-biology/abyss/abyss-2.0.3-r2.ebuild
 1702282250 ./sci-biology/amap/amap-2.2-r3.ebuild
-1803032108 ./sci-biology/amos/amos-3.1.0-r4.ebuild
 1912110309 ./sci-biology/augustus/augustus-2.5.5.ebuild
 2001052109 ./sci-biology/bamtools/bamtools-2.5.1.ebuild
 2001052109 ./sci-biology/bamtools/bamtools-9999.ebuild
@@ -24436,7 +24371,6 @@
 1702282250 ./sci-biology/embassy-esim4/embassy-esim4-1.0.0.660.ebuild
 1702282250 ./sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660.ebuild
 1702282250 ./sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660.ebuild
-1702282250 ./sci-biology/embassy-meme/embassy-meme-4.7.660.ebuild
 1702282250 ./sci-biology/embassy-mse/embassy-mse-3.0.0.660.ebuild
 1912281709 ./sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.ebuild
 1702282250 ./sci-biology/embassy-signature/embassy-signature-0.1.660.ebuild
@@ -24475,7 +24409,6 @@
 1702282250 ./sci-biology/maq/maq-0.7.1-r2.ebuild
 1702282250 ./sci-biology/maqview/maqview-0.2.5-r3.ebuild
 2006211709 ./sci-biology/mcl/mcl-14.137.ebuild
-1702282250 ./sci-biology/meme/meme-4.11.2_p2.ebuild
 1912111540 ./sci-biology/mira/mira-4.0.2.ebuild
 1712242109 ./sci-biology/mosaik/mosaik-2.2.30.ebuild
 1805212239 ./sci-biology/mothur/mothur-1.27.0-r1.ebuild
@@ -24530,7 +24463,6 @@
 1702282250 ./sci-biology/seaview/seaview-4.6.ebuild
 2009091409 ./sci-biology/seqan/seqan-2.4.0.ebuild
 2009091409 ./sci-biology/seqan/seqan-9999.ebuild
-1702282250 ./sci-biology/shrimp/shrimp-2.2.3.ebuild
 1702282250 ./sci-biology/sibsim4/sibsim4-0.20.ebuild
 1910051539 ./sci-biology/sim4/sim4-20030921-r2.ebuild
 1908171439 ./sci-biology/stride/stride-20011129-r1.ebuild
@@ -24546,7 +24478,6 @@
 1702282250 ./sci-biology/update-blastdb/update-blastdb-12.0.0.ebuild
 1907151840 ./sci-biology/vcftools/vcftools-0.1.14.ebuild
 1805212239 ./sci-biology/velvet/velvet-1.2.10.ebuild
-1702282250 ./sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild
 2006212109 ./sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild
 1712100310 ./sci-biology/wise/wise-2.4.0_alpha.ebuild
 1702282250 ./sci-biology/yass/yass-1.14-r2.ebuild
@@ -24609,6 +24540,7 @@
 2007091809 ./sci-chemistry/gromacs/gromacs-2020.3.ebuild
 2007091809 ./sci-chemistry/gromacs/gromacs-2020.9999.ebuild
 2007091809 ./sci-chemistry/gromacs/gromacs-9999.ebuild
+2010100039 ./sci-chemistry/gromacs/gromacs-2020.4.ebuild
 2009162339 ./sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
 2009162339 ./sci-chemistry/mars/mars-1.2.ebuild
 2009181339 ./sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild
@@ -24716,21 +24648,22 @@
 2006181539 ./sci-electronics/iverilog/iverilog-10.3-r1.ebuild
 2006290939 ./sci-electronics/iverilog/iverilog-10.3.ebuild
 2009142209 ./sci-electronics/iverilog/iverilog-10.3-r2.ebuild
-2009142139 ./sci-electronics/iverilog/iverilog-9999.ebuild
-2001070009 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.5.ebuild
+2010111239 ./sci-electronics/iverilog/iverilog-11.0.ebuild
+2010111239 ./sci-electronics/iverilog/iverilog-9999.ebuild
 2006062109 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild
-2001070009 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild
+2010111239 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
 2006062109 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild
-1912172139 ./sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild
+2010111239 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
 2006062109 ./sci-electronics/kicad-meta/kicad-meta-5.1.6.ebuild
-2001070009 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.ebuild
+2010111239 ./sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
 2006062109 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild
-2001070009 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.5.ebuild
+2010111239 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
 2006062109 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild
-2001070009 ./sci-electronics/kicad-templates/kicad-templates-5.1.5.ebuild
+2010111239 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
 2006062109 ./sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild
-2009071209 ./sci-electronics/kicad/kicad-5.1.5-r2.ebuild
-2009071209 ./sci-electronics/kicad/kicad-5.1.6.ebuild
+2010111239 ./sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
+2010111239 ./sci-electronics/kicad/kicad-5.1.6.ebuild
+2010111239 ./sci-electronics/kicad/kicad-5.1.7.ebuild
 2009200209 ./sci-electronics/klayout/klayout-0.26.5.ebuild
 2009291239 ./sci-electronics/klayout/klayout-0.26.8.ebuild
 2009291239 ./sci-electronics/klayout/klayout-9999.ebuild
@@ -24748,9 +24681,8 @@
 1904200439 ./sci-electronics/puff/puff-20100127-r1.ebuild
 2007062139 ./sci-electronics/pulseview/pulseview-0.4.2.ebuild
 2007062139 ./sci-electronics/pulseview/pulseview-9999.ebuild
-2005212239 ./sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
 2008091139 ./sci-electronics/qelectrotech/qelectrotech-9999.ebuild
-2010042009 ./sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
+2010091209 ./sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
 1911081009 ./sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
 1911081009 ./sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
 2002092009 ./sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
@@ -24776,6 +24708,7 @@
 2006040939 ./sci-geosciences/gmt/gmt-5.4.4.ebuild
 2001271309 ./sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild
 2008302139 ./sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild
+2010120039 ./sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild
 2005210239 ./sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
 2005211409 ./sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
 1906291209 ./sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
@@ -24874,8 +24807,6 @@
 2002171539 ./sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
 2007161939 ./sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
 2010041839 ./sci-geosciences/grass/grass-7.8.3.ebuild
-2001290039 ./sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
-2008221339 ./sci-libs/Rtree/Rtree-0.9.4.ebuild
 2009191939 ./sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
 2009290009 ./sci-libs/Shapely/Shapely-1.7.0.ebuild
 2008311239 ./sci-libs/ViSP/ViSP-3.3.0.ebuild
@@ -24911,7 +24842,7 @@
 1702282250 ./sci-libs/buddy/buddy-2.4-r1.ebuild
 2009230039 ./sci-libs/camd/camd-2.4.6.ebuild
 2003051539 ./sci-libs/cantera/cantera-2.4.0-r4.ebuild
-2005052009 ./sci-libs/cantera/cantera-2.4.0-r5.ebuild
+2010091839 ./sci-libs/cantera/cantera-2.4.0-r5.ebuild
 2002230040 ./sci-libs/cbflib/cbflib-0.9.3.3.ebuild
 1910111911 ./sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
 1910111911 ./sci-libs/cblas-reference/cblas-reference-20161223.ebuild
@@ -24969,10 +24900,10 @@
 1912110241 ./sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
 2005081846 ./sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild
 2005081846 ./sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
-2008232009 ./sci-libs/colamd/colamd-2.9.6.ebuild
+2010091709 ./sci-libs/colamd/colamd-2.9.6.ebuild
 2002151310 ./sci-libs/colpack/colpack-1.0.10.ebuild
 1702282250 ./sci-libs/cqrlib/cqrlib-1.1.3.ebuild
-2007191909 ./sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+2010091709 ./sci-libs/cxsparse/cxsparse-3.2.0.ebuild
 1906221639 ./sci-libs/dcmtk/dcmtk-3.6.3.ebuild
 1908091939 ./sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild
 2001052109 ./sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -25163,7 +25094,7 @@
 2007152009 ./sci-libs/octomap/octomap-1.9.5.ebuild
 2004132009 ./sci-libs/ogdi/ogdi-4.1.0.ebuild
 2006251009 ./sci-libs/openblas/openblas-0.3.9-r1.ebuild
-2009190239 ./sci-libs/openblas/openblas-0.3.10.ebuild
+2010081739 ./sci-libs/openblas/openblas-0.3.10.ebuild
 2004271809 ./sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
 1704221903 ./sci-libs/openlibm/openlibm-0.5.4.ebuild
 2004030639 ./sci-libs/openlibm/openlibm-0.7.0.ebuild
@@ -25221,8 +25152,8 @@
 1907161639 ./sci-libs/sundials/sundials-4.1.0.ebuild
 1912241809 ./sci-libs/sundials/sundials-5.0.0.ebuild
 2003051539 ./sci-libs/sundials/sundials-5.1.0.ebuild
-2005052009 ./sci-libs/sundials/sundials-5.2.0.ebuild
 2006060339 ./sci-libs/sundials/sundials-3.2.1.ebuild
+2010091839 ./sci-libs/sundials/sundials-5.2.0.ebuild
 1912110241 ./sci-libs/superlu/superlu-5.2.1-r1.ebuild
 2002112051 ./sci-libs/superlu/superlu-4.3-r1.ebuild
 2001141809 ./sci-libs/superlu_mt/superlu_mt-3.1.ebuild
@@ -25234,9 +25165,11 @@
 2004070639 ./sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild
 2006080809 ./sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild
 2009251539 ./sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r2.ebuild
+2010090709 ./sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
 2004070639 ./sci-libs/tensorflow/tensorflow-2.1.0.ebuild
 2008300339 ./sci-libs/tensorflow/tensorflow-2.2.0-r1.ebuild
 2009252139 ./sci-libs/tensorflow/tensorflow-2.2.0-r2.ebuild
+2010090709 ./sci-libs/tensorflow/tensorflow-2.3.1.ebuild
 2006111539 ./sci-libs/tnt/tnt-3.0.12.ebuild
 1908130939 ./sci-libs/trilinos/trilinos-12.14.1.ebuild
 2006102109 ./sci-libs/trilinos/trilinos-12.18.1.ebuild
@@ -25282,15 +25215,13 @@
 2008142139 ./sci-libs/volk/volk-2.3.0-r2.ebuild
 2008130009 ./sci-libs/libhomfly/libhomfly-1.02.6.ebuild
 2010051809 ./sci-libs/libecpint/libecpint-1.0.2.ebuild
+2010111909 ./sci-libs/rtree/rtree-0.9.4.ebuild
 1805271108 ./sci-mathematics/4ti2/4ti2-1.6.7.ebuild
 2002140110 ./sci-mathematics/4ti2/4ti2-1.6.2.ebuild
 2002140110 ./sci-mathematics/4ti2/4ti2-1.6.6.ebuild
 2005172009 ./sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
 2005172009 ./sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild
-2005172009 ./sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
 2005172009 ./sci-mathematics/agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild
-2005172009 ./sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
-2005172009 ./sci-mathematics/agda/agda-2.5.2-r1.ebuild
 2005172009 ./sci-mathematics/agda/agda-2.5.2-r2.ebuild
 1909120939 ./sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
 2005270909 ./sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
@@ -25438,7 +25369,6 @@
 2002112051 ./sci-misc/fitsverify/fitsverify-4.17.ebuild
 2002112051 ./sci-misc/fitsverify/fitsverify-4.18.ebuild
 1702282250 ./sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
-1702282250 ./sci-misc/gato/gato-1.2.2.ebuild
 1908270609 ./sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
 1702282250 ./sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
 1802192308 ./sci-misc/lttoolbox/lttoolbox-3.3.3.ebuild
@@ -25456,6 +25386,7 @@
 2009251539 ./sci-misc/vitables/vitables-3.0.0-r2.ebuild
 2008231639 ./sci-physics/bullet/bullet-2.86.ebuild
 2009272339 ./sci-physics/bullet/bullet-2.89.ebuild
+2010101039 ./sci-physics/bullet/bullet-3.05.ebuild
 1702282250 ./sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
 1702282250 ./sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r4.ebuild
 1702282250 ./sci-physics/cernlib/cernlib-2006-r5.ebuild
@@ -25513,7 +25444,6 @@
 2009181339 ./sci-physics/qmeq/qmeq-1.0-r1.ebuild
 2009201309 ./sci-physics/qmeq/qmeq-1.0_p202004.ebuild
 1712191709 ./sci-physics/reduze/reduze-2.2.ebuild
-2003012209 ./sci-physics/rivet/rivet-2.6.0-r2.ebuild
 2009161309 ./sci-physics/root/root-6.18.04-r3.ebuild
 2009161309 ./sci-physics/root/root-6.20.06.ebuild
 2009161309 ./sci-physics/root/root-6.20.08.ebuild
@@ -25523,9 +25453,9 @@
 1901010239 ./sci-physics/sassena/sassena-1.4.2.ebuild
 1702282250 ./sci-physics/siscone/siscone-2.0.6.ebuild
 1702282250 ./sci-physics/siscone/siscone-3.0.3.ebuild
-1912210209 ./sci-physics/thepeg/thepeg-1.9.2.ebuild
-1912210209 ./sci-physics/thepeg/thepeg-2.0.0.ebuild
-1912210209 ./sci-physics/thepeg/thepeg-2.0.4.ebuild
+2010091139 ./sci-physics/thepeg/thepeg-1.9.2.ebuild
+2010091139 ./sci-physics/thepeg/thepeg-2.0.0.ebuild
+2010091139 ./sci-physics/thepeg/thepeg-2.0.4.ebuild
 2009171109 ./sci-physics/vgm/vgm-4.5.ebuild
 2009171109 ./sci-physics/vgm/vgm-4.8.ebuild
 2009171109 ./sci-physics/vgm/vgm-9999.ebuild
@@ -25552,7 +25482,7 @@
 2005172009 ./sci-visualization/grace/grace-5.1.25_p7.ebuild
 1912210209 ./sci-visualization/gri/gri-2.12.23-r1.ebuild
 2003091209 ./sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
-2006301409 ./sci-visualization/gwyddion/gwyddion-2.56.ebuild
+2010092309 ./sci-visualization/gwyddion/gwyddion-2.56.ebuild
 1809052109 ./sci-visualization/kst/kst-2.0.8.ebuild
 1911202009 ./sci-visualization/labplot/labplot-2.7.0.ebuild
 1911202009 ./sci-visualization/labplot/labplot-9999.ebuild
@@ -25571,6 +25501,7 @@
 2009181339 ./sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild
 2009181339 ./sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
 2009251539 ./sci-visualization/tensorboard/tensorboard-2.2.1-r1.ebuild
+2010090709 ./sci-visualization/tensorboard/tensorboard-2.3.0.ebuild
 2009180209 ./sci-visualization/veusz/veusz-3.1.ebuild
 2009180209 ./sci-visualization/veusz/veusz-3.2.ebuild
 1702282250 ./sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
@@ -25580,776 +25511,777 @@
 2007020109 ./sci-visualization/gr/gr-0.50.0-r1.ebuild
 1904041409 ./sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
 2003191139 ./sec-policy/apparmor-profiles/apparmor-profiles-2.13.4.ebuild
+2010101309 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
 1804251509 ./sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
 2002151740 ./sec-policy/selinux-abrt/selinux-abrt-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
 2002151740 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-acct/selinux-acct-9999.ebuild
 2002151740 ./sec-policy/selinux-acct/selinux-acct-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ada/selinux-ada-9999.ebuild
 2002151740 ./sec-policy/selinux-ada/selinux-ada-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-afs/selinux-afs-9999.ebuild
 2002151740 ./sec-policy/selinux-afs/selinux-afs-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-aide/selinux-aide-9999.ebuild
 2002151740 ./sec-policy/selinux-aide/selinux-aide-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
 2002151740 ./sec-policy/selinux-alsa/selinux-alsa-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
 2002151740 ./sec-policy/selinux-amanda/selinux-amanda-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
 2002151740 ./sec-policy/selinux-amavis/selinux-amavis-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-android/selinux-android-9999.ebuild
 2002151740 ./sec-policy/selinux-android/selinux-android-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-apache/selinux-apache-9999.ebuild
 2002151740 ./sec-policy/selinux-apache/selinux-apache-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
 2002151740 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-apm/selinux-apm-9999.ebuild
 2002151740 ./sec-policy/selinux-apm/selinux-apm-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
 2002151740 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
 2002151740 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-at/selinux-at-9999.ebuild
 2002151740 ./sec-policy/selinux-at/selinux-at-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-automount/selinux-automount-9999.ebuild
 2002151740 ./sec-policy/selinux-automount/selinux-automount-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
 2002151740 ./sec-policy/selinux-avahi/selinux-avahi-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
 2002151740 ./sec-policy/selinux-awstats/selinux-awstats-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-backup/selinux-backup-9999.ebuild
 2002151740 ./sec-policy/selinux-backup/selinux-backup-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
 2002151740 ./sec-policy/selinux-bacula/selinux-bacula-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
 1912211739 ./sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
 2002151740 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
 1912211739 ./sec-policy/selinux-base/selinux-base-9999.ebuild
 2002151740 ./sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-bind/selinux-bind-9999.ebuild
 2002151740 ./sec-policy/selinux-bind/selinux-bind-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
 2002151740 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
 2002151740 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
 2002151740 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
 2002151740 ./sec-policy/selinux-brctl/selinux-brctl-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
 2002151740 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
 2002151740 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-canna/selinux-canna-9999.ebuild
 2002151740 ./sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
 2002151740 ./sec-policy/selinux-ccs/selinux-ccs-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
 2002151740 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
 2002151740 ./sec-policy/selinux-ceph/selinux-ceph-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
 2002151740 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
 2002151740 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
 2002151740 ./sec-policy/selinux-chromium/selinux-chromium-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
 2002151740 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
 2002151740 ./sec-policy/selinux-clamav/selinux-clamav-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
 2002151740 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
 2002151740 ./sec-policy/selinux-collectd/selinux-collectd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
 2002151740 ./sec-policy/selinux-corosync/selinux-corosync-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
 2002151740 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-courier/selinux-courier-9999.ebuild
 2002151740 ./sec-policy/selinux-courier/selinux-courier-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
 2002151740 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
 2002151740 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cups/selinux-cups-9999.ebuild
 2002151740 ./sec-policy/selinux-cups/selinux-cups-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
 2002151740 ./sec-policy/selinux-cvs/selinux-cvs-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
 2002151740 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
 2002151740 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dante/selinux-dante-9999.ebuild
 2002151740 ./sec-policy/selinux-dante/selinux-dante-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
 2002151740 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
 2002151740 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
 2002151740 ./sec-policy/selinux-dbus/selinux-dbus-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
 2002151740 ./sec-policy/selinux-dcc/selinux-dcc-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
 2002151740 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
 2002151740 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
 2002151740 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
 2002151740 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
 2002151740 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
 2002151740 ./sec-policy/selinux-dictd/selinux-dictd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
 2002151740 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
 2002151740 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
 2002151740 ./sec-policy/selinux-distcc/selinux-distcc-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
 2002151740 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
 2002151740 ./sec-policy/selinux-dkim/selinux-dkim-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
 2002151740 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
 2002151740 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
 2002151740 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
 2002151740 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
 2002151740 ./sec-policy/selinux-dracut/selinux-dracut-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
 2002151740 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
 2002151740 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
 2002151740 ./sec-policy/selinux-evolution/selinux-evolution-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-exim/selinux-exim-9999.ebuild
 2002151740 ./sec-policy/selinux-exim/selinux-exim-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
 2002151740 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
 2002151740 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-finger/selinux-finger-9999.ebuild
 2002151740 ./sec-policy/selinux-finger/selinux-finger-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-flash/selinux-flash-9999.ebuild
 2002151740 ./sec-policy/selinux-flash/selinux-flash-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
 2002151740 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
 2002151740 ./sec-policy/selinux-ftp/selinux-ftp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-games/selinux-games-9999.ebuild
 2002151740 ./sec-policy/selinux-games/selinux-games-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
 2002151740 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-git/selinux-git-9999.ebuild
 2002151740 ./sec-policy/selinux-git/selinux-git-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
 2002151740 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
 2002151740 ./sec-policy/selinux-gnome/selinux-gnome-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
 2002151740 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
 2002151740 ./sec-policy/selinux-gorg/selinux-gorg-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
 2002151740 ./sec-policy/selinux-gpg/selinux-gpg-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
 2002151740 ./sec-policy/selinux-gpm/selinux-gpm-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
 2002151740 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
 2002151740 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
 2002151740 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-howl/selinux-howl-9999.ebuild
 2002151740 ./sec-policy/selinux-howl/selinux-howl-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
 2002151740 ./sec-policy/selinux-icecast/selinux-icecast-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
 2002151740 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
 2002151740 ./sec-policy/selinux-imaze/selinux-imaze-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
 2002151740 ./sec-policy/selinux-inetd/selinux-inetd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-inn/selinux-inn-9999.ebuild
 2002151740 ./sec-policy/selinux-inn/selinux-inn-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
 2002151740 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-irc/selinux-irc-9999.ebuild
 2002151740 ./sec-policy/selinux-irc/selinux-irc-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
 2002151740 ./sec-policy/selinux-ircd/selinux-ircd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
 2002151740 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
 2002151740 ./sec-policy/selinux-jabber/selinux-jabber-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-java/selinux-java-9999.ebuild
 2002151740 ./sec-policy/selinux-java/selinux-java-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
 2002151740 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
 2002151740 ./sec-policy/selinux-kdump/selinux-kdump-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
 2002151740 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
 2002151740 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
 2002151740 ./sec-policy/selinux-kismet/selinux-kismet-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
 2002151740 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
 2002151740 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
 2002151740 ./sec-policy/selinux-ldap/selinux-ldap-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-links/selinux-links-9999.ebuild
 2002151740 ./sec-policy/selinux-links/selinux-links-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
 2002151740 ./sec-policy/selinux-lircd/selinux-lircd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
 2002151740 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
 2002151740 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
 2002151740 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
 2002151740 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
 2002151740 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
 2002151740 ./sec-policy/selinux-lpd/selinux-lpd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
 2002151740 ./sec-policy/selinux-mailman/selinux-mailman-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
 2002151740 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
 2002151740 ./sec-policy/selinux-mandb/selinux-mandb-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
 2002151740 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
 2002151740 ./sec-policy/selinux-memcached/selinux-memcached-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-milter/selinux-milter-9999.ebuild
 2002151740 ./sec-policy/selinux-milter/selinux-milter-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
 2002151740 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mono/selinux-mono-9999.ebuild
 2002151740 ./sec-policy/selinux-mono/selinux-mono-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
 2002151740 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
 2002151740 ./sec-policy/selinux-mpd/selinux-mpd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
 2002151740 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
 2002151740 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-munin/selinux-munin-9999.ebuild
 2002151740 ./sec-policy/selinux-munin/selinux-munin-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
 2002151740 ./sec-policy/selinux-mutt/selinux-mutt-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
 2002151740 ./sec-policy/selinux-mysql/selinux-mysql-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
 2002151740 ./sec-policy/selinux-nagios/selinux-nagios-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
 2002151740 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
 2002151740 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
 2002151740 ./sec-policy/selinux-nginx/selinux-nginx-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
 2002151740 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
 2002151740 ./sec-policy/selinux-ntop/selinux-ntop-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
 2002151740 ./sec-policy/selinux-ntp/selinux-ntp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-nut/selinux-nut-9999.ebuild
 2002151740 ./sec-policy/selinux-nut/selinux-nut-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-nx/selinux-nx-9999.ebuild
 2002151740 ./sec-policy/selinux-nx/selinux-nx-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
 2002151740 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-oident/selinux-oident-9999.ebuild
 2002151740 ./sec-policy/selinux-oident/selinux-oident-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-openct/selinux-openct-9999.ebuild
 2002151740 ./sec-policy/selinux-openct/selinux-openct-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
 2002151740 ./sec-policy/selinux-openrc/selinux-openrc-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
 2002151740 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-pan/selinux-pan-9999.ebuild
 2002151740 ./sec-policy/selinux-pan/selinux-pan-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
 2002151740 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
 2002151740 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
 2002151740 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
 2002151740 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
 2002151740 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
 2002151740 ./sec-policy/selinux-policykit/selinux-policykit-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
 2002151740 ./sec-policy/selinux-portmap/selinux-portmap-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
 2002151740 ./sec-policy/selinux-postfix/selinux-postfix-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
 2002151740 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
 2002151740 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
 2002151740 ./sec-policy/selinux-ppp/selinux-ppp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
 2002151740 ./sec-policy/selinux-prelink/selinux-prelink-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
 2002151740 ./sec-policy/selinux-prelude/selinux-prelude-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
 2002151740 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
 2002151740 ./sec-policy/selinux-procmail/selinux-procmail-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-psad/selinux-psad-9999.ebuild
 2002151740 ./sec-policy/selinux-psad/selinux-psad-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
 2002151740 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
 2002151740 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
 2002151740 ./sec-policy/selinux-puppet/selinux-puppet-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
 2002151740 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
 2002151740 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
 2002151740 ./sec-policy/selinux-qemu/selinux-qemu-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
 2002151740 ./sec-policy/selinux-qmail/selinux-qmail-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-quota/selinux-quota-9999.ebuild
 2002151740 ./sec-policy/selinux-quota/selinux-quota-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-radius/selinux-radius-9999.ebuild
 2002151740 ./sec-policy/selinux-radius/selinux-radius-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
 2002151740 ./sec-policy/selinux-radvd/selinux-radvd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-razor/selinux-razor-9999.ebuild
 2002151740 ./sec-policy/selinux-razor/selinux-razor-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
 1805110608 ./sec-policy/selinux-redis/selinux-redis-9999.ebuild
 2002151740 ./sec-policy/selinux-redis/selinux-redis-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
 2002151740 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
 2002151740 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
 2002151740 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
 2002151740 ./sec-policy/selinux-rngd/selinux-rngd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
 2002151740 ./sec-policy/selinux-roundup/selinux-roundup-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
 2002151740 ./sec-policy/selinux-rpc/selinux-rpc-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
 2002151740 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
 2002151740 ./sec-policy/selinux-rpm/selinux-rpm-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
 2002151740 ./sec-policy/selinux-rssh/selinux-rssh-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
 2002151740 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
 2002151740 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-salt/selinux-salt-9999.ebuild
 2002151740 ./sec-policy/selinux-salt/selinux-salt-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-samba/selinux-samba-9999.ebuild
 2002151740 ./sec-policy/selinux-samba/selinux-samba-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
 2002151740 ./sec-policy/selinux-sasl/selinux-sasl-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-screen/selinux-screen-9999.ebuild
 2002151740 ./sec-policy/selinux-screen/selinux-screen-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
 2002151740 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
 2002151740 ./sec-policy/selinux-sensord/selinux-sensord-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
 2002151740 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
 2002151740 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-skype/selinux-skype-9999.ebuild
 2002151740 ./sec-policy/selinux-skype/selinux-skype-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
 2002151740 ./sec-policy/selinux-slocate/selinux-slocate-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
 2002151740 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
 2002151740 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
 2002151740 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
 2002151740 ./sec-policy/selinux-snmp/selinux-snmp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-snort/selinux-snort-9999.ebuild
 2002151740 ./sec-policy/selinux-snort/selinux-snort-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
 2002151740 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
 2002151740 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
 2002151740 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-squid/selinux-squid-9999.ebuild
 2002151740 ./sec-policy/selinux-squid/selinux-squid-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
 2002151740 ./sec-policy/selinux-sssd/selinux-sssd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
 2002151740 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
 2002151740 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
 2002151740 ./sec-policy/selinux-sudo/selinux-sudo-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
 2002151740 ./sec-policy/selinux-sxid/selinux-sxid-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
 2002151740 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
 2002151740 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
 2002151740 ./sec-policy/selinux-tboot/selinux-tboot-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
 2002151740 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
 2002151740 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
 2002151740 ./sec-policy/selinux-telnet/selinux-telnet-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
 2002151740 ./sec-policy/selinux-tftp/selinux-tftp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
 2002151740 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
 2002151740 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
 2002151740 ./sec-policy/selinux-timidity/selinux-timidity-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
 2002151740 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tor/selinux-tor-9999.ebuild
 2002151740 ./sec-policy/selinux-tor/selinux-tor-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
 2002151740 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
 2002151740 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
 2002151740 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-uml/selinux-uml-9999.ebuild
 2002151740 ./sec-policy/selinux-uml/selinux-uml-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
 2002151740 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
 2002151740 ./sec-policy/selinux-uptime/selinux-uptime-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
 2002151740 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
 2002151740 ./sec-policy/selinux-uucp/selinux-uucp-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
 2002151740 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
 2002151740 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
 2002151740 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
 2002151740 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
 2002151740 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vde/selinux-vde-9999.ebuild
 2002151740 ./sec-policy/selinux-vde/selinux-vde-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-virt/selinux-virt-9999.ebuild
 2002151740 ./sec-policy/selinux-virt/selinux-virt-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
 2002151740 ./sec-policy/selinux-vlock/selinux-vlock-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
 2002151740 ./sec-policy/selinux-vmware/selinux-vmware-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
 2002151740 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
 2002151740 ./sec-policy/selinux-vpn/selinux-vpn-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
 2002151740 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
 2002151740 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-wine/selinux-wine-9999.ebuild
 2002151740 ./sec-policy/selinux-wine/selinux-wine-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
 2002151740 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-wm/selinux-wm-9999.ebuild
 2002151740 ./sec-policy/selinux-wm/selinux-wm-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-xen/selinux-xen-9999.ebuild
 2002151740 ./sec-policy/selinux-xen/selinux-xen-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
 2002151740 ./sec-policy/selinux-xfs/selinux-xfs-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
 2002151740 ./sec-policy/selinux-xprint/selinux-xprint-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
 2002151740 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
 2002151740 ./sec-policy/selinux-xserver/selinux-xserver-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
 1804251509 ./sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
 2002151740 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20190201-r1.ebuild
-2002151740 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
-2002161139 ./sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
+2010120609 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
 2002161139 ./sec-policy/selinux-colord/selinux-colord-9999.ebuild
+2010120609 ./sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
 2010062239 ./sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
 2010062239 ./sys-apps/accountsservice/accountsservice-0.6.55.ebuild
 1910111911 ./sys-apps/ack/ack-3.0.0.ebuild
@@ -26363,7 +26295,9 @@
 1704141028 ./sys-apps/aix-miscutils/aix-miscutils-0.1.1671.ebuild
 1706121121 ./sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild
 2004211209 ./sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
+2010101309 ./sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
 2003191139 ./sys-apps/apparmor/apparmor-2.13.4.ebuild
+2010110739 ./sys-apps/apparmor/apparmor-3.0.0.ebuild
 2008051909 ./sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
 1712021939 ./sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
 2006061509 ./sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -26413,6 +26347,7 @@
 2009192339 ./sys-apps/coreutils/coreutils-8.32-r1.ebuild
 1702282250 ./sys-apps/cpint/cpint-2.5.3.ebuild
 2008111739 ./sys-apps/cpuid/cpuid-20200427.ebuild
+2010101639 ./sys-apps/cpuid/cpuid-20201006.ebuild
 2004211009 ./sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
 2006041009 ./sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
 2001091509 ./sys-apps/daemonize/daemonize-1.7.8.ebuild
@@ -26443,9 +26378,9 @@
 2002112051 ./sys-apps/dog/dog-1.7-r6.ebuild
 2009071209 ./sys-apps/dstat/dstat-0.7.4-r2.ebuild
 2007071009 ./sys-apps/dtc/dtc-1.5.0-r2.ebuild
-2007071039 ./sys-apps/dtc/dtc-1.6.0.ebuild
 2007071039 ./sys-apps/dtc/dtc-9999.ebuild
 2008200209 ./sys-apps/dtc/dtc-1.5.0.ebuild
+2010111209 ./sys-apps/dtc/dtc-1.6.0.ebuild
 1702282250 ./sys-apps/duc/duc-1.4.1-r1.ebuild
 1806172339 ./sys-apps/duc/duc-1.4.3-r1.ebuild
 1806172339 ./sys-apps/duc/duc-9999.ebuild
@@ -26476,6 +26411,7 @@
 2005042309 ./sys-apps/fakeroot/fakeroot-1.24.ebuild
 2009251539 ./sys-apps/fakeroot/fakeroot-1.25.1.ebuild
 2010051939 ./sys-apps/fakeroot/fakeroot-1.25.2.ebuild
+2010090209 ./sys-apps/fakeroot/fakeroot-1.25.3.ebuild
 2004032241 ./sys-apps/fbset/fbset-2.1.ebuild
 2006120709 ./sys-apps/fd/fd-8.1.1.ebuild
 2005072109 ./sys-apps/file/file-5.37-r1.ebuild
@@ -26520,8 +26456,8 @@
 1910130039 ./sys-apps/gradm/gradm-3.1.201708012022.ebuild
 2002241139 ./sys-apps/gradm/gradm-3.1.201903191516.ebuild
 2004032241 ./sys-apps/grep/grep-3.3-r1.ebuild
-2009071209 ./sys-apps/grep/grep-3.4.ebuild
 2009281039 ./sys-apps/grep/grep-3.5.ebuild
+2010082039 ./sys-apps/grep/grep-3.4.ebuild
 1702282250 ./sys-apps/grepcidr/grepcidr-2.0.ebuild
 2007120039 ./sys-apps/groff/groff-1.22.4.ebuild
 2002100339 ./sys-apps/gscanbus/gscanbus-0.8.ebuild
@@ -26557,6 +26493,7 @@
 2008051739 ./sys-apps/hwloc/hwloc-1.11.13.ebuild
 2004032241 ./sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
 2003111509 ./sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+2010101109 ./sys-apps/i2c-tools/i2c-tools-4.2.ebuild
 1912221009 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
 1912221009 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild
 2009090039 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild
@@ -26579,7 +26516,7 @@
 2004130409 ./sys-apps/inxi/inxi-3.0.38.1.ebuild
 2008221709 ./sys-apps/inxi/inxi-3.1.06.1.ebuild
 2009200309 ./sys-apps/iotools/iotools-1.5.ebuild
-2008091909 ./sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild
+2010091709 ./sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild
 2008200039 ./sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
 1912111540 ./sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
 1912111540 ./sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
@@ -26731,7 +26668,7 @@
 2009070039 ./sys-apps/portage/portage-2.3.99-r2.ebuild
 2009122339 ./sys-apps/portage/portage-9999.ebuild
 2009181139 ./sys-apps/portage/portage-3.0.4-r1.ebuild
-2009210909 ./sys-apps/portage/portage-3.0.8.ebuild
+2010111839 ./sys-apps/portage/portage-3.0.8.ebuild
 1906061309 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
 2005281139 ./sys-apps/prctl/prctl-1.6-r1.ebuild
 2009170039 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -26742,7 +26679,7 @@
 2002112051 ./sys-apps/pv/pv-1.6.0-r1.ebuild
 2009010539 ./sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
 2009181139 ./sys-apps/qdirstat/qdirstat-1.7.ebuild
-1912210209 ./sys-apps/qingy/qingy-1.0.0-r4.ebuild
+2010082239 ./sys-apps/qingy/qingy-1.0.0-r4.ebuild
 2002092009 ./sys-apps/razercfg/razercfg-0.39-r2.ebuild
 2007241139 ./sys-apps/razercfg/razercfg-0.42.ebuild
 1801130140 ./sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
@@ -26773,20 +26710,24 @@
 1806010208 ./sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
 1906271809 ./sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
 2007151539 ./sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
+2010112109 ./sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
 1711152307 ./sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild
 1810090339 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.0.ebuild
 1906221109 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.0.1.ebuild
 2007151539 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
+2010112109 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
 1710032143 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.1.ebuild
 1810090339 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild
 1906221109 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.3.ebuild
 2007151539 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild
+2010112109 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
 1711152307 ./sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
 1801110040 ./sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild
 1806010208 ./sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild
 1810090339 ./sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild
 1906221109 ./sys-apps/s6-rc/s6-rc-0.5.0.0.ebuild
 2007151539 ./sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
+2010112109 ./sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
 1702282250 ./sys-apps/s6/s6-2.1.3.0.ebuild
 1711152307 ./sys-apps/s6/s6-2.6.1.1.ebuild
 1801110040 ./sys-apps/s6/s6-2.7.0.0.ebuild
@@ -26794,6 +26735,7 @@
 1810090339 ./sys-apps/s6/s6-2.7.2.1.ebuild
 1906221109 ./sys-apps/s6/s6-2.8.0.1.ebuild
 1911290109 ./sys-apps/s6/s6-2.9.0.1.ebuild
+2010120109 ./sys-apps/s6/s6-2.9.2.0.ebuild
 2005311339 ./sys-apps/salinfo/salinfo-1.2.ebuild
 2003261841 ./sys-apps/sandbox/sandbox-2.14.ebuild
 2003261841 ./sys-apps/sandbox/sandbox-2.15.ebuild
@@ -26829,9 +26771,8 @@
 2008231509 ./sys-apps/smartmontools/smartmontools-9999.ebuild
 2010061909 ./sys-apps/smartmontools/smartmontools-7.1.ebuild
 2008081539 ./sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
-2002042139 ./sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild
-1910012239 ./sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild
-2002042139 ./sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
+2010091909 ./sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild
+2010091909 ./sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
 2004010839 ./sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
 1702282250 ./sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
 1901201539 ./sys-apps/stroke/stroke-0.1.3-r1.ebuild
@@ -26848,7 +26789,7 @@
 2005021439 ./sys-apps/sysvinit/sysvinit-2.93.ebuild
 2005021439 ./sys-apps/sysvinit/sysvinit-2.96.ebuild
 2007071239 ./sys-apps/sysvinit/sysvinit-2.97.ebuild
-2009071209 ./sys-apps/tas/tas-1.6.0.200601.ebuild
+2010091909 ./sys-apps/tas/tas-1.6.0.200601.ebuild
 2006162309 ./sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
 2004211009 ./sys-apps/texinfo/texinfo-6.6-r1.ebuild
 2006121109 ./sys-apps/texinfo/texinfo-6.7.ebuild
@@ -26914,7 +26855,7 @@
 1912071909 ./sys-apps/edid-decode/edid-decode-9999.ebuild
 2009181139 ./sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
 2008272109 ./sys-apps/pnputils/pnputils-0.1.ebuild
-2010080639 ./sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+2010091139 ./sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
 2002222009 ./sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
 2006131809 ./sys-apps/usbguard/usbguard-0.7.8.ebuild
 2009212109 ./sys-apps/earlyoom/earlyoom-1.3.ebuild
@@ -26926,7 +26867,7 @@
 2003042239 ./sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild
 2009240109 ./sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
 2009240109 ./sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
-2008010009 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
+2010102209 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-9999.ebuild
 1912100909 ./sys-auth/docker_auth/docker_auth-1.3.1.ebuild
@@ -26990,10 +26931,9 @@
 1910130009 ./sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
 2003201209 ./sys-auth/pam_u2f/pam_u2f-1.0.8.ebuild
 1912110241 ./sys-auth/pam_yubico/pam_yubico-2.26.ebuild
-2009201209 ./sys-auth/pambase/pambase-20200917.ebuild
-2010042309 ./sys-auth/pambase/pambase-20200304.ebuild
-2004211009 ./sys-auth/passwdqc/passwdqc-1.3.0.ebuild
-2009052209 ./sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
+2010101239 ./sys-auth/pambase/pambase-20200917.ebuild
+2010101909 ./sys-auth/pambase/pambase-20201010.ebuild
+2010101239 ./sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
 1802112038 ./sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
 1912291610 ./sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
 2010062139 ./sys-auth/polkit/polkit-0.116-r1.ebuild
@@ -27004,12 +26944,10 @@
 2005091439 ./sys-auth/rtkit/rtkit-0.13-r1.ebuild
 2004032241 ./sys-auth/skey/skey-1.1.5-r11.ebuild
 2009021939 ./sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
-2003261841 ./sys-auth/sssd/sssd-1.16.3-r3.ebuild
-2003261841 ./sys-auth/sssd/sssd-2.1.0-r1.ebuild
-2003261841 ./sys-auth/sssd/sssd-2.2.0-r1.ebuild
 2003261841 ./sys-auth/sssd/sssd-2.2.2.ebuild
 2008312239 ./sys-auth/sssd/sssd-2.2.3.ebuild
-2009290009 ./sys-auth/sssd/sssd-2.3.1-r1.ebuild
+2010101509 ./sys-auth/sssd/sssd-2.2.0-r1.ebuild
+2010120109 ./sys-auth/sssd/sssd-2.3.1-r2.ebuild
 2008291539 ./sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
 1702282250 ./sys-auth/ykclient/ykclient-2.15.ebuild
 1702282250 ./sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild
@@ -27215,9 +27153,9 @@
 2009250409 ./sys-cluster/ceph/ceph-14.2.11-r1.ebuild
 2010021509 ./sys-cluster/ceph/ceph-15.2.4-r3.ebuild
 2010021509 ./sys-cluster/ceph/ceph-15.2.5-r1.ebuild
-2009071209 ./sys-cluster/charliecloud/charliecloud-0.16.ebuild
 2009161539 ./sys-cluster/charliecloud/charliecloud-0.18.ebuild
-2009161539 ./sys-cluster/charliecloud/charliecloud-9999.ebuild
+2010091039 ./sys-cluster/charliecloud/charliecloud-0.19.ebuild
+2010091039 ./sys-cluster/charliecloud/charliecloud-9999.ebuild
 2009011239 ./sys-cluster/charm/charm-6.8.2.ebuild
 1702282250 ./sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
 2007030309 ./sys-cluster/cinder/cinder-16.1.0.ebuild
@@ -27247,22 +27185,15 @@
 2009111509 ./sys-cluster/galera/galera-26.4.5.ebuild
 1905311709 ./sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild
 1912111540 ./sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
-2009300509 ./sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
+2010091209 ./sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
 1904050039 ./sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
 1904050039 ./sys-cluster/gasnet/gasnet-1.26.4.ebuild
 1912110241 ./sys-cluster/gasnet/gasnet-1.28.0.ebuild
 1912110241 ./sys-cluster/gasnet/gasnet-1.28.2.ebuild
 1912110241 ./sys-cluster/gasnet/gasnet-1.30.0.ebuild
-2005092339 ./sys-cluster/glusterfs/glusterfs-7.5.ebuild
-2006300939 ./sys-cluster/glusterfs/glusterfs-6.8.ebuild
-2006301639 ./sys-cluster/glusterfs/glusterfs-6.9.ebuild
-2006301639 ./sys-cluster/glusterfs/glusterfs-7.6.ebuild
 2006301639 ./sys-cluster/glusterfs/glusterfs-9999.ebuild
-2010071009 ./sys-cluster/glusterfs/glusterfs-7.7.ebuild
-2010070109 ./sys-cluster/glusterfs/glusterfs-7.8.ebuild
-1912111540 ./sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild
-1912111540 ./sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild
-1912111540 ./sys-cluster/heartbeat/heartbeat-3.0.6.ebuild
+2010091209 ./sys-cluster/glusterfs/glusterfs-7.7.ebuild
+2010091539 ./sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
 2007090439 ./sys-cluster/heat/heat-14.0.0.ebuild
 2010071839 ./sys-cluster/heat/heat-14.1.0.ebuild
 2010071839 ./sys-cluster/heat/heat-2020.1.9999.ebuild
@@ -27283,7 +27214,7 @@
 2009160239 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.1.ebuild
 2010032139 ./sys-cluster/kube-apiserver/kube-apiserver-1.17.12.ebuild
 2010032139 ./sys-cluster/kube-apiserver/kube-apiserver-1.18.9.ebuild
-2010032139 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.2.ebuild
+2010102139 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.2.ebuild
 2002190109 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.3.ebuild
 2003200039 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.4.ebuild
 2009142239 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.11.ebuild
@@ -27291,12 +27222,12 @@
 2009142239 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.1.ebuild
 2010032139 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.12.ebuild
 2010032139 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.18.9.ebuild
-2010032139 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.2.ebuild
+2010102139 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.2.ebuild
 2002190109 ./sys-cluster/kube-proxy/kube-proxy-1.17.3.ebuild
 2003200039 ./sys-cluster/kube-proxy/kube-proxy-1.17.4.ebuild
 2010032139 ./sys-cluster/kube-proxy/kube-proxy-1.17.12.ebuild
 2010032139 ./sys-cluster/kube-proxy/kube-proxy-1.18.9.ebuild
-2010032139 ./sys-cluster/kube-proxy/kube-proxy-1.19.2.ebuild
+2010102139 ./sys-cluster/kube-proxy/kube-proxy-1.19.2.ebuild
 2004291509 ./sys-cluster/kube-router/kube-router-0.4.0.ebuild
 2008121109 ./sys-cluster/kube-router/kube-router-1.0.1.ebuild
 2010071939 ./sys-cluster/kube-router/kube-router-1.1.0.ebuild
@@ -27304,23 +27235,23 @@
 2003200039 ./sys-cluster/kube-scheduler/kube-scheduler-1.17.4.ebuild
 2010032139 ./sys-cluster/kube-scheduler/kube-scheduler-1.17.12.ebuild
 2010032139 ./sys-cluster/kube-scheduler/kube-scheduler-1.18.9.ebuild
-2010032139 ./sys-cluster/kube-scheduler/kube-scheduler-1.19.2.ebuild
+2010102139 ./sys-cluster/kube-scheduler/kube-scheduler-1.19.2.ebuild
 2009142109 ./sys-cluster/kubeadm/kubeadm-1.17.11.ebuild
 2009142109 ./sys-cluster/kubeadm/kubeadm-1.18.8.ebuild
 2009160239 ./sys-cluster/kubeadm/kubeadm-1.19.1.ebuild
 2010032139 ./sys-cluster/kubeadm/kubeadm-1.17.12.ebuild
 2010032139 ./sys-cluster/kubeadm/kubeadm-1.18.9.ebuild
-2010032139 ./sys-cluster/kubeadm/kubeadm-1.19.2.ebuild
+2010102139 ./sys-cluster/kubeadm/kubeadm-1.19.2.ebuild
 2002190109 ./sys-cluster/kubectl/kubectl-1.17.3.ebuild
 2003200039 ./sys-cluster/kubectl/kubectl-1.17.4.ebuild
 2010032139 ./sys-cluster/kubectl/kubectl-1.17.12.ebuild
 2010032139 ./sys-cluster/kubectl/kubectl-1.18.9.ebuild
-2010032139 ./sys-cluster/kubectl/kubectl-1.19.2.ebuild
+2010102139 ./sys-cluster/kubectl/kubectl-1.19.2.ebuild
 2002190109 ./sys-cluster/kubelet/kubelet-1.17.3.ebuild
 2003200039 ./sys-cluster/kubelet/kubelet-1.17.4.ebuild
 2010032139 ./sys-cluster/kubelet/kubelet-1.17.12.ebuild
 2010032139 ./sys-cluster/kubelet/kubelet-1.18.9.ebuild
-2010032139 ./sys-cluster/kubelet/kubelet-1.19.2.ebuild
+2010102139 ./sys-cluster/kubelet/kubelet-1.19.2.ebuild
 1903190209 ./sys-cluster/legion/legion-16.08.0-r1.ebuild
 1903190209 ./sys-cluster/legion/legion-16.10.0.ebuild
 1903190209 ./sys-cluster/legion/legion-17.02.0.ebuild
@@ -27371,9 +27302,9 @@
 2007301139 ./sys-cluster/openmpi/openmpi-4.0.4.ebuild
 2005170039 ./sys-cluster/openstack-meta/openstack-meta-2020.1.0.ebuild
 2005170039 ./sys-cluster/openstack-meta/openstack-meta-2020.1.9999.ebuild
-2002222009 ./sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
-2005072109 ./sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
-2009271309 ./sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+2010091139 ./sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+2010091139 ./sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+2010091139 ./sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
 1808081009 ./sys-cluster/pconsole/pconsole-1.0-r4.ebuild
 2005170039 ./sys-cluster/placement/placement-2020.1.9999.ebuild
 2005302109 ./sys-cluster/placement/placement-3.0.0.ebuild
@@ -27396,8 +27327,9 @@
 2010021039 ./sys-cluster/spark-bin/spark-bin-3.0.1.ebuild
 2005082323 ./sys-cluster/swift/swift-2020.1.9999.ebuild
 2005232309 ./sys-cluster/swift/swift-2.25.0.ebuild
-2009230239 ./sys-cluster/swift/swift-2.26.0.ebuild
-2009230239 ./sys-cluster/swift/swift-2020.2.9999.ebuild
+2010102239 ./sys-cluster/swift/swift-2.25.1.ebuild
+2010110239 ./sys-cluster/swift/swift-2.26.0.ebuild
+2010110239 ./sys-cluster/swift/swift-2020.2.9999.ebuild
 1911111839 ./sys-cluster/teleport/teleport-4.0.10.ebuild
 1910111709 ./sys-cluster/teleport/teleport-4.0.9.ebuild
 1910111709 ./sys-cluster/teleport/teleport-4.1.1.ebuild
@@ -27428,6 +27360,7 @@
 2010040639 ./sys-cluster/k9scli/k9scli-0.22.1.ebuild
 2008212009 ./sys-cluster/nomad/nomad-0.12.3.ebuild
 2009190609 ./sys-cluster/nomad/nomad-0.12.4.ebuild
+2010100009 ./sys-cluster/nomad/nomad-0.12.5.ebuild
 2004211009 ./sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
 2008171539 ./sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
 2004211009 ./sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -27494,24 +27427,24 @@
 2008010139 ./sys-devel/clang-common/clang-common-10.0.0.ebuild
 2009230009 ./sys-devel/clang-common/clang-common-11.0.0_rc3.ebuild
 2009290109 ./sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild
-2010061709 ./sys-devel/clang-common/clang-common-10.0.1.ebuild
 2010072209 ./sys-devel/clang-common/clang-common-11.0.0_rc6.ebuild
+2010110939 ./sys-devel/clang-common/clang-common-10.0.1.ebuild
 2001182039 ./sys-devel/clang-runtime/clang-runtime-11.0.0.9999.ebuild
 2003092139 ./sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
 2007152209 ./sys-devel/clang-runtime/clang-runtime-12.0.0.9999.ebuild
 2008010139 ./sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
 2009230009 ./sys-devel/clang-runtime/clang-runtime-11.0.0_rc3.ebuild
 2009290109 ./sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild
-2010061709 ./sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
 2010072209 ./sys-devel/clang-runtime/clang-runtime-11.0.0_rc6.ebuild
+2010110939 ./sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
 2005072109 ./sys-devel/clang/clang-9.0.1.ebuild
 2008010139 ./sys-devel/clang/clang-10.0.0.ebuild
 2008182009 ./sys-devel/clang/clang-11.0.0.9999.ebuild
 2009230009 ./sys-devel/clang/clang-11.0.0_rc3.ebuild
 2009231339 ./sys-devel/clang/clang-12.0.0.9999.ebuild
 2009290109 ./sys-devel/clang/clang-11.0.0_rc4.ebuild
-2010061709 ./sys-devel/clang/clang-10.0.1.ebuild
 2010072209 ./sys-devel/clang/clang-11.0.0_rc6.ebuild
+2010110939 ./sys-devel/clang/clang-10.0.1.ebuild
 1910071309 ./sys-devel/cons/cons-2.3.0.ebuild
 2003261841 ./sys-devel/crossdev/crossdev-99999999.ebuild
 2009041339 ./sys-devel/crossdev/crossdev-20200801.ebuild
@@ -27527,15 +27460,13 @@
 2006131809 ./sys-devel/flex/flex-2.6.4-r1.ebuild
 2002140110 ./sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
 2006250009 ./sys-devel/gcc-config/gcc-config-9999.ebuild
-2009052139 ./sys-devel/gcc-config/gcc-config-2.3.2.ebuild
 2010071009 ./sys-devel/gcc-config/gcc-config-2.3.1.ebuild
+2010102039 ./sys-devel/gcc-config/gcc-config-2.3.2.ebuild
 2007251209 ./sys-devel/gcc/gcc-8.4.0-r1.ebuild
 2007272209 ./sys-devel/gcc/gcc-9.3.0-r1.ebuild
 2008142109 ./sys-devel/gcc/gcc-6.5.0-r2.ebuild
 2008142109 ./sys-devel/gcc/gcc-7.5.0-r1.ebuild
-2008231239 ./sys-devel/gcc/gcc-5.5.0.ebuild
 2008311909 ./sys-devel/gcc/gcc-6.5.0-r3.ebuild
-2009111939 ./sys-devel/gcc/gcc-10.2.0-r1.ebuild
 2009111939 ./sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
 2009111939 ./sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
 2010021239 ./sys-devel/gcc/gcc-10.2.0-r2.ebuild
@@ -27550,16 +27481,11 @@
 2008292039 ./sys-devel/gnuconfig/gnuconfig-20200621.ebuild
 2008292039 ./sys-devel/gnuconfig/gnuconfig-99999999.ebuild
 2004141039 ./sys-devel/icecream/icecream-1.0.0-r2.ebuild
-2004121839 ./sys-devel/kgcc64/kgcc64-4.9.4.ebuild
-2004121839 ./sys-devel/kgcc64/kgcc64-5.4.0.ebuild
 2004121839 ./sys-devel/kgcc64/kgcc64-6.4.0.ebuild
 2004121839 ./sys-devel/kgcc64/kgcc64-7.3.0.ebuild
 2004121839 ./sys-devel/kgcc64/kgcc64-8.3.0.ebuild
-2005080339 ./sys-devel/kgcc64/kgcc64-10.1.0.ebuild
 2006082009 ./sys-devel/kgcc64/kgcc64-9.3.0-r1.ebuild
 2007231209 ./sys-devel/kgcc64/kgcc64-10.2.0.ebuild
-2007232109 ./sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild
-2007232109 ./sys-devel/kgcc64/kgcc64-5.5.0.ebuild
 2007232109 ./sys-devel/kgcc64/kgcc64-6.5.0.ebuild
 2007232109 ./sys-devel/kgcc64/kgcc64-7.5.0.ebuild
 2007232109 ./sys-devel/kgcc64/kgcc64-8.4.0.ebuild
@@ -27572,16 +27498,16 @@
 2009230009 ./sys-devel/lld/lld-11.0.0_rc3.ebuild
 2009241709 ./sys-devel/lld/lld-12.0.0.9999.ebuild
 2009290109 ./sys-devel/lld/lld-11.0.0_rc4.ebuild
-2010061709 ./sys-devel/lld/lld-10.0.1.ebuild
 2010072209 ./sys-devel/lld/lld-11.0.0_rc6.ebuild
+2010110939 ./sys-devel/lld/lld-10.0.1.ebuild
 2003092139 ./sys-devel/llvm-common/llvm-common-9.0.1.ebuild
 2006232139 ./sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
 2007152209 ./sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
 2008010139 ./sys-devel/llvm-common/llvm-common-10.0.0.ebuild
 2009230009 ./sys-devel/llvm-common/llvm-common-11.0.0_rc3.ebuild
 2009290109 ./sys-devel/llvm-common/llvm-common-11.0.0_rc4.ebuild
-2010061709 ./sys-devel/llvm-common/llvm-common-10.0.1.ebuild
 2010072209 ./sys-devel/llvm-common/llvm-common-11.0.0_rc6.ebuild
+2010110939 ./sys-devel/llvm-common/llvm-common-10.0.1.ebuild
 2009082109 ./sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
 2009271639 ./sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
 2005062039 ./sys-devel/llvm/llvm-9.0.1.ebuild
@@ -27590,8 +27516,8 @@
 2008010139 ./sys-devel/llvm/llvm-10.0.0.ebuild
 2009230009 ./sys-devel/llvm/llvm-11.0.0_rc3.ebuild
 2009290109 ./sys-devel/llvm/llvm-11.0.0_rc4.ebuild
-2010061709 ./sys-devel/llvm/llvm-10.0.1.ebuild
 2010072209 ./sys-devel/llvm/llvm-11.0.0_rc6.ebuild
+2010110939 ./sys-devel/llvm/llvm-10.0.1.ebuild
 2001182039 ./sys-devel/llvmgold/llvmgold-11.ebuild
 2006040739 ./sys-devel/llvmgold/llvmgold-9.ebuild
 2007152209 ./sys-devel/llvmgold/llvmgold-12.ebuild
@@ -27619,6 +27545,7 @@
 1910271939 ./sys-devel/ucpp/ucpp-1.3.4.ebuild
 1910271939 ./sys-devel/ucpp/ucpp-1.3.5.ebuild
 2009251109 ./sys-devel/rust-std/rust-std-1.46.0.ebuild
+2010112039 ./sys-devel/rust-std/rust-std-1.47.0.ebuild
 1804230338 ./sys-fabric/dapl/dapl-2.0.40.ebuild
 1804230338 ./sys-fabric/ibacm/ibacm-1.0.8.ebuild
 1804230338 ./sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
@@ -27658,7 +27585,7 @@
 1702282250 ./sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
 2002101639 ./sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
 2010021439 ./sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
-2010021709 ./sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+2010120309 ./sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
 1905300009 ./sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
 2006291439 ./sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild
 2009210309 ./sys-firmware/intel-microcode/intel-microcode-20200616_p20200921.ebuild
@@ -27710,6 +27637,7 @@
 1805272138 ./sys-fs/autorun/autorun-3.17.ebuild
 1910022239 ./sys-fs/avfs/avfs-1.1.1.ebuild
 1708061641 ./sys-fs/bashmount/bashmount-3.2.0.ebuild
+2010111239 ./sys-fs/bashmount/bashmount-4.3.2.ebuild
 2005172009 ./sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
 2009260139 ./sys-fs/bcache-tools/bcache-tools-1.1.ebuild
 1911301109 ./sys-fs/bees/bees-9999.ebuild
@@ -27745,6 +27673,7 @@
 2008051739 ./sys-fs/ddrescue/ddrescue-1.25.ebuild
 1904180639 ./sys-fs/dfc/dfc-3.1.1.ebuild
 2008200009 ./sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+2010101339 ./sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
 1911190009 ./sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
 2007271809 ./sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
 2007271809 ./sys-fs/dislocker/dislocker-9999.ebuild
@@ -27844,7 +27773,6 @@
 2002112051 ./sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
 2004231409 ./sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
 2006100339 ./sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
-2006041239 ./sys-fs/owfs/owfs-3.2_p2-r2.ebuild
 2002151310 ./sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
 2004032241 ./sys-fs/quota/quota-4.04-r3.ebuild
 2004032241 ./sys-fs/quota/quota-4.05-r1.ebuild
@@ -27861,7 +27789,7 @@
 2003080109 ./sys-fs/safecopy/safecopy-1.7.ebuild
 1811061039 ./sys-fs/shake/shake-1.0.ebuild
 2002112051 ./sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
-2010071039 ./sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
+2010091139 ./sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
 2005260027 ./sys-fs/snapraid/snapraid-11.4.ebuild
 2006071539 ./sys-fs/snapraid/snapraid-11.5.ebuild
 1910090409 ./sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -28052,6 +27980,7 @@
 2009121139 ./sys-kernel/pf-sources/pf-sources-5.8_p4.ebuild
 2009210939 ./sys-kernel/pf-sources/pf-sources-5.8_p5.ebuild
 2009271339 ./sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild
+2010091039 ./sys-kernel/pf-sources/pf-sources-5.8_p7.ebuild
 1903250339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
 1907152339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.75_p20190925.ebuild
@@ -28091,6 +28020,8 @@
 2009270939 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.8.12.ebuild
 2010011839 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild
 2010020109 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild
+2010081909 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
+2010081909 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.8.14.ebuild
 2009151439 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.64.ebuild
 2009172239 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.66.ebuild
 2009221639 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.64-r1.ebuild
@@ -28103,12 +28034,18 @@
 2010011939 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69.ebuild
 2010020409 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13-r1.ebuild
 2010020109 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13.ebuild
+2010090839 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.70-r1.ebuild
+2010081909 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.70.ebuild
+2010090839 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.14-r1.ebuild
+2010081909 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.14.ebuild
 2009221639 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.64.ebuild
 2009221639 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.66.ebuild
 2009270939 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68.ebuild
 2009270939 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12.ebuild
 2010011839 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.69.ebuild
 2010020109 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.8.13.ebuild
+2010081909 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70.ebuild
+2010081909 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14.ebuild
 2007181939 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
 2009201639 ./sys-kernel/bliss-initramfs/bliss-initramfs-9.3.0.ebuild
 2007152309 ./sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
@@ -28123,16 +28060,16 @@
 2008010139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
 2009230009 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc3.ebuild
 2009290109 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc4.ebuild
-2010061709 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
 2010072209 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc6.ebuild
+2010110939 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
 2003092139 ./sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
 2006232139 ./sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
 2007152209 ./sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
 2008010139 ./sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
 2009230009 ./sys-libs/compiler-rt/compiler-rt-11.0.0_rc3.ebuild
 2009290109 ./sys-libs/compiler-rt/compiler-rt-11.0.0_rc4.ebuild
-2010061709 ./sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
 2010072209 ./sys-libs/compiler-rt/compiler-rt-11.0.0_rc6.ebuild
+2010110939 ./sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 1912111540 ./sys-libs/csu/csu-79.ebuild
@@ -28182,8 +28119,8 @@
 2009160139 ./sys-libs/glibc/glibc-2.31-r6.ebuild
 2009160139 ./sys-libs/glibc/glibc-2.32-r1.ebuild
 2009302139 ./sys-libs/glibc/glibc-2.31-r7.ebuild
-2009302139 ./sys-libs/glibc/glibc-2.32-r2.ebuild
-2009302139 ./sys-libs/glibc/glibc-9999.ebuild
+2010100009 ./sys-libs/glibc/glibc-2.32-r2.ebuild
+2010100009 ./sys-libs/glibc/glibc-9999.ebuild
 2004211009 ./sys-libs/gpm/gpm-1.20.7-r2.ebuild
 2008291639 ./sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
 2003251909 ./sys-libs/kpmcore/kpmcore-4.1.0.ebuild
@@ -28192,6 +28129,7 @@
 2008152339 ./sys-libs/ldb/ldb-2.2.0-r1.ebuild
 2001061409 ./sys-libs/libaal/libaal-1.0.7-r1.ebuild
 2005071639 ./sys-libs/libapparmor/libapparmor-2.13.4.ebuild
+2010101309 ./sys-libs/libapparmor/libapparmor-3.0.0.ebuild
 2006132027 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
 2009231639 ./sys-libs/libblockdev/libblockdev-2.24.ebuild
 2009231639 ./sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -28199,6 +28137,7 @@
 2008250209 ./sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild
 2009091009 ./sys-libs/libcap-ng/libcap-ng-0.8.ebuild
 2009181139 ./sys-libs/libcap/libcap-2.43.ebuild
+2010090209 ./sys-libs/libcap/libcap-2.44.ebuild
 2008291639 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
 2005060109 ./sys-libs/libcxx/libcxx-9.0.1.ebuild
 2007291439 ./sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
@@ -28234,8 +28173,8 @@
 2008010139 ./sys-libs/libomp/libomp-10.0.0.ebuild
 2009230009 ./sys-libs/libomp/libomp-11.0.0_rc3.ebuild
 2009290109 ./sys-libs/libomp/libomp-11.0.0_rc4.ebuild
-2010061709 ./sys-libs/libomp/libomp-10.0.1.ebuild
 2010072209 ./sys-libs/libomp/libomp-11.0.0_rc6.ebuild
+2010110939 ./sys-libs/libomp/libomp-10.0.1.ebuild
 2003121709 ./sys-libs/libosinfo/libosinfo-1.6.0.ebuild
 2008302139 ./sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
 2004032241 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
@@ -28300,11 +28239,8 @@
 2003220009 ./sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
 2005091209 ./sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
 2001301109 ./sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild
-2009291009 ./sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
-2009291009 ./sys-libs/openipmi/openipmi-2.0.28.ebuild
-2010071039 ./sys-libs/openipmi/openipmi-2.0.29.ebuild
-2009131309 ./sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
-2009131309 ./sys-libs/pam/pam-1.4.0_p20200829.ebuild
+2010091139 ./sys-libs/openipmi/openipmi-2.0.29.ebuild
+2010101239 ./sys-libs/pam/pam-1.4.0_p20200829.ebuild
 1709100011 ./sys-libs/pinktrace/pinktrace-0.9.3.ebuild
 2004211009 ./sys-libs/pwdb/pwdb-0.62-r1.ebuild
 2001301109 ./sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
@@ -28342,7 +28278,7 @@
 1908192109 ./sys-power/acpid/acpid-2.0.32.ebuild
 2004032241 ./sys-power/acpid/acpid-2.0.31.ebuild
 2004032241 ./sys-power/acpid/acpid-2.0.32-r1.ebuild
-2010071039 ./sys-power/acpid/acpid-2.0.32-r2.ebuild
+2010091139 ./sys-power/acpid/acpid-2.0.32-r2.ebuild
 2002112309 ./sys-power/acpilight/acpilight-1.2.ebuild
 2009011939 ./sys-power/acpilight/acpilight-1.2-r1.ebuild
 1702282250 ./sys-power/acpitool/acpitool-0.5.1-r1.ebuild
@@ -28444,7 +28380,7 @@
 1912290039 ./sys-process/numad/numad-9999.ebuild
 2009050439 ./sys-process/parallel/parallel-20200722.ebuild
 2009300009 ./sys-process/parallel/parallel-20200922.ebuild
-2010071039 ./sys-process/parallel/parallel-20200822.ebuild
+2010091139 ./sys-process/parallel/parallel-20200822.ebuild
 1907151840 ./sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
 2003221439 ./sys-process/prll/prll-0.6.4.ebuild
 1908150239 ./sys-process/procenv/procenv-0.51.ebuild
@@ -28481,7 +28417,7 @@
 2005062039 ./virtual/acl/acl-0-r1.ebuild
 2005062039 ./virtual/acl/acl-0-r2.ebuild
 2005062039 ./virtual/acl/acl-0.ebuild
-2004211009 ./virtual/awk/awk-1.ebuild
+2010100009 ./virtual/awk/awk-1.ebuild
 1910111911 ./virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
 1910111911 ./virtual/blas/blas-3.6.ebuild
 1910111911 ./virtual/blas/blas-3.7.ebuild
@@ -28522,7 +28458,7 @@
 2004032241 ./virtual/imap-c-client/imap-c-client-2.ebuild
 2004211009 ./virtual/inetd/inetd-0.ebuild
 2004211009 ./virtual/jack/jack-0.ebuild
-2010071009 ./virtual/jack/jack-1.ebuild
+2010082039 ./virtual/jack/jack-1.ebuild
 2009191139 ./virtual/jdk/jdk-1.8.0-r5.ebuild
 2009191139 ./virtual/jdk/jdk-11-r1.ebuild
 1905272109 ./virtual/jpeg-compat/jpeg-compat-62.ebuild
@@ -28732,7 +28668,8 @@
 2008071109 ./virtual/rubygems/rubygems-16.ebuild
 2007190509 ./virtual/rust/rust-1.44.1.ebuild
 2009020409 ./virtual/rust/rust-1.45.2.ebuild
-2010071139 ./virtual/rust/rust-1.46.0.ebuild
+2010091209 ./virtual/rust/rust-1.46.0.ebuild
+2010090939 ./virtual/rust/rust-1.47.0.ebuild
 2003261841 ./virtual/service-manager/service-manager-1.ebuild
 2004211009 ./virtual/service-manager/service-manager-0.ebuild
 1706251013 ./virtual/skkserv/skkserv-0.ebuild
@@ -28799,7 +28736,7 @@
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
 1810260409 ./www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
 1903040439 ./www-apache/modsecurity-crs/modsecurity-crs-3.1.0.ebuild
-2010072209 ./www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
+2010091839 ./www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
 1702282250 ./www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
 2006040939 ./www-apache/passenger/passenger-6.0.4.ebuild
 2006142309 ./www-apache/passenger/passenger-6.0.5.ebuild
@@ -28841,7 +28778,7 @@
 2008062209 ./www-apps/gitit/gitit-0.13.0.0.ebuild
 2006041139 ./www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
 2008200309 ./www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
-2004211139 ./www-apps/hugo/hugo-0.69.0.ebuild
+2010101539 ./www-apps/hugo/hugo-0.76.3.ebuild
 1904250439 ./www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
 1903242209 ./www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
 1806241039 ./www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
@@ -28877,9 +28814,8 @@
 2006290009 ./www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
 2006290009 ./www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
 2006290009 ./www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
-2006290009 ./www-apps/mediawiki/mediawiki-1.34.2.ebuild
 2009261139 ./www-apps/mediawiki/mediawiki-1.35.0.ebuild
-2010071039 ./www-apps/mediawiki/mediawiki-1.34.4.ebuild
+2010091139 ./www-apps/mediawiki/mediawiki-1.34.4.ebuild
 2006141409 ./www-apps/mirmon/mirmon-2.11-r2.ebuild
 2009121839 ./www-apps/moodle/moodle-3.5.14.ebuild
 2009121839 ./www-apps/moodle/moodle-3.7.8.ebuild
@@ -28934,8 +28870,8 @@
 1912111540 ./www-apps/wiliki/wiliki-0.6.1-r1.ebuild
 2009021039 ./www-apps/wordpress/wordpress-5.5.1.ebuild
 1912121239 ./www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
-2010052209 ./www-client/chromium/chromium-87.0.4278.0.ebuild
 2010080539 ./www-client/chromium/chromium-86.0.4240.75.ebuild
+2010091009 ./www-client/chromium/chromium-87.0.4280.11.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
 2008031009 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2008061509 ./www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -28948,17 +28884,11 @@
 2009302139 ./www-client/epiphany/epiphany-3.34.4.ebuild
 2005280239 ./www-client/falkon/falkon-3.1.0-r1.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
-2008252239 ./www-client/firefox-bin/firefox-bin-68.12.0.ebuild
-2008252239 ./www-client/firefox-bin/firefox-bin-80.0.ebuild
-2009020109 ./www-client/firefox-bin/firefox-bin-80.0.1.ebuild
-2010052009 ./www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild
-2010052009 ./www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild
-2008261309 ./www-client/firefox/firefox-68.12.0.ebuild
-2008300509 ./www-client/firefox/firefox-80.0.ebuild
-2009020109 ./www-client/firefox/firefox-80.0.1.ebuild
-2009052039 ./www-client/firefox/firefox-80.0.1-r1.ebuild
-2010070439 ./www-client/firefox/firefox-78.3.1.ebuild
+2010112309 ./www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild
+2010112309 ./www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild
 2010070439 ./www-client/firefox/firefox-81.0.1.ebuild
+2010112209 ./www-client/firefox/firefox-78.3.1.ebuild
+2010112209 ./www-client/firefox/firefox-81.0.1-r1.ebuild
 2010071009 ./www-client/google-chrome-beta/google-chrome-beta-86.0.4240.75.ebuild
 2010072239 ./www-client/google-chrome-unstable/google-chrome-unstable-87.0.4280.11.ebuild
 2010071009 ./www-client/google-chrome/google-chrome-86.0.4240.75.ebuild
@@ -28977,6 +28907,7 @@
 1702282250 ./www-client/netrik/netrik-1.16.1-r1.ebuild
 2009300209 ./www-client/netsurf/netsurf-3.10-r3.ebuild
 2010011809 ./www-client/opera-beta/opera-beta-72.0.3815.49.ebuild
+2010081739 ./www-client/opera-beta/opera-beta-72.0.3815.86.ebuild
 2009241609 ./www-client/opera-developer/opera-developer-73.0.3820.0.ebuild
 2009300609 ./www-client/opera-developer/opera-developer-73.0.3827.0.ebuild
 2010070939 ./www-client/opera-developer/opera-developer-73.0.3834.0.ebuild
@@ -29011,6 +28942,7 @@
 2010011309 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild
 2010070939 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2064.6_p1.ebuild
 2010072039 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.7_p1.ebuild
+2010091509 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.37_p1.ebuild
 2009241609 ./www-client/vivaldi/vivaldi-3.3.2022.47_p1.ebuild
 2002140110 ./www-client/w3m/w3m-0.5.3_p20190105.ebuild
 2004032241 ./www-client/w3m/w3m-0.5.3_p20180125.ebuild
@@ -29063,7 +28995,6 @@
 2001051839 ./www-servers/boa/boa-0.94.14_rc21-r2.ebuild
 2003192239 ./www-servers/bozohttpd/bozohttpd-20190228.ebuild
 2007122209 ./www-servers/caddy/caddy-2.0.0.ebuild
-2007282139 ./www-servers/cherokee/cherokee-1.2.104-r2.ebuild
 1811051209 ./www-servers/civetweb/civetweb-1.11.ebuild
 2007270339 ./www-servers/civetweb/civetweb-1.12.ebuild
 2002230040 ./www-servers/fnord/fnord-1.11-r1.ebuild
@@ -29079,6 +29010,7 @@
 1804280139 ./www-servers/monkeyd/monkeyd-9999.ebuild
 2005071639 ./www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
 2006121809 ./www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
+2010111239 ./www-servers/nginx-unit/nginx-unit-1.20.0.ebuild
 2008140339 ./www-servers/nginx/nginx-1.18.0-r2.ebuild
 2008140339 ./www-servers/nginx/nginx-1.19.2-r1.ebuild
 2009302109 ./www-servers/nginx/nginx-1.19.3.ebuild
@@ -29161,7 +29093,7 @@
 2004032241 ./x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
 2003261841 ./x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
 2003261841 ./x11-apps/xditview/xditview-1.0.5.ebuild
-2010072109 ./x11-apps/xdm/xdm-1.1.12.ebuild
+2010090909 ./x11-apps/xdm/xdm-1.1.12.ebuild
 2004032241 ./x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
 2004032241 ./x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
 2006190109 ./x11-apps/xedit/xedit-1.2.2.ebuild
@@ -29383,7 +29315,7 @@
 1908131409 ./x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
 1911282339 ./x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild
 1911282339 ./x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
-2010071039 ./x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
+2010091139 ./x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
 1810230209 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild
 1902251409 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild
 2005182239 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
@@ -29504,7 +29436,6 @@
 1910111911 ./x11-misc/dmenu/dmenu-4.9.ebuild
 1908061139 ./x11-misc/dmenu/dmenu-9999.ebuild
 2009022039 ./x11-misc/dmenu/dmenu-5.0.ebuild
-2002112051 ./x11-misc/dsx/dsx-0.1-r1.ebuild
 2001231339 ./x11-misc/dunst/dunst-1.4.1.ebuild
 2009051409 ./x11-misc/dunst/dunst-1.5.0.ebuild
 2009051409 ./x11-misc/dunst/dunst-9999.ebuild
@@ -29512,7 +29443,7 @@
 1805220439 ./x11-misc/dzen/dzen-0.9.5-r1.ebuild
 2001141339 ./x11-misc/dzen/dzen-0.9.5_p1.ebuild
 1903080839 ./x11-misc/e16-keyedit/e16-keyedit-0.9.ebuild
-1903080839 ./x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+2010111209 ./x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
 1712022339 ./x11-misc/easystroke/easystroke-0.6.0-r3.ebuild
 2006051039 ./x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
 2007201009 ./x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
@@ -29590,7 +29521,7 @@
 2006251209 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
 1811061009 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
 2004050839 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
-2006301109 ./x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
+2010111009 ./x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
 1805220439 ./x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
 1905131209 ./x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
 1910072239 ./x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -29673,7 +29604,6 @@
 2001161139 ./x11-misc/sct/sct-0.4.ebuild
 2004131309 ./x11-misc/sct/sct-0.5.ebuild
 2010062139 ./x11-misc/sddm/sddm-0.15.0.ebuild
-2010062139 ./x11-misc/sddm/sddm-0.18.1-r1.ebuild
 2010062139 ./x11-misc/sddm/sddm-0.18.1-r3.ebuild
 1702282250 ./x11-misc/seetxt/seetxt-0.72-r1.ebuild
 1708311311 ./x11-misc/sent/sent-0.2.ebuild
@@ -29691,8 +29621,8 @@
 1903141339 ./x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
 1805220439 ./x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
 2001311509 ./x11-misc/skippy/skippy-0.5.0-r1.ebuild
-1910122109 ./x11-misc/slim/slim-9999.ebuild
-2007101639 ./x11-misc/slim/slim-1.3.6-r5.ebuild
+2010082309 ./x11-misc/slim/slim-1.3.6-r5.ebuild
+2010082309 ./x11-misc/slim/slim-9999.ebuild
 2007101539 ./x11-misc/slock/slock-1.4.ebuild
 2006050139 ./x11-misc/slop/slop-7.5.ebuild
 2006050139 ./x11-misc/slop/slop-9999.ebuild
@@ -29734,6 +29664,7 @@
 2003281839 ./x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild
 1802221408 ./x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild
 2004032241 ./x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+2010111239 ./x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
 2001021409 ./x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
 2004151039 ./x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
 2004151039 ./x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
@@ -29825,9 +29756,8 @@
 2002230040 ./x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
 2002121439 ./x11-misc/xlockmore/xlockmore-5.50.ebuild
 2007220939 ./x11-misc/xlockmore/xlockmore-5.65.ebuild
-2009301209 ./x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild
-2010041509 ./x11-misc/xlockmore/xlockmore-5.66_alpha09.ebuild
 2010071009 ./x11-misc/xlockmore/xlockmore-5.66_alpha10.ebuild
+2010112139 ./x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild
 2008270239 ./x11-misc/xmobar/xmobar-0.36.ebuild
 2001270739 ./x11-misc/xmountains/xmountains-2.9-r1.ebuild
 2007021039 ./x11-misc/xnee/xnee-3.19-r2.ebuild
@@ -30150,9 +30080,9 @@
 1903150739 ./x11-terms/root-tail/root-tail-1.2-r4.ebuild
 2008171709 ./x11-terms/roxterm/roxterm-3.9.3.ebuild
 2009140309 ./x11-terms/roxterm/roxterm-3.9.4.ebuild
-1910111911 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
 1904271609 ./x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
 2004032241 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+2010112109 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
 2009031639 ./x11-terms/sakura/sakura-3.7.0.ebuild
 2009031639 ./x11-terms/sakura/sakura-3.7.1.ebuild
 1903291509 ./x11-terms/st/st-9999.ebuild
@@ -30384,14 +30314,13 @@
 2006281409 ./x11-wm/cwm/cwm-9999.ebuild
 2006051009 ./x11-wm/dwm/dwm-9999.ebuild
 2007101639 ./x11-wm/dwm/dwm-6.2.ebuild
-1908192239 ./x11-wm/e16/e16-1.0.20.ebuild
-1912220239 ./x11-wm/e16/e16-1.0.21.ebuild
+2010111209 ./x11-wm/e16/e16-1.0.21.ebuild
 1912242109 ./x11-wm/echinus/echinus-0.4.9.ebuild
 2009071209 ./x11-wm/enlightenment/enlightenment-0.24.1.ebuild
 2009272339 ./x11-wm/enlightenment/enlightenment-0.24.2.ebuild
 1910111911 ./x11-wm/evilwm/evilwm-1.1.1.ebuild
 2002112051 ./x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
-2007011139 ./x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+2010111309 ./x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
 1912111540 ./x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
 2002231739 ./x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
 2008051739 ./x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -30545,8 +30474,8 @@
 2009010909 ./xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.2.ebuild
 2002092009 ./xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild
 2007041609 ./xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.1.ebuild
-2003060642 ./xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild
-2004231409 ./xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
+2010090009 ./xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild
+2010090009 ./xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild
 2006292139 ./xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
 2010062139 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
 2003261841 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
@@ -30811,8 +30740,10 @@
 2010031839 metadata/md5-cache/acct-group/flows-0
 2010031839 metadata/md5-cache/acct-group/sancp-0
 2010040039 metadata/md5-cache/acct-group/nzbget-0
-2010051809 metadata/md5-cache/acct-group/Manifest.gz
 2010051809 metadata/md5-cache/acct-group/croc-0
+2010120139 metadata/md5-cache/acct-group/Manifest.gz
+2010120139 metadata/md5-cache/acct-group/jabber-0
+2010090209 metadata/md5-cache/acct-group/sks-0
 2009060009 metadata/md5-cache/acct-user/abrt-0
 2009060009 metadata/md5-cache/acct-user/airdcppd-0
 2009060009 metadata/md5-cache/acct-user/alias-0
@@ -31036,8 +30967,10 @@
 2010031839 metadata/md5-cache/acct-user/sancp-0
 2010040039 metadata/md5-cache/acct-user/nzbget-0
 2010051809 metadata/md5-cache/acct-user/croc-0
-2010080609 metadata/md5-cache/acct-user/Manifest.gz
 2010080609 metadata/md5-cache/acct-user/pgbouncer-0
+2010120139 metadata/md5-cache/acct-user/Manifest.gz
+2010120139 metadata/md5-cache/acct-user/jabber-0
+2010090209 metadata/md5-cache/acct-user/sks-0
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2004032241 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2009121921 metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1
@@ -31072,9 +31005,9 @@
 2009251309 metadata/md5-cache/app-accessibility/emacspeak-9999
 2009252239 metadata/md5-cache/app-accessibility/speechd-el-2.8
 2009271339 metadata/md5-cache/app-accessibility/speech-tools-2.5.0
-2009291711 metadata/md5-cache/app-accessibility/simon-9999
-2010051439 metadata/md5-cache/app-accessibility/Manifest.gz
-2010051439 metadata/md5-cache/app-accessibility/kontrast-1.0.2
+2010092209 metadata/md5-cache/app-accessibility/Manifest.gz
+2010092209 metadata/md5-cache/app-accessibility/kontrast-1.0.2
+2010092209 metadata/md5-cache/app-accessibility/simon-9999
 1903312039 metadata/md5-cache/app-admin/checksec-1.11.1
 1810171539 metadata/md5-cache/app-admin/checksec-1.9.0
 1907241909 metadata/md5-cache/app-admin/checksec-2.0.1
@@ -31337,7 +31270,6 @@
 2009141809 metadata/md5-cache/app-admin/terraform-0.12.28
 2009141809 metadata/md5-cache/app-admin/vault-1.4.2-r1
 2009141809 metadata/md5-cache/app-admin/vault-1.4.3
-2009141809 metadata/md5-cache/app-admin/vault-1.4.5
 2009141809 metadata/md5-cache/app-admin/vault-1.5.0
 2009141809 metadata/md5-cache/app-admin/vault-1.5.2
 2009172012 metadata/md5-cache/app-admin/abrt-2.14.0
@@ -31393,7 +31325,6 @@
 2009211840 metadata/md5-cache/app-admin/webapp-config-1.55-r1
 2009211840 metadata/md5-cache/app-admin/webapp-config-9999
 2009221109 metadata/md5-cache/app-admin/eclean-kernel-2.99.2
-2009241639 metadata/md5-cache/app-admin/exo-1.18.0
 2009240709 metadata/md5-cache/app-admin/github-backup-utils-2.22.0
 2009221539 metadata/md5-cache/app-admin/kpcli-3.5
 2009241539 metadata/md5-cache/app-admin/mcelog-173
@@ -31418,7 +31349,6 @@
 2009291711 metadata/md5-cache/app-admin/keepassxc-2.6.1
 2009291711 metadata/md5-cache/app-admin/keepassxc-9999
 2009291711 metadata/md5-cache/app-admin/passwordsafe-1.11.0
-2009291711 metadata/md5-cache/app-admin/systemdgenie-0.99.0
 2009301839 metadata/md5-cache/app-admin/apg-2.3.0b_p20150129
 2009301539 metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
 2009302109 metadata/md5-cache/app-admin/glance-20.0.0
@@ -31433,12 +31363,17 @@
 2010061639 metadata/md5-cache/app-admin/aws-elb-tools-1.0.15.1-r1
 2010061909 metadata/md5-cache/app-admin/rsyslog-8.2008.0
 2010062309 metadata/md5-cache/app-admin/terraform-0.13.4
-2010081309 metadata/md5-cache/app-admin/Manifest.gz
 2010072239 metadata/md5-cache/app-admin/ansible-2.10.0-r1
 2010072239 metadata/md5-cache/app-admin/ansible-9999
 2010072239 metadata/md5-cache/app-admin/ansible-base-2.10.2
 2010081309 metadata/md5-cache/app-admin/gixy-0.1.20
 2010080239 metadata/md5-cache/app-admin/restart-services-0.16.1
+2010120539 metadata/md5-cache/app-admin/Manifest.gz
+2010091739 metadata/md5-cache/app-admin/exo-1.19.0
+2010120539 metadata/md5-cache/app-admin/selint-1.1.0
+2010120539 metadata/md5-cache/app-admin/selint-9999
+2010092209 metadata/md5-cache/app-admin/systemdgenie-0.99.0
+2010091439 metadata/md5-cache/app-admin/vault-1.4.5
 2009121921 metadata/md5-cache/app-antivirus/clamav-0.102.4
 2009181139 metadata/md5-cache/app-antivirus/clamtk-6.05
 2009211840 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
@@ -31637,8 +31572,6 @@
 2009131115 metadata/md5-cache/app-backup/pdumpfs-1.3-r2
 2009131115 metadata/md5-cache/app-backup/rdup-1.1.15
 2009131115 metadata/md5-cache/app-backup/reoback-1.0_p3-r1
-2009111825 metadata/md5-cache/app-backup/restic-0.9.4
-2009111825 metadata/md5-cache/app-backup/restic-0.9.5
 2009111825 metadata/md5-cache/app-backup/restic-0.9.6
 2009111825 metadata/md5-cache/app-backup/snapper-0.5.6-r1
 2009111825 metadata/md5-cache/app-backup/snapper-0.8.6
@@ -31647,8 +31580,6 @@
 2009131115 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
 2009111825 metadata/md5-cache/app-backup/tarsnap-1.0.37
 2009111825 metadata/md5-cache/app-backup/tarsnap-1.0.39
-2009131115 metadata/md5-cache/app-backup/tsm-7.1.8.0-r1
-2009131115 metadata/md5-cache/app-backup/tsm-8.1.6.0
 2009131115 metadata/md5-cache/app-backup/zbackup-1.4.4-r1
 2009131115 metadata/md5-cache/app-backup/zbackup-9999
 2009172012 metadata/md5-cache/app-backup/backintime-1.2.1
@@ -31659,7 +31590,6 @@
 2009211840 metadata/md5-cache/app-backup/attic-9999
 2009211840 metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
 2009211840 metadata/md5-cache/app-backup/borgbackup-1.1.13
-2009211840 metadata/md5-cache/app-backup/borgbackup-9999
 2009211840 metadata/md5-cache/app-backup/borgmatic-1.5.10
 2009211840 metadata/md5-cache/app-backup/borgmatic-1.5.9
 2009211840 metadata/md5-cache/app-backup/borgweb-0.2.0-r2
@@ -31675,14 +31605,19 @@
 2009291711 metadata/md5-cache/app-backup/bareos-18.2.9
 2009291711 metadata/md5-cache/app-backup/bareos-19.2.8
 2009291711 metadata/md5-cache/app-backup/kfoldersync-3.4.1
-2009291711 metadata/md5-cache/app-backup/kup-0.8.0
 2009301839 metadata/md5-cache/app-backup/btrbk-0.30.0
 2009301839 metadata/md5-cache/app-backup/btrbk-9999
 2010050909 metadata/md5-cache/app-backup/rear-2.6
 2010071039 metadata/md5-cache/app-backup/backupninja-1.1.0
 2010071039 metadata/md5-cache/app-backup/duplicity-0.8.15
-2010080009 metadata/md5-cache/app-backup/Manifest.gz
 2010080009 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+2010101809 metadata/md5-cache/app-backup/Manifest.gz
+2010101809 metadata/md5-cache/app-backup/borgbackup-1.1.14
+2010101809 metadata/md5-cache/app-backup/borgbackup-9999
+2010092209 metadata/md5-cache/app-backup/kup-0.8.0
+2010101039 metadata/md5-cache/app-backup/restic-0.10.0
+2010091839 metadata/md5-cache/app-backup/tsm-8.1.6.0
+2010092139 metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -31778,12 +31713,12 @@
 2009150109 metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
 2009291711 metadata/md5-cache/app-cdr/cdemu-3.2.4
 2009291711 metadata/md5-cache/app-cdr/cdemu-daemon-3.2.4
-2009291711 metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.1
 2009291711 metadata/md5-cache/app-cdr/gcdemu-3.2.4
-2009291711 metadata/md5-cache/app-cdr/isoimagewriter-0.8
 2009291711 metadata/md5-cache/app-cdr/kcdemu-0.7.3
-2010011509 metadata/md5-cache/app-cdr/Manifest.gz
 2010011509 metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
+2010092209 metadata/md5-cache/app-cdr/Manifest.gz
+2010092209 metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.2
+2010092209 metadata/md5-cache/app-cdr/isoimagewriter-0.8
 1904220939 metadata/md5-cache/app-crypt/bcwipe-1.9.13
 1809280333 metadata/md5-cache/app-crypt/cardpeek-0.7.2
 1809280333 metadata/md5-cache/app-crypt/cardpeek-0.8.4
@@ -31932,8 +31867,6 @@
 2009131115 metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r2
 2009121921 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.1-r1
 2009111825 metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
-2009111825 metadata/md5-cache/app-crypt/tpm2-tss-2.4.2
-2009111825 metadata/md5-cache/app-crypt/tpm2-tss-3.0.0
 2009111825 metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0_rc1
 2009111825 metadata/md5-cache/app-crypt/trousers-0.3.14-r3
 2009131115 metadata/md5-cache/app-crypt/veracrypt-1.24_p2
@@ -31944,11 +31877,7 @@
 2009131115 metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
 2009141809 metadata/md5-cache/app-crypt/cfssl-1.4.1
 2009140709 metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20200704
-2009142139 metadata/md5-cache/app-crypt/scrypt-1.3.1
 2009151739 metadata/md5-cache/app-crypt/tpm2-abrmd-2.3.3
-2009172012 metadata/md5-cache/app-crypt/acmebot-2.3.0-r1
-2009172012 metadata/md5-cache/app-crypt/acmebot-2.7.0
-2009172012 metadata/md5-cache/app-crypt/acmebot-9999
 2009172012 metadata/md5-cache/app-crypt/gcr-3.34.0-r1
 2009172012 metadata/md5-cache/app-crypt/gcr-3.36.0
 2009172012 metadata/md5-cache/app-crypt/seahorse-3.34.1
@@ -31996,23 +31925,13 @@
 2009291711 metadata/md5-cache/app-crypt/nitrokey-app-1.4-r1
 2009291711 metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
 2009291711 metadata/md5-cache/app-crypt/nitrokey-app-9999
-2009291711 metadata/md5-cache/app-crypt/qca-2.3.1
 2010010609 metadata/md5-cache/app-crypt/paperkey-1.6
-2010020039 metadata/md5-cache/app-crypt/acme-1.7.0
-2010020039 metadata/md5-cache/app-crypt/acme-1.8.0
 2010020039 metadata/md5-cache/app-crypt/acme-9999
-2010020039 metadata/md5-cache/app-crypt/certbot-1.7.0
-2010020039 metadata/md5-cache/app-crypt/certbot-1.8.0
-2010020039 metadata/md5-cache/app-crypt/certbot-apache-1.7.0
-2010020039 metadata/md5-cache/app-crypt/certbot-apache-1.8.0
-2010020039 metadata/md5-cache/app-crypt/certbot-nginx-1.7.0
-2010020039 metadata/md5-cache/app-crypt/certbot-nginx-1.8.0
 2010020039 metadata/md5-cache/app-crypt/certbot-nginx-9999
 2010021209 metadata/md5-cache/app-crypt/tpm2-totp-0.3.0
 2010060509 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
 2010061839 metadata/md5-cache/app-crypt/gpgme-1.14.0
 2010061709 metadata/md5-cache/app-crypt/jitterentropy-2.2.0
-2010081309 metadata/md5-cache/app-crypt/Manifest.gz
 2010071839 metadata/md5-cache/app-crypt/acme-1.9.0
 2010071839 metadata/md5-cache/app-crypt/certbot-1.9.0
 2010071839 metadata/md5-cache/app-crypt/certbot-9999
@@ -32024,6 +31943,16 @@
 2010081009 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.3.2
 2010081009 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.4.0
 2010081009 metadata/md5-cache/app-crypt/tpm2-tools-4.3.0
+2010111239 metadata/md5-cache/app-crypt/Manifest.gz
+2010102239 metadata/md5-cache/app-crypt/acme-1.8.0
+2010102239 metadata/md5-cache/app-crypt/certbot-1.8.0
+2010102239 metadata/md5-cache/app-crypt/certbot-apache-1.8.0
+2010102239 metadata/md5-cache/app-crypt/certbot-nginx-1.8.0
+2010102139 metadata/md5-cache/app-crypt/openpgp-keys-miniupnp-20201006
+2010092209 metadata/md5-cache/app-crypt/qca-2.3.1
+2010091209 metadata/md5-cache/app-crypt/scrypt-1.3.1
+2010111239 metadata/md5-cache/app-crypt/tpm2-tss-2.4.3
+2010111239 metadata/md5-cache/app-crypt/tpm2-tss-3.0.1
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
 1702282308 metadata/md5-cache/app-dicts/libydpdict-1.0.2
@@ -32687,8 +32616,6 @@
 2009131115 metadata/md5-cache/app-doc/gnucash-docs-4.0
 2009131115 metadata/md5-cache/app-doc/gnucash-docs-4.1
 2009111825 metadata/md5-cache/app-doc/halibut-1.2
-2009131115 metadata/md5-cache/app-doc/kicad-doc-4.0.7
-2009131115 metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1
 2009131115 metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
 2009131115 metadata/md5-cache/app-doc/psmark-2.1
 2009131115 metadata/md5-cache/app-doc/votca-csg-manual-9999
@@ -32701,10 +32628,10 @@
 2009231339 metadata/md5-cache/app-doc/gimp-help-2.10.0-r1
 2009251309 metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
 2009280512 metadata/md5-cache/app-doc/gnucash-docs-4.2
-2009291711 metadata/md5-cache/app-doc/kicad-doc-5.1.5
-2009291711 metadata/md5-cache/app-doc/kicad-doc-5.1.6
 2009291711 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
-2009300909 metadata/md5-cache/app-doc/Manifest.gz
+2010111239 metadata/md5-cache/app-doc/Manifest.gz
+2010111239 metadata/md5-cache/app-doc/kicad-doc-5.1.6
+2010111239 metadata/md5-cache/app-doc/kicad-doc-5.1.7
 1702282308 metadata/md5-cache/app-editors/jupp-3.1_p30
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
 1702282308 metadata/md5-cache/app-editors/le-1.16.1
@@ -32835,14 +32762,14 @@
 2009251309 metadata/md5-cache/app-editors/emacs-28.0.9999
 2009252339 metadata/md5-cache/app-editors/pluma-1.24.1
 2009291711 metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
-2009291711 metadata/md5-cache/app-editors/kile-2.9.93
 2009300509 metadata/md5-cache/app-editors/neovim-0.4.3
 2009300309 metadata/md5-cache/app-editors/neovim-0.4.4
 2009300309 metadata/md5-cache/app-editors/neovim-9999
-2009291711 metadata/md5-cache/app-editors/okteta-0.26.4
 2010062339 metadata/md5-cache/app-editors/texworks-0.6.5
-2010071809 metadata/md5-cache/app-editors/Manifest.gz
 2010071809 metadata/md5-cache/app-editors/nano-5.3
+2010092209 metadata/md5-cache/app-editors/Manifest.gz
+2010092209 metadata/md5-cache/app-editors/kile-2.9.93
+2010092209 metadata/md5-cache/app-editors/okteta-0.26.4
 2009251309 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2009251309 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2009251309 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -32971,7 +32898,6 @@
 2009251309 metadata/md5-cache/app-emacs/ledger-mode-3.1.1
 2009251309 metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
 2009251309 metadata/md5-cache/app-emacs/lua-mode-20151025
-2009251309 metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513
 2009251309 metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
 2009251309 metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
 2009251309 metadata/md5-cache/app-emacs/magit-2.13.1
@@ -33106,8 +33032,9 @@
 2009251309 metadata/md5-cache/app-emacs/yc-5.2.1
 2009251309 metadata/md5-cache/app-emacs/zenburn-20110907-r1
 2009251309 metadata/md5-cache/app-emacs/zenirc-2.112-r1
-2009291711 metadata/md5-cache/app-emacs/Manifest.gz
 2009291711 metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+2010111539 metadata/md5-cache/app-emacs/Manifest.gz
+2010111539 metadata/md5-cache/app-emacs/lua-mode-20201010
 1804270439 metadata/md5-cache/app-emulation/bochs-2.6.9
 1805292338 metadata/md5-cache/app-emulation/coldfire-0.3.1
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -33197,8 +33124,6 @@
 2009131115 metadata/md5-cache/app-emulation/free42-2.0.20
 2009111825 metadata/md5-cache/app-emulation/free42-2.5.18
 2009111825 metadata/md5-cache/app-emulation/fs-uae-3.0.5
-2009111825 metadata/md5-cache/app-emulation/fuse-1.5.6
-2009111825 metadata/md5-cache/app-emulation/fuse-1.5.7
 2009111825 metadata/md5-cache/app-emulation/fuse-utils-1.4.3
 2009121921 metadata/md5-cache/app-emulation/hercules-3.13
 2009111825 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
@@ -33213,7 +33138,6 @@
 2009131115 metadata/md5-cache/app-emulation/nemu-9999
 2009121921 metadata/md5-cache/app-emulation/open-vm-tools-11.0.1-r1
 2009121921 metadata/md5-cache/app-emulation/open-vm-tools-11.1.0
-2009121921 metadata/md5-cache/app-emulation/pcem-16
 2009111825 metadata/md5-cache/app-emulation/punes-0.106
 2009131115 metadata/md5-cache/app-emulation/qt-virt-manager-9999
 2009111825 metadata/md5-cache/app-emulation/runc-1.0.0_rc10
@@ -33290,13 +33214,11 @@
 2009181540 metadata/md5-cache/app-emulation/vkd3d-1.0
 2009181540 metadata/md5-cache/app-emulation/vkd3d-1.1
 2009181540 metadata/md5-cache/app-emulation/vkd3d-1.1-r1
-2009181540 metadata/md5-cache/app-emulation/wine-staging-5.15
 2009181540 metadata/md5-cache/app-emulation/wine-staging-5.16
 2009181540 metadata/md5-cache/app-emulation/wine-staging-5.17
 2009181540 metadata/md5-cache/app-emulation/wine-vanilla-4.0.3
 2009181540 metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
 2009181540 metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
-2009181540 metadata/md5-cache/app-emulation/wine-vanilla-5.15
 2009181540 metadata/md5-cache/app-emulation/wine-vanilla-5.16
 2009181540 metadata/md5-cache/app-emulation/wine-vanilla-5.17
 2009181809 metadata/md5-cache/app-emulation/xen-4.13.1-r3
@@ -33324,14 +33246,11 @@
 2009262309 metadata/md5-cache/app-emulation/uade-2.13-r1
 2009262039 metadata/md5-cache/app-emulation/vice-3.4_p38553
 2009280609 metadata/md5-cache/app-emulation/wine-staging-5.18
-2009280609 metadata/md5-cache/app-emulation/wine-staging-9999
 2009280609 metadata/md5-cache/app-emulation/wine-vanilla-5.18
-2009280609 metadata/md5-cache/app-emulation/wine-vanilla-9999
 2009290509 metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
 2009291711 metadata/md5-cache/app-emulation/q4wine-1.3.12
 2009300209 metadata/md5-cache/app-emulation/vkd3d-1.2
 2009300209 metadata/md5-cache/app-emulation/vkd3d-9999
-2009292309 metadata/md5-cache/app-emulation/xen-4.13.1-r4
 2009292309 metadata/md5-cache/app-emulation/xen-4.14.0-r2
 2009292309 metadata/md5-cache/app-emulation/xen-tools-4.14.0-r2
 2010030009 metadata/md5-cache/app-emulation/cloud-init-19.4
@@ -33354,10 +33273,18 @@
 2010061709 metadata/md5-cache/app-emulation/docker-registry-2.7.1
 2010071239 metadata/md5-cache/app-emulation/crun-0.15
 2010071039 metadata/md5-cache/app-emulation/qemu-5.1.0-r1
-2010071039 metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4
-2010081109 metadata/md5-cache/app-emulation/Manifest.gz
 2010080009 metadata/md5-cache/app-emulation/free42-2.5.20
 2010080009 metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
+2010112339 metadata/md5-cache/app-emulation/Manifest.gz
+2010101039 metadata/md5-cache/app-emulation/fuse-1.5.7
+2010101639 metadata/md5-cache/app-emulation/pcem-16-r1
+2010112339 metadata/md5-cache/app-emulation/wine-mono-5.1.1
+2010112339 metadata/md5-cache/app-emulation/wine-staging-5.19
+2010112339 metadata/md5-cache/app-emulation/wine-staging-9999
+2010112339 metadata/md5-cache/app-emulation/wine-vanilla-5.19
+2010112339 metadata/md5-cache/app-emulation/wine-vanilla-9999
+2010091139 metadata/md5-cache/app-emulation/xen-4.13.1-r4
+2010091139 metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -33571,7 +33498,6 @@
 2009161509 metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
 2009161509 metadata/md5-cache/app-i18n/scim-input-pad-0.1.3.1
 2009161709 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
-2009172012 metadata/md5-cache/app-i18n/ibus-1.5.22
 2009172012 metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
 2009172012 metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
 2009172012 metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
@@ -33594,7 +33520,6 @@
 2009172012 metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
 2009172012 metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
 2009172012 metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2
-2009172012 metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
 2009172012 metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1
 2009172012 metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
 2009172012 metadata/md5-cache/app-i18n/xsunpinyin-3.0.0_rc1
@@ -33620,7 +33545,6 @@
 2009291711 metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
 2009291711 metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
 2009291711 metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
-2009291711 metadata/md5-cache/app-i18n/pology-0.12-r2
 2009291711 metadata/md5-cache/app-i18n/uchardet-0.0.7
 2009291711 metadata/md5-cache/app-i18n/uchardet-9999
 2010022109 metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
@@ -33636,8 +33560,11 @@
 2010022109 metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001
 2010022109 metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
 2010021039 metadata/md5-cache/app-i18n/transifex-client-0.13.12
-2010050609 metadata/md5-cache/app-i18n/Manifest.gz
 2010050609 metadata/md5-cache/app-i18n/yaskkserv-1.1.1-r1
+2010112339 metadata/md5-cache/app-i18n/Manifest.gz
+2010112339 metadata/md5-cache/app-i18n/ibus-1.5.22
+2010092209 metadata/md5-cache/app-i18n/pology-0.12-r2
+2010111209 metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2009111825 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2009131115 metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -33840,7 +33767,6 @@
 1912261539 metadata/md5-cache/app-misc/neofetch-6.1.0
 2001061639 metadata/md5-cache/app-misc/remind-03.02.00
 2001100909 metadata/md5-cache/app-misc/imgurbash2-3.1
-2001211409 metadata/md5-cache/app-misc/fr24feed-1.0.24_p5
 2002011539 metadata/md5-cache/app-misc/remind-03.03.00
 2002060309 metadata/md5-cache/app-misc/unfoo-1.0.8
 2002112051 metadata/md5-cache/app-misc/banner-1.3.4
@@ -34007,7 +33933,6 @@
 2009111825 metadata/md5-cache/app-misc/jq-1.6-r3
 2009131115 metadata/md5-cache/app-misc/kanatest-0.4.8
 2009131115 metadata/md5-cache/app-misc/klavaro-3.0.1
-2009111825 metadata/md5-cache/app-misc/lcdproc-0.5.9-r1
 2009131115 metadata/md5-cache/app-misc/leave-20100918-r1
 2009131115 metadata/md5-cache/app-misc/ledit-2.03
 2009111825 metadata/md5-cache/app-misc/linux-logo-5.11-r4
@@ -34072,7 +33997,6 @@
 2009111825 metadata/md5-cache/app-misc/regionset-0.2
 2009131115 metadata/md5-cache/app-misc/reptyr-0.6.2
 2009131115 metadata/md5-cache/app-misc/reptyr-0.7.0
-2009111825 metadata/md5-cache/app-misc/rioutil-1.5.4
 2009131115 metadata/md5-cache/app-misc/rox-filer-2.11
 2009131115 metadata/md5-cache/app-misc/rundeck-bin-2.6.8
 2009131115 metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.11
@@ -34140,7 +34064,6 @@
 2009141809 metadata/md5-cache/app-misc/pet-0.3.6
 2009141809 metadata/md5-cache/app-misc/pet-0.3.6-r1
 2009141809 metadata/md5-cache/app-misc/spire-0.10.0
-2009170009 metadata/md5-cache/app-misc/todo-2.12.0
 2009152309 metadata/md5-cache/app-misc/ttysnoop-0.12d
 2009150609 metadata/md5-cache/app-misc/vittk-1.3
 2009172012 metadata/md5-cache/app-misc/anki-2.1.0_beta27
@@ -34163,9 +34086,6 @@
 2009172012 metadata/md5-cache/app-misc/mosquitto-1.6.12
 2009172012 metadata/md5-cache/app-misc/mosquitto-1.6.8
 2009172012 metadata/md5-cache/app-misc/mosquitto-1.6.9
-2009172012 metadata/md5-cache/app-misc/mswinurl_launcher-1.0
-2009172012 metadata/md5-cache/app-misc/mtail-1.1.1-r3
-2009172012 metadata/md5-cache/app-misc/mtail-1.2.0
 2009172012 metadata/md5-cache/app-misc/recoll-1.25.19
 2009172012 metadata/md5-cache/app-misc/terminal-colors-2.2
 2009172012 metadata/md5-cache/app-misc/terminal-colors-2.3
@@ -34174,7 +34094,6 @@
 2009172012 metadata/md5-cache/app-misc/votrify-5
 2009181139 metadata/md5-cache/app-misc/colordiff-1.0.19
 2009181139 metadata/md5-cache/app-misc/datefudge-1.24
-2009181139 metadata/md5-cache/app-misc/dtach-0.9
 2009181139 metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1
 2009192239 metadata/md5-cache/app-misc/realpath-1.18
 2009181540 metadata/md5-cache/app-misc/rl-0.2.7-r1
@@ -34212,7 +34131,6 @@
 2009262309 metadata/md5-cache/app-misc/joymouse-0.5-r1
 2009262309 metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
 2009271939 metadata/md5-cache/app-misc/resolve-march-native-0.9.4
-2009290139 metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r2
 2009290509 metadata/md5-cache/app-misc/rpick-0.6.1
 2009290509 metadata/md5-cache/app-misc/rpick-0.7.0
 2009290509 metadata/md5-cache/app-misc/skim-0.6.9
@@ -34235,12 +34153,15 @@
 2010060039 metadata/md5-cache/app-misc/yq-2.11.1
 2010062009 metadata/md5-cache/app-misc/ca-certificates-20200601.3.53
 2010062209 metadata/md5-cache/app-misc/spire-0.11.1
-2010071039 metadata/md5-cache/app-misc/fr24feed-1.0.25_p3
-2010071039 metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
-2010071039 metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
 2010071039 metadata/md5-cache/app-misc/task-2.5.1-r2
-2010080139 metadata/md5-cache/app-misc/Manifest.gz
 2010080139 metadata/md5-cache/app-misc/go-jira-1.0.27
+2010112109 metadata/md5-cache/app-misc/Manifest.gz
+2010112109 metadata/md5-cache/app-misc/dtach-0.9
+2010091139 metadata/md5-cache/app-misc/fr24feed-1.0.25_p3
+2010091139 metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
+2010101639 metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
+2010111209 metadata/md5-cache/app-misc/rioutil-1.5.4
+2010092309 metadata/md5-cache/app-misc/todo-2.12.0-r1
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -34260,14 +34181,12 @@
 2009131115 metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
 2009172012 metadata/md5-cache/app-mobilephone/adb-sync-0_p20181127-r1
 2009172012 metadata/md5-cache/app-mobilephone/adb-sync-0_p20190101
-2009172012 metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2
 2009241009 metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
-2009291711 metadata/md5-cache/app-mobilephone/Manifest.gz
 2009291711 metadata/md5-cache/app-mobilephone/gammu-1.40.0
 2009291711 metadata/md5-cache/app-mobilephone/gammu-1.41.0
+2010091209 metadata/md5-cache/app-mobilephone/Manifest.gz
 2001081609 metadata/md5-cache/app-office/libreoffice-voikko-5.0
 2005311909 metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.3.2
-2008301909 metadata/md5-cache/app-office/moneydance-2020.0.1919
 2009111825 metadata/md5-cache/app-office/abiword-3.0.4
 2009131115 metadata/md5-cache/app-office/abiword-docs-3.0.2
 2009111825 metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
@@ -34285,7 +34204,6 @@
 2009130310 metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.6.2-r1
 2009121921 metadata/md5-cache/app-office/libreoffice-l10n-6.4.3.2
 2009131115 metadata/md5-cache/app-office/mdbtools-0.7.1-r2
-2009131115 metadata/md5-cache/app-office/moneydance-2017.10
 2009131115 metadata/md5-cache/app-office/multitalk-1.4-r1
 2009131115 metadata/md5-cache/app-office/orage-4.12.1-r2
 2009131115 metadata/md5-cache/app-office/pinpoint-0.1.8-r1
@@ -34325,25 +34243,26 @@
 2009251309 metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
 2009272039 metadata/md5-cache/app-office/libreoffice-6.4.9999
 2009272039 metadata/md5-cache/app-office/libreoffice-9999
-2009291711 metadata/md5-cache/app-office/calligra-3.2.1
-2009291711 metadata/md5-cache/app-office/calligraplan-3.2.2
 2009291711 metadata/md5-cache/app-office/gnucash-4.0
 2009291711 metadata/md5-cache/app-office/gnucash-4.1
 2009291711 metadata/md5-cache/app-office/gnucash-4.2
-2009291711 metadata/md5-cache/app-office/kexi-3.2.0-r1
-2009291711 metadata/md5-cache/app-office/kmymoney-5.1.0
 2009300139 metadata/md5-cache/app-office/kraft-0.95
-2009291711 metadata/md5-cache/app-office/ktimetracker-5.0.1
 2009291711 metadata/md5-cache/app-office/ledger-3.2.0
-2009291711 metadata/md5-cache/app-office/libalkimia-8.0.3
 2009291711 metadata/md5-cache/app-office/scribus-1.5.5_p20200626
 2009291711 metadata/md5-cache/app-office/scribus-9999
-2009291711 metadata/md5-cache/app-office/skrooge-2.23.0
-2010040339 metadata/md5-cache/app-office/Manifest.gz
 2010040339 metadata/md5-cache/app-office/libreoffice-6.4.6.2-r2
 2010040339 metadata/md5-cache/app-office/libreoffice-bin-6.4.6.2-r2
 2010040339 metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.6.2-r2
 2010040339 metadata/md5-cache/app-office/libreoffice-l10n-6.4.6.2
+2010101409 metadata/md5-cache/app-office/Manifest.gz
+2010092209 metadata/md5-cache/app-office/calligra-3.2.1
+2010092209 metadata/md5-cache/app-office/calligraplan-3.2.2
+2010092209 metadata/md5-cache/app-office/kexi-3.2.0-r1
+2010092209 metadata/md5-cache/app-office/kmymoney-5.1.0
+2010092209 metadata/md5-cache/app-office/ktimetracker-5.0.1
+2010092209 metadata/md5-cache/app-office/libalkimia-8.0.3
+2010101409 metadata/md5-cache/app-office/moneydance-2020.2.1929
+2010092209 metadata/md5-cache/app-office/skrooge-2.23.0
 2009131115 metadata/md5-cache/app-officeext/Manifest.gz
 2009131115 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2009121921 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -34384,7 +34303,6 @@
 2003131739 metadata/md5-cache/app-portage/prefix-toolkit-9
 2003261841 metadata/md5-cache/app-portage/elt-patches-20170826.1
 2004032241 metadata/md5-cache/app-portage/demerge-0.047-r3
-2004032241 metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.5
 2004032241 metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
 2004110239 metadata/md5-cache/app-portage/g-cpan-0.16.9-r1
 2004110239 metadata/md5-cache/app-portage/g-cpan-0.17.0
@@ -34485,16 +34403,16 @@
 2010042139 metadata/md5-cache/app-portage/mirrorselect-9999
 2010042339 metadata/md5-cache/app-portage/portage-utils-0.90
 2010071309 metadata/md5-cache/app-portage/elogv-0.7.8-r3
-2010071309 metadata/md5-cache/app-portage/gentoolkit-0.5.0
 2010071309 metadata/md5-cache/app-portage/gentoolkit-9999
 2010071309 metadata/md5-cache/app-portage/layman-2.4.3
 2010071309 metadata/md5-cache/app-portage/layman-9999
 2010071339 metadata/md5-cache/app-portage/repoman-3.0.1
-2010072039 metadata/md5-cache/app-portage/Manifest.gz
 2010071739 metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
 2010071739 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
 2010072039 metadata/md5-cache/app-portage/portpeek-3.1.5
 2010072039 metadata/md5-cache/app-portage/repoman-9999
+2010112309 metadata/md5-cache/app-portage/Manifest.gz
+2010090939 metadata/md5-cache/app-portage/gentoolkit-0.5.0-r1
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1907092339 metadata/md5-cache/app-shells/rush-2.0
@@ -34538,7 +34456,6 @@
 2009111825 metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
 2009111825 metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
 2009111825 metadata/md5-cache/app-shells/posh-0.14.1
-2009111825 metadata/md5-cache/app-shells/quoter-3.0_p2-r1
 2009111825 metadata/md5-cache/app-shells/rrs-1.70-r2
 2009121921 metadata/md5-cache/app-shells/sash-3.8
 2009111825 metadata/md5-cache/app-shells/scsh-0.6.7-r2
@@ -34580,14 +34497,15 @@
 2009251439 metadata/md5-cache/app-shells/powerline-2.7-r2
 2009252239 metadata/md5-cache/app-shells/squirrelsh-1.2.7
 2009272239 metadata/md5-cache/app-shells/dash-0.5.11.2
-2009270039 metadata/md5-cache/app-shells/quoter-4.2
 2009290509 metadata/md5-cache/app-shells/mcfly-0.3.6
 2009291711 metadata/md5-cache/app-shells/fish-3.0.2
 2009291711 metadata/md5-cache/app-shells/fish-3.1.0
 2009291711 metadata/md5-cache/app-shells/fish-3.1.2
 2009291711 metadata/md5-cache/app-shells/fish-9999
-2010030939 metadata/md5-cache/app-shells/Manifest.gz
 2010030939 metadata/md5-cache/app-shells/loksh-6.7.4
+2010100439 metadata/md5-cache/app-shells/Manifest.gz
+2010100439 metadata/md5-cache/app-shells/loksh-6.7.5
+2010091139 metadata/md5-cache/app-shells/quoter-4.2
 1801051609 metadata/md5-cache/app-text/antixls-0.3b
 1803271139 metadata/md5-cache/app-text/convmv-2.05
 1910111840 metadata/md5-cache/app-text/dbacl-1.14
@@ -34691,7 +34609,6 @@
 2006280009 metadata/md5-cache/app-text/flpsed-0.7.3
 2006291309 metadata/md5-cache/app-text/txt2man-1.7.1
 2007040239 metadata/md5-cache/app-text/binfind-0.0.3
-2007230839 metadata/md5-cache/app-text/gocr-0.50
 2007231439 metadata/md5-cache/app-text/wgetpaste-2.29-r1
 2008042209 metadata/md5-cache/app-text/gv-3.7.3.90
 2008070940 metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
@@ -34766,7 +34683,6 @@
 2009131115 metadata/md5-cache/app-text/fictionup-0.1
 2009121921 metadata/md5-cache/app-text/fictionup-0.2.1
 2009121921 metadata/md5-cache/app-text/ghostscript-gpl-9.52-r1
-2009121921 metadata/md5-cache/app-text/ghostscript-gpl-9.53.0
 2009111825 metadata/md5-cache/app-text/goldendict-1.5.0_rc2-r2
 2009131115 metadata/md5-cache/app-text/groonga-6.1.2
 2009111825 metadata/md5-cache/app-text/groonga-8.0.2
@@ -34909,7 +34825,6 @@
 2009111825 metadata/md5-cache/app-text/yodl-4.02.01
 2009121921 metadata/md5-cache/app-text/yodl-4.02.02-r1
 2009160039 metadata/md5-cache/app-text/blogc-0.20.0
-2009162239 metadata/md5-cache/app-text/ghostscript-gpl-9.53.1
 2009140439 metadata/md5-cache/app-text/mandoc-1.14.5
 2009141809 metadata/md5-cache/app-text/vgrep-2.3.1
 2009141809 metadata/md5-cache/app-text/vgrep-2.3.3
@@ -34975,7 +34890,6 @@
 2009211840 metadata/md5-cache/app-text/dblatex-0.3.11-r1
 2009211840 metadata/md5-cache/app-text/htmlmin-0.1.12
 2009211840 metadata/md5-cache/app-text/krop-0.5.1-r1
-2009211840 metadata/md5-cache/app-text/krop-9999
 2009211840 metadata/md5-cache/app-text/nfoview-1.27.1
 2009211840 metadata/md5-cache/app-text/nfoview-1.28
 2009211840 metadata/md5-cache/app-text/nfoview-9999
@@ -34993,14 +34907,10 @@
 2009211840 metadata/md5-cache/app-text/pelican-9999
 2009211840 metadata/md5-cache/app-text/pytextile-3.0.3
 2009211840 metadata/md5-cache/app-text/pytextile-4.0.1
-2009211840 metadata/md5-cache/app-text/restview-2.9.2
 2009211840 metadata/md5-cache/app-text/rnc2rng-2.6.1
 2009211840 metadata/md5-cache/app-text/rnc2rng-2.6.2
 2009211840 metadata/md5-cache/app-text/rpl-1.6.7
-2009211840 metadata/md5-cache/app-text/silvercity-0.9.7-r1
-2009211840 metadata/md5-cache/app-text/txt2tags-3.3
 2009211840 metadata/md5-cache/app-text/xapers-0.9.0
-2009211840 metadata/md5-cache/app-text/xlsx2csv-0.7.6
 2009211840 metadata/md5-cache/app-text/xmldiff-2.3
 2009231339 metadata/md5-cache/app-text/asciidoc-9.0.2
 2009251309 metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -35008,11 +34918,9 @@
 2009251309 metadata/md5-cache/app-text/namazu-2.0.21
 2009251309 metadata/md5-cache/app-text/namazu-2.0.22_pre7
 2009251309 metadata/md5-cache/app-text/xdvik-22.87.03-r2
-2009261309 metadata/md5-cache/app-text/ghostscript-gpl-9.53.2
 2009262309 metadata/md5-cache/app-text/wscr-1.2-r2
 2009290509 metadata/md5-cache/app-text/fblog-1.4.1
 2009282109 metadata/md5-cache/app-text/xapian-omega-1.4.17
-2009290309 metadata/md5-cache/app-text/xournalpp-1.0.18-r1
 2009290309 metadata/md5-cache/app-text/xournalpp-9999
 2009291711 metadata/md5-cache/app-text/apvlv-0.1.5-r2
 2009291711 metadata/md5-cache/app-text/bibletime-2.11.2
@@ -35025,9 +34933,6 @@
 2009291711 metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
 2009291711 metadata/md5-cache/app-text/fb2edit-0.1.0
 2009300009 metadata/md5-cache/app-text/fbreader-0.99.4-r5
-2009291711 metadata/md5-cache/app-text/kbibtex-0.9.2
-2009291711 metadata/md5-cache/app-text/kjots-5.0.2-r1
-2009291711 metadata/md5-cache/app-text/kjots-5.0.2-r2
 2009291711 metadata/md5-cache/app-text/nuspell-3.0.0
 2009291711 metadata/md5-cache/app-text/nuspell-3.1.0
 2009291711 metadata/md5-cache/app-text/nuspell-3.1.1
@@ -35039,7 +34944,6 @@
 2009291711 metadata/md5-cache/app-text/sigil-1.3.0
 2009291711 metadata/md5-cache/app-text/xiphos-4.2.1
 2009291711 metadata/md5-cache/app-text/xpdf-4.02-r4
-2010011509 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3
 2010021209 metadata/md5-cache/app-text/master-pdf-editor-5.6.42
 2010021909 metadata/md5-cache/app-text/poppler-20.10.0
 2010021909 metadata/md5-cache/app-text/poppler-9999
@@ -35053,8 +34957,22 @@
 2010060709 metadata/md5-cache/app-text/iso-codes-4.5.0
 2010071039 metadata/md5-cache/app-text/discount-2.2.7
 2010070039 metadata/md5-cache/app-text/epstool-3.08-r1
-2010080009 metadata/md5-cache/app-text/Manifest.gz
 2010080009 metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
+2010120009 metadata/md5-cache/app-text/Manifest.gz
+2010101109 metadata/md5-cache/app-text/ansifilter-2.17
+2010120009 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r1
+2010112239 metadata/md5-cache/app-text/gocr-0.50
+2010092209 metadata/md5-cache/app-text/kbibtex-0.9.2
+2010092209 metadata/md5-cache/app-text/kjots-5.0.2-r1
+2010092209 metadata/md5-cache/app-text/kjots-5.0.2-r2
+2010092209 metadata/md5-cache/app-text/krop-0.6.0
+2010092209 metadata/md5-cache/app-text/krop-9999
+2010111239 metadata/md5-cache/app-text/restview-2.9.2
+2010111239 metadata/md5-cache/app-text/txt2tags-3.3
+2010111239 metadata/md5-cache/app-text/txt2tags-3.7
+2010111239 metadata/md5-cache/app-text/xlsx2csv-0.7.6
+2010101039 metadata/md5-cache/app-text/xmldiff-2.4
+2010110309 metadata/md5-cache/app-text/xournalpp-1.0.18-r1
 1911262256 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1911262256 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 1911262256 metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -35275,7 +35193,6 @@
 2009131115 metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
 2009131115 metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
 2009131115 metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
-2009172012 metadata/md5-cache/app-vim/conque-2.3-r1
 2009172012 metadata/md5-cache/app-vim/gundo-2.6.2-r3
 2009172012 metadata/md5-cache/app-vim/iris-1.0.0
 2009172012 metadata/md5-cache/app-vim/jedi-0.8_p20171015-r1
@@ -35294,8 +35211,8 @@
 2009271939 metadata/md5-cache/app-vim/jedi-0.10.0
 2010061739 metadata/md5-cache/app-vim/screen-1.5
 2010061739 metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
-2010071339 metadata/md5-cache/app-vim/Manifest.gz
 2010071339 metadata/md5-cache/app-vim/gentoo-syntax-20201007
+2010091109 metadata/md5-cache/app-vim/Manifest.gz
 1704032208 metadata/md5-cache/app-xemacs/dired-1.19
 1704032208 metadata/md5-cache/app-xemacs/easypg-1.02
 1704032208 metadata/md5-cache/app-xemacs/ediff-1.77
@@ -35727,7 +35644,6 @@
 2009181540 metadata/md5-cache/dev-cpp/tbb-2020.3
 2009251309 metadata/md5-cache/dev-cpp/ctemplate-2.4
 2009291711 metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2
-2009291711 metadata/md5-cache/dev-cpp/abseil-cpp-20200923
 2009291711 metadata/md5-cache/dev-cpp/aixlog-1.4.0
 2009291711 metadata/md5-cache/dev-cpp/aixlog-9999
 2009291711 metadata/md5-cache/dev-cpp/benchmark-1.5.1
@@ -35735,7 +35651,6 @@
 2009291711 metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
 2009291711 metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
 2009291711 metadata/md5-cache/dev-cpp/gtest-1.10.0_p20200702
-2009291711 metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
 2009291711 metadata/md5-cache/dev-cpp/gtest-9999
 2009291711 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.3.0
 2009291711 metadata/md5-cache/dev-cpp/lucene++-3.0.7-r2
@@ -35757,10 +35672,15 @@
 2009291711 metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
 2009291711 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
 2010071039 metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
-2010081309 metadata/md5-cache/dev-cpp/Manifest.gz
 2010080539 metadata/md5-cache/dev-cpp/glibmm-2.64.2
 2010080539 metadata/md5-cache/dev-cpp/mm-common-1.0.1
 2010081309 metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0
+2010120809 metadata/md5-cache/dev-cpp/Manifest.gz
+2010120809 metadata/md5-cache/dev-cpp/abseil-cpp-20200923.1
+2010120039 metadata/md5-cache/dev-cpp/eigen-3.3.8
+2010112339 metadata/md5-cache/dev-cpp/nlohmann_json-3.9.1
+2010090039 metadata/md5-cache/dev-cpp/robin-map-0.6.3
+2010090039 metadata/md5-cache/dev-cpp/robin-map-9999
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1910170740 metadata/md5-cache/dev-db/innotop-1.12.0
 1702282310 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -35941,12 +35861,10 @@
 2009261939 metadata/md5-cache/dev-db/postgresql-9.6.19
 2009290139 metadata/md5-cache/dev-db/mongodb-4.0.19
 2009291711 metadata/md5-cache/dev-db/cpp-driver-2.11.0
-2009291711 metadata/md5-cache/dev-db/kdb-3.2.0
 2009291711 metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.6
 2009291711 metadata/md5-cache/dev-db/mysql-5.7.31
 2009291711 metadata/md5-cache/dev-db/mysql-8.0.21-r1
 2009291711 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
-2009291711 metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1
 2009291711 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
 2009291711 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
 2009291711 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
@@ -35960,8 +35878,6 @@
 2010020339 metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
 2010020339 metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
 2010041939 metadata/md5-cache/dev-db/influxdb-1.8.3
-2010071009 metadata/md5-cache/dev-db/sqlite-3.33.0
-2010080139 metadata/md5-cache/dev-db/Manifest.gz
 2010080139 metadata/md5-cache/dev-db/mariadb-10.1.47
 2010080139 metadata/md5-cache/dev-db/mariadb-10.2.32-r3
 2010080139 metadata/md5-cache/dev-db/mariadb-10.2.34
@@ -35970,6 +35886,11 @@
 2010080139 metadata/md5-cache/dev-db/mariadb-10.4.13-r3
 2010080139 metadata/md5-cache/dev-db/mariadb-10.4.15
 2010080139 metadata/md5-cache/dev-db/mariadb-10.5.6
+2010111509 metadata/md5-cache/dev-db/Manifest.gz
+2010092209 metadata/md5-cache/dev-db/kdb-3.2.0
+2010090309 metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
+2010101039 metadata/md5-cache/dev-db/sqldeveloper-20.2.0.175.1842
+2010111509 metadata/md5-cache/dev-db/sqlite-3.33.0
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2009131115 metadata/md5-cache/dev-dotnet/Manifest.gz
@@ -36063,8 +35984,9 @@
 2009280209 metadata/md5-cache/dev-embedded/libjaylink-9999
 2010050039 metadata/md5-cache/dev-embedded/esptool-2.8-r1
 2010060109 metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1
-2010062339 metadata/md5-cache/dev-embedded/Manifest.gz
 2010062339 metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
+2010111239 metadata/md5-cache/dev-embedded/Manifest.gz
+2010111239 metadata/md5-cache/dev-embedded/esptool-2.8-r2
 2005120109 metadata/md5-cache/dev-erlang/cache_tab-1.0.20
 2005120109 metadata/md5-cache/dev-erlang/cache_tab-1.0.22
 2005120109 metadata/md5-cache/dev-erlang/cache_tab-1.0.7
@@ -36191,7 +36113,6 @@
 2009131115 metadata/md5-cache/dev-games/libmt_client-0.1.98
 2009111825 metadata/md5-cache/dev-games/libnw-1.30.02
 2009131115 metadata/md5-cache/dev-games/mercator-0.3.3
-2009131115 metadata/md5-cache/dev-games/mygui-3.2.2
 2009121921 metadata/md5-cache/dev-games/mygui-3.4.0
 2009131115 metadata/md5-cache/dev-games/newton-3.14
 2009131115 metadata/md5-cache/dev-games/ode-0.11.1
@@ -36210,7 +36131,6 @@
 2009172012 metadata/md5-cache/dev-games/tiled-1.4.2
 2009191909 metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
 2009270139 metadata/md5-cache/dev-games/irrlicht-1.8.4-r1
-2009292339 metadata/md5-cache/dev-games/Manifest.gz
 2009291711 metadata/md5-cache/dev-games/aseprite-1.1.7-r1
 2009291711 metadata/md5-cache/dev-games/aseprite-1.1.9
 2009291711 metadata/md5-cache/dev-games/cegui-0.8.7-r1
@@ -36228,6 +36148,8 @@
 2009291711 metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511
 2009291711 metadata/md5-cache/dev-games/simgear-2020.1.2
 2009291711 metadata/md5-cache/dev-games/simgear-9999
+2010111339 metadata/md5-cache/dev-games/Manifest.gz
+2010111339 metadata/md5-cache/dev-games/mygui-3.2.2
 1902072239 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
 1902072239 metadata/md5-cache/dev-go/blackfriday-1.4
 1902072239 metadata/md5-cache/dev-go/go-bindata-assetfs-1.0.0_p20180223
@@ -36421,20 +36343,16 @@
 2009121921 metadata/md5-cache/dev-haskell/doctemplates-0.8.2
 2009121921 metadata/md5-cache/dev-haskell/doctest-0.16.3
 2009131115 metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
-2009131115 metadata/md5-cache/dev-haskell/easy-file-0.2.1
 2009131115 metadata/md5-cache/dev-haskell/echo-0.1.3
 2009131115 metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
 2009121921 metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
-2009131115 metadata/md5-cache/dev-haskell/edisoncore-1.3.1.1
 2009121921 metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
-2009131115 metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
 2009121921 metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
 2009121921 metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
 2009121921 metadata/md5-cache/dev-haskell/either-5.0.1.1
 2009121921 metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
 2009121921 metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6
 2009131115 metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
-2009131115 metadata/md5-cache/dev-haskell/email-validate-2.0.1
 2009121921 metadata/md5-cache/dev-haskell/emojis-0.1
 2009131115 metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
 2009121921 metadata/md5-cache/dev-haskell/encoding-0.8.5
@@ -36442,29 +36360,22 @@
 2009121921 metadata/md5-cache/dev-haskell/enumerator-0.4.20
 2009121921 metadata/md5-cache/dev-haskell/equivalence-0.3.5
 2009131115 metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
-2009131115 metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
 2009121921 metadata/md5-cache/dev-haskell/errors-2.3.0
 2009121921 metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
 2009121921 metadata/md5-cache/dev-haskell/exceptions-0.10.4
 2009131115 metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
-2009131115 metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
 2009131115 metadata/md5-cache/dev-haskell/fail-4.9.0.0
-2009131115 metadata/md5-cache/dev-haskell/failure-0.2.0.3
 2009121921 metadata/md5-cache/dev-haskell/fast-logger-3.0.1
 2009131115 metadata/md5-cache/dev-haskell/fclabels-2.0.3.3
-2009131115 metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
 2009121921 metadata/md5-cache/dev-haskell/feed-1.3.0.1
 2009121921 metadata/md5-cache/dev-haskell/fgl-5.7.0.2
 2009131115 metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
 2009121921 metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
 2009131115 metadata/md5-cache/dev-haskell/file-location-0.4.9.1
 2009121921 metadata/md5-cache/dev-haskell/filelock-0.1.1.5
-2009131115 metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
 2009121921 metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
 2009121921 metadata/md5-cache/dev-haskell/filestore-0.6.5
-2009131115 metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
 2009121921 metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
-2009131115 metadata/md5-cache/dev-haskell/fixed-0.2.1.1
 2009121921 metadata/md5-cache/dev-haskell/fmlist-0.9.3
 2009121921 metadata/md5-cache/dev-haskell/foldl-1.4.7
 2009121921 metadata/md5-cache/dev-haskell/foundation-0.0.25
@@ -36472,14 +36383,12 @@
 2009121921 metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
 2009121921 metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
 2009121921 metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
-2009131115 metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
 2009121921 metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
 2009121921 metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
 2009121921 metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
 2009121921 metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
 2009121921 metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
 2009121921 metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
-2009131115 metadata/md5-cache/dev-haskell/ghc-syb-utils-0.2.3
 2009121921 metadata/md5-cache/dev-haskell/gio-0.13.8.1
 2009121921 metadata/md5-cache/dev-haskell/git-0.3.0
 2009121921 metadata/md5-cache/dev-haskell/git-lfs-1.1.0
@@ -36489,11 +36398,7 @@
 2009131115 metadata/md5-cache/dev-haskell/glob-0.9.3
 2009131115 metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
 2009121921 metadata/md5-cache/dev-haskell/glut-2.7.0.15
-2009131115 metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
-2009131115 metadata/md5-cache/dev-haskell/gnutls-0.2
 2009121921 metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
-2009131115 metadata/md5-cache/dev-haskell/groupoids-4.0
-2009131115 metadata/md5-cache/dev-haskell/gsasl-0.3.6
 2009121921 metadata/md5-cache/dev-haskell/gtk-0.14.10-r3
 2009121921 metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
 2009121921 metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0
@@ -36603,9 +36508,7 @@
 2009131115 metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
 2009131115 metadata/md5-cache/dev-haskell/hunit-1.6.0.0
 2009121921 metadata/md5-cache/dev-haskell/hxt-9.3.1.18
-2009131115 metadata/md5-cache/dev-haskell/hxt-charproperties-9.2.0.1
 2009131115 metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
-2009131115 metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
 2009121921 metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
 2009131115 metadata/md5-cache/dev-haskell/iconv-0.4.1.3
 2009131115 metadata/md5-cache/dev-haskell/idiii-0.1.3.3
@@ -37152,7 +37055,6 @@
 2010041409 metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
 2010041409 metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
 2010041409 metadata/md5-cache/dev-haskell/curl-1.3.8
-2010081109 metadata/md5-cache/dev-haskell/Manifest.gz
 2010081109 metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
 2010081109 metadata/md5-cache/dev-haskell/data-default-0.7.1.1
 2010081109 metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
@@ -37160,12 +37062,31 @@
 2010081109 metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
 2010081109 metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
 2010081109 metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
-2010081109 metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
 2010081109 metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
 2010081109 metadata/md5-cache/dev-haskell/digest-0.0.1.2
 2010081109 metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
 2010081109 metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
 2010081109 metadata/md5-cache/dev-haskell/drbg-0.5.5
+2010112139 metadata/md5-cache/dev-haskell/Manifest.gz
+2010082139 metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+2010082139 metadata/md5-cache/dev-haskell/easy-file-0.2.2
+2010082139 metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+2010082139 metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
+2010082139 metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+2010082139 metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+2010101239 metadata/md5-cache/dev-haskell/failure-0.2.0.3
+2010101239 metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+2010101239 metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
+2010101239 metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+2010101239 metadata/md5-cache/dev-haskell/fixed-0.3
+2010101239 metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
+2010111809 metadata/md5-cache/dev-haskell/ghc-syb-utils-0.3.0.0
+2010111809 metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
+2010111809 metadata/md5-cache/dev-haskell/gnutls-0.2
+2010111809 metadata/md5-cache/dev-haskell/groupoids-4.0
+2010111809 metadata/md5-cache/dev-haskell/gsasl-0.3.7
+2010112139 metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
+2010112139 metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
 1702282312 metadata/md5-cache/dev-java/java-apicheck-0_p20150907
 1702282312 metadata/md5-cache/dev-java/offo-hyphenation-2.0
 2007200039 metadata/md5-cache/dev-java/ant-1.10.8
@@ -37868,7 +37789,6 @@
 2009211840 metadata/md5-cache/dev-java/javatoolkit-0.6.1
 2009211840 metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
 2009211840 metadata/md5-cache/dev-java/javatoolkit-0.6.3
-2009241009 metadata/md5-cache/dev-java/bcprov-1.66
 2009231409 metadata/md5-cache/dev-java/jsch-0.1.54
 2009240339 metadata/md5-cache/dev-java/openjdk-11.0.8_p10
 2009240339 metadata/md5-cache/dev-java/openjdk-8.265_p01
@@ -37879,7 +37799,6 @@
 2009290509 metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
 2009292109 metadata/md5-cache/dev-java/maven-bin-3.6.2
 2009292109 metadata/md5-cache/dev-java/maven-bin-3.6.3
-2010022109 metadata/md5-cache/dev-java/Manifest.gz
 2010012139 metadata/md5-cache/dev-java/ant-1.10.9
 2010012139 metadata/md5-cache/dev-java/ant-antlr-1.10.9
 2010012139 metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
@@ -37906,6 +37825,8 @@
 2010012139 metadata/md5-cache/dev-java/jdepend-2.9-r6
 2010022109 metadata/md5-cache/dev-java/qdox-1.12.1-r2
 2010022109 metadata/md5-cache/dev-java/qdox-1.6.3-r2
+2010091139 metadata/md5-cache/dev-java/Manifest.gz
+2010091139 metadata/md5-cache/dev-java/bcprov-1.66
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1910152339 metadata/md5-cache/dev-lang/duktape-2.4.0
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -38084,7 +38005,6 @@
 2009131115 metadata/md5-cache/dev-lang/vala-0.48.7
 2009131115 metadata/md5-cache/dev-lang/vala-0.48.8
 2009131115 metadata/md5-cache/dev-lang/vala-0.48.9
-2009131115 metadata/md5-cache/dev-lang/vala-0.49.91
 2009131115 metadata/md5-cache/dev-lang/whitespace-0.4
 2009121639 metadata/md5-cache/dev-lang/xsb-3.8.0
 2009131115 metadata/md5-cache/dev-lang/yap-6.3.3-r1
@@ -38131,10 +38051,8 @@
 2009181540 metadata/md5-cache/dev-lang/rust-bin-1.44.1
 2009181540 metadata/md5-cache/dev-lang/rust-bin-1.45.2
 2009201409 metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
-2009201409 metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
 2009201409 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
 2009201709 metadata/md5-cache/dev-lang/spidermonkey-68.12.0
-2009201839 metadata/md5-cache/dev-lang/spidermonkey-78.2.0
 2009181139 metadata/md5-cache/dev-lang/swi-prolog-8.2.1
 2009181540 metadata/md5-cache/dev-lang/tcl-8.5.17-r1
 2009181540 metadata/md5-cache/dev-lang/tcl-8.6.8
@@ -38173,7 +38091,6 @@
 2009291711 metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
 2009291711 metadata/md5-cache/dev-lang/ispc-1.14.1
 2009291711 metadata/md5-cache/dev-lang/ispc-9999
-2009300439 metadata/md5-cache/dev-lang/spidermonkey-78.3.0
 2009291711 metadata/md5-cache/dev-lang/squirrel-3.1_p20200612
 2009291711 metadata/md5-cache/dev-lang/zig-0.5.0
 2009291711 metadata/md5-cache/dev-lang/zig-9999
@@ -38198,14 +38115,22 @@
 2010071039 metadata/md5-cache/dev-lang/php-7.2.34
 2010071039 metadata/md5-cache/dev-lang/php-7.3.23
 2010071039 metadata/md5-cache/dev-lang/php-7.4.11
-2010071139 metadata/md5-cache/dev-lang/rust-1.45.2
-2010071139 metadata/md5-cache/dev-lang/rust-1.46.0
-2010071139 metadata/md5-cache/dev-lang/rust-bin-1.46.0
-2010070409 metadata/md5-cache/dev-lang/spidermonkey-78.3.1
-2010071039 metadata/md5-cache/dev-lang/swig-4.0.2
-2010081609 metadata/md5-cache/dev-lang/Manifest.gz
-2010081609 metadata/md5-cache/dev-lang/python-2.7.18-r4
-2010081609 metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
+2010120109 metadata/md5-cache/dev-lang/Manifest.gz
+2010090109 metadata/md5-cache/dev-lang/elixir-1.11.0
+2010112109 metadata/md5-cache/dev-lang/execline-2.6.1.1
+2010102109 metadata/md5-cache/dev-lang/python-2.7.18-r4
+2010102109 metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
+2010091239 metadata/md5-cache/dev-lang/rust-1.45.2
+2010091239 metadata/md5-cache/dev-lang/rust-1.46.0
+2010091239 metadata/md5-cache/dev-lang/rust-1.47.0
+2010091209 metadata/md5-cache/dev-lang/rust-bin-1.46.0
+2010090939 metadata/md5-cache/dev-lang/rust-bin-1.47.0
+2010111509 metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
+2010102109 metadata/md5-cache/dev-lang/spidermonkey-78.3.1
+2010101709 metadata/md5-cache/dev-lang/swig-4.0.2
+2010120039 metadata/md5-cache/dev-lang/vala-0.40.24
+2010120039 metadata/md5-cache/dev-lang/vala-0.48.11
+2010120109 metadata/md5-cache/dev-lang/vala-0.50.1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.6.0
 1806262009 metadata/md5-cache/dev-libs/cudnn-7.1.4
@@ -38309,13 +38234,11 @@
 2007312139 metadata/md5-cache/dev-libs/vala-common-0.48.8
 2008050409 metadata/md5-cache/dev-libs/cdk-5.0.20160131
 2008131939 metadata/md5-cache/dev-libs/libpipeline-1.5.3
-2008231909 metadata/md5-cache/dev-libs/vala-common-0.49.91
 2009021410 metadata/md5-cache/dev-libs/bemenu-9999
 2009021410 metadata/md5-cache/dev-libs/gnulib-9999-r1
 2009021410 metadata/md5-cache/dev-libs/go-fuse-9999
 2009021410 metadata/md5-cache/dev-libs/libmowgli-9999
 2009040309 metadata/md5-cache/dev-libs/xmlsec-1.2.30
-2009072139 metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
 2009081739 metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
 2009091539 metadata/md5-cache/dev-libs/libg15-1.2.7-r1
 2009111825 metadata/md5-cache/dev-libs/9libs-1.0-r4
@@ -38384,7 +38307,6 @@
 2009111825 metadata/md5-cache/dev-libs/gf2x-1.3.0
 2009131115 metadata/md5-cache/dev-libs/gjs-1.58.6
 2009131115 metadata/md5-cache/dev-libs/gmime-2.6.23-r1
-2009131115 metadata/md5-cache/dev-libs/gmime-3.2.7
 2009131115 metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
 2009131115 metadata/md5-cache/dev-libs/go-fuse-0_p20150422
 2009111825 metadata/md5-cache/dev-libs/go-usb-9999
@@ -38511,7 +38433,6 @@
 2009111825 metadata/md5-cache/dev-libs/libnsutils-0.1.0-r1
 2009121921 metadata/md5-cache/dev-libs/libofx-0.9.15
 2009131115 metadata/md5-cache/dev-libs/libotf-0.9.13
-2009111825 metadata/md5-cache/dev-libs/libotf-0.9.16
 2009131115 metadata/md5-cache/dev-libs/libowfat-0.31-r1
 2009121921 metadata/md5-cache/dev-libs/libowfat-0.32-r1
 2009121921 metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
@@ -38546,7 +38467,6 @@
 2009111825 metadata/md5-cache/dev-libs/libtompoly-0.04-r1
 2009131115 metadata/md5-cache/dev-libs/libtsm-4.0.1
 2009131115 metadata/md5-cache/dev-libs/libtubo-5.0.15
-2009111825 metadata/md5-cache/dev-libs/libugpio-0.0.6
 2009131115 metadata/md5-cache/dev-libs/libunique-1.1.6-r2
 2009131115 metadata/md5-cache/dev-libs/libunique-3.0.2-r1
 2009111825 metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
@@ -38643,7 +38563,6 @@
 2009111825 metadata/md5-cache/dev-libs/rlog-1.4
 2009131115 metadata/md5-cache/dev-libs/sdformat-6.2.0
 2009121921 metadata/md5-cache/dev-libs/sdformat-9.2.0
-2009111825 metadata/md5-cache/dev-libs/serdisplib-2.02
 2009111825 metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
 2009111825 metadata/md5-cache/dev-libs/skalibs-2.3.2.0
 2009131115 metadata/md5-cache/dev-libs/smack-0.5.0
@@ -38708,14 +38627,11 @@
 2009172012 metadata/md5-cache/dev-libs/girara-9999
 2009172012 metadata/md5-cache/dev-libs/gjs-1.64.4
 2009172012 metadata/md5-cache/dev-libs/gobject-introspection-1.62.0-r1
-2009172012 metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
 2009172012 metadata/md5-cache/dev-libs/gom-0.4
 2009172012 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2009172012 metadata/md5-cache/dev-libs/jsoncpp-1.9.3
 2009172012 metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0
 2009172012 metadata/md5-cache/dev-libs/jsonrpc-glib-3.34.0
-2009172012 metadata/md5-cache/dev-libs/libarcus-3.4.1
-2009172012 metadata/md5-cache/dev-libs/libarcus-3.6.0
 2009172012 metadata/md5-cache/dev-libs/libcbor-0.5.0
 2009172012 metadata/md5-cache/dev-libs/libcbor-0.6.0-r1
 2009172012 metadata/md5-cache/dev-libs/libcbor-0.6.1
@@ -38723,8 +38639,6 @@
 2009172012 metadata/md5-cache/dev-libs/libcec-4.0.2-r2
 2009172012 metadata/md5-cache/dev-libs/libcec-4.0.4-r1
 2009172012 metadata/md5-cache/dev-libs/libcec-4.0.7
-2009172012 metadata/md5-cache/dev-libs/libcharon-3.4.1
-2009172012 metadata/md5-cache/dev-libs/libcharon-3.6.0-r1
 2009172012 metadata/md5-cache/dev-libs/libclc-0.2.0_pre20191024
 2009172012 metadata/md5-cache/dev-libs/libdazzle-3.34.1
 2009172012 metadata/md5-cache/dev-libs/libdazzle-3.36.0
@@ -38750,8 +38664,6 @@
 2009172012 metadata/md5-cache/dev-libs/libreport-2.12.0
 2009172012 metadata/md5-cache/dev-libs/libreport-2.13.0
 2009172012 metadata/md5-cache/dev-libs/libreport-2.13.1
-2009172012 metadata/md5-cache/dev-libs/libsavitar-3.4.1
-2009172012 metadata/md5-cache/dev-libs/libsavitar-3.6.0
 2009172012 metadata/md5-cache/dev-libs/libvarlink-16
 2009172012 metadata/md5-cache/dev-libs/libvarlink-18
 2009172012 metadata/md5-cache/dev-libs/libvarlink-19
@@ -38761,8 +38673,6 @@
 2009172012 metadata/md5-cache/dev-libs/libxmlb-0.2.0
 2009172012 metadata/md5-cache/dev-libs/libxmlb-0.2.1
 2009172012 metadata/md5-cache/dev-libs/newt-0.52.21-r1
-2009172012 metadata/md5-cache/dev-libs/qrosspython-0.3.2
-2009172012 metadata/md5-cache/dev-libs/qrosspython-9999
 2009172012 metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r1
 2009172012 metadata/md5-cache/dev-libs/satyr-0.27
 2009172012 metadata/md5-cache/dev-libs/satyr-0.30
@@ -38791,8 +38701,6 @@
 2009181540 metadata/md5-cache/dev-libs/atk-2.36.0
 2009181540 metadata/md5-cache/dev-libs/boehm-gc-8.0.4
 2009181139 metadata/md5-cache/dev-libs/botan-2.15.0
-2009181540 metadata/md5-cache/dev-libs/cloog-0.18.4
-2009181540 metadata/md5-cache/dev-libs/cloog-9999
 2009181540 metadata/md5-cache/dev-libs/confuse-3.0
 2009181540 metadata/md5-cache/dev-libs/confuse-3.2.2
 2009181540 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r3
@@ -38805,7 +38713,6 @@
 2009181540 metadata/md5-cache/dev-libs/ding-libs-0.6.0
 2009181540 metadata/md5-cache/dev-libs/ding-libs-0.6.1
 2009181540 metadata/md5-cache/dev-libs/elfutils-0.180
-2009181540 metadata/md5-cache/dev-libs/elfutils-0.181
 2009181540 metadata/md5-cache/dev-libs/ell-0.28
 2009181540 metadata/md5-cache/dev-libs/ell-0.31
 2009181540 metadata/md5-cache/dev-libs/ell-0.32
@@ -38942,7 +38849,6 @@
 2009181540 metadata/md5-cache/dev-libs/msgpack-3.2.0
 2009181540 metadata/md5-cache/dev-libs/nettle-3.4.1
 2009181540 metadata/md5-cache/dev-libs/nettle-3.5.1-r1
-2009181540 metadata/md5-cache/dev-libs/nettle-3.6-r2
 2009181540 metadata/md5-cache/dev-libs/nspr-4.26
 2009181540 metadata/md5-cache/dev-libs/nspr-4.27
 2009181540 metadata/md5-cache/dev-libs/nss-3.55
@@ -38962,7 +38868,6 @@
 2009181540 metadata/md5-cache/dev-libs/popt-1.18
 2009181540 metadata/md5-cache/dev-libs/protobuf-c-1.3.2
 2009181540 metadata/md5-cache/dev-libs/protobuf-c-1.3.3
-2009181540 metadata/md5-cache/dev-libs/serd-0.30.2
 2009191609 metadata/md5-cache/dev-libs/starpu-1.2.6-r1
 2009191939 metadata/md5-cache/dev-libs/stb-20200205
 2009181540 metadata/md5-cache/dev-libs/udis86-1.7-r2
@@ -39023,7 +38928,6 @@
 2009271309 metadata/md5-cache/dev-libs/glib-2.64.5
 2009261409 metadata/md5-cache/dev-libs/jsoncpp-1.9.4
 2009270039 metadata/md5-cache/dev-libs/libdnet-1.14
-2009271339 metadata/md5-cache/dev-libs/libdnet-1.14-r1
 2009270039 metadata/md5-cache/dev-libs/libnl-3.5.0
 2009261939 metadata/md5-cache/dev-libs/libxml2-2.9.10-r2
 2009262109 metadata/md5-cache/dev-libs/libxml2-2.9.10-r3
@@ -39034,7 +38938,6 @@
 2009282109 metadata/md5-cache/dev-libs/link-grammar-5.8.0
 2009290009 metadata/md5-cache/dev-libs/softhsm-2.6.1
 2009282109 metadata/md5-cache/dev-libs/xapian-bindings-1.4.17
-2009291711 metadata/md5-cache/dev-libs/atcore-1.0.0
 2009291711 metadata/md5-cache/dev-libs/avro-c-1.9.1
 2009291711 metadata/md5-cache/dev-libs/c-blosc-1.20.0
 2009291711 metadata/md5-cache/dev-libs/c-blosc-1.20.1
@@ -39060,23 +38963,13 @@
 2009291711 metadata/md5-cache/dev-libs/json-c-0.14-r3
 2009291711 metadata/md5-cache/dev-libs/json-c-0.15
 2009291711 metadata/md5-cache/dev-libs/json-c-9999
-2009291711 metadata/md5-cache/dev-libs/kasync-0.3.0
-2009291711 metadata/md5-cache/dev-libs/kdiagram-2.7.0
 2009291711 metadata/md5-cache/dev-libs/keystone-0.9.1-r1
 2009291711 metadata/md5-cache/dev-libs/keystone-9999
-2009291711 metadata/md5-cache/dev-libs/kpeoplevcard-0.1
-2009291711 metadata/md5-cache/dev-libs/kproperty-3.2.0
-2009291711 metadata/md5-cache/dev-libs/kreport-3.2.0
-2009291711 metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
 2009291711 metadata/md5-cache/dev-libs/level-zero-0.91.10
 2009291711 metadata/md5-cache/dev-libs/level-zero-1.0.0
-2009291711 metadata/md5-cache/dev-libs/libarcus-4.2.0
-2009291711 metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
 2009291711 metadata/md5-cache/dev-libs/libarcus-4.6.1
 2009291711 metadata/md5-cache/dev-libs/libarcus-4.7.0
 2009300039 metadata/md5-cache/dev-libs/libcbor-0.8.0
-2009291711 metadata/md5-cache/dev-libs/libcharon-4.2.0
-2009291711 metadata/md5-cache/dev-libs/libcharon-4.3.0
 2009291711 metadata/md5-cache/dev-libs/libcharon-4.6.1
 2009291711 metadata/md5-cache/dev-libs/libcharon-4.7.0
 2009291711 metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
@@ -39095,8 +38988,6 @@
 2009291711 metadata/md5-cache/dev-libs/libical-3.0.8
 2009291711 metadata/md5-cache/dev-libs/libmirage-3.2.4
 2009291711 metadata/md5-cache/dev-libs/libqtxdg-3.5.0
-2009291711 metadata/md5-cache/dev-libs/libsavitar-4.2.0
-2009291711 metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
 2009291711 metadata/md5-cache/dev-libs/libsavitar-4.6.1
 2009291711 metadata/md5-cache/dev-libs/libsavitar-4.7.0
 2009291711 metadata/md5-cache/dev-libs/libzip-1.7.3
@@ -39148,7 +39039,6 @@
 2009291711 metadata/md5-cache/dev-libs/tinyxml2-7.1.0
 2009291711 metadata/md5-cache/dev-libs/tinyxml2-8.0.0
 2009300339 metadata/md5-cache/dev-libs/unibilium-2.1.0
-2009291711 metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
 2009291711 metadata/md5-cache/dev-libs/urdfdom-1.0.4
 2009291711 metadata/md5-cache/dev-libs/urdfdom-9999
 2009291711 metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
@@ -39173,27 +39063,52 @@
 2010021009 metadata/md5-cache/dev-libs/libucl-9999
 2010021209 metadata/md5-cache/dev-libs/serd-0.30.6
 2010032209 metadata/md5-cache/dev-libs/expat-2.2.10
-2010050309 metadata/md5-cache/dev-libs/protobuf-3.12.2
 2010051739 metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
 2010060139 metadata/md5-cache/dev-libs/libgit2-1.0.1
-2010061909 metadata/md5-cache/dev-libs/librelp-1.7.0
-2010071009 metadata/md5-cache/dev-libs/jansson-2.13.1
-2010071039 metadata/md5-cache/dev-libs/libugpio-0.0.7
 2010071039 metadata/md5-cache/dev-libs/libzia-4.22
 2010070339 metadata/md5-cache/dev-libs/npth-1.6-r1
 2010071039 metadata/md5-cache/dev-libs/nspr-4.28
 2010071039 metadata/md5-cache/dev-libs/nss-3.56
 2010071039 metadata/md5-cache/dev-libs/pugixml-1.10
-2010071039 metadata/md5-cache/dev-libs/serd-0.30.4
 2010071039 metadata/md5-cache/dev-libs/sord-0.16.6
-2010081339 metadata/md5-cache/dev-libs/Manifest.gz
 2010081339 metadata/md5-cache/dev-libs/efl-1.25.1
 2010071809 metadata/md5-cache/dev-libs/libinput-1.16.2
 2010080539 metadata/md5-cache/dev-libs/libsigc++-2.10.3
 2010081009 metadata/md5-cache/dev-libs/libtpms-0.7.3
 2010081309 metadata/md5-cache/dev-libs/pigpio-78
-2010080539 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
 2010071939 metadata/md5-cache/dev-libs/uthash-2.1.0
+2010120109 metadata/md5-cache/dev-libs/Manifest.gz
+2010092209 metadata/md5-cache/dev-libs/atcore-1.0.0
+2010090239 metadata/md5-cache/dev-libs/botan-2.16.0
+2010100809 metadata/md5-cache/dev-libs/cloog-0.20.0
+2010100809 metadata/md5-cache/dev-libs/cloog-9999
+2010111839 metadata/md5-cache/dev-libs/elfutils-0.181
+2010112109 metadata/md5-cache/dev-libs/gmime-3.2.7
+2010111509 metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
+2010111509 metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
+2010082209 metadata/md5-cache/dev-libs/hiredis-1.0.0
+2010091209 metadata/md5-cache/dev-libs/jansson-2.13.1
+2010092209 metadata/md5-cache/dev-libs/kasync-0.3.0
+2010092209 metadata/md5-cache/dev-libs/kdiagram-2.7.0
+2010092209 metadata/md5-cache/dev-libs/kpeoplevcard-0.1
+2010092209 metadata/md5-cache/dev-libs/kproperty-3.2.0
+2010092209 metadata/md5-cache/dev-libs/kreport-3.2.0
+2010092209 metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
+2010111909 metadata/md5-cache/dev-libs/libdnet-1.14-r1
+2010111209 metadata/md5-cache/dev-libs/libotf-0.9.16
+2010101209 metadata/md5-cache/dev-libs/librelp-1.7.0
+2010091139 metadata/md5-cache/dev-libs/libugpio-0.0.7
+2010112339 metadata/md5-cache/dev-libs/mxml-3.2
+2010101709 metadata/md5-cache/dev-libs/nettle-3.6-r2
+2010092209 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
+2010091209 metadata/md5-cache/dev-libs/protobuf-3.12.2
+2010101039 metadata/md5-cache/dev-libs/qtcompress-0_p20180513
+2010091139 metadata/md5-cache/dev-libs/serd-0.30.4
+2010101639 metadata/md5-cache/dev-libs/serdisplib-2.02-r1
+2010112109 metadata/md5-cache/dev-libs/skalibs-2.9.3.0
+2010101809 metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
+2010120039 metadata/md5-cache/dev-libs/vala-common-0.48.11
+2010120109 metadata/md5-cache/dev-libs/vala-common-0.50.1
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2009131115 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2009131115 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -39206,7 +39121,6 @@
 2009131115 metadata/md5-cache/dev-lisp/cl-ppcre-unicode-2.0.11
 2009131115 metadata/md5-cache/dev-lisp/cl-ppcre-unicode-2.1.0
 2009131115 metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
-2009131115 metadata/md5-cache/dev-lisp/clisp-2.49.92
 2009131115 metadata/md5-cache/dev-lisp/clozurecl-1.11.5
 2009131115 metadata/md5-cache/dev-lisp/clx-0.7.5
 2009131115 metadata/md5-cache/dev-lisp/cmucl-21c
@@ -39238,8 +39152,9 @@
 2009251309 metadata/md5-cache/dev-lisp/gcl-2.6.12
 2009291711 metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
 2009291711 metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
-2010062009 metadata/md5-cache/dev-lisp/Manifest.gz
 2010062009 metadata/md5-cache/dev-lisp/sbcl-2.0.9
+2010102109 metadata/md5-cache/dev-lisp/Manifest.gz
+2010102109 metadata/md5-cache/dev-lisp/clisp-2.49.92
 1907291809 metadata/md5-cache/dev-lua/ldoc-1.4.6
 1911101439 metadata/md5-cache/dev-lua/luadoc-3.0.1
 1902152109 metadata/md5-cache/dev-lua/luajson-1.3.3
@@ -39255,14 +39170,12 @@
 2009131115 metadata/md5-cache/dev-lua/lpeg-1.0.1
 2009121921 metadata/md5-cache/dev-lua/lpeg-1.0.2
 2009111825 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
-2009111825 metadata/md5-cache/dev-lua/lua-bit32-5.3.5
 2009121921 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6
 2009121921 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7
 2009111825 metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0
 2009111825 metadata/md5-cache/dev-lua/lua-term-0.3
 2009111825 metadata/md5-cache/dev-lua/lua-term-0.7
 2009111825 metadata/md5-cache/dev-lua/lua-utf8-0.1.1
-2009131115 metadata/md5-cache/dev-lua/lua-zlib-1.1
 2009111825 metadata/md5-cache/dev-lua/lua_cliargs-2.5_p5
 2009111825 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p1
 2009111825 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2
@@ -39270,10 +39183,6 @@
 2009111825 metadata/md5-cache/dev-lua/luacheck-0.23.0
 2009131115 metadata/md5-cache/dev-lua/luacov-0.8
 2009131115 metadata/md5-cache/dev-lua/luacrypto-0.3.2-r1
-2009131115 metadata/md5-cache/dev-lua/luadbi-0.5-r5
-2009131115 metadata/md5-cache/dev-lua/luadbi-0.5-r6
-2009111825 metadata/md5-cache/dev-lua/luaevent-0.4.4
-2009111825 metadata/md5-cache/dev-lua/luaevent-0.4.6
 2009111825 metadata/md5-cache/dev-lua/luafilesystem-1.5.0
 2009111825 metadata/md5-cache/dev-lua/luafilesystem-1.6.2
 2009111825 metadata/md5-cache/dev-lua/luafilesystem-1.6.3
@@ -39284,9 +39193,6 @@
 2009111825 metadata/md5-cache/dev-lua/luaossl-20181207
 2009111825 metadata/md5-cache/dev-lua/luaossl-20190731
 2009131009 metadata/md5-cache/dev-lua/luarocks-3.3.1
-2009111825 metadata/md5-cache/dev-lua/luasec-0.7
-2009111825 metadata/md5-cache/dev-lua/luasec-0.9
-2009111825 metadata/md5-cache/dev-lua/luasec-9999
 2009111825 metadata/md5-cache/dev-lua/luassert-1.7.10
 2009111825 metadata/md5-cache/dev-lua/luassert-1.7.9
 2009111825 metadata/md5-cache/dev-lua/luassert-1.8.0
@@ -39303,14 +39209,25 @@
 2009111825 metadata/md5-cache/dev-lua/say-1.3_p1-r1
 2009121921 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r1
 2009181540 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
-2009181540 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
 2009181540 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
 2009181540 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r5
-2009291711 metadata/md5-cache/dev-lua/lua-zlib-1.2
 2009291009 metadata/md5-cache/dev-lua/luaposix-35.0
 2009291711 metadata/md5-cache/dev-lua/luv-1.32.0.0
-2010060039 metadata/md5-cache/dev-lua/Manifest.gz
 2010060039 metadata/md5-cache/dev-lua/luaexpat-1.3.3-r1
+2010120309 metadata/md5-cache/dev-lua/Manifest.gz
+2010101839 metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r1
+2010120239 metadata/md5-cache/dev-lua/lua-zlib-1.1
+2010120239 metadata/md5-cache/dev-lua/lua-zlib-1.2
+2010120309 metadata/md5-cache/dev-lua/luadbi-0.5-r5
+2010120309 metadata/md5-cache/dev-lua/luadbi-0.5-r6
+2010120239 metadata/md5-cache/dev-lua/luaevent-0.4.4
+2010120239 metadata/md5-cache/dev-lua/luaevent-0.4.6
+2010082239 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
+2010082239 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r2
+2010082239 metadata/md5-cache/dev-lua/luaexpat-1.3.3-r2
+2010120239 metadata/md5-cache/dev-lua/luasec-0.7
+2010120239 metadata/md5-cache/dev-lua/luasec-0.9
+2010120239 metadata/md5-cache/dev-lua/luasec-9999
 1704021208 metadata/md5-cache/dev-ml/async_extra-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_rpc_kernel-0.9.0
@@ -39553,7 +39470,6 @@
 2009291711 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
 2010031709 metadata/md5-cache/dev-ml/camlp4-4.04_p1
 2010031709 metadata/md5-cache/dev-ml/camlp4-4.05_p1
-2010031709 metadata/md5-cache/dev-ml/camlp4-4.08_p1
 2010031709 metadata/md5-cache/dev-ml/facile-1.1.3
 2010031709 metadata/md5-cache/dev-ml/findlib-1.7.1
 2010031709 metadata/md5-cache/dev-ml/findlib-1.7.2
@@ -39568,8 +39484,9 @@
 2010031709 metadata/md5-cache/dev-ml/ocamlbuild-0.10.1
 2010031709 metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
 2010031709 metadata/md5-cache/dev-ml/ocamlbuild-0.14.0
-2010072209 metadata/md5-cache/dev-ml/Manifest.gz
 2010072209 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc6
+2010091209 metadata/md5-cache/dev-ml/Manifest.gz
+2010091209 metadata/md5-cache/dev-ml/camlp4-4.08_p1
 1910170740 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
@@ -40196,7 +40113,6 @@
 2004032241 metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
 2004032241 metadata/md5-cache/dev-perl/Data-OptList-0.110.0
 2004032241 metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
-2004032241 metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
 2004032241 metadata/md5-cache/dev-perl/DateTime-1.280.0
 2004032241 metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0
 2004032241 metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0
@@ -40226,7 +40142,6 @@
 2004032241 metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r2
 2004032241 metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
 2004032241 metadata/md5-cache/dev-perl/File-NCopy-0.360.0-r2
-2004032241 metadata/md5-cache/dev-perl/File-Remove-1.570.0
 2004032241 metadata/md5-cache/dev-perl/File-Share-0.250.0
 2004032241 metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
 2004032241 metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
@@ -40954,15 +40869,7 @@
 2008251339 metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r2
 2008242239 metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r2
 2008242239 metadata/md5-cache/dev-perl/Devel-PatchPerl-1.920.0
-2008250509 metadata/md5-cache/dev-perl/MIME-Types-2.130.0
-2008250509 metadata/md5-cache/dev-perl/Mail-Box-3.3.0
-2008250509 metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
-2008250509 metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
-2008250509 metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
-2008250509 metadata/md5-cache/dev-perl/Mail-Message-3.2.0
-2008250509 metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
 2008250509 metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.360.0
-2008250509 metadata/md5-cache/dev-perl/User-Identity-0.990.0
 2008242239 metadata/md5-cache/dev-perl/asa-1.40.0
 2008242239 metadata/md5-cache/dev-perl/autobox-3.0.1-r1
 2008242239 metadata/md5-cache/dev-perl/autovivification-0.180.0-r1
@@ -40992,7 +40899,6 @@
 2008311739 metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r3
 2008311739 metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r3
 2008311739 metadata/md5-cache/dev-perl/Audio-Wav-0.140.0-r2
-2008311739 metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r2
 2008311739 metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r3
 2008311739 metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r2
 2008311739 metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r2
@@ -41357,7 +41263,6 @@
 2009131115 metadata/md5-cache/dev-perl/Number-Format-1.750.0
 2009131115 metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
 2009131115 metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
-2009131115 metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
 2009131115 metadata/md5-cache/dev-perl/OpenGL-0.700.0
 2009131115 metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
 2009131115 metadata/md5-cache/dev-perl/PDL-2.17.0-r1
@@ -41431,7 +41336,6 @@
 2009131115 metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
 2009131115 metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
 2009131115 metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
-2009131115 metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
 2009120939 metadata/md5-cache/dev-perl/String-Util-1.310.0
 2009131115 metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
 2009131115 metadata/md5-cache/dev-perl/Sub-Install-0.928.0
@@ -41466,7 +41370,6 @@
 2009131115 metadata/md5-cache/dev-perl/Test-Most-0.340.0
 2009131115 metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
 2009131115 metadata/md5-cache/dev-perl/Test-Pod-1.510.0
-2009131115 metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
 2009131115 metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
 2009131115 metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
 2009131115 metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -41631,7 +41534,21 @@
 2010061639 metadata/md5-cache/dev-perl/IPC-Run-0.960.0
 2010071139 metadata/md5-cache/dev-perl/Carp-Assert-More-1.240.0
 2010080239 metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.240.0
-2010080239 metadata/md5-cache/dev-perl/Manifest.gz
+2010112109 metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r2
+2010111309 metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
+2010112109 metadata/md5-cache/dev-perl/File-Remove-1.570.0
+2010112109 metadata/md5-cache/dev-perl/MIME-Types-2.130.0
+2010112109 metadata/md5-cache/dev-perl/Mail-Box-3.3.0
+2010112109 metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
+2010112109 metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
+2010112109 metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
+2010112109 metadata/md5-cache/dev-perl/Mail-Message-3.2.0
+2010112109 metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
+2010112109 metadata/md5-cache/dev-perl/Manifest.gz
+2010112109 metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+2010112109 metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
+2010111309 metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+2010112109 metadata/md5-cache/dev-perl/User-Identity-0.990.0
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -42030,8 +41947,10 @@
 2009302109 metadata/md5-cache/dev-php/pecl-oauth-2.0.7
 2009302109 metadata/md5-cache/dev-php/xdebug-2.9.8
 2009302109 metadata/md5-cache/dev-php/xdebug-client-2.9.8
-2010051939 metadata/md5-cache/dev-php/Manifest.gz
 2010051939 metadata/md5-cache/dev-php/pecl-apcu-5.1.19
+2010090209 metadata/md5-cache/dev-php/Manifest.gz
+2010090209 metadata/md5-cache/dev-php/igbinary-3.1.6
+2010090209 metadata/md5-cache/dev-php/pecl-uuid-1.2.0
 2005091439 metadata/md5-cache/dev-python/nltk-data-20200312-r1
 2007080039 metadata/md5-cache/dev-python/python-docs-2.7.18
 2007080039 metadata/md5-cache/dev-python/python-docs-3.6.11
@@ -42106,7 +42025,6 @@
 2009211840 metadata/md5-cache/dev-python/QtPy-1.9.0-r2
 2009211840 metadata/md5-cache/dev-python/Rx-3.1.0
 2009211840 metadata/md5-cache/dev-python/SaltTesting-2018.9.21
-2009211840 metadata/md5-cache/dev-python/SchemaObject-0.5.8
 2009211840 metadata/md5-cache/dev-python/WSME-0.9.3
 2009211840 metadata/md5-cache/dev-python/XenAPI-2.14
 2009211840 metadata/md5-cache/dev-python/aiocontextvars-0.2.2
@@ -42176,7 +42094,6 @@
 2009211840 metadata/md5-cache/dev-python/backports-functools-lru-cache-1.6.1
 2009211840 metadata/md5-cache/dev-python/backports-os-0.1.1
 2009211840 metadata/md5-cache/dev-python/backports-tempfile-1.0
-2009211840 metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
 2009211840 metadata/md5-cache/dev-python/backports-weakref-1.0_p1
 2009211840 metadata/md5-cache/dev-python/bandit-1.5.1-r1
 2009211840 metadata/md5-cache/dev-python/bandit-1.6.2
@@ -42198,7 +42115,6 @@
 2009211840 metadata/md5-cache/dev-python/bitstring-3.1.7
 2009211840 metadata/md5-cache/dev-python/bleach-3.1.5
 2009211840 metadata/md5-cache/dev-python/bleach-3.2.0
-2009211840 metadata/md5-cache/dev-python/bleach-3.2.1
 2009211840 metadata/md5-cache/dev-python/blessed-1.17.10
 2009211840 metadata/md5-cache/dev-python/blessings-1.7-r1
 2009211840 metadata/md5-cache/dev-python/blinker-1.4-r2
@@ -42235,7 +42151,6 @@
 2009211840 metadata/md5-cache/dev-python/castellan-1.2.2
 2009211840 metadata/md5-cache/dev-python/casttube-0.2.0
 2009211840 metadata/md5-cache/dev-python/cbor-1.0.0-r1
-2009211840 metadata/md5-cache/dev-python/cbor2-5.1.0
 2009211840 metadata/md5-cache/dev-python/celery-4.3.0
 2009211840 metadata/md5-cache/dev-python/certifi-10001
 2009211840 metadata/md5-cache/dev-python/cffi-1.14.0-r3
@@ -42536,8 +42451,6 @@
 2009211840 metadata/md5-cache/dev-python/hpack-3.0.0
 2009211840 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
 2009211840 metadata/md5-cache/dev-python/html5-parser-0.4.9
-2009211840 metadata/md5-cache/dev-python/html5lib-1.0.1-r2
-2009211840 metadata/md5-cache/dev-python/html5lib-1.1
 2009211840 metadata/md5-cache/dev-python/httmock-1.2.5
 2009211840 metadata/md5-cache/dev-python/http-parser-0.9.0
 2009211840 metadata/md5-cache/dev-python/httpauth-0.3
@@ -42712,7 +42625,6 @@
 2009211840 metadata/md5-cache/dev-python/matplotlib-3.2.2-r2
 2009211840 metadata/md5-cache/dev-python/matplotlib-3.3.0-r1
 2009211840 metadata/md5-cache/dev-python/matplotlib-3.3.2
-2009211840 metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
 2009211840 metadata/md5-cache/dev-python/mccabe-0.6.1-r1
 2009211840 metadata/md5-cache/dev-python/mdx_gh_links-0.2
 2009211840 metadata/md5-cache/dev-python/mecab-python-0.996
@@ -42727,7 +42639,6 @@
 2009211840 metadata/md5-cache/dev-python/mimerender-0.6.0
 2009211840 metadata/md5-cache/dev-python/minidb-2.0.4
 2009211840 metadata/md5-cache/dev-python/minimock-1.2.8-r1
-2009211840 metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
 2009211840 metadata/md5-cache/dev-python/misaka-2.1.1
 2009211840 metadata/md5-cache/dev-python/mistune-0.8.4-r1
 2009211840 metadata/md5-cache/dev-python/mkautodoc-0.1.0
@@ -42802,13 +42713,11 @@
 2009211840 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
 2009211840 metadata/md5-cache/dev-python/ntplib-0.3.3
 2009211840 metadata/md5-cache/dev-python/nuitka-0.6.8
-2009211840 metadata/md5-cache/dev-python/numexpr-2.7.1
 2009211840 metadata/md5-cache/dev-python/numpy-1.19.0
 2009211840 metadata/md5-cache/dev-python/numpy-1.19.2
 2009211840 metadata/md5-cache/dev-python/numpy-python2-1.16.6
 2009211840 metadata/md5-cache/dev-python/numpydoc-0.9.1
 2009211840 metadata/md5-cache/dev-python/numpydoc-1.1.0
-2009211840 metadata/md5-cache/dev-python/oauth-1.0.1-r1
 2009211840 metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
 2009211840 metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
 2009211840 metadata/md5-cache/dev-python/oauthlib-3.1.0
@@ -42942,7 +42851,6 @@
 2009211840 metadata/md5-cache/dev-python/pretty-yaml-20.4.0
 2009211840 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
 2009211840 metadata/md5-cache/dev-python/priority-1.3.0
-2009211840 metadata/md5-cache/dev-python/process-tests-2.0.2
 2009211840 metadata/md5-cache/dev-python/progress-1.3
 2009211840 metadata/md5-cache/dev-python/progressbar-2.5
 2009211840 metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -43033,7 +42941,6 @@
 2009211840 metadata/md5-cache/dev-python/pygments-2.7.1
 2009211840 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
 2009211840 metadata/md5-cache/dev-python/pygpgme-0.3-r2
-2009211840 metadata/md5-cache/dev-python/pygraphviz-1.5
 2009211840 metadata/md5-cache/dev-python/pygresql-5.1
 2009211840 metadata/md5-cache/dev-python/pygresql-5.2
 2009211840 metadata/md5-cache/dev-python/pyhamcrest-2.0.2
@@ -43059,8 +42966,6 @@
 2009211840 metadata/md5-cache/dev-python/pymountboot-9999
 2009211840 metadata/md5-cache/dev-python/pympler-0.6
 2009211840 metadata/md5-cache/dev-python/pymssql-2.1.3
-2009211840 metadata/md5-cache/dev-python/pymysql-0.10.0
-2009211840 metadata/md5-cache/dev-python/pymysql-0.9.3
 2009211840 metadata/md5-cache/dev-python/pynacl-1.4.0
 2009211840 metadata/md5-cache/dev-python/pynput-1.6.8
 2009211840 metadata/md5-cache/dev-python/pynput-9999
@@ -43104,7 +43009,6 @@
 2009211840 metadata/md5-cache/dev-python/pysaml2-4.6.5-r1
 2009211840 metadata/md5-cache/dev-python/pyscard-1.9.9
 2009211840 metadata/md5-cache/dev-python/pyscreenshot-2.2
-2009211840 metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
 2009211840 metadata/md5-cache/dev-python/pyserial-3.4
 2009211840 metadata/md5-cache/dev-python/pysmi-0.3.4
 2009211840 metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
@@ -43145,7 +43049,6 @@
 2009211939 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
 2009211840 metadata/md5-cache/dev-python/pytest-pylint-0.14.1
 2009211939 metadata/md5-cache/dev-python/pytest-regressions-2.0.1
-2009211939 metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
 2009211840 metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
 2009211939 metadata/md5-cache/dev-python/pytest-salt-2020.1.27
 2009211939 metadata/md5-cache/dev-python/pytest-salt-factories-0.92.0
@@ -43200,7 +43103,6 @@
 2009211840 metadata/md5-cache/dev-python/python-keystoneclient-4.0.0
 2009211840 metadata/md5-cache/dev-python/python-ldap-3.2.0
 2009211840 metadata/md5-cache/dev-python/python-ldap-9999
-2009211840 metadata/md5-cache/dev-python/python-levenshtein-0.12.0
 2009211840 metadata/md5-cache/dev-python/python-lhafile-0.2.2
 2009211840 metadata/md5-cache/dev-python/python-libevdev-0.8
 2009211840 metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
@@ -43294,13 +43196,11 @@
 2009211840 metadata/md5-cache/dev-python/recommonmark-0.6.0
 2009211840 metadata/md5-cache/dev-python/redis-py-3.3.11
 2009211840 metadata/md5-cache/dev-python/redis-py-3.5.3
-2009211840 metadata/md5-cache/dev-python/redlock-py-1.0.8
 2009211840 metadata/md5-cache/dev-python/rednose-0.4.3
 2009211840 metadata/md5-cache/dev-python/reflink-0.2.1-r1
 2009211840 metadata/md5-cache/dev-python/regex-2020.4.4-r1
 2009211840 metadata/md5-cache/dev-python/rencode-1.0.6
 2009211840 metadata/md5-cache/dev-python/reno-2.11.3
-2009211840 metadata/md5-cache/dev-python/reportlab-3.5.42
 2009211840 metadata/md5-cache/dev-python/repoze-lru-0.7-r1
 2009211840 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
 2009211840 metadata/md5-cache/dev-python/requests-2.24.0-r1
@@ -43315,7 +43215,6 @@
 2009211840 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
 2009211840 metadata/md5-cache/dev-python/requests_download-0.1.2
 2009211840 metadata/md5-cache/dev-python/requests_pkcs12-1.7
-2009211840 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
 2009211840 metadata/md5-cache/dev-python/responses-0.10.16
 2009211840 metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
 2009211840 metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
@@ -43327,8 +43226,6 @@
 2009211840 metadata/md5-cache/dev-python/rjsmin-1.1.0
 2009211840 metadata/md5-cache/dev-python/robot-detection-0.4.0
 2009211840 metadata/md5-cache/dev-python/roman-3.2
-2009211840 metadata/md5-cache/dev-python/root_numpy-4.7.3-r1
-2009211840 metadata/md5-cache/dev-python/rootpy-1.0.1-r1
 2009211840 metadata/md5-cache/dev-python/rope-0.16.0
 2009211840 metadata/md5-cache/dev-python/rope-0.17.0
 2009211840 metadata/md5-cache/dev-python/ropemode-0.5
@@ -43340,7 +43237,6 @@
 2009211840 metadata/md5-cache/dev-python/rpy-2.9.0
 2009211840 metadata/md5-cache/dev-python/rpyc-4.1.4
 2009211840 metadata/md5-cache/dev-python/rq-1.5.0
-2009211840 metadata/md5-cache/dev-python/rq-1.5.2
 2009211840 metadata/md5-cache/dev-python/rsa-4.2
 2009211840 metadata/md5-cache/dev-python/rst-linker-2.0.0
 2009211840 metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
@@ -43479,7 +43375,6 @@
 2009211840 metadata/md5-cache/dev-python/svg-path-3.0
 2009211840 metadata/md5-cache/dev-python/svgwrite-1.4
 2009211840 metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0
-2009211840 metadata/md5-cache/dev-python/sybil-1.4.0
 2009211840 metadata/md5-cache/dev-python/symengine-0.6.1-r1
 2009211840 metadata/md5-cache/dev-python/sympy-1.6.2
 2009211840 metadata/md5-cache/dev-python/tabulate-0.8.7
@@ -43522,7 +43417,6 @@
 2009211840 metadata/md5-cache/dev-python/tooz-1.60.1
 2009211840 metadata/md5-cache/dev-python/towncrier-19.2.0
 2009211840 metadata/md5-cache/dev-python/tox-3.19.0
-2009211840 metadata/md5-cache/dev-python/tox-3.20.0
 2009211840 metadata/md5-cache/dev-python/tqdm-4.48.2
 2009211840 metadata/md5-cache/dev-python/tqdm-4.49.0
 2009211840 metadata/md5-cache/dev-python/tqdm-9999
@@ -43554,7 +43448,6 @@
 2009211840 metadata/md5-cache/dev-python/ubelt-0.8.8
 2009211840 metadata/md5-cache/dev-python/ujson-1.35-r1
 2009211840 metadata/md5-cache/dev-python/ujson-3.1.0
-2009211840 metadata/md5-cache/dev-python/ujson-3.2.0
 2009211840 metadata/md5-cache/dev-python/uncertainties-3.1.4
 2009211840 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
 2009211840 metadata/md5-cache/dev-python/unidecode-0.04.21
@@ -43569,7 +43462,6 @@
 2009211840 metadata/md5-cache/dev-python/urwid-2.1.0
 2009211840 metadata/md5-cache/dev-python/urwid-2.1.1
 2009211840 metadata/md5-cache/dev-python/urwidtrees-1.0.3
-2009211840 metadata/md5-cache/dev-python/utidylib-0.6-r1
 2009211840 metadata/md5-cache/dev-python/uvloop-0.14.0
 2009211840 metadata/md5-cache/dev-python/vcrpy-4.1.0
 2009211840 metadata/md5-cache/dev-python/vcstools-0.1.42
@@ -43645,7 +43537,6 @@
 2009211840 metadata/md5-cache/dev-python/zeroconf-0.24.4
 2009211840 metadata/md5-cache/dev-python/zict-0.1.4
 2009211840 metadata/md5-cache/dev-python/zipp-3.1.0
-2009211840 metadata/md5-cache/dev-python/zope-component-4.4.1
 2009211840 metadata/md5-cache/dev-python/zope-configuration-4.4.0
 2009211840 metadata/md5-cache/dev-python/zope-deprecation-4.4.0
 2009211840 metadata/md5-cache/dev-python/zope-event-4.4-r1
@@ -43688,7 +43579,6 @@
 2009241009 metadata/md5-cache/dev-python/networkx-2.5
 2009241009 metadata/md5-cache/dev-python/pandas-1.1.1
 2009231039 metadata/md5-cache/dev-python/pyglet-1.5.7-r1
-2009241009 metadata/md5-cache/dev-python/pygraphviz-1.6
 2009221309 metadata/md5-cache/dev-python/pyh2o-1
 2009241009 metadata/md5-cache/dev-python/pytest-xdist-2.1.0
 2009230809 metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0
@@ -43711,7 +43601,6 @@
 2009251309 metadata/md5-cache/dev-python/cython-0.29.20-r2
 2009251439 metadata/md5-cache/dev-python/gast-0.3.3-r1
 2009251439 metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
-2009260209 metadata/md5-cache/dev-python/grpcio-1.32.0
 2009260209 metadata/md5-cache/dev-python/grpcio-testing-1.32.0
 2009260209 metadata/md5-cache/dev-python/grpcio-tools-1.32.0
 2009251339 metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
@@ -43727,7 +43616,6 @@
 2009251339 metadata/md5-cache/dev-python/protobuf-python-9999
 2009252309 metadata/md5-cache/dev-python/pycparser-2.20-r1
 2009252309 metadata/md5-cache/dev-python/pygobject-3.34.0-r1
-2009252309 metadata/md5-cache/dev-python/pygobject-3.36.1-r1
 2009252339 metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
 2009260809 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
 2009251109 metadata/md5-cache/dev-python/pytest-services-2.2.0
@@ -43753,7 +43641,6 @@
 2009280139 metadata/md5-cache/dev-python/graph-tool-9999
 2009271839 metadata/md5-cache/dev-python/lark-parser-0.7.8
 2009261939 metadata/md5-cache/dev-python/lxml-4.5.2-r1
-2009270039 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
 2009261409 metadata/md5-cache/dev-python/paste-3.4.6
 2009262209 metadata/md5-cache/dev-python/pbr-5.5.0-r1
 2009271009 metadata/md5-cache/dev-python/pyenchant-3.1.0
@@ -43800,7 +43687,6 @@
 2009292209 metadata/md5-cache/dev-python/jwcrypto-0.8.0
 2009291339 metadata/md5-cache/dev-python/neovim-remote-2.4.0
 2009291639 metadata/md5-cache/dev-python/phonenumbers-8.12.10
-2009300509 metadata/md5-cache/dev-python/process-tests-2.1.1
 2009291711 metadata/md5-cache/dev-python/pybind11-2.5.0
 2009291711 metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
 2009300539 metadata/md5-cache/dev-python/pypy-7.3.2
@@ -43836,7 +43722,6 @@
 2009302109 metadata/md5-cache/dev-python/osprofiler-2.6.0
 2010010139 metadata/md5-cache/dev-python/prompt_toolkit-3.0.7
 2009302109 metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
-2010010109 metadata/md5-cache/dev-python/reportlab-3.5.48
 2010010239 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
 2010010039 metadata/md5-cache/dev-python/websockets-8.1
 2010021839 metadata/md5-cache/dev-python/async_generator-1.10
@@ -43851,12 +43736,9 @@
 2010030009 metadata/md5-cache/dev-python/humanize-3.0.1
 2010030009 metadata/md5-cache/dev-python/hyper-h2-4.0.0
 2010030009 metadata/md5-cache/dev-python/hyperframe-6.0.0
-2010020139 metadata/md5-cache/dev-python/iniconfig-1.0.0
 2010011439 metadata/md5-cache/dev-python/ipython-7.18.1
 2010022009 metadata/md5-cache/dev-python/libvirt-python-6.8.0
 2010030339 metadata/md5-cache/dev-python/pyflakes-2.2.0
-2010021809 metadata/md5-cache/dev-python/pymysql-0.10.1
-2010020139 metadata/md5-cache/dev-python/pytest-6.0.1
 2010011109 metadata/md5-cache/dev-python/zope-interface-5.1.1
 2010031539 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
 2010031539 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
@@ -43866,18 +43748,15 @@
 2010032009 metadata/md5-cache/dev-python/botocore-1.18.10
 2010032009 metadata/md5-cache/dev-python/botocore-1.18.11
 2010032009 metadata/md5-cache/dev-python/dask-2.29.0
-2010041739 metadata/md5-cache/dev-python/flake8-3.8.3-r1
 2010042109 metadata/md5-cache/dev-python/fsspec-0.8.0
 2010042109 metadata/md5-cache/dev-python/fsspec-0.8.2
 2010032109 metadata/md5-cache/dev-python/google-auth-1.20.1
 2010032009 metadata/md5-cache/dev-python/hypothesis-5.36.2
 2010032009 metadata/md5-cache/dev-python/hypothesis-5.37.0
 2010040039 metadata/md5-cache/dev-python/loky-2.9.0
-2010041739 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
 2010040039 metadata/md5-cache/dev-python/nbconvert-6.0.7
 2010041539 metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
 2010040039 metadata/md5-cache/dev-python/pytest-6.1.1
-2010041739 metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
 2010032009 metadata/md5-cache/dev-python/virtualenv-20.0.32
 2010040109 metadata/md5-cache/dev-python/zipp-3.3.0
 2010032009 metadata/md5-cache/dev-python/zope-interface-5.1.2
@@ -43885,8 +43764,6 @@
 2010050339 metadata/md5-cache/dev-python/fqdn-1.5.0
 2010042309 metadata/md5-cache/dev-python/hypothesis-5.36.1
 2010050309 metadata/md5-cache/dev-python/libtmux-0.8.3
-2010051409 metadata/md5-cache/dev-python/lmdb-1.0.0
-2010050309 metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
 2010050039 metadata/md5-cache/dev-python/pyelftools-0.26
 2010050439 metadata/md5-cache/dev-python/pypy-exe-7.3.2
 2010050439 metadata/md5-cache/dev-python/pypy3-exe-7.3.2-r1
@@ -43913,8 +43790,6 @@
 2010061009 metadata/md5-cache/dev-python/slixmpp-1.5.2
 2010060109 metadata/md5-cache/dev-python/virtualenv-20.0.33
 2010062009 metadata/md5-cache/dev-python/eradicate-2.0.0
-2010061709 metadata/md5-cache/dev-python/lit-10.0.1
-2010062039 metadata/md5-cache/dev-python/numpy-1.19.1
 2010061239 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0
 2010061639 metadata/md5-cache/dev-python/pygame-2.0.0_pre12
 2010061709 metadata/md5-cache/dev-python/pygame-9999
@@ -43925,10 +43800,8 @@
 2010071039 metadata/md5-cache/dev-python/arrow-0.17.0
 2010070409 metadata/md5-cache/dev-python/async_timeout-3.0.1
 2010070409 metadata/md5-cache/dev-python/black-20.8_beta1
-2010070409 metadata/md5-cache/dev-python/blockdiag-2.0.1
 2010071039 metadata/md5-cache/dev-python/boto3-1.15.13
 2010071039 metadata/md5-cache/dev-python/botocore-1.18.13
-2010071039 metadata/md5-cache/dev-python/cbor2-5.1.2
 2010071039 metadata/md5-cache/dev-python/cfn-python-lint-0.37.1
 2010071039 metadata/md5-cache/dev-python/cloudpickle-1.6.0
 2010070339 metadata/md5-cache/dev-python/croniter-0.3.30
@@ -43943,10 +43816,8 @@
 2010070409 metadata/md5-cache/dev-python/idna-ssl-1.1.0
 2010071039 metadata/md5-cache/dev-python/matterhook-0.2
 2010071039 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
-2010071039 metadata/md5-cache/dev-python/numexpr-2.7.2
 2010071209 metadata/md5-cache/dev-python/ordered-set-4.0.2
 2010071039 metadata/md5-cache/dev-python/podcastparser-0.6.5
-2010071039 metadata/md5-cache/dev-python/pygame-2.0.0_pre10
 2010071209 metadata/md5-cache/dev-python/pylatex-1.4.0
 2010070409 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
 2010071039 metadata/md5-cache/dev-python/pytest-django-3.10.0
@@ -43959,7 +43830,6 @@
 2010071239 metadata/md5-cache/dev-python/ssl-fetch-0.4
 2010071239 metadata/md5-cache/dev-python/ssl-fetch-9999
 2010070409 metadata/md5-cache/dev-python/uranium-4.6.1
-2010081439 metadata/md5-cache/dev-python/Manifest.gz
 2010080639 metadata/md5-cache/dev-python/boto3-1.15.14
 2010080639 metadata/md5-cache/dev-python/botocore-1.18.14
 2010072209 metadata/md5-cache/dev-python/clang-python-11.0.0_rc6
@@ -43967,8 +43837,6 @@
 2010072209 metadata/md5-cache/dev-python/lit-11.0.0_rc6
 2010072209 metadata/md5-cache/dev-python/markdown-3.3
 2010071939 metadata/md5-cache/dev-python/mypy-0.782
-2010080009 metadata/md5-cache/dev-python/pydocstyle-5.1.1
-2010080039 metadata/md5-cache/dev-python/pylama-7.7.1-r1
 2010072209 metadata/md5-cache/dev-python/pylast-4.0.0
 2010072209 metadata/md5-cache/dev-python/pytest-qt-3.3.0
 2010072209 metadata/md5-cache/dev-python/python-language-server-0.34.1
@@ -43981,6 +43849,89 @@
 2010072209 metadata/md5-cache/dev-python/tqdm-4.50.1
 2010072209 metadata/md5-cache/dev-python/ujson-4.0.0
 2010072209 metadata/md5-cache/dev-python/xarray-0.16.0
+2010120309 metadata/md5-cache/dev-python/Manifest.gz
+2010100909 metadata/md5-cache/dev-python/asgiref-3.3.0
+2010082209 metadata/md5-cache/dev-python/bleach-3.2.1
+2010101209 metadata/md5-cache/dev-python/blockdiag-2.0.1
+2010090039 metadata/md5-cache/dev-python/boto3-1.15.15
+2010100909 metadata/md5-cache/dev-python/boto3-1.15.16
+2010090039 metadata/md5-cache/dev-python/botocore-1.18.15
+2010100909 metadata/md5-cache/dev-python/botocore-1.18.16
+2010091139 metadata/md5-cache/dev-python/cbor2-5.1.2
+2010110439 metadata/md5-cache/dev-python/debtcollector-2.2.0
+2010112109 metadata/md5-cache/dev-python/fastjsonschema-2.14.5
+2010101709 metadata/md5-cache/dev-python/flake8-3.8.3-r1
+2010100109 metadata/md5-cache/dev-python/grpcio-1.32.0-r1
+2010082209 metadata/md5-cache/dev-python/html5lib-1.1
+2010091139 metadata/md5-cache/dev-python/iniconfig-1.0.0
+2010120039 metadata/md5-cache/dev-python/iniparse-0.5
+2010120309 metadata/md5-cache/dev-python/isort-5.6.3
+2010110409 metadata/md5-cache/dev-python/joblib-0.17.0
+2010110239 metadata/md5-cache/dev-python/keystoneauth-4.2.1
+2010110939 metadata/md5-cache/dev-python/lit-10.0.1
+2010091609 metadata/md5-cache/dev-python/lmdb-1.0.0
+2010101709 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
+2010110009 metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
+2010111209 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
+2010112109 metadata/md5-cache/dev-python/nbformat-5.0.8
+2010101039 metadata/md5-cache/dev-python/nuitka-0.6.9.1
+2010091139 metadata/md5-cache/dev-python/numexpr-2.7.2
+2010091139 metadata/md5-cache/dev-python/numpy-1.19.1
+2010111809 metadata/md5-cache/dev-python/objgraph-3.5.0
+2010110239 metadata/md5-cache/dev-python/openstacksdk-0.50.0
+2010110439 metadata/md5-cache/dev-python/os-client-config-2.1.0
+2010110439 metadata/md5-cache/dev-python/osc-lib-2.2.1
+2010110439 metadata/md5-cache/dev-python/oslo-config-8.3.2
+2010110439 metadata/md5-cache/dev-python/oslo-context-3.1.1
+2010110439 metadata/md5-cache/dev-python/oslo-i18n-5.0.1
+2010110439 metadata/md5-cache/dev-python/oslo-log-4.4.0
+2010110439 metadata/md5-cache/dev-python/oslo-serialization-4.0.1
+2010110439 metadata/md5-cache/dev-python/oslo-utils-4.6.0
+2010090009 metadata/md5-cache/dev-python/passlib-1.7.4
+2010101939 metadata/md5-cache/dev-python/phonenumbers-8.12.11
+2010102239 metadata/md5-cache/dev-python/plyvel-1.3.0
+2010091139 metadata/md5-cache/dev-python/process-tests-2.1.1
+2010100939 metadata/md5-cache/dev-python/progress-1.5
+2010091209 metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
+2010101039 metadata/md5-cache/dev-python/pyacoustid-1.2.0
+2010082309 metadata/md5-cache/dev-python/pydantic-1.6.1
+2010120309 metadata/md5-cache/dev-python/pydocstyle-5.1.1
+2010091139 metadata/md5-cache/dev-python/pygame-2.0.0_pre10
+2010120009 metadata/md5-cache/dev-python/pygobject-3.36.1-r1
+2010091139 metadata/md5-cache/dev-python/pygraphviz-1.6
+2010120309 metadata/md5-cache/dev-python/pylama-7.7.1-r1
+2010091209 metadata/md5-cache/dev-python/pymysql-0.10.1
+2010101939 metadata/md5-cache/dev-python/pypiserver-1.4.2
+2010091139 metadata/md5-cache/dev-python/pytest-6.0.1
+2010100239 metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
+2010100239 metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
+2010110439 metadata/md5-cache/dev-python/python-cinderclient-7.2.0
+2010110439 metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
+2010100239 metadata/md5-cache/dev-python/python-ldap-3.3.1
+2010120039 metadata/md5-cache/dev-python/python-levenshtein-0.12.0
+2010110439 metadata/md5-cache/dev-python/python-novaclient-17.2.1
+2010110439 metadata/md5-cache/dev-python/python-openstackclient-5.4.0
+2010102339 metadata/md5-cache/dev-python/python-swiftclient-3.10.1
+2010110439 metadata/md5-cache/dev-python/python-zunclient-4.1.1
+2010100909 metadata/md5-cache/dev-python/readme_renderer-27.0
+2010091139 metadata/md5-cache/dev-python/reportlab-3.5.48
+2010102339 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+2010120039 metadata/md5-cache/dev-python/rq-1.5.2
+2010101709 metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
+2010111809 metadata/md5-cache/dev-python/spur-0.3.22
+2010090039 metadata/md5-cache/dev-python/sqlparse-0.4.1
+2010091039 metadata/md5-cache/dev-python/sybil-1.4.0
+2010091039 metadata/md5-cache/dev-python/testfixtures-6.15.0
+2010091409 metadata/md5-cache/dev-python/tox-3.20.0-r1
+2010100909 metadata/md5-cache/dev-python/tox-3.20.1
+2010090039 metadata/md5-cache/dev-python/tqdm-4.50.2
+2010120039 metadata/md5-cache/dev-python/translate-toolkit-2.5.1
+2010102209 metadata/md5-cache/dev-python/treq-20.9.0
+2010102039 metadata/md5-cache/dev-python/ujson-3.2.0
+2010100909 metadata/md5-cache/dev-python/ujson-4.0.1
+2010120139 metadata/md5-cache/dev-python/utidylib-0.6-r1
+2010100909 metadata/md5-cache/dev-python/vcrpy-4.1.1
+2010091039 metadata/md5-cache/dev-python/zope-component-4.4.1
 2005201639 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239
 2006251039 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1
 2009102109 metadata/md5-cache/dev-qt/qt-docs-5.15.1_p202009071124
@@ -44023,7 +43974,6 @@
 2009121921 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.14.2
 2009121921 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.1
 2009121921 metadata/md5-cache/dev-qt/qtgui-5.14.2-r1
-2009121921 metadata/md5-cache/dev-qt/qtgui-5.15.1
 2009121921 metadata/md5-cache/dev-qt/qthelp-5.14.2
 2009121921 metadata/md5-cache/dev-qt/qthelp-5.15.1
 2009121921 metadata/md5-cache/dev-qt/qtimageformats-5.14.2
@@ -44093,26 +44043,16 @@
 2009172012 metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r4
 2009172012 metadata/md5-cache/dev-qt/qtdeclarative-5.15.1
 2009172012 metadata/md5-cache/dev-qt/qtwebengine-5.14.2
-2009172012 metadata/md5-cache/dev-qt/qtwebengine-5.15.1
 2009292339 metadata/md5-cache/dev-qt/qtdiag-5.15.1
 2009291711 metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
 2010010609 metadata/md5-cache/dev-qt/qtnetworkauth-5.15.1
 2010022339 metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311
-2010041939 metadata/md5-cache/dev-qt/Manifest.gz
 2010041939 metadata/md5-cache/dev-qt/qtgui-5.15.1-r1
+2010102239 metadata/md5-cache/dev-qt/Manifest.gz
+2010102109 metadata/md5-cache/dev-qt/qtcore-5.15.1-r1
+2010102239 metadata/md5-cache/dev-qt/qtwebengine-5.15.1
 2009211840 metadata/md5-cache/dev-ros/ament_lint-0.9.5
 2009211840 metadata/md5-cache/dev-ros/ament_lint-9999
-2009291711 metadata/md5-cache/dev-ros/actionlib-1.13.2
-2009291711 metadata/md5-cache/dev-ros/actionlib-9999
-2009291711 metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/actionlib_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
-2009291711 metadata/md5-cache/dev-ros/actionlib_tools-9999
-2009291711 metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
-2009291711 metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
-2009291711 metadata/md5-cache/dev-ros/actionlib_tutorials-9999
-2009291711 metadata/md5-cache/dev-ros/amcl-1.17.0
-2009291711 metadata/md5-cache/dev-ros/amcl-9999
 2009291711 metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
 2009291711 metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
 2009291711 metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
@@ -44178,752 +44118,12 @@
 2009291711 metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
 2009291711 metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
 2009291711 metadata/md5-cache/dev-ros/ament_lint_auto-9999
-2009291711 metadata/md5-cache/dev-ros/angles-1.9.13
-2009291711 metadata/md5-cache/dev-ros/angles-9999
-2009291711 metadata/md5-cache/dev-ros/audio_capture-0.3.6
-2009291711 metadata/md5-cache/dev-ros/audio_capture-0.3.7
-2009291711 metadata/md5-cache/dev-ros/audio_capture-9999
-2009291711 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
-2009291711 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
-2009291711 metadata/md5-cache/dev-ros/audio_common_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/audio_play-0.3.6
-2009291711 metadata/md5-cache/dev-ros/audio_play-0.3.7
-2009291711 metadata/md5-cache/dev-ros/audio_play-9999
-2009291711 metadata/md5-cache/dev-ros/base_local_planner-1.17.0
-2009291711 metadata/md5-cache/dev-ros/base_local_planner-9999
-2009291711 metadata/md5-cache/dev-ros/bond-1.8.5
-2009291711 metadata/md5-cache/dev-ros/bond-1.8.6
-2009291711 metadata/md5-cache/dev-ros/bond-9999
-2009291711 metadata/md5-cache/dev-ros/bondcpp-1.8.5
-2009291711 metadata/md5-cache/dev-ros/bondcpp-1.8.6
-2009291711 metadata/md5-cache/dev-ros/bondcpp-9999
-2009291711 metadata/md5-cache/dev-ros/bondpy-1.8.5
-2009291711 metadata/md5-cache/dev-ros/bondpy-1.8.6
-2009291711 metadata/md5-cache/dev-ros/bondpy-9999
-2009291711 metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
-2009291711 metadata/md5-cache/dev-ros/calibration_estimation-9999
-2009291711 metadata/md5-cache/dev-ros/calibration_launch-0.10.14
-2009291711 metadata/md5-cache/dev-ros/calibration_launch-9999
-2009291711 metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
-2009291711 metadata/md5-cache/dev-ros/calibration_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
-2009291711 metadata/md5-cache/dev-ros/calibration_setup_helper-9999
-2009291711 metadata/md5-cache/dev-ros/camera_calibration-1.15.2
-2009291711 metadata/md5-cache/dev-ros/camera_calibration-9999
-2009291711 metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
-2009291711 metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
-2009291711 metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
-2009291711 metadata/md5-cache/dev-ros/camera_info_manager-9999
-2009291711 metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
-2009291711 metadata/md5-cache/dev-ros/carrot_planner-9999
-2009291711 metadata/md5-cache/dev-ros/class_loader-0.5.0
-2009291711 metadata/md5-cache/dev-ros/class_loader-9999
-2009291711 metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
-2009291711 metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
-2009291711 metadata/md5-cache/dev-ros/cmake_modules-0.5.0
-2009291711 metadata/md5-cache/dev-ros/cmake_modules-9999
-2009291711 metadata/md5-cache/dev-ros/collada_parser-1.12.13
-2009291711 metadata/md5-cache/dev-ros/collada_parser-9999
-2009291711 metadata/md5-cache/dev-ros/collada_urdf-1.12.13
-2009291711 metadata/md5-cache/dev-ros/collada_urdf-9999
-2009291711 metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
-2009291711 metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
-2009291711 metadata/md5-cache/dev-ros/combined_robot_hw-9999
-2009291711 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
-2009291711 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
-2009291711 metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
-2009291711 metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
-2009291711 metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
-2009291711 metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
-2009291711 metadata/md5-cache/dev-ros/compressed_image_transport-9999
 2009291711 metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1
 2009291711 metadata/md5-cache/dev-ros/console_bridge_vendor-9999
-2009291711 metadata/md5-cache/dev-ros/control_msgs-1.5.2
-2009291711 metadata/md5-cache/dev-ros/control_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/control_toolbox-1.18.2
-2009291711 metadata/md5-cache/dev-ros/control_toolbox-9999
-2009291711 metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
-2009291711 metadata/md5-cache/dev-ros/controller_interface-0.19.2
-2009291711 metadata/md5-cache/dev-ros/controller_interface-9999
-2009291711 metadata/md5-cache/dev-ros/controller_manager-0.19.1
-2009291711 metadata/md5-cache/dev-ros/controller_manager-0.19.2
-2009291711 metadata/md5-cache/dev-ros/controller_manager-9999
-2009291711 metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
-2009291711 metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
-2009291711 metadata/md5-cache/dev-ros/controller_manager_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
-2009291711 metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
-2009291711 metadata/md5-cache/dev-ros/controller_manager_tests-9999
-2009291711 metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
-2009291711 metadata/md5-cache/dev-ros/convex_decomposition-9999
-2009291711 metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
-2009291711 metadata/md5-cache/dev-ros/costmap_2d-9999
-2009291711 metadata/md5-cache/dev-ros/cpp_common-0.7.2
-2009291711 metadata/md5-cache/dev-ros/cpp_common-9999
-2009291711 metadata/md5-cache/dev-ros/cv_bridge-1.15.0
-2009291711 metadata/md5-cache/dev-ros/cv_bridge-9999
-2009291711 metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
-2009291711 metadata/md5-cache/dev-ros/depth_image_proc-9999
-2009291711 metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
-2009291711 metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
-2009291711 metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
-2009291711 metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
-2009291711 metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
-2009291711 metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
-2009291711 metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
-2009291711 metadata/md5-cache/dev-ros/diagnostic_analysis-9999
-2009291711 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
-2009291711 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
-2009291711 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
-2009291711 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
-2009291711 metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/diagnostic_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
-2009291711 metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
-2009291711 metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
-2009291711 metadata/md5-cache/dev-ros/diagnostic_updater-9999
-2009291711 metadata/md5-cache/dev-ros/driver_base-1.6.8
-2009291711 metadata/md5-cache/dev-ros/driver_base-9999
-2009291711 metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
-2009291711 metadata/md5-cache/dev-ros/dwa_local_planner-9999
-2009291711 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
-2009291711 metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
-2009291711 metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
-2009291711 metadata/md5-cache/dev-ros/eigen_conversions-9999
-2009291711 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
-2009291711 metadata/md5-cache/dev-ros/eigen_stl_containers-9999
-2009291711 metadata/md5-cache/dev-ros/fake_localization-1.17.0
-2009291711 metadata/md5-cache/dev-ros/fake_localization-9999
-2009291711 metadata/md5-cache/dev-ros/filters-1.9.0
-2009291711 metadata/md5-cache/dev-ros/filters-9999
-2009291711 metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
-2009291711 metadata/md5-cache/dev-ros/gazebo_dev-9999
-2009291711 metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
-2009291711 metadata/md5-cache/dev-ros/gazebo_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
-2009291711 metadata/md5-cache/dev-ros/gazebo_plugins-9999
-2009291711 metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
-2009291711 metadata/md5-cache/dev-ros/gazebo_ros-9999
-2009291711 metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
-2009291711 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
-2009291711 metadata/md5-cache/dev-ros/gencpp-0.6.5
-2009291711 metadata/md5-cache/dev-ros/gencpp-9999
-2009291711 metadata/md5-cache/dev-ros/geneus-3.0.0-r1
-2009291711 metadata/md5-cache/dev-ros/geneus-9999
-2009291711 metadata/md5-cache/dev-ros/genlisp-0.4.18
-2009291711 metadata/md5-cache/dev-ros/genlisp-9999
-2009291711 metadata/md5-cache/dev-ros/genmsg-0.5.16
-2009291711 metadata/md5-cache/dev-ros/genmsg-9999
-2009291711 metadata/md5-cache/dev-ros/gennodejs-2.0.1
-2009291711 metadata/md5-cache/dev-ros/gennodejs-9999
-2009291711 metadata/md5-cache/dev-ros/genpy-0.6.11
-2009291711 metadata/md5-cache/dev-ros/genpy-0.6.14
-2009291711 metadata/md5-cache/dev-ros/genpy-9999
-2009291711 metadata/md5-cache/dev-ros/geodesy-0.5.5
-2009291711 metadata/md5-cache/dev-ros/geodesy-9999
-2009291711 metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
-2009291711 metadata/md5-cache/dev-ros/geographic_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
-2009291711 metadata/md5-cache/dev-ros/geometric_shapes-9999
-2009291711 metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/geometry_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/global_planner-1.17.0
-2009291711 metadata/md5-cache/dev-ros/global_planner-9999
-2009291711 metadata/md5-cache/dev-ros/gmapping-1.4.1
-2009291711 metadata/md5-cache/dev-ros/gmapping-9999
-2009291711 metadata/md5-cache/dev-ros/hardware_interface-0.19.1
-2009291711 metadata/md5-cache/dev-ros/hardware_interface-0.19.2
-2009291711 metadata/md5-cache/dev-ros/hardware_interface-9999
-2009291711 metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
-2009291711 metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_geotiff-9999
-2009291711 metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
-2009291711 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
-2009291711 metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_imu_tools-9999
-2009291711 metadata/md5-cache/dev-ros/hector_map_server-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_map_server-9999
-2009291711 metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_map_tools-9999
-2009291711 metadata/md5-cache/dev-ros/hector_mapping-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_mapping-9999
-2009291711 metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_marker_drawing-9999
-2009291711 metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_nav_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
-2009291711 metadata/md5-cache/dev-ros/hector_pose_estimation-9999
-2009291711 metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
-2009291711 metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
-2009291711 metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_slam_launch-9999
-2009291711 metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
-2009291711 metadata/md5-cache/dev-ros/hector_trajectory_server-9999
-2009291711 metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
-2009291711 metadata/md5-cache/dev-ros/image_cb_detector-9999
-2009291711 metadata/md5-cache/dev-ros/image_geometry-1.15.0
-2009291711 metadata/md5-cache/dev-ros/image_geometry-9999
-2009291711 metadata/md5-cache/dev-ros/image_proc-1.15.2
-2009291711 metadata/md5-cache/dev-ros/image_proc-9999
-2009291711 metadata/md5-cache/dev-ros/image_publisher-1.15.2
-2009291711 metadata/md5-cache/dev-ros/image_publisher-9999
-2009291711 metadata/md5-cache/dev-ros/image_rotate-1.15.2
-2009291711 metadata/md5-cache/dev-ros/image_rotate-9999
-2009291711 metadata/md5-cache/dev-ros/image_transport-1.12.0
-2009291711 metadata/md5-cache/dev-ros/image_transport-9999
-2009291711 metadata/md5-cache/dev-ros/image_view-1.15.2-r1
-2009291711 metadata/md5-cache/dev-ros/image_view-9999
-2009291711 metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
-2009291711 metadata/md5-cache/dev-ros/imu_complementary_filter-9999
-2009291711 metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
-2009291711 metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
-2009291711 metadata/md5-cache/dev-ros/imu_processors-0.3.0
-2009291711 metadata/md5-cache/dev-ros/imu_processors-9999
-2009291711 metadata/md5-cache/dev-ros/imu_transformer-0.3.0
-2009291711 metadata/md5-cache/dev-ros/imu_transformer-9999
-2009291711 metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
-2009291711 metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
-2009291711 metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
-2009291711 metadata/md5-cache/dev-ros/interactive_markers-9999
-2009291711 metadata/md5-cache/dev-ros/interval_intersection-0.10.14
-2009291711 metadata/md5-cache/dev-ros/interval_intersection-9999
-2009291711 metadata/md5-cache/dev-ros/ivcon-0.1.7
-2009291711 metadata/md5-cache/dev-ros/ivcon-9999
-2009291711 metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
-2009291711 metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
-2009291711 metadata/md5-cache/dev-ros/joint_limits_interface-9999
-2009291711 metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
-2009291711 metadata/md5-cache/dev-ros/joint_state_publisher-9999
-2009291711 metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
-2009291711 metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
-2009291711 metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
-2009291711 metadata/md5-cache/dev-ros/joint_states_settler-9999
-2009291711 metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
-2009291711 metadata/md5-cache/dev-ros/kdl_conversions-9999
-2009291711 metadata/md5-cache/dev-ros/kdl_parser-1.14.1
-2009291711 metadata/md5-cache/dev-ros/kdl_parser-9999
-2009291711 metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
-2009291711 metadata/md5-cache/dev-ros/kdl_parser_py-9999
-2009291711 metadata/md5-cache/dev-ros/laser_assembler-1.7.8
-2009291711 metadata/md5-cache/dev-ros/laser_assembler-9999
-2009291711 metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
-2009291711 metadata/md5-cache/dev-ros/laser_cb_detector-9999
-2009291711 metadata/md5-cache/dev-ros/laser_filters-1.8.11
-2009291711 metadata/md5-cache/dev-ros/laser_filters-9999
-2009291711 metadata/md5-cache/dev-ros/laser_geometry-1.6.5
-2009291711 metadata/md5-cache/dev-ros/laser_geometry-9999
-2009291711 metadata/md5-cache/dev-ros/laser_proc-0.1.6
-2009291711 metadata/md5-cache/dev-ros/laser_proc-9999
-2009291711 metadata/md5-cache/dev-ros/libmavconn-1.2.0
-2009291711 metadata/md5-cache/dev-ros/libmavconn-9999
-2009291711 metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
-2009291711 metadata/md5-cache/dev-ros/librviz_tutorial-9999
-2009291711 metadata/md5-cache/dev-ros/map_msgs-1.14.0
-2009291711 metadata/md5-cache/dev-ros/map_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/map_server-1.17.0
-2009291711 metadata/md5-cache/dev-ros/map_server-9999
-2009291711 metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
-2009291711 metadata/md5-cache/dev-ros/mavros-1.2.0
-2009291711 metadata/md5-cache/dev-ros/mavros-9999
-2009291711 metadata/md5-cache/dev-ros/mavros_extras-1.2.0
-2009291711 metadata/md5-cache/dev-ros/mavros_extras-9999
-2009291711 metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
-2009291711 metadata/md5-cache/dev-ros/mavros_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/media_export-0.3.0
-2009291711 metadata/md5-cache/dev-ros/media_export-9999
-2009291711 metadata/md5-cache/dev-ros/message_filters-1.15.8
-2009291711 metadata/md5-cache/dev-ros/message_filters-9999
-2009291711 metadata/md5-cache/dev-ros/message_generation-0.4.1
-2009291711 metadata/md5-cache/dev-ros/message_generation-9999
-2009291711 metadata/md5-cache/dev-ros/message_runtime-0.4.13
-2009291711 metadata/md5-cache/dev-ros/message_runtime-9999
-2009291711 metadata/md5-cache/dev-ros/message_to_tf-0.3.0
-2009291711 metadata/md5-cache/dev-ros/message_to_tf-9999
-2009291711 metadata/md5-cache/dev-ros/mk-1.15.5
-2009291711 metadata/md5-cache/dev-ros/mk-1.15.6
-2009291711 metadata/md5-cache/dev-ros/mk-9999
-2009291711 metadata/md5-cache/dev-ros/monocam_settler-0.10.14
-2009291711 metadata/md5-cache/dev-ros/monocam_settler-9999
-2009291711 metadata/md5-cache/dev-ros/move_base-1.17.0
-2009291711 metadata/md5-cache/dev-ros/move_base-9999
-2009291711 metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
-2009291711 metadata/md5-cache/dev-ros/move_base_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
-2009291711 metadata/md5-cache/dev-ros/move_slow_and_clear-9999
-2009291711 metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
-2009291711 metadata/md5-cache/dev-ros/moveit_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/nav_core-1.17.0
-2009291711 metadata/md5-cache/dev-ros/nav_core-9999
-2009291711 metadata/md5-cache/dev-ros/nav_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/nav_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/navfn-1.17.0
-2009291711 metadata/md5-cache/dev-ros/navfn-9999
-2009291711 metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
-2009291711 metadata/md5-cache/dev-ros/nmea_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
-2009291711 metadata/md5-cache/dev-ros/nodelet-9999
-2009291711 metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
-2009291711 metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
-2009291711 metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
-2009291711 metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
-2009291711 metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
-2009291711 metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
-2009291711 metadata/md5-cache/dev-ros/object_recognition_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
-2009291711 metadata/md5-cache/dev-ros/octomap_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/octomap_ros-0.4.1
-2009291711 metadata/md5-cache/dev-ros/octomap_ros-9999
-2009291711 metadata/md5-cache/dev-ros/opencv_apps-2.0.2
-2009291711 metadata/md5-cache/dev-ros/opencv_apps-9999
-2009291711 metadata/md5-cache/dev-ros/opencv_tests-1.15.0
-2009291711 metadata/md5-cache/dev-ros/opencv_tests-9999
-2009291711 metadata/md5-cache/dev-ros/openni2_camera-1.4.2
-2009291711 metadata/md5-cache/dev-ros/openni2_camera-9999
-2009291711 metadata/md5-cache/dev-ros/openni2_launch-1.4.2
-2009291711 metadata/md5-cache/dev-ros/openni2_launch-9999
-2009291711 metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
-2009291711 metadata/md5-cache/dev-ros/openslam_gmapping-9999
-2009291711 metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
-2009291711 metadata/md5-cache/dev-ros/pcl_conversions-9999
-2009291711 metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
-2009291711 metadata/md5-cache/dev-ros/pcl_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/pcl_ros-1.7.1
-2009291711 metadata/md5-cache/dev-ros/pcl_ros-9999
-2009291711 metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
-2009291711 metadata/md5-cache/dev-ros/pluginlib-9999
-2009291711 metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
-2009291711 metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
-2009291711 metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
 2009291711 metadata/md5-cache/dev-ros/poco_vendor-1.2.0
 2009291711 metadata/md5-cache/dev-ros/poco_vendor-9999
-2009291711 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
-2009291711 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
-2009291711 metadata/md5-cache/dev-ros/polled_camera-1.12.0
-2009291711 metadata/md5-cache/dev-ros/polled_camera-9999
-2009291711 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
-2009291711 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
-2009291711 metadata/md5-cache/dev-ros/pr2_description-1.12.4
-2009291711 metadata/md5-cache/dev-ros/pr2_description-9999
-2009291711 metadata/md5-cache/dev-ros/pr2_machine-1.12.4
-2009291711 metadata/md5-cache/dev-ros/pr2_machine-9999
-2009291711 metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
-2009291711 metadata/md5-cache/dev-ros/pr2_msgs-9999
 2009291711 metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
 2009291711 metadata/md5-cache/dev-ros/python_cmake_module-9999
-2009291711 metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
-2009291711 metadata/md5-cache/dev-ros/python_qt_binding-9999
-2009291711 metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
-2009291711 metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
-2009291711 metadata/md5-cache/dev-ros/qt_dotgraph-9999
-2009291711 metadata/md5-cache/dev-ros/qt_gui-0.4.1
-2009291711 metadata/md5-cache/dev-ros/qt_gui-0.4.2
-2009291711 metadata/md5-cache/dev-ros/qt_gui-9999
-2009291711 metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
-2009291711 metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
-2009291711 metadata/md5-cache/dev-ros/qt_gui_app-9999
-2009291711 metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
-2009291711 metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
-2009291711 metadata/md5-cache/dev-ros/qt_gui_cpp-9999
-2009291711 metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
-2009291711 metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
-2009291711 metadata/md5-cache/dev-ros/qt_gui_py_common-9999
-2009291711 metadata/md5-cache/dev-ros/random_numbers-0.3.2
-2009291711 metadata/md5-cache/dev-ros/random_numbers-9999
-2009291711 metadata/md5-cache/dev-ros/realtime_tools-1.16.0-r1
-2009291711 metadata/md5-cache/dev-ros/realtime_tools-9999
-2009291711 metadata/md5-cache/dev-ros/resource_retriever-1.12.6
-2009291711 metadata/md5-cache/dev-ros/resource_retriever-9999
-2009291711 metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
-2009291711 metadata/md5-cache/dev-ros/rgbd_launch-9999
-2009291711 metadata/md5-cache/dev-ros/robot_localization-2.6.8
-2009291711 metadata/md5-cache/dev-ros/robot_localization-9999
-2009291711 metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
-2009291711 metadata/md5-cache/dev-ros/robot_pose_ekf-9999
-2009291711 metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
-2009291711 metadata/md5-cache/dev-ros/robot_pose_publisher-9999
-2009291711 metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
-2009291711 metadata/md5-cache/dev-ros/robot_state_publisher-9999
-2009291711 metadata/md5-cache/dev-ros/ros_environment-1.3.1
-2009291711 metadata/md5-cache/dev-ros/ros_environment-9999
-2009291711 metadata/md5-cache/dev-ros/rosapi-0.11.10
-2009291711 metadata/md5-cache/dev-ros/rosapi-0.11.9
-2009291711 metadata/md5-cache/dev-ros/rosapi-9999
-2009291711 metadata/md5-cache/dev-ros/rosauth-1.0.1
-2009291711 metadata/md5-cache/dev-ros/rosauth-9999
-2009291711 metadata/md5-cache/dev-ros/rosbag-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rosbag-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosbag-9999
-2009291711 metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
-2009291711 metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
-2009291711 metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
-2009291711 metadata/md5-cache/dev-ros/rosbag_storage-9999
-2009291711 metadata/md5-cache/dev-ros/rosbash-1.15.5
-2009291711 metadata/md5-cache/dev-ros/rosbash-1.15.6
-2009291711 metadata/md5-cache/dev-ros/rosbash-9999
-2009291711 metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
-2009291711 metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
-2009291711 metadata/md5-cache/dev-ros/rosboost_cfg-9999
-2009291711 metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
-2009291711 metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
-2009291711 metadata/md5-cache/dev-ros/rosbridge_library-9999
-2009291711 metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
-2009291711 metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
-2009291711 metadata/md5-cache/dev-ros/rosbridge_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
-2009291711 metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
-2009291711 metadata/md5-cache/dev-ros/rosbridge_server-9999
-2009291711 metadata/md5-cache/dev-ros/rosbuild-1.15.5
-2009291711 metadata/md5-cache/dev-ros/rosbuild-1.15.6
-2009291711 metadata/md5-cache/dev-ros/rosbuild-9999
-2009291711 metadata/md5-cache/dev-ros/rosclean-1.15.5
-2009291711 metadata/md5-cache/dev-ros/rosclean-1.15.6
-2009291711 metadata/md5-cache/dev-ros/rosclean-9999
-2009291711 metadata/md5-cache/dev-ros/rosconsole-1.14.0
-2009291711 metadata/md5-cache/dev-ros/rosconsole-1.14.2
-2009291711 metadata/md5-cache/dev-ros/rosconsole-9999
-2009291711 metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
-2009291711 metadata/md5-cache/dev-ros/rosconsole_bridge-9999
-2009291711 metadata/md5-cache/dev-ros/roscpp-1.15.7
-2009291711 metadata/md5-cache/dev-ros/roscpp-1.15.8
-2009291711 metadata/md5-cache/dev-ros/roscpp-9999
-2009291711 metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
-2009291711 metadata/md5-cache/dev-ros/roscpp_serialization-9999
-2009291711 metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
-2009291711 metadata/md5-cache/dev-ros/roscpp_traits-9999
-2009291711 metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
-2009291711 metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
-2009291711 metadata/md5-cache/dev-ros/roscpp_tutorials-9999
-2009291711 metadata/md5-cache/dev-ros/roscreate-1.15.6
-2009291711 metadata/md5-cache/dev-ros/roscreate-9999
-2009291711 metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
-2009291711 metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
-2009291711 metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
-2009291711 metadata/md5-cache/dev-ros/rosdiagnostic-9999
-2009291711 metadata/md5-cache/dev-ros/rosgraph-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosgraph-9999
-2009291711 metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
-2009291711 metadata/md5-cache/dev-ros/rosgraph_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/roslang-1.15.5
-2009291711 metadata/md5-cache/dev-ros/roslang-1.15.6
-2009291711 metadata/md5-cache/dev-ros/roslang-9999
-2009291711 metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
-2009291711 metadata/md5-cache/dev-ros/roslaunch-9999
-2009291711 metadata/md5-cache/dev-ros/roslib-1.15.6
-2009291711 metadata/md5-cache/dev-ros/roslib-9999
-2009291711 metadata/md5-cache/dev-ros/roslint-0.12.0
-2009291711 metadata/md5-cache/dev-ros/roslint-9999
-2009291711 metadata/md5-cache/dev-ros/roslisp-1.9.24
-2009291711 metadata/md5-cache/dev-ros/roslisp-9999
-2009291711 metadata/md5-cache/dev-ros/roslz4-1.15.8
-2009291711 metadata/md5-cache/dev-ros/roslz4-9999
-2009291711 metadata/md5-cache/dev-ros/rosmake-1.15.5
-2009291711 metadata/md5-cache/dev-ros/rosmake-1.15.6
-2009291711 metadata/md5-cache/dev-ros/rosmake-9999
-2009291711 metadata/md5-cache/dev-ros/rosmaster-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rosmaster-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosmaster-9999
-2009291711 metadata/md5-cache/dev-ros/rosmsg-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rosmsg-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosmsg-9999
-2009291711 metadata/md5-cache/dev-ros/rosnode-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosnode-9999
-2009291711 metadata/md5-cache/dev-ros/rosout-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rosout-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosout-9999
-2009291711 metadata/md5-cache/dev-ros/rospack-2.6.2
-2009291711 metadata/md5-cache/dev-ros/rospack-9999
-2009291711 metadata/md5-cache/dev-ros/rosparam-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rosparam-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosparam-9999
-2009291711 metadata/md5-cache/dev-ros/rospy-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rospy-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rospy-9999
-2009291711 metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
-2009291711 metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
-2009291711 metadata/md5-cache/dev-ros/rospy_tutorials-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_arduino-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_client-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_client-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_python-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_python-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_server-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_server-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_tivac-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_windows-9999
-2009291711 metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
-2009291711 metadata/md5-cache/dev-ros/rosserial_xbee-9999
-2009291711 metadata/md5-cache/dev-ros/rosservice-1.15.7
-2009291711 metadata/md5-cache/dev-ros/rosservice-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rosservice-9999
-2009291711 metadata/md5-cache/dev-ros/rostest-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rostest-9999
-2009291711 metadata/md5-cache/dev-ros/rostime-0.7.2
-2009291711 metadata/md5-cache/dev-ros/rostime-9999
-2009291711 metadata/md5-cache/dev-ros/rostopic-1.15.8
-2009291711 metadata/md5-cache/dev-ros/rostopic-9999
-2009291711 metadata/md5-cache/dev-ros/rosunit-1.15.5
-2009291711 metadata/md5-cache/dev-ros/rosunit-1.15.6
-2009291711 metadata/md5-cache/dev-ros/rosunit-9999
-2009291711 metadata/md5-cache/dev-ros/roswtf-1.15.8
-2009291711 metadata/md5-cache/dev-ros/roswtf-9999
-2009291711 metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
-2009291711 metadata/md5-cache/dev-ros/rotate_recovery-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_action-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_action-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_bag-0.4.13
-2009291711 metadata/md5-cache/dev-ros/rqt_bag-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
-2009291711 metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_console-0.4.11
-2009291711 metadata/md5-cache/dev-ros/rqt_console-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
-2009291711 metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
-2009291711 metadata/md5-cache/dev-ros/rqt_controller_manager-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_dep-0.4.10
-2009291711 metadata/md5-cache/dev-ros/rqt_dep-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_graph-0.4.14
-2009291711 metadata/md5-cache/dev-ros/rqt_graph-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_gui-0.5.2
-2009291711 metadata/md5-cache/dev-ros/rqt_gui-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
-2009291711 metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
-2009291711 metadata/md5-cache/dev-ros/rqt_gui_py-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
-2009291711 metadata/md5-cache/dev-ros/rqt_image_view-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_launch-0.4.8
-2009291711 metadata/md5-cache/dev-ros/rqt_launch-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
-2009291711 metadata/md5-cache/dev-ros/rqt_logger_level-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
-2009291711 metadata/md5-cache/dev-ros/rqt_moveit-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_msg-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_msg-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
-2009291711 metadata/md5-cache/dev-ros/rqt_nav_view-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_plot-0.4.12
-2009291711 metadata/md5-cache/dev-ros/rqt_plot-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
-2009291711 metadata/md5-cache/dev-ros/rqt_pose_view-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_publisher-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
-2009291711 metadata/md5-cache/dev-ros/rqt_py_common-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_py_console-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
-2009291711 metadata/md5-cache/dev-ros/rqt_reconfigure-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
-2009291711 metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
-2009291711 metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
-2009291711 metadata/md5-cache/dev-ros/rqt_robot_steering-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
-2009291711 metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
-2009291711 metadata/md5-cache/dev-ros/rqt_rviz-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_service_caller-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_shell-0.4.10
-2009291711 metadata/md5-cache/dev-ros/rqt_shell-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_srv-0.4.8
-2009291711 metadata/md5-cache/dev-ros/rqt_srv-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
-2009291711 metadata/md5-cache/dev-ros/rqt_tf_tree-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_top-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_top-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_topic-0.4.12
-2009291711 metadata/md5-cache/dev-ros/rqt_topic-9999
-2009291711 metadata/md5-cache/dev-ros/rqt_web-0.4.9
-2009291711 metadata/md5-cache/dev-ros/rqt_web-9999
-2009291711 metadata/md5-cache/dev-ros/rviz-1.14.1
-2009291711 metadata/md5-cache/dev-ros/rviz-9999
-2009291711 metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
-2009291711 metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
-2009291711 metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
-2009291711 metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
-2009291711 metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
-2009291711 metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
-2009291711 metadata/md5-cache/dev-ros/self_test-1.10.1
-2009291711 metadata/md5-cache/dev-ros/self_test-1.9.4
-2009291711 metadata/md5-cache/dev-ros/self_test-1.9.6
-2009291711 metadata/md5-cache/dev-ros/self_test-9999
-2009291711 metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/sensor_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/settlerlib-0.10.14
-2009291711 metadata/md5-cache/dev-ros/settlerlib-9999
-2009291711 metadata/md5-cache/dev-ros/shape_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/shape_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/smach-2.5.0
-2009291711 metadata/md5-cache/dev-ros/smach-9999
-2009291711 metadata/md5-cache/dev-ros/smach_msgs-2.5.0
-2009291711 metadata/md5-cache/dev-ros/smach_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/smach_ros-2.5.0
-2009291711 metadata/md5-cache/dev-ros/smach_ros-9999
-2009291711 metadata/md5-cache/dev-ros/smclib-1.8.5
-2009291711 metadata/md5-cache/dev-ros/smclib-1.8.6
-2009291711 metadata/md5-cache/dev-ros/smclib-9999
-2009291711 metadata/md5-cache/dev-ros/stage_ros-1.8.0
-2009291711 metadata/md5-cache/dev-ros/stage_ros-9999
-2009291711 metadata/md5-cache/dev-ros/std_msgs-0.5.13
-2009291711 metadata/md5-cache/dev-ros/std_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/std_srvs-1.11.3
-2009291711 metadata/md5-cache/dev-ros/std_srvs-9999
-2009291711 metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
-2009291711 metadata/md5-cache/dev-ros/stereo_image_proc-9999
-2009291711 metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/stereo_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/test_bond-1.8.5
-2009291711 metadata/md5-cache/dev-ros/test_bond-1.8.6
-2009291711 metadata/md5-cache/dev-ros/test_bond-9999
-2009291711 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
-2009291711 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
-2009291711 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
-2009291711 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
-2009291711 metadata/md5-cache/dev-ros/test_nodelet-1.10.0
-2009291711 metadata/md5-cache/dev-ros/test_nodelet-9999
-2009291711 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
-2009291711 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
-2009291711 metadata/md5-cache/dev-ros/test_rosbag-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rosbag-9999
-2009291711 metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rosbag_storage-9999
-2009291711 metadata/md5-cache/dev-ros/test_roscpp-1.15.7
-2009291711 metadata/md5-cache/dev-ros/test_roscpp-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_roscpp-9999
-2009291711 metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
-2009291711 metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rosgraph-9999
-2009291711 metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_roslaunch-9999
-2009291711 metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_roslib_comm-9999
-2009291711 metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rosmaster-9999
-2009291711 metadata/md5-cache/dev-ros/test_rosparam-1.15.7
-2009291711 metadata/md5-cache/dev-ros/test_rosparam-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rosparam-9999
-2009291711 metadata/md5-cache/dev-ros/test_rospy-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rospy-9999
-2009291711 metadata/md5-cache/dev-ros/test_rosservice-1.15.8
-2009291711 metadata/md5-cache/dev-ros/test_rosservice-9999
-2009291711 metadata/md5-cache/dev-ros/test_tf2-0.7.2
-2009291711 metadata/md5-cache/dev-ros/test_tf2-0.7.3
-2009291711 metadata/md5-cache/dev-ros/test_tf2-0.7.5
-2009291711 metadata/md5-cache/dev-ros/test_tf2-9999
-2009291711 metadata/md5-cache/dev-ros/tf-1.13.2-r1
-2009291711 metadata/md5-cache/dev-ros/tf-9999
-2009291711 metadata/md5-cache/dev-ros/tf2-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_bullet-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_eigen-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_kdl-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_py-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_py-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_py-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_py-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_ros-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_ros-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_ros-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_ros-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/tf2_tools-0.7.2
-2009291711 metadata/md5-cache/dev-ros/tf2_tools-0.7.3
-2009291711 metadata/md5-cache/dev-ros/tf2_tools-0.7.5
-2009291711 metadata/md5-cache/dev-ros/tf2_tools-9999
-2009291711 metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
-2009291711 metadata/md5-cache/dev-ros/tf_conversions-9999
-2009291711 metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
-2009291711 metadata/md5-cache/dev-ros/theora_image_transport-9999
-2009291711 metadata/md5-cache/dev-ros/timestamp_tools-1.6.8-r1
-2009291711 metadata/md5-cache/dev-ros/timestamp_tools-9999
-2009291711 metadata/md5-cache/dev-ros/topic_tools-1.15.8
-2009291711 metadata/md5-cache/dev-ros/topic_tools-9999
-2009291711 metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/trajectory_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/transmission_interface-0.19.1
-2009291711 metadata/md5-cache/dev-ros/transmission_interface-0.19.2
-2009291711 metadata/md5-cache/dev-ros/transmission_interface-9999
-2009291711 metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
-2009291711 metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
-2009291711 metadata/md5-cache/dev-ros/turtle_actionlib-9999
-2009291711 metadata/md5-cache/dev-ros/turtle_tf-0.2.3
-2009291711 metadata/md5-cache/dev-ros/turtle_tf-9999
-2009291711 metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
-2009291711 metadata/md5-cache/dev-ros/turtle_tf2-9999
-2009291711 metadata/md5-cache/dev-ros/turtlesim-0.10.1
-2009291711 metadata/md5-cache/dev-ros/turtlesim-0.10.2
-2009291711 metadata/md5-cache/dev-ros/turtlesim-9999
-2009291711 metadata/md5-cache/dev-ros/unique_id-1.0.6
-2009291711 metadata/md5-cache/dev-ros/unique_id-9999
-2009291711 metadata/md5-cache/dev-ros/urdf-1.13.2
-2009291711 metadata/md5-cache/dev-ros/urdf-9999
-2009291711 metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
-2009291711 metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
-2009291711 metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
-2009291711 metadata/md5-cache/dev-ros/urdf_tutorial-9999
-2009291711 metadata/md5-cache/dev-ros/urg_c-1.0.405
-2009291711 metadata/md5-cache/dev-ros/urg_c-9999
-2009291711 metadata/md5-cache/dev-ros/urg_node-0.1.13
-2009291711 metadata/md5-cache/dev-ros/urg_node-9999
-2009291711 metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
-2009291711 metadata/md5-cache/dev-ros/uuid_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
-2009291711 metadata/md5-cache/dev-ros/visp_auto_tracker-9999
-2009291711 metadata/md5-cache/dev-ros/visp_bridge-0.11.1
-2009291711 metadata/md5-cache/dev-ros/visp_bridge-9999
-2009291711 metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
-2009291711 metadata/md5-cache/dev-ros/visp_camera_calibration-9999
-2009291711 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
-2009291711 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
-2009291711 metadata/md5-cache/dev-ros/visp_tracker-0.11.1
-2009291711 metadata/md5-cache/dev-ros/visp_tracker-9999
-2009291711 metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
-2009291711 metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
-2009291711 metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
-2009291711 metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
-2009291711 metadata/md5-cache/dev-ros/visualization_msgs-9999
-2009291711 metadata/md5-cache/dev-ros/voxel_grid-1.16.6
-2009291711 metadata/md5-cache/dev-ros/voxel_grid-1.17.0
-2009291711 metadata/md5-cache/dev-ros/voxel_grid-9999
-2009291711 metadata/md5-cache/dev-ros/xacro-1.14.1
-2009291711 metadata/md5-cache/dev-ros/xacro-9999
-2009291711 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
-2009291711 metadata/md5-cache/dev-ros/xmlrpcpp-9999
-2009301709 metadata/md5-cache/dev-ros/Manifest.gz
 2009301439 metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
 2009301439 metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1
 2009301439 metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0
@@ -44965,6 +44165,757 @@
 2009301709 metadata/md5-cache/dev-ros/ament_uncrustify-9999
 2009301709 metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
 2009301709 metadata/md5-cache/dev-ros/ament_xmllint-9999
+2010111509 metadata/md5-cache/dev-ros/Manifest.gz
+2010111509 metadata/md5-cache/dev-ros/actionlib-1.13.2
+2010111509 metadata/md5-cache/dev-ros/actionlib-9999
+2010111509 metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/actionlib_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
+2010111509 metadata/md5-cache/dev-ros/actionlib_tools-9999
+2010111509 metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
+2010111509 metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
+2010111509 metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/amcl-1.17.0
+2010111509 metadata/md5-cache/dev-ros/amcl-9999
+2010111509 metadata/md5-cache/dev-ros/angles-1.9.13
+2010111509 metadata/md5-cache/dev-ros/angles-9999
+2010111509 metadata/md5-cache/dev-ros/audio_capture-0.3.6
+2010111509 metadata/md5-cache/dev-ros/audio_capture-0.3.7
+2010111509 metadata/md5-cache/dev-ros/audio_capture-9999
+2010111509 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
+2010111509 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
+2010111509 metadata/md5-cache/dev-ros/audio_common_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/audio_play-0.3.6
+2010111509 metadata/md5-cache/dev-ros/audio_play-0.3.7
+2010111509 metadata/md5-cache/dev-ros/audio_play-9999
+2010111509 metadata/md5-cache/dev-ros/base_local_planner-1.17.0
+2010111509 metadata/md5-cache/dev-ros/base_local_planner-9999
+2010111509 metadata/md5-cache/dev-ros/bond-1.8.5
+2010111509 metadata/md5-cache/dev-ros/bond-1.8.6
+2010111509 metadata/md5-cache/dev-ros/bond-9999
+2010111509 metadata/md5-cache/dev-ros/bondcpp-1.8.5
+2010111509 metadata/md5-cache/dev-ros/bondcpp-1.8.6
+2010111509 metadata/md5-cache/dev-ros/bondcpp-9999
+2010111509 metadata/md5-cache/dev-ros/bondpy-1.8.5
+2010111509 metadata/md5-cache/dev-ros/bondpy-1.8.6
+2010111509 metadata/md5-cache/dev-ros/bondpy-9999
+2010111509 metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+2010111509 metadata/md5-cache/dev-ros/calibration_estimation-9999
+2010111509 metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+2010111509 metadata/md5-cache/dev-ros/calibration_launch-9999
+2010111509 metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+2010111509 metadata/md5-cache/dev-ros/calibration_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
+2010111509 metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+2010111509 metadata/md5-cache/dev-ros/camera_calibration-1.15.2
+2010111509 metadata/md5-cache/dev-ros/camera_calibration-9999
+2010111509 metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
+2010111509 metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+2010111509 metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
+2010111509 metadata/md5-cache/dev-ros/camera_info_manager-9999
+2010111509 metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
+2010111509 metadata/md5-cache/dev-ros/carrot_planner-9999
+2010111509 metadata/md5-cache/dev-ros/class_loader-0.5.0
+2010111509 metadata/md5-cache/dev-ros/class_loader-9999
+2010111509 metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
+2010111509 metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+2010111509 metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+2010111509 metadata/md5-cache/dev-ros/cmake_modules-9999
+2010111509 metadata/md5-cache/dev-ros/collada_parser-1.12.13
+2010111509 metadata/md5-cache/dev-ros/collada_parser-9999
+2010111509 metadata/md5-cache/dev-ros/collada_urdf-1.12.13
+2010111509 metadata/md5-cache/dev-ros/collada_urdf-9999
+2010111509 metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
+2010111509 metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
+2010111509 metadata/md5-cache/dev-ros/combined_robot_hw-9999
+2010111509 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
+2010111509 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
+2010111509 metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+2010111509 metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
+2010111509 metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+2010111509 metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
+2010111509 metadata/md5-cache/dev-ros/compressed_image_transport-9999
+2010111509 metadata/md5-cache/dev-ros/control_msgs-1.5.2
+2010111509 metadata/md5-cache/dev-ros/control_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/control_toolbox-1.18.2
+2010111509 metadata/md5-cache/dev-ros/control_toolbox-9999
+2010111509 metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
+2010111509 metadata/md5-cache/dev-ros/controller_interface-0.19.2
+2010111509 metadata/md5-cache/dev-ros/controller_interface-9999
+2010111509 metadata/md5-cache/dev-ros/controller_manager-0.19.1
+2010111509 metadata/md5-cache/dev-ros/controller_manager-0.19.2
+2010111509 metadata/md5-cache/dev-ros/controller_manager-9999
+2010111509 metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
+2010111509 metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
+2010111509 metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
+2010111509 metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
+2010111509 metadata/md5-cache/dev-ros/controller_manager_tests-9999
+2010111509 metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+2010111509 metadata/md5-cache/dev-ros/convex_decomposition-9999
+2010111509 metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
+2010111509 metadata/md5-cache/dev-ros/costmap_2d-9999
+2010111509 metadata/md5-cache/dev-ros/cpp_common-0.7.2
+2010111509 metadata/md5-cache/dev-ros/cpp_common-9999
+2010111509 metadata/md5-cache/dev-ros/cv_bridge-1.15.0
+2010111509 metadata/md5-cache/dev-ros/cv_bridge-9999
+2010111509 metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
+2010111509 metadata/md5-cache/dev-ros/depth_image_proc-9999
+2010111509 metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+2010111509 metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+2010111509 metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
+2010111509 metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+2010111509 metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
+2010111509 metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
+2010111509 metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
+2010111509 metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+2010111509 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
+2010111509 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
+2010111509 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
+2010111509 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+2010111509 metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
+2010111509 metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
+2010111509 metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
+2010111509 metadata/md5-cache/dev-ros/diagnostic_updater-9999
+2010111509 metadata/md5-cache/dev-ros/driver_base-1.6.8
+2010111509 metadata/md5-cache/dev-ros/driver_base-9999
+2010111509 metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
+2010111509 metadata/md5-cache/dev-ros/dwa_local_planner-9999
+2010111509 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
+2010111509 metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+2010111509 metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
+2010111509 metadata/md5-cache/dev-ros/eigen_conversions-9999
+2010111509 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
+2010111509 metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+2010111509 metadata/md5-cache/dev-ros/fake_localization-1.17.0
+2010111509 metadata/md5-cache/dev-ros/fake_localization-9999
+2010111509 metadata/md5-cache/dev-ros/filters-1.9.0
+2010111509 metadata/md5-cache/dev-ros/filters-9999
+2010111509 metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
+2010111509 metadata/md5-cache/dev-ros/gazebo_dev-9999
+2010111509 metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
+2010111509 metadata/md5-cache/dev-ros/gazebo_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+2010111509 metadata/md5-cache/dev-ros/gazebo_plugins-9999
+2010111509 metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
+2010111509 metadata/md5-cache/dev-ros/gazebo_ros-9999
+2010111509 metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
+2010111509 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+2010111509 metadata/md5-cache/dev-ros/gencpp-0.6.5
+2010111509 metadata/md5-cache/dev-ros/gencpp-9999
+2010111509 metadata/md5-cache/dev-ros/geneus-3.0.0-r1
+2010111509 metadata/md5-cache/dev-ros/geneus-9999
+2010111509 metadata/md5-cache/dev-ros/genlisp-0.4.18
+2010111509 metadata/md5-cache/dev-ros/genlisp-9999
+2010111509 metadata/md5-cache/dev-ros/genmsg-0.5.16
+2010111509 metadata/md5-cache/dev-ros/genmsg-9999
+2010111509 metadata/md5-cache/dev-ros/gennodejs-2.0.1
+2010111509 metadata/md5-cache/dev-ros/gennodejs-9999
+2010111509 metadata/md5-cache/dev-ros/genpy-0.6.11
+2010111509 metadata/md5-cache/dev-ros/genpy-0.6.14
+2010111509 metadata/md5-cache/dev-ros/genpy-9999
+2010111509 metadata/md5-cache/dev-ros/geodesy-0.5.5
+2010111509 metadata/md5-cache/dev-ros/geodesy-9999
+2010111509 metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
+2010111509 metadata/md5-cache/dev-ros/geographic_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
+2010111509 metadata/md5-cache/dev-ros/geometric_shapes-9999
+2010111509 metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/geometry_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/global_planner-1.17.0
+2010111509 metadata/md5-cache/dev-ros/global_planner-9999
+2010111509 metadata/md5-cache/dev-ros/gmapping-1.4.1
+2010111509 metadata/md5-cache/dev-ros/gmapping-9999
+2010111509 metadata/md5-cache/dev-ros/hardware_interface-0.19.1
+2010111509 metadata/md5-cache/dev-ros/hardware_interface-0.19.2
+2010111509 metadata/md5-cache/dev-ros/hardware_interface-9999
+2010111509 metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+2010111509 metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_geotiff-9999
+2010111509 metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+2010111509 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
+2010111509 metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_imu_tools-9999
+2010111509 metadata/md5-cache/dev-ros/hector_map_server-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_map_server-9999
+2010111509 metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_map_tools-9999
+2010111509 metadata/md5-cache/dev-ros/hector_mapping-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_mapping-9999
+2010111509 metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+2010111509 metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
+2010111509 metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+2010111509 metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
+2010111509 metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+2010111509 metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_slam_launch-9999
+2010111509 metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
+2010111509 metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+2010111509 metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
+2010111509 metadata/md5-cache/dev-ros/image_cb_detector-9999
+2010111509 metadata/md5-cache/dev-ros/image_geometry-1.15.0
+2010111509 metadata/md5-cache/dev-ros/image_geometry-9999
+2010111509 metadata/md5-cache/dev-ros/image_proc-1.15.2
+2010111509 metadata/md5-cache/dev-ros/image_proc-9999
+2010111509 metadata/md5-cache/dev-ros/image_publisher-1.15.2
+2010111509 metadata/md5-cache/dev-ros/image_publisher-9999
+2010111509 metadata/md5-cache/dev-ros/image_rotate-1.15.2
+2010111509 metadata/md5-cache/dev-ros/image_rotate-9999
+2010111509 metadata/md5-cache/dev-ros/image_transport-1.12.0
+2010111509 metadata/md5-cache/dev-ros/image_transport-9999
+2010111509 metadata/md5-cache/dev-ros/image_view-1.15.2-r1
+2010111509 metadata/md5-cache/dev-ros/image_view-9999
+2010111509 metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
+2010111509 metadata/md5-cache/dev-ros/imu_complementary_filter-9999
+2010111509 metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
+2010111509 metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+2010111509 metadata/md5-cache/dev-ros/imu_processors-0.3.0
+2010111509 metadata/md5-cache/dev-ros/imu_processors-9999
+2010111509 metadata/md5-cache/dev-ros/imu_transformer-0.3.0
+2010111509 metadata/md5-cache/dev-ros/imu_transformer-9999
+2010111509 metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
+2010111509 metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
+2010111509 metadata/md5-cache/dev-ros/interactive_markers-9999
+2010111509 metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+2010111509 metadata/md5-cache/dev-ros/interval_intersection-9999
+2010111509 metadata/md5-cache/dev-ros/ivcon-0.1.7
+2010111509 metadata/md5-cache/dev-ros/ivcon-9999
+2010111509 metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
+2010111509 metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
+2010111509 metadata/md5-cache/dev-ros/joint_limits_interface-9999
+2010111509 metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
+2010111509 metadata/md5-cache/dev-ros/joint_state_publisher-9999
+2010111509 metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
+2010111509 metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
+2010111509 metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
+2010111509 metadata/md5-cache/dev-ros/joint_states_settler-9999
+2010111509 metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
+2010111509 metadata/md5-cache/dev-ros/kdl_conversions-9999
+2010111509 metadata/md5-cache/dev-ros/kdl_parser-1.14.1
+2010111509 metadata/md5-cache/dev-ros/kdl_parser-9999
+2010111509 metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
+2010111509 metadata/md5-cache/dev-ros/kdl_parser_py-9999
+2010111509 metadata/md5-cache/dev-ros/laser_assembler-1.7.8
+2010111509 metadata/md5-cache/dev-ros/laser_assembler-9999
+2010111509 metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+2010111509 metadata/md5-cache/dev-ros/laser_cb_detector-9999
+2010111509 metadata/md5-cache/dev-ros/laser_filters-1.8.11
+2010111509 metadata/md5-cache/dev-ros/laser_filters-9999
+2010111509 metadata/md5-cache/dev-ros/laser_geometry-1.6.5
+2010111509 metadata/md5-cache/dev-ros/laser_geometry-9999
+2010111509 metadata/md5-cache/dev-ros/laser_proc-0.1.6
+2010111509 metadata/md5-cache/dev-ros/laser_proc-9999
+2010111509 metadata/md5-cache/dev-ros/libmavconn-1.2.0
+2010111509 metadata/md5-cache/dev-ros/libmavconn-9999
+2010111509 metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
+2010111509 metadata/md5-cache/dev-ros/librviz_tutorial-9999
+2010111509 metadata/md5-cache/dev-ros/map_msgs-1.14.0
+2010111509 metadata/md5-cache/dev-ros/map_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/map_server-1.17.0
+2010111509 metadata/md5-cache/dev-ros/map_server-9999
+2010111509 metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
+2010111509 metadata/md5-cache/dev-ros/mavros-1.2.0
+2010111509 metadata/md5-cache/dev-ros/mavros-9999
+2010111509 metadata/md5-cache/dev-ros/mavros_extras-1.2.0
+2010111509 metadata/md5-cache/dev-ros/mavros_extras-9999
+2010111509 metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+2010111509 metadata/md5-cache/dev-ros/mavros_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/media_export-0.3.0
+2010111509 metadata/md5-cache/dev-ros/media_export-9999
+2010111509 metadata/md5-cache/dev-ros/message_filters-1.15.8
+2010111509 metadata/md5-cache/dev-ros/message_filters-9999
+2010111509 metadata/md5-cache/dev-ros/message_generation-0.4.1
+2010111509 metadata/md5-cache/dev-ros/message_generation-9999
+2010111509 metadata/md5-cache/dev-ros/message_runtime-0.4.13
+2010111509 metadata/md5-cache/dev-ros/message_runtime-9999
+2010111509 metadata/md5-cache/dev-ros/message_to_tf-0.3.0
+2010111509 metadata/md5-cache/dev-ros/message_to_tf-9999
+2010111509 metadata/md5-cache/dev-ros/mk-1.15.5
+2010111509 metadata/md5-cache/dev-ros/mk-1.15.6
+2010111509 metadata/md5-cache/dev-ros/mk-9999
+2010111509 metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+2010111509 metadata/md5-cache/dev-ros/monocam_settler-9999
+2010111509 metadata/md5-cache/dev-ros/move_base-1.17.0
+2010111509 metadata/md5-cache/dev-ros/move_base-9999
+2010111509 metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
+2010111509 metadata/md5-cache/dev-ros/move_base_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
+2010111509 metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+2010111509 metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
+2010111509 metadata/md5-cache/dev-ros/moveit_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/nav_core-1.17.0
+2010111509 metadata/md5-cache/dev-ros/nav_core-9999
+2010111509 metadata/md5-cache/dev-ros/nav_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/nav_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/navfn-1.17.0
+2010111509 metadata/md5-cache/dev-ros/navfn-9999
+2010111509 metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
+2010111509 metadata/md5-cache/dev-ros/nmea_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
+2010111509 metadata/md5-cache/dev-ros/nodelet-9999
+2010111509 metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
+2010111509 metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+2010111509 metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
+2010111509 metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
+2010111509 metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+2010111509 metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+2010111509 metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
+2010111509 metadata/md5-cache/dev-ros/octomap_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/octomap_ros-0.4.1
+2010111509 metadata/md5-cache/dev-ros/octomap_ros-9999
+2010111509 metadata/md5-cache/dev-ros/opencv_apps-2.0.2
+2010111509 metadata/md5-cache/dev-ros/opencv_apps-9999
+2010111509 metadata/md5-cache/dev-ros/opencv_tests-1.15.0
+2010111509 metadata/md5-cache/dev-ros/opencv_tests-9999
+2010111509 metadata/md5-cache/dev-ros/openni2_camera-1.4.2
+2010111509 metadata/md5-cache/dev-ros/openni2_camera-9999
+2010111509 metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+2010111509 metadata/md5-cache/dev-ros/openni2_launch-9999
+2010111509 metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
+2010111509 metadata/md5-cache/dev-ros/openslam_gmapping-9999
+2010111509 metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+2010111509 metadata/md5-cache/dev-ros/pcl_conversions-9999
+2010111509 metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
+2010111509 metadata/md5-cache/dev-ros/pcl_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/pcl_ros-1.7.1
+2010111509 metadata/md5-cache/dev-ros/pcl_ros-9999
+2010111509 metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
+2010111509 metadata/md5-cache/dev-ros/pluginlib-9999
+2010111509 metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
+2010111509 metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
+2010111509 metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
+2010111509 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+2010111509 metadata/md5-cache/dev-ros/polled_camera-1.12.0
+2010111509 metadata/md5-cache/dev-ros/polled_camera-9999
+2010111509 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
+2010111509 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+2010111509 metadata/md5-cache/dev-ros/pr2_description-1.12.4
+2010111509 metadata/md5-cache/dev-ros/pr2_description-9999
+2010111509 metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+2010111509 metadata/md5-cache/dev-ros/pr2_machine-9999
+2010111509 metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+2010111509 metadata/md5-cache/dev-ros/pr2_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
+2010111509 metadata/md5-cache/dev-ros/python_qt_binding-9999
+2010111509 metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
+2010111509 metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
+2010111509 metadata/md5-cache/dev-ros/qt_dotgraph-9999
+2010111509 metadata/md5-cache/dev-ros/qt_gui-0.4.1
+2010111509 metadata/md5-cache/dev-ros/qt_gui-0.4.2
+2010111509 metadata/md5-cache/dev-ros/qt_gui-9999
+2010111509 metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
+2010111509 metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
+2010111509 metadata/md5-cache/dev-ros/qt_gui_app-9999
+2010111509 metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
+2010111509 metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
+2010111509 metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+2010111509 metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
+2010111509 metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
+2010111509 metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+2010111509 metadata/md5-cache/dev-ros/random_numbers-0.3.2
+2010111509 metadata/md5-cache/dev-ros/random_numbers-9999
+2010111509 metadata/md5-cache/dev-ros/realtime_tools-1.16.0-r1
+2010111509 metadata/md5-cache/dev-ros/realtime_tools-9999
+2010111509 metadata/md5-cache/dev-ros/resource_retriever-1.12.6
+2010111509 metadata/md5-cache/dev-ros/resource_retriever-9999
+2010111509 metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
+2010111509 metadata/md5-cache/dev-ros/rgbd_launch-9999
+2010111509 metadata/md5-cache/dev-ros/robot_localization-2.6.8
+2010111509 metadata/md5-cache/dev-ros/robot_localization-9999
+2010111509 metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
+2010111509 metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+2010111509 metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
+2010111509 metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+2010111509 metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
+2010111509 metadata/md5-cache/dev-ros/robot_state_publisher-9999
+2010111509 metadata/md5-cache/dev-ros/ros_environment-1.3.1
+2010111509 metadata/md5-cache/dev-ros/ros_environment-9999
+2010111509 metadata/md5-cache/dev-ros/rosapi-0.11.10
+2010111509 metadata/md5-cache/dev-ros/rosapi-0.11.9
+2010111509 metadata/md5-cache/dev-ros/rosapi-9999
+2010111509 metadata/md5-cache/dev-ros/rosauth-1.0.1
+2010111509 metadata/md5-cache/dev-ros/rosauth-9999
+2010111509 metadata/md5-cache/dev-ros/rosbag-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rosbag-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosbag-9999
+2010111509 metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
+2010111509 metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
+2010111509 metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
+2010111509 metadata/md5-cache/dev-ros/rosbag_storage-9999
+2010111509 metadata/md5-cache/dev-ros/rosbash-1.15.5
+2010111509 metadata/md5-cache/dev-ros/rosbash-1.15.6
+2010111509 metadata/md5-cache/dev-ros/rosbash-9999
+2010111509 metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
+2010111509 metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
+2010111509 metadata/md5-cache/dev-ros/rosboost_cfg-9999
+2010111509 metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
+2010111509 metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
+2010111509 metadata/md5-cache/dev-ros/rosbridge_library-9999
+2010111509 metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
+2010111509 metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
+2010111509 metadata/md5-cache/dev-ros/rosbridge_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
+2010111509 metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
+2010111509 metadata/md5-cache/dev-ros/rosbridge_server-9999
+2010111509 metadata/md5-cache/dev-ros/rosbuild-1.15.5
+2010111509 metadata/md5-cache/dev-ros/rosbuild-1.15.6
+2010111509 metadata/md5-cache/dev-ros/rosbuild-9999
+2010111509 metadata/md5-cache/dev-ros/rosclean-1.15.5
+2010111509 metadata/md5-cache/dev-ros/rosclean-1.15.6
+2010111509 metadata/md5-cache/dev-ros/rosclean-9999
+2010111509 metadata/md5-cache/dev-ros/rosconsole-1.14.0
+2010111509 metadata/md5-cache/dev-ros/rosconsole-1.14.2
+2010111509 metadata/md5-cache/dev-ros/rosconsole-9999
+2010111509 metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
+2010111509 metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+2010111509 metadata/md5-cache/dev-ros/roscpp-1.15.7
+2010111509 metadata/md5-cache/dev-ros/roscpp-1.15.8
+2010111509 metadata/md5-cache/dev-ros/roscpp-9999
+2010111509 metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
+2010111509 metadata/md5-cache/dev-ros/roscpp_serialization-9999
+2010111509 metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
+2010111509 metadata/md5-cache/dev-ros/roscpp_traits-9999
+2010111509 metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
+2010111509 metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
+2010111509 metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/roscreate-1.15.6
+2010111509 metadata/md5-cache/dev-ros/roscreate-9999
+2010111509 metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
+2010111509 metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
+2010111509 metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
+2010111509 metadata/md5-cache/dev-ros/rosdiagnostic-9999
+2010111509 metadata/md5-cache/dev-ros/rosgraph-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosgraph-9999
+2010111509 metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
+2010111509 metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/roslang-1.15.5
+2010111509 metadata/md5-cache/dev-ros/roslang-1.15.6
+2010111509 metadata/md5-cache/dev-ros/roslang-9999
+2010111509 metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
+2010111509 metadata/md5-cache/dev-ros/roslaunch-9999
+2010111509 metadata/md5-cache/dev-ros/roslib-1.15.6
+2010111509 metadata/md5-cache/dev-ros/roslib-9999
+2010111509 metadata/md5-cache/dev-ros/roslint-0.12.0
+2010111509 metadata/md5-cache/dev-ros/roslint-9999
+2010111509 metadata/md5-cache/dev-ros/roslisp-1.9.24
+2010111509 metadata/md5-cache/dev-ros/roslisp-9999
+2010111509 metadata/md5-cache/dev-ros/roslz4-1.15.8
+2010111509 metadata/md5-cache/dev-ros/roslz4-9999
+2010111509 metadata/md5-cache/dev-ros/rosmake-1.15.5
+2010111509 metadata/md5-cache/dev-ros/rosmake-1.15.6
+2010111509 metadata/md5-cache/dev-ros/rosmake-9999
+2010111509 metadata/md5-cache/dev-ros/rosmaster-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rosmaster-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosmaster-9999
+2010111509 metadata/md5-cache/dev-ros/rosmsg-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rosmsg-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosmsg-9999
+2010111509 metadata/md5-cache/dev-ros/rosnode-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosnode-9999
+2010111509 metadata/md5-cache/dev-ros/rosout-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rosout-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosout-9999
+2010111509 metadata/md5-cache/dev-ros/rospack-2.6.2
+2010111509 metadata/md5-cache/dev-ros/rospack-9999
+2010111509 metadata/md5-cache/dev-ros/rosparam-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rosparam-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosparam-9999
+2010111509 metadata/md5-cache/dev-ros/rospy-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rospy-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rospy-9999
+2010111509 metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+2010111509 metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
+2010111509 metadata/md5-cache/dev-ros/rospy_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_arduino-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_client-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_client-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_python-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_python-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_server-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_server-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_tivac-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_windows-9999
+2010111509 metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
+2010111509 metadata/md5-cache/dev-ros/rosserial_xbee-9999
+2010111509 metadata/md5-cache/dev-ros/rosservice-1.15.7
+2010111509 metadata/md5-cache/dev-ros/rosservice-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rosservice-9999
+2010111509 metadata/md5-cache/dev-ros/rostest-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rostest-9999
+2010111509 metadata/md5-cache/dev-ros/rostime-0.7.2
+2010111509 metadata/md5-cache/dev-ros/rostime-9999
+2010111509 metadata/md5-cache/dev-ros/rostopic-1.15.8
+2010111509 metadata/md5-cache/dev-ros/rostopic-9999
+2010111509 metadata/md5-cache/dev-ros/rosunit-1.15.5
+2010111509 metadata/md5-cache/dev-ros/rosunit-1.15.6
+2010111509 metadata/md5-cache/dev-ros/rosunit-9999
+2010111509 metadata/md5-cache/dev-ros/roswtf-1.15.8
+2010111509 metadata/md5-cache/dev-ros/roswtf-9999
+2010111509 metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
+2010111509 metadata/md5-cache/dev-ros/rotate_recovery-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_action-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_action-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_bag-0.4.13
+2010111509 metadata/md5-cache/dev-ros/rqt_bag-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
+2010111509 metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_console-0.4.11
+2010111509 metadata/md5-cache/dev-ros/rqt_console-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
+2010111509 metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
+2010111509 metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_dep-0.4.10
+2010111509 metadata/md5-cache/dev-ros/rqt_dep-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_graph-0.4.14
+2010111509 metadata/md5-cache/dev-ros/rqt_graph-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_gui-0.5.2
+2010111509 metadata/md5-cache/dev-ros/rqt_gui-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
+2010111509 metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
+2010111509 metadata/md5-cache/dev-ros/rqt_gui_py-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
+2010111509 metadata/md5-cache/dev-ros/rqt_image_view-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+2010111509 metadata/md5-cache/dev-ros/rqt_launch-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
+2010111509 metadata/md5-cache/dev-ros/rqt_logger_level-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
+2010111509 metadata/md5-cache/dev-ros/rqt_moveit-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_msg-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_msg-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
+2010111509 metadata/md5-cache/dev-ros/rqt_nav_view-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_plot-0.4.12
+2010111509 metadata/md5-cache/dev-ros/rqt_plot-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
+2010111509 metadata/md5-cache/dev-ros/rqt_pose_view-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_publisher-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
+2010111509 metadata/md5-cache/dev-ros/rqt_py_common-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_py_console-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
+2010111509 metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
+2010111509 metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
+2010111509 metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
+2010111509 metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
+2010111509 metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
+2010111509 metadata/md5-cache/dev-ros/rqt_rviz-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_service_caller-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_shell-0.4.10
+2010111509 metadata/md5-cache/dev-ros/rqt_shell-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+2010111509 metadata/md5-cache/dev-ros/rqt_srv-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
+2010111509 metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_top-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_top-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_topic-0.4.12
+2010111509 metadata/md5-cache/dev-ros/rqt_topic-9999
+2010111509 metadata/md5-cache/dev-ros/rqt_web-0.4.9
+2010111509 metadata/md5-cache/dev-ros/rqt_web-9999
+2010111509 metadata/md5-cache/dev-ros/rviz-1.14.1
+2010111509 metadata/md5-cache/dev-ros/rviz-9999
+2010111509 metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
+2010111509 metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
+2010111509 metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
+2010111509 metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
+2010111509 metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+2010111509 metadata/md5-cache/dev-ros/self_test-1.10.1
+2010111509 metadata/md5-cache/dev-ros/self_test-1.9.4
+2010111509 metadata/md5-cache/dev-ros/self_test-1.9.6
+2010111509 metadata/md5-cache/dev-ros/self_test-9999
+2010111509 metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/sensor_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/settlerlib-0.10.14
+2010111509 metadata/md5-cache/dev-ros/settlerlib-9999
+2010111509 metadata/md5-cache/dev-ros/shape_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/shape_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/smach-2.5.0
+2010111509 metadata/md5-cache/dev-ros/smach-9999
+2010111509 metadata/md5-cache/dev-ros/smach_msgs-2.5.0
+2010111509 metadata/md5-cache/dev-ros/smach_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/smach_ros-2.5.0
+2010111509 metadata/md5-cache/dev-ros/smach_ros-9999
+2010111509 metadata/md5-cache/dev-ros/smclib-1.8.5
+2010111509 metadata/md5-cache/dev-ros/smclib-1.8.6
+2010111509 metadata/md5-cache/dev-ros/smclib-9999
+2010111509 metadata/md5-cache/dev-ros/stage_ros-1.8.0
+2010111509 metadata/md5-cache/dev-ros/stage_ros-9999
+2010111509 metadata/md5-cache/dev-ros/std_msgs-0.5.13
+2010111509 metadata/md5-cache/dev-ros/std_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/std_srvs-1.11.3
+2010111509 metadata/md5-cache/dev-ros/std_srvs-9999
+2010111509 metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
+2010111509 metadata/md5-cache/dev-ros/stereo_image_proc-9999
+2010111509 metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/stereo_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/test_bond-1.8.5
+2010111509 metadata/md5-cache/dev-ros/test_bond-1.8.6
+2010111509 metadata/md5-cache/dev-ros/test_bond-9999
+2010111509 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
+2010111509 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
+2010111509 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
+2010111509 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+2010111509 metadata/md5-cache/dev-ros/test_nodelet-1.10.0
+2010111509 metadata/md5-cache/dev-ros/test_nodelet-9999
+2010111509 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
+2010111509 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+2010111509 metadata/md5-cache/dev-ros/test_rosbag-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rosbag-9999
+2010111509 metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+2010111509 metadata/md5-cache/dev-ros/test_roscpp-1.15.7
+2010111509 metadata/md5-cache/dev-ros/test_roscpp-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_roscpp-9999
+2010111509 metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
+2010111509 metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rosgraph-9999
+2010111509 metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_roslaunch-9999
+2010111509 metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_roslib_comm-9999
+2010111509 metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rosmaster-9999
+2010111509 metadata/md5-cache/dev-ros/test_rosparam-1.15.7
+2010111509 metadata/md5-cache/dev-ros/test_rosparam-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rosparam-9999
+2010111509 metadata/md5-cache/dev-ros/test_rospy-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rospy-9999
+2010111509 metadata/md5-cache/dev-ros/test_rosservice-1.15.8
+2010111509 metadata/md5-cache/dev-ros/test_rosservice-9999
+2010111509 metadata/md5-cache/dev-ros/test_tf2-0.7.2
+2010111509 metadata/md5-cache/dev-ros/test_tf2-0.7.3
+2010111509 metadata/md5-cache/dev-ros/test_tf2-0.7.5
+2010111509 metadata/md5-cache/dev-ros/test_tf2-9999
+2010111509 metadata/md5-cache/dev-ros/tf-1.13.2-r1
+2010111509 metadata/md5-cache/dev-ros/tf-9999
+2010111509 metadata/md5-cache/dev-ros/tf2-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_bullet-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_eigen-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_kdl-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_py-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_py-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_py-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_py-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_ros-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_ros-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_ros-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_ros-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/tf2_tools-0.7.2
+2010111509 metadata/md5-cache/dev-ros/tf2_tools-0.7.3
+2010111509 metadata/md5-cache/dev-ros/tf2_tools-0.7.5
+2010111509 metadata/md5-cache/dev-ros/tf2_tools-9999
+2010111509 metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
+2010111509 metadata/md5-cache/dev-ros/tf_conversions-9999
+2010111509 metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
+2010111509 metadata/md5-cache/dev-ros/theora_image_transport-9999
+2010111509 metadata/md5-cache/dev-ros/timestamp_tools-1.6.8-r1
+2010111509 metadata/md5-cache/dev-ros/timestamp_tools-9999
+2010111509 metadata/md5-cache/dev-ros/topic_tools-1.15.8
+2010111509 metadata/md5-cache/dev-ros/topic_tools-9999
+2010111509 metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/trajectory_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/transmission_interface-0.19.1
+2010111509 metadata/md5-cache/dev-ros/transmission_interface-0.19.2
+2010111509 metadata/md5-cache/dev-ros/transmission_interface-9999
+2010111509 metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
+2010111509 metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
+2010111509 metadata/md5-cache/dev-ros/turtle_actionlib-9999
+2010111509 metadata/md5-cache/dev-ros/turtle_tf-0.2.3
+2010111509 metadata/md5-cache/dev-ros/turtle_tf-9999
+2010111509 metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
+2010111509 metadata/md5-cache/dev-ros/turtle_tf2-9999
+2010111509 metadata/md5-cache/dev-ros/turtlesim-0.10.1
+2010111509 metadata/md5-cache/dev-ros/turtlesim-0.10.2
+2010111509 metadata/md5-cache/dev-ros/turtlesim-9999
+2010111509 metadata/md5-cache/dev-ros/unique_id-1.0.6
+2010111509 metadata/md5-cache/dev-ros/unique_id-9999
+2010111509 metadata/md5-cache/dev-ros/urdf-1.13.2
+2010111509 metadata/md5-cache/dev-ros/urdf-9999
+2010111509 metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
+2010111509 metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+2010111509 metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
+2010111509 metadata/md5-cache/dev-ros/urdf_tutorial-9999
+2010111509 metadata/md5-cache/dev-ros/urg_c-1.0.405
+2010111509 metadata/md5-cache/dev-ros/urg_c-9999
+2010111509 metadata/md5-cache/dev-ros/urg_node-0.1.13
+2010111509 metadata/md5-cache/dev-ros/urg_node-9999
+2010111509 metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
+2010111509 metadata/md5-cache/dev-ros/uuid_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
+2010111509 metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+2010111509 metadata/md5-cache/dev-ros/visp_bridge-0.11.1
+2010111509 metadata/md5-cache/dev-ros/visp_bridge-9999
+2010111509 metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
+2010111509 metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+2010111509 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
+2010111509 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+2010111509 metadata/md5-cache/dev-ros/visp_tracker-0.11.1
+2010111509 metadata/md5-cache/dev-ros/visp_tracker-9999
+2010111509 metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
+2010111509 metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+2010111509 metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
+2010111509 metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
+2010111509 metadata/md5-cache/dev-ros/visualization_msgs-9999
+2010111509 metadata/md5-cache/dev-ros/voxel_grid-1.16.6
+2010111509 metadata/md5-cache/dev-ros/voxel_grid-1.17.0
+2010111509 metadata/md5-cache/dev-ros/voxel_grid-9999
+2010111509 metadata/md5-cache/dev-ros/xacro-1.14.1
+2010111509 metadata/md5-cache/dev-ros/xacro-9999
+2010111509 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+2010111509 metadata/md5-cache/dev-ros/xmlrpcpp-9999
 2009131115 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 2009131115 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
 2009111825 metadata/md5-cache/dev-ruby/acme-client-2.0.6
@@ -46033,7 +45984,6 @@
 2009170839 metadata/md5-cache/dev-ruby/activerecord-5.2.4.3
 2009170839 metadata/md5-cache/dev-ruby/activerecord-5.2.4.4
 2009170839 metadata/md5-cache/dev-ruby/activerecord-6.0.3.2
-2009172012 metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1
 2009172012 metadata/md5-cache/dev-ruby/rbst-0.6.5
 2009190909 metadata/md5-cache/dev-ruby/acme-client-2.0.7
 2009190909 metadata/md5-cache/dev-ruby/actiontext-6.0.3.3
@@ -46091,7 +46041,6 @@
 2010040909 metadata/md5-cache/dev-ruby/em-websocket-0.5.2
 2010061639 metadata/md5-cache/dev-ruby/xml-simple-1.1.5
 2010070809 metadata/md5-cache/dev-ruby/parser-2.7.2.0
-2010080839 metadata/md5-cache/dev-ruby/Manifest.gz
 2010080839 metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
 2010080839 metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
 2010080839 metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
@@ -46105,6 +46054,8 @@
 2010080839 metadata/md5-cache/dev-ruby/activesupport-6.0.3.4
 2010080839 metadata/md5-cache/dev-ruby/rails-6.0.3.4
 2010080839 metadata/md5-cache/dev-ruby/railties-6.0.3.4
+2010100909 metadata/md5-cache/dev-ruby/Manifest.gz
+2010100909 metadata/md5-cache/dev-ruby/tins-1.26.0
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -46238,7 +46189,6 @@
 2009111825 metadata/md5-cache/dev-tex/csindex-2.11c-r2
 2009111825 metadata/md5-cache/dev-tex/detex-2.8-r1
 2009111825 metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
-2009111825 metadata/md5-cache/dev-tex/dvi2tty-5.3.4-r1
 2009121921 metadata/md5-cache/dev-tex/dvipost-1.1-r3
 2009131115 metadata/md5-cache/dev-tex/html2latex-1.1-r1
 2009111825 metadata/md5-cache/dev-tex/hyphen_show-20000425-r1
@@ -46259,8 +46209,8 @@
 2010031709 metadata/md5-cache/dev-tex/hevea-2.29
 2010031709 metadata/md5-cache/dev-tex/hevea-2.30
 2010031709 metadata/md5-cache/dev-tex/hevea-2.31
-2010070039 metadata/md5-cache/dev-tex/Manifest.gz
 2010070039 metadata/md5-cache/dev-tex/tth-4.08
+2010100939 metadata/md5-cache/dev-tex/Manifest.gz
 2008121539 metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
 2008121539 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
 2008121539 metadata/md5-cache/dev-texlive/texlive-context-2020
@@ -46407,7 +46357,6 @@
 2004211009 metadata/md5-cache/dev-util/cpuinfo-collection-20101114
 2004211009 metadata/md5-cache/dev-util/dejagnu-1.6
 2004211009 metadata/md5-cache/dev-util/intltool-0.51.0-r2
-2004211339 metadata/md5-cache/dev-util/re2c-1.3-r1
 2004211009 metadata/md5-cache/dev-util/shadowman-2
 2004211009 metadata/md5-cache/dev-util/shflags-1.0.3
 2005010209 metadata/md5-cache/dev-util/cloc-1.84
@@ -46484,7 +46433,6 @@
 2009121921 metadata/md5-cache/dev-util/bnfc-2.8.3
 2009121921 metadata/md5-cache/dev-util/boost-build-1.72.0
 2009121921 metadata/md5-cache/dev-util/boost-build-1.73.0
-2009121921 metadata/md5-cache/dev-util/boost-build-1.74.0
 2009121921 metadata/md5-cache/dev-util/bpftrace-0.10.0-r1
 2009121921 metadata/md5-cache/dev-util/bsdiff-4.3-r4
 2009111825 metadata/md5-cache/dev-util/btyacc-3.0-r3
@@ -46748,7 +46696,6 @@
 2009172012 metadata/md5-cache/dev-util/devhelp-3.34.0
 2009172012 metadata/md5-cache/dev-util/devhelp-3.36.2
 2009172012 metadata/md5-cache/dev-util/diffuse-0.5.0_alpha7-r1
-2009172012 metadata/md5-cache/dev-util/doxy-coverage-151229
 2009172012 metadata/md5-cache/dev-util/dwarves-1.17
 2009172012 metadata/md5-cache/dev-util/edi-0.8.0
 2009172012 metadata/md5-cache/dev-util/eric-18.03
@@ -46757,7 +46704,6 @@
 2009172012 metadata/md5-cache/dev-util/glade-3.22.2
 2009172012 metadata/md5-cache/dev-util/glade-3.36.0
 2009172012 metadata/md5-cache/dev-util/glib-utils-2.62.6
-2009172012 metadata/md5-cache/dev-util/glib-utils-2.64.4
 2009172012 metadata/md5-cache/dev-util/gn-0.1726
 2009172012 metadata/md5-cache/dev-util/gn-0.1807
 2009172012 metadata/md5-cache/dev-util/gnome-builder-3.34.1-r1
@@ -46782,8 +46728,6 @@
 2009172012 metadata/md5-cache/dev-util/redo-99999
 2009172012 metadata/md5-cache/dev-util/rpmdevtools-8.10-r2
 2009172012 metadata/md5-cache/dev-util/scanmem-0.17
-2009172012 metadata/md5-cache/dev-util/setconf-0.6.6
-2009172012 metadata/md5-cache/dev-util/setconf-0.6.7
 2009172012 metadata/md5-cache/dev-util/smem-1.5-r1
 2009172012 metadata/md5-cache/dev-util/sysprof-3.34.1-r1
 2009172012 metadata/md5-cache/dev-util/sysprof-3.36.0
@@ -46824,7 +46768,6 @@
 2009181540 metadata/md5-cache/dev-util/umockdev-0.12.1
 2009181139 metadata/md5-cache/dev-util/valgrind-3.16.1
 2009211840 metadata/md5-cache/dev-util/buildbot-2.8.2-r1
-2009211840 metadata/md5-cache/dev-util/buildbot-9999
 2009211840 metadata/md5-cache/dev-util/buildbot-badges-2.8.2
 2009211840 metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
 2009211840 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
@@ -46834,10 +46777,6 @@
 2009211840 metadata/md5-cache/dev-util/buildbot-worker-9999
 2009211840 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
 2009211840 metadata/md5-cache/dev-util/buildbot-www-2.8.2
-2009211840 metadata/md5-cache/dev-util/catalyst-3.0.12
-2009211840 metadata/md5-cache/dev-util/catalyst-3.0.13
-2009211840 metadata/md5-cache/dev-util/catalyst-3.0.9
-2009211840 metadata/md5-cache/dev-util/catalyst-9999
 2009211840 metadata/md5-cache/dev-util/catfish-1.4.13
 2009211840 metadata/md5-cache/dev-util/cligh-0.3
 2009211840 metadata/md5-cache/dev-util/cligh-9999
@@ -46859,7 +46798,6 @@
 2009211840 metadata/md5-cache/dev-util/flawfinder-2.0.11
 2009211840 metadata/md5-cache/dev-util/gcovr-4.2
 2009211840 metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
-2009211840 metadata/md5-cache/dev-util/gdbus-codegen-2.64.4
 2009211840 metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
 2009211840 metadata/md5-cache/dev-util/gertty-1.6.0-r1
 2009211840 metadata/md5-cache/dev-util/gertty-9999
@@ -46873,9 +46811,7 @@
 2009211840 metadata/md5-cache/dev-util/howdoi-2.0.6
 2009212109 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r3
 2009211840 metadata/md5-cache/dev-util/meld-3.20.2-r1
-2009211840 metadata/md5-cache/dev-util/meson-0.54.3
 2009211840 metadata/md5-cache/dev-util/meson-9999
-2009211840 metadata/md5-cache/dev-util/mpatch-0.8-r1
 2009211840 metadata/md5-cache/dev-util/pkgcheck-9999
 2009211840 metadata/md5-cache/dev-util/rbtools-1.0.2
 2009211840 metadata/md5-cache/dev-util/rbtools-1.0.3
@@ -46892,7 +46828,6 @@
 2009211840 metadata/md5-cache/dev-util/ydiff-1.2
 2009242139 metadata/md5-cache/dev-util/aruba-1.0.3-r1
 2009241009 metadata/md5-cache/dev-util/pkgcheck-0.7.7
-2009241009 metadata/md5-cache/dev-util/statifier-1.7.4-r1
 2009231339 metadata/md5-cache/dev-util/uncrustify-0.71.0
 2009251309 metadata/md5-cache/dev-util/cflow-1.6
 2009251309 metadata/md5-cache/dev-util/cscope-15.8a-r1
@@ -46902,8 +46837,6 @@
 2009251309 metadata/md5-cache/dev-util/desktop-file-utils-0.26
 2009251309 metadata/md5-cache/dev-util/global-6.6.4
 2009251309 metadata/md5-cache/dev-util/gtk-doc-1.32-r1
-2009251309 metadata/md5-cache/dev-util/gtk-doc-1.32-r2
-2009251209 metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
 2009251309 metadata/md5-cache/dev-util/ninja-1.10.0
 2009251309 metadata/md5-cache/dev-util/ninja-1.10.1
 2009251309 metadata/md5-cache/dev-util/ninja-9999
@@ -46948,17 +46881,9 @@
 2009291711 metadata/md5-cache/dev-util/glslang-8.13.3559
 2009291711 metadata/md5-cache/dev-util/glslang-8.13.3560_pre20200404
 2009291711 metadata/md5-cache/dev-util/glslang-9999
-2009291711 metadata/md5-cache/dev-util/heaptrack-9999
 2009291711 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
 2009291711 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
 2009291711 metadata/md5-cache/dev-util/kdbg-3.0.1
-2009291711 metadata/md5-cache/dev-util/kdevelop-5.5.2
-2009291711 metadata/md5-cache/dev-util/kdevelop-5.6.0
-2009291711 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
-2009291711 metadata/md5-cache/dev-util/kdevelop-php-5.5.2
-2009291711 metadata/md5-cache/dev-util/kdevelop-php-5.6.0
-2009291711 metadata/md5-cache/dev-util/kdevelop-python-5.5.2
-2009291711 metadata/md5-cache/dev-util/kdevelop-python-5.6.0
 2009291711 metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
 2009291711 metadata/md5-cache/dev-util/kdstatemachineeditor-9999
 2009291009 metadata/md5-cache/dev-util/lcov-1.15
@@ -46968,7 +46893,6 @@
 2009291711 metadata/md5-cache/dev-util/lldb-11.0.0_rc4
 2009291711 metadata/md5-cache/dev-util/lldb-12.0.0.9999
 2009291711 metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
-2009291711 metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
 2009291039 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
 2009291711 metadata/md5-cache/dev-util/rocm-cmake-3.8.0
 2009291711 metadata/md5-cache/dev-util/rocm-cmake-9999
@@ -47000,7 +46924,6 @@
 2010031409 metadata/md5-cache/dev-util/checkbashisms-2.20.3
 2010031409 metadata/md5-cache/dev-util/checkbashisms-2.20.4
 2010030939 metadata/md5-cache/dev-util/cpputest-4.0
-2010031939 metadata/md5-cache/dev-util/catalyst-3.0.14
 2010042039 metadata/md5-cache/dev-util/cbindgen-0.14.6
 2010032009 metadata/md5-cache/dev-util/sysdig-0.27.1
 2010032009 metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
@@ -47009,7 +46932,6 @@
 2010060839 metadata/md5-cache/dev-util/dwarves-1.18
 2010060709 metadata/md5-cache/dev-util/glib-utils-2.64.5
 2010052009 metadata/md5-cache/dev-util/ostree-2020.6
-2010070009 metadata/md5-cache/dev-util/cmake-3.17.4-r1
 2010062139 metadata/md5-cache/dev-util/cmake-3.18.4
 2010062039 metadata/md5-cache/dev-util/gengetopt-2.23
 2010061709 metadata/md5-cache/dev-util/lldb-10.0.1
@@ -47018,20 +46940,50 @@
 2010070209 metadata/md5-cache/dev-util/cccc-3.1.6
 2010071039 metadata/md5-cache/dev-util/cgdb-0.7.1
 2010070639 metadata/md5-cache/dev-util/jenkins-bin-2.252
-2010071039 metadata/md5-cache/dev-util/meson-0.55.3
-2010071039 metadata/md5-cache/dev-util/re2c-2.0.3
 2010070709 metadata/md5-cache/dev-util/rt-tests-1.9
-2010081009 metadata/md5-cache/dev-util/Manifest.gz
-2010080539 metadata/md5-cache/dev-util/cargo-c-0.6.2
 2010081009 metadata/md5-cache/dev-util/clion-2020.2.3
-2010080539 metadata/md5-cache/dev-util/glslang-8.13.3743-r1
 2010071939 metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26
 2010080339 metadata/md5-cache/dev-util/jenkins-bin-2.249.2
 2010080339 metadata/md5-cache/dev-util/jenkins-bin-2.260
 2010072209 metadata/md5-cache/dev-util/lldb-11.0.0_rc6
-2010080539 metadata/md5-cache/dev-util/spirv-headers-1.5.3
-2010080539 metadata/md5-cache/dev-util/spirv-tools-2020.3
-2010080539 metadata/md5-cache/dev-util/vulkan-headers-1.2.143
+2010112139 metadata/md5-cache/dev-util/Manifest.gz
+2010091809 metadata/md5-cache/dev-util/boost-build-1.74.0
+2010102209 metadata/md5-cache/dev-util/buildbot-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-9999
+2010102209 metadata/md5-cache/dev-util/buildbot-badges-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-worker-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
+2010102209 metadata/md5-cache/dev-util/buildbot-www-2.8.4
+2010091209 metadata/md5-cache/dev-util/cargo-c-0.6.2
+2010090109 metadata/md5-cache/dev-util/catalyst-3.0.14
+2010090109 metadata/md5-cache/dev-util/catalyst-9999
+2010091209 metadata/md5-cache/dev-util/cmake-3.17.4-r1
+2010111509 metadata/md5-cache/dev-util/gdbus-codegen-2.64.4
+2010111509 metadata/md5-cache/dev-util/glib-utils-2.64.4
+2010091209 metadata/md5-cache/dev-util/glslang-8.13.3743-r1
+2010111509 metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+2010092209 metadata/md5-cache/dev-util/heaptrack-9999
+2010101309 metadata/md5-cache/dev-util/howdoi-2.0.7
+2010091139 metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
+2010092209 metadata/md5-cache/dev-util/kdevelop-5.5.2
+2010092209 metadata/md5-cache/dev-util/kdevelop-5.6.0
+2010092209 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
+2010092209 metadata/md5-cache/dev-util/kdevelop-php-5.5.2
+2010092209 metadata/md5-cache/dev-util/kdevelop-php-5.6.0
+2010092209 metadata/md5-cache/dev-util/kdevelop-python-5.5.2
+2010092209 metadata/md5-cache/dev-util/kdevelop-python-5.6.0
+2010092209 metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
+2010082039 metadata/md5-cache/dev-util/meson-0.55.3
+2010091139 metadata/md5-cache/dev-util/re2c-2.0.3
+2010101209 metadata/md5-cache/dev-util/rpmdevtools-9.2
+2010091209 metadata/md5-cache/dev-util/spirv-headers-1.5.3
+2010091209 metadata/md5-cache/dev-util/spirv-tools-2020.3
+2010101409 metadata/md5-cache/dev-util/statifier-1.7.4-r1
+2010091209 metadata/md5-cache/dev-util/vulkan-headers-1.2.143
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -47101,8 +47053,6 @@
 2009172012 metadata/md5-cache/dev-vcs/repo-2.8
 2009181139 metadata/md5-cache/dev-vcs/tkcvs-9.3.2
 2009181809 metadata/md5-cache/dev-vcs/topgit-0.19.12
-2009211840 metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
-2009211840 metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
 2009211840 metadata/md5-cache/dev-vcs/git-cola-3.5-r1
 2009211840 metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
 2009211840 metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
@@ -47139,12 +47089,12 @@
 2009251309 metadata/md5-cache/dev-vcs/mercurial-5.5.1-r1
 2009251309 metadata/md5-cache/dev-vcs/mercurial-9999
 2009270039 metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
-2009291711 metadata/md5-cache/dev-vcs/kdesvn-2.1.0
 2009291711 metadata/md5-cache/dev-vcs/qgit-2.9
 2009302039 metadata/md5-cache/dev-vcs/svn2git-9999
 2010012309 metadata/md5-cache/dev-vcs/fossil-2.12.1
-2010030939 metadata/md5-cache/dev-vcs/Manifest.gz
 2010030939 metadata/md5-cache/dev-vcs/tig-2.5.1
+2010092209 metadata/md5-cache/dev-vcs/Manifest.gz
+2010092209 metadata/md5-cache/dev-vcs/kdesvn-2.1.0
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
 1707090139 metadata/md5-cache/games-action/xbomber-101-r1
@@ -47559,13 +47509,13 @@
 2009211840 metadata/md5-cache/games-engines/renpy-7.3.5
 2009240939 metadata/md5-cache/games-engines/scummvm-2.2.0
 2009231839 metadata/md5-cache/games-engines/scummvm-tools-2.2.0
-2009291711 metadata/md5-cache/games-engines/Manifest.gz
-2009291711 metadata/md5-cache/games-engines/devilutionx-1.0.0-r1
 2009291711 metadata/md5-cache/games-engines/devilutionx-1.0.1
-2009291711 metadata/md5-cache/games-engines/devilutionx-9999
 2009291711 metadata/md5-cache/games-engines/odamex-0.8.3
 2009291711 metadata/md5-cache/games-engines/openmw-0.46.0
 2009291711 metadata/md5-cache/games-engines/openmw-9999
+2010111039 metadata/md5-cache/games-engines/Manifest.gz
+2010111039 metadata/md5-cache/games-engines/devilutionx-1.0.3
+2010101909 metadata/md5-cache/games-engines/devilutionx-9999
 1911080039 metadata/md5-cache/games-fps/freedoom-0.12.1
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
@@ -47640,8 +47590,8 @@
 2009131115 metadata/md5-cache/games-kids/memonix-1.6-r1
 2009131115 metadata/md5-cache/games-kids/tuxmath-2.0.3-r1
 2009111825 metadata/md5-cache/games-kids/tuxtype-1.8.3-r1
-2009291711 metadata/md5-cache/games-kids/Manifest.gz
-2009291711 metadata/md5-cache/games-kids/gcompris-0.97-r1
+2010092209 metadata/md5-cache/games-kids/Manifest.gz
+2010092209 metadata/md5-cache/games-kids/gcompris-0.97-r1
 1702282323 metadata/md5-cache/games-misc/nyancat-1.5.1
 1903261739 metadata/md5-cache/games-misc/opengfx-0.5.5
 1707090139 metadata/md5-cache/games-misc/opensfx-0.2.3-r1
@@ -47824,11 +47774,11 @@
 2009172012 metadata/md5-cache/games-puzzle/quadrapassel-3.36.05
 2009172012 metadata/md5-cache/games-puzzle/swell-foop-3.34.1
 2009210109 metadata/md5-cache/games-puzzle/tetrinet-0.11-r2
-2009291711 metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225
-2009291711 metadata/md5-cache/games-puzzle/ksokoban-9999
 2009291711 metadata/md5-cache/games-puzzle/pingus-9999
-2010081639 metadata/md5-cache/games-puzzle/Manifest.gz
 2010081639 metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
+2010092209 metadata/md5-cache/games-puzzle/Manifest.gz
+2010092209 metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225
+2010092209 metadata/md5-cache/games-puzzle/ksokoban-9999
 2009131115 metadata/md5-cache/games-roguelike/FTL-1.5.13
 2009111825 metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
 2009131115 metadata/md5-cache/games-roguelike/adom-1.1.1-r1
@@ -47842,16 +47792,15 @@
 2009121921 metadata/md5-cache/games-roguelike/nethack-3.6.6
 2009131115 metadata/md5-cache/games-roguelike/powder-117-r1
 2009131115 metadata/md5-cache/games-roguelike/scourge-0.21.1-r1
-2009121921 metadata/md5-cache/games-roguelike/stone-soup-0.23.2
-2009121921 metadata/md5-cache/games-roguelike/stone-soup-0.24.0
-2009121921 metadata/md5-cache/games-roguelike/stone-soup-0.25.0
 2009131115 metadata/md5-cache/games-roguelike/tome-2.3.5
 2009131115 metadata/md5-cache/games-roguelike/tomenet-4.6.1a
 2009131115 metadata/md5-cache/games-roguelike/tomenet-4.7.2
 2009111825 metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
 2009131115 metadata/md5-cache/games-roguelike/zangband-2.7.4c
-2009291711 metadata/md5-cache/games-roguelike/Manifest.gz
 2009291711 metadata/md5-cache/games-roguelike/moria-5.7.12-r1
+2010101809 metadata/md5-cache/games-roguelike/Manifest.gz
+2010101809 metadata/md5-cache/games-roguelike/stone-soup-0.25.0
+2010101809 metadata/md5-cache/games-roguelike/stone-soup-0.25.1
 1805012309 metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1
 1806081339 metadata/md5-cache/games-rpg/freedink-data-1.08.20170409
 1707090139 metadata/md5-cache/games-rpg/twclone-0.14-r1
@@ -47905,7 +47854,6 @@
 2010021009 metadata/md5-cache/games-rpg/wastesedge-0.3.8
 1805012309 metadata/md5-cache/games-server/crossfire-server-1.71.0-r1
 1702282323 metadata/md5-cache/games-server/mednafen-server-0.5.2-r1
-1912152109 metadata/md5-cache/games-server/steamcmd-1.0-r2
 2008101539 metadata/md5-cache/games-server/bedrock-server-1.16.1.02
 2008301909 metadata/md5-cache/games-server/minecraft-server-1.16.1
 2009131115 metadata/md5-cache/games-server/etqw-ded-1.5-r1
@@ -47915,8 +47863,8 @@
 2009121921 metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
 2009250009 metadata/md5-cache/games-server/bedrock-server-1.16.40.02
 2009250009 metadata/md5-cache/games-server/minecraft-server-1.16.3
-2010071039 metadata/md5-cache/games-server/Manifest.gz
-2010071039 metadata/md5-cache/games-server/steamcmd-1.0-r3
+2010091709 metadata/md5-cache/games-server/Manifest.gz
+2010091139 metadata/md5-cache/games-server/steamcmd-1.0-r3
 2003311822 metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
 2008030139 metadata/md5-cache/games-simulation/flightgear-data-2020.1.2
 2009021410 metadata/md5-cache/games-simulation/flightgear-data-9999
@@ -48017,9 +47965,9 @@
 2009291711 metadata/md5-cache/games-strategy/wesnoth-1.15.4
 2009291711 metadata/md5-cache/games-strategy/widelands-0.20-r1
 2009291711 metadata/md5-cache/games-strategy/widelands-9999
-2010062139 metadata/md5-cache/games-strategy/Manifest.gz
-2010062139 metadata/md5-cache/games-strategy/freeorion-0.4.10.1
 2010062139 metadata/md5-cache/games-strategy/freeorion-9999
+2010120639 metadata/md5-cache/games-strategy/Manifest.gz
+2010120639 metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r1
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1806110509 metadata/md5-cache/games-util/etswitch-0.1.14-r1
 1702282323 metadata/md5-cache/games-util/gslist-0.8.11a-r1
@@ -48138,10 +48086,11 @@
 2009231339 metadata/md5-cache/gnome-base/gconf-3.2.6-r5
 2009241739 metadata/md5-cache/gnome-base/gnome-keyring-3.36.0
 2009241739 metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
-2010072109 metadata/md5-cache/gnome-base/Manifest.gz
 2010072109 metadata/md5-cache/gnome-base/gnome-session-3.34.2
 2010072109 metadata/md5-cache/gnome-base/gnome-session-3.36.0
 2010072109 metadata/md5-cache/gnome-base/gnome-session-3.36.0-r1
+2010120039 metadata/md5-cache/gnome-base/Manifest.gz
+2010120039 metadata/md5-cache/gnome-base/gnome-desktop-3.36.7
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2004032241 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2004202139 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.34.2
@@ -48441,763 +48390,713 @@
 2008040239 metadata/md5-cache/kde-apps/kdesdk-meta-20.04.3
 2008040239 metadata/md5-cache/kde-apps/kdeutils-meta-20.04.3
 2008040239 metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.04.3
-2009031539 metadata/md5-cache/kde-apps/kde-apps-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kde-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdebase-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdecore-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdeedu-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdegames-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdepim-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdesdk-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/kdeutils-meta-20.08.1
-2009031539 metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-calendar-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-contacts-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-import-wizard-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-mime-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-mime-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-notes-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-notes-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadi-search-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadi-search-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akonadiconsole-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akonadiconsole-20.08.1
-2009291711 metadata/md5-cache/kde-apps/akregator-20.04.3
-2009291711 metadata/md5-cache/kde-apps/akregator-20.08.1
-2009291711 metadata/md5-cache/kde-apps/analitza-20.04.3
-2009291711 metadata/md5-cache/kde-apps/analitza-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ark-20.08.1
-2009291711 metadata/md5-cache/kde-apps/artikulate-20.04.3
-2009291711 metadata/md5-cache/kde-apps/artikulate-20.08.1
-2009291711 metadata/md5-cache/kde-apps/audiocd-kio-20.04.3
-2009291711 metadata/md5-cache/kde-apps/audiocd-kio-20.08.1
-2009291711 metadata/md5-cache/kde-apps/baloo-widgets-20.04.3
-2009291711 metadata/md5-cache/kde-apps/baloo-widgets-20.08.1
-2009291711 metadata/md5-cache/kde-apps/blinken-20.04.3
-2009291711 metadata/md5-cache/kde-apps/blinken-20.08.1
-2009291711 metadata/md5-cache/kde-apps/bomber-20.04.3
-2009291711 metadata/md5-cache/kde-apps/bomber-20.08.1
-2009291711 metadata/md5-cache/kde-apps/bovo-20.04.3
-2009291711 metadata/md5-cache/kde-apps/bovo-20.08.1
-2009291711 metadata/md5-cache/kde-apps/calendarjanitor-20.04.3
-2009291711 metadata/md5-cache/kde-apps/calendarjanitor-20.08.1
-2009291711 metadata/md5-cache/kde-apps/calendarsupport-20.04.3
-2009291711 metadata/md5-cache/kde-apps/calendarsupport-20.08.1
-2009291711 metadata/md5-cache/kde-apps/cantor-20.04.3-r1
-2009291711 metadata/md5-cache/kde-apps/cantor-20.08.1
-2009291711 metadata/md5-cache/kde-apps/cervisia-20.04.3
-2009291711 metadata/md5-cache/kde-apps/cervisia-20.08.1
-2009291711 metadata/md5-cache/kde-apps/dolphin-20.04.3
-2009291711 metadata/md5-cache/kde-apps/dolphin-20.08.1
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.04.3
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.1
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-git-20.04.3
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.1
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.04.3
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.1
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.04.3
-2009291711 metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.1
-2009291711 metadata/md5-cache/kde-apps/dragon-20.04.3
-2009291711 metadata/md5-cache/kde-apps/dragon-20.08.1
-2009291711 metadata/md5-cache/kde-apps/eventviews-20.04.3
-2009291711 metadata/md5-cache/kde-apps/eventviews-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ffmpegthumbs-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.1
-2009291711 metadata/md5-cache/kde-apps/filelight-20.04.3
-2009291711 metadata/md5-cache/kde-apps/filelight-20.08.1
-2009291711 metadata/md5-cache/kde-apps/granatier-20.04.3
-2009291711 metadata/md5-cache/kde-apps/granatier-20.08.1
-2009291711 metadata/md5-cache/kde-apps/grantlee-editor-20.04.3
-2009291711 metadata/md5-cache/kde-apps/grantlee-editor-20.08.1
-2009291711 metadata/md5-cache/kde-apps/grantleetheme-20.04.3
-2009291711 metadata/md5-cache/kde-apps/grantleetheme-20.08.1
-2009291711 metadata/md5-cache/kde-apps/gwenview-20.04.3
-2009291711 metadata/md5-cache/kde-apps/gwenview-20.08.1
-2009291711 metadata/md5-cache/kde-apps/incidenceeditor-20.04.3
-2009291711 metadata/md5-cache/kde-apps/incidenceeditor-20.08.1
-2009291711 metadata/md5-cache/kde-apps/juk-20.04.3
-2009291711 metadata/md5-cache/kde-apps/juk-20.08.1
-2009291711 metadata/md5-cache/kde-apps/k3b-20.04.3
-2009291711 metadata/md5-cache/kde-apps/k3b-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kaccounts-integration-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kaccounts-integration-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kaccounts-providers-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kaccounts-providers-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kaddressbook-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kaddressbook-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kajongg-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kajongg-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kalarm-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kalarm-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kalarmcal-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kalarmcal-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kalgebra-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kalgebra-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kalzium-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kalzium-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kamera-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kamera-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kamoso-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kamoso-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kanagram-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kanagram-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kapman-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kapman-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kapptemplate-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kapptemplate-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kate-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kate-20.08.1
-2009291711 metadata/md5-cache/kde-apps/katomic-20.04.3
-2009291711 metadata/md5-cache/kde-apps/katomic-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kbackup-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kbackup-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kblackbox-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kblackbox-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kblocks-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kblocks-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kbounce-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kbounce-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kbreakout-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kbreakout-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kbruch-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kbruch-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kcachegrind-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kcachegrind-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kcalc-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kcalc-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kcalutils-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kcalutils-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kcharselect-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kcharselect-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kcolorchooser-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kcolorchooser-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kcron-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kcron-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdav-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kde-dev-scripts-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kde-dev-utils-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kde-dev-utils-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdebugsettings-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdebugsettings-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdeedu-data-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdeedu-data-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdenlive-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdenlive-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdepim-addons-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdepim-addons-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdepim-apps-libs-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
-2009291711 metadata/md5-cache/kde-apps/kdepim-runtime-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdf-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdf-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdialog-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdialog-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kdiamond-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kdiamond-20.08.1
-2009291711 metadata/md5-cache/kde-apps/keditbookmarks-20.04.3
-2009291711 metadata/md5-cache/kde-apps/keditbookmarks-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kfind-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kfind-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kfloppy-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kfloppy-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kfourinline-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kfourinline-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kgeography-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kgeography-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kget-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kget-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kgoldrunner-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kgoldrunner-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kgpg-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kgpg-20.08.1
-2009291711 metadata/md5-cache/kde-apps/khangman-20.04.3
-2009291711 metadata/md5-cache/kde-apps/khangman-20.08.1
-2009291711 metadata/md5-cache/kde-apps/khelpcenter-20.04.3
-2009291711 metadata/md5-cache/kde-apps/khelpcenter-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kidentitymanagement-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kidentitymanagement-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kig-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kig-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kigo-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kigo-20.08.1
-2009291711 metadata/md5-cache/kde-apps/killbots-20.04.3
-2009291711 metadata/md5-cache/kde-apps/killbots-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kimagemapeditor-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kimagemapeditor-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kimap-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kimap-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kio-extras-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kio-extras-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kipi-plugins-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kipi-plugins-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kiriki-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kiriki-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kiten-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kiten-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kitinerary-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kitinerary-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kjumpingcube-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kjumpingcube-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kldap-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kldap-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kleopatra-20.04.3-r1
-2009291711 metadata/md5-cache/kde-apps/kleopatra-20.08.1
-2009291711 metadata/md5-cache/kde-apps/klettres-20.04.3
-2009291711 metadata/md5-cache/kde-apps/klettres-20.08.1
-2009291711 metadata/md5-cache/kde-apps/klickety-20.04.3
-2009291711 metadata/md5-cache/kde-apps/klickety-20.08.1
-2009291711 metadata/md5-cache/kde-apps/klines-20.04.3
-2009291711 metadata/md5-cache/kde-apps/klines-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmag-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmag-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmahjongg-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmahjongg-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmail-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmail-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
-2009291711 metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmailtransport-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmailtransport-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmbox-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmbox-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmime-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmime-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmines-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmines-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmix-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmix-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmousetool-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmousetool-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmouth-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmouth-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kmplot-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kmplot-20.08.1
-2009291711 metadata/md5-cache/kde-apps/knavalbattle-20.04.3
-2009291711 metadata/md5-cache/kde-apps/knavalbattle-20.08.1
-2009291711 metadata/md5-cache/kde-apps/knetwalk-20.04.3
-2009291711 metadata/md5-cache/kde-apps/knetwalk-20.08.1
-2009291711 metadata/md5-cache/kde-apps/knights-20.04.3
-2009291711 metadata/md5-cache/kde-apps/knights-20.08.1
-2009291711 metadata/md5-cache/kde-apps/knotes-20.04.3
-2009291711 metadata/md5-cache/kde-apps/knotes-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kolf-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kolf-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kollision-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kollision-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kolourpaint-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kolourpaint-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kompare-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kompare-20.08.1
-2009291711 metadata/md5-cache/kde-apps/konqueror-20.04.3
-2009291711 metadata/md5-cache/kde-apps/konqueror-20.08.1
-2009291711 metadata/md5-cache/kde-apps/konquest-20.04.3
-2009291711 metadata/md5-cache/kde-apps/konquest-20.08.1
-2009291711 metadata/md5-cache/kde-apps/konsole-20.04.3
-2009291711 metadata/md5-cache/kde-apps/konsole-20.08.1
-2009291711 metadata/md5-cache/kde-apps/konsolekalendar-20.04.3
-2009291711 metadata/md5-cache/kde-apps/konsolekalendar-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kontact-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kontact-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kontactinterface-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kontactinterface-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kopete-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kopete-20.08.1
-2009291711 metadata/md5-cache/kde-apps/korganizer-20.04.3
-2009291711 metadata/md5-cache/kde-apps/korganizer-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kpat-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kpat-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kpimtextedit-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kpimtextedit-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kpkpass-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kpkpass-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kqtquickcharts-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kqtquickcharts-20.08.1
-2009291711 metadata/md5-cache/kde-apps/krdc-20.04.3
-2009291711 metadata/md5-cache/kde-apps/krdc-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kreversi-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kreversi-20.08.1
-2009291711 metadata/md5-cache/kde-apps/krfb-20.04.3
-2009291711 metadata/md5-cache/kde-apps/krfb-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kross-interpreters-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kross-interpreters-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kruler-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kruler-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kshisen-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kshisen-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ksirk-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ksirk-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ksmtp-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ksmtp-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ksnakeduel-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ksnakeduel-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kspaceduel-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kspaceduel-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ksquares-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ksquares-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ksudoku-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ksudoku-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ksystemlog-20.04.3-r1
-2009291711 metadata/md5-cache/kde-apps/ksystemlog-20.08.1-r1
-2009291711 metadata/md5-cache/kde-apps/kteatime-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kteatime-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktimer-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktimer-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktouch-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktouch-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-approver-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-approver-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-auth-handler-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-call-ui-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-call-ui-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-common-internals-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-common-internals-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-contact-list-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-contact-list-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-contact-runner-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-desktop-applets-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-kded-module-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-kded-module-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-send-file-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-send-file-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktp-text-ui-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktp-text-ui-20.08.1
-2009291711 metadata/md5-cache/kde-apps/ktuberling-20.04.3
-2009291711 metadata/md5-cache/kde-apps/ktuberling-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kturtle-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kturtle-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kubrick-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kubrick-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kwalletmanager-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kwalletmanager-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kwave-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kwave-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kwordquiz-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kwordquiz-20.08.1
-2009291711 metadata/md5-cache/kde-apps/kwrite-20.04.3
-2009291711 metadata/md5-cache/kde-apps/kwrite-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libgravatar-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libgravatar-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkcddb-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkcddb-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkcompactdisc-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkcompactdisc-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkdcraw-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkdcraw-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkdegames-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkdegames-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkdepim-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkdepim-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkeduvocdocument-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkexiv2-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkexiv2-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkgapi-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkgapi-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkipi-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkipi-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkleo-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkleo-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkmahjongg-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkmahjongg-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libkomparediff2-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libkomparediff2-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libksane-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libksane-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libksieve-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libksieve-20.08.1
-2009291711 metadata/md5-cache/kde-apps/libktnef-20.04.3
-2009291711 metadata/md5-cache/kde-apps/libktnef-20.08.1
-2009291711 metadata/md5-cache/kde-apps/lokalize-20.04.3
-2009291711 metadata/md5-cache/kde-apps/lokalize-20.08.1
-2009291711 metadata/md5-cache/kde-apps/lskat-20.04.3
-2009291711 metadata/md5-cache/kde-apps/lskat-20.08.1
-2009291711 metadata/md5-cache/kde-apps/mailcommon-20.04.3
-2009291711 metadata/md5-cache/kde-apps/mailcommon-20.08.1
-2009291711 metadata/md5-cache/kde-apps/mailimporter-20.04.3
-2009291711 metadata/md5-cache/kde-apps/mailimporter-20.08.1
-2009291711 metadata/md5-cache/kde-apps/marble-20.04.3
-2009291711 metadata/md5-cache/kde-apps/marble-20.08.1
-2009291711 metadata/md5-cache/kde-apps/mbox-importer-20.04.3
-2009291711 metadata/md5-cache/kde-apps/mbox-importer-20.08.1
-2009291711 metadata/md5-cache/kde-apps/messagelib-20.04.3
-2009291711 metadata/md5-cache/kde-apps/messagelib-20.08.1
-2009291711 metadata/md5-cache/kde-apps/minuet-20.04.3
-2009291711 metadata/md5-cache/kde-apps/minuet-20.08.1
-2009291711 metadata/md5-cache/kde-apps/okular-20.04.3
-2009291711 metadata/md5-cache/kde-apps/okular-20.08.1
-2009291711 metadata/md5-cache/kde-apps/palapeli-20.04.3
-2009291711 metadata/md5-cache/kde-apps/palapeli-20.08.1
-2009291711 metadata/md5-cache/kde-apps/parley-20.04.3
-2009291711 metadata/md5-cache/kde-apps/parley-20.08.1
-2009291711 metadata/md5-cache/kde-apps/picmi-20.04.3
-2009291711 metadata/md5-cache/kde-apps/picmi-20.08.1
-2009291711 metadata/md5-cache/kde-apps/pim-data-exporter-20.04.3
-2009291711 metadata/md5-cache/kde-apps/pim-data-exporter-20.08.1
-2009291711 metadata/md5-cache/kde-apps/pim-sieve-editor-20.04.3
-2009291711 metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.1
-2009291711 metadata/md5-cache/kde-apps/pimcommon-20.04.3
-2009291711 metadata/md5-cache/kde-apps/pimcommon-20.08.1
-2009291711 metadata/md5-cache/kde-apps/poxml-20.04.3
-2009291711 metadata/md5-cache/kde-apps/poxml-20.08.1
-2009291711 metadata/md5-cache/kde-apps/print-manager-20.04.3
-2009291711 metadata/md5-cache/kde-apps/print-manager-20.08.1
-2009291711 metadata/md5-cache/kde-apps/rocs-20.04.3
-2009291711 metadata/md5-cache/kde-apps/rocs-20.08.1
-2009291711 metadata/md5-cache/kde-apps/signon-kwallet-extension-20.04.3
-2009291711 metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.1
-2009291711 metadata/md5-cache/kde-apps/spectacle-20.04.3
-2009291711 metadata/md5-cache/kde-apps/spectacle-20.08.1
-2009291711 metadata/md5-cache/kde-apps/step-20.04.3
-2009291711 metadata/md5-cache/kde-apps/step-20.08.1
-2009291711 metadata/md5-cache/kde-apps/svgpart-20.04.3
-2009291711 metadata/md5-cache/kde-apps/svgpart-20.08.1
-2009291711 metadata/md5-cache/kde-apps/sweeper-20.04.3
-2009291711 metadata/md5-cache/kde-apps/sweeper-20.08.1
-2009291711 metadata/md5-cache/kde-apps/thumbnailers-20.04.3
-2009291711 metadata/md5-cache/kde-apps/thumbnailers-20.08.1
-2009291711 metadata/md5-cache/kde-apps/umbrello-20.04.3
-2009291711 metadata/md5-cache/kde-apps/umbrello-20.08.1
-2009291711 metadata/md5-cache/kde-apps/yakuake-20.04.3-r1
-2009291711 metadata/md5-cache/kde-apps/yakuake-20.08.1
-2009291711 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3
-2009291711 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.1
-2010030039 metadata/md5-cache/kde-apps/ark-20.04.3-r2
-2010042209 metadata/md5-cache/kde-apps/Manifest.gz
+2010120039 metadata/md5-cache/kde-apps/Manifest.gz
+2010092209 metadata/md5-cache/kde-apps/akonadi-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-calendar-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-contacts-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadi-import-wizard-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadi-mime-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-mime-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadi-notes-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-notes-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadi-search-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadi-search-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akonadiconsole-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akonadiconsole-20.08.2
+2010092209 metadata/md5-cache/kde-apps/akregator-20.04.3
+2010092209 metadata/md5-cache/kde-apps/akregator-20.08.2
+2010092209 metadata/md5-cache/kde-apps/analitza-20.04.3
+2010092209 metadata/md5-cache/kde-apps/analitza-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ark-20.04.3-r2
+2010092209 metadata/md5-cache/kde-apps/ark-20.08.2
+2010092209 metadata/md5-cache/kde-apps/artikulate-20.04.3
+2010092209 metadata/md5-cache/kde-apps/artikulate-20.08.2
+2010092209 metadata/md5-cache/kde-apps/audiocd-kio-20.04.3
+2010092209 metadata/md5-cache/kde-apps/audiocd-kio-20.08.2
+2010092209 metadata/md5-cache/kde-apps/baloo-widgets-20.04.3
+2010092209 metadata/md5-cache/kde-apps/baloo-widgets-20.08.2
+2010092209 metadata/md5-cache/kde-apps/blinken-20.04.3
+2010092209 metadata/md5-cache/kde-apps/blinken-20.08.2
+2010092209 metadata/md5-cache/kde-apps/bomber-20.04.3
+2010092209 metadata/md5-cache/kde-apps/bomber-20.08.2
+2010092209 metadata/md5-cache/kde-apps/bovo-20.04.3
+2010092209 metadata/md5-cache/kde-apps/bovo-20.08.2
+2010092209 metadata/md5-cache/kde-apps/calendarjanitor-20.04.3
+2010092209 metadata/md5-cache/kde-apps/calendarjanitor-20.08.2
+2010092209 metadata/md5-cache/kde-apps/calendarsupport-20.04.3
+2010092209 metadata/md5-cache/kde-apps/calendarsupport-20.08.2
+2010092209 metadata/md5-cache/kde-apps/cantor-20.04.3-r1
+2010120039 metadata/md5-cache/kde-apps/cantor-20.08.2
+2010092209 metadata/md5-cache/kde-apps/cervisia-20.04.3
+2010092209 metadata/md5-cache/kde-apps/cervisia-20.08.2
+2010092209 metadata/md5-cache/kde-apps/dolphin-20.04.3
+2010092209 metadata/md5-cache/kde-apps/dolphin-20.08.2
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.04.3
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.2
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-git-20.04.3
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.2
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.04.3
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.2
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.04.3
+2010092209 metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.2
+2010092209 metadata/md5-cache/kde-apps/dragon-20.04.3
+2010092209 metadata/md5-cache/kde-apps/dragon-20.08.2
+2010092209 metadata/md5-cache/kde-apps/eventviews-20.04.3
+2010092209 metadata/md5-cache/kde-apps/eventviews-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ffmpegthumbs-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.2
+2010092209 metadata/md5-cache/kde-apps/filelight-20.04.3
+2010092209 metadata/md5-cache/kde-apps/filelight-20.08.2
+2010092209 metadata/md5-cache/kde-apps/granatier-20.04.3
+2010092209 metadata/md5-cache/kde-apps/granatier-20.08.2
+2010092209 metadata/md5-cache/kde-apps/grantlee-editor-20.04.3
+2010092209 metadata/md5-cache/kde-apps/grantlee-editor-20.08.2
+2010092209 metadata/md5-cache/kde-apps/grantleetheme-20.04.3
+2010092209 metadata/md5-cache/kde-apps/grantleetheme-20.08.2
+2010092209 metadata/md5-cache/kde-apps/gwenview-20.04.3
+2010092209 metadata/md5-cache/kde-apps/gwenview-20.08.2
+2010092209 metadata/md5-cache/kde-apps/incidenceeditor-20.04.3
+2010092209 metadata/md5-cache/kde-apps/incidenceeditor-20.08.2
+2010092209 metadata/md5-cache/kde-apps/juk-20.04.3
+2010092209 metadata/md5-cache/kde-apps/juk-20.08.2
+2010092209 metadata/md5-cache/kde-apps/k3b-20.04.3
+2010092209 metadata/md5-cache/kde-apps/k3b-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kaccounts-integration-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kaccounts-integration-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kaccounts-providers-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kaccounts-providers-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kaddressbook-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kaddressbook-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kajongg-20.04.3
+2010120039 metadata/md5-cache/kde-apps/kajongg-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kalarm-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kalarm-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kalarmcal-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kalarmcal-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kalgebra-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kalgebra-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kalzium-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kalzium-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kamera-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kamera-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kamoso-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kamoso-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kanagram-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kanagram-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kapman-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kapman-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kapptemplate-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kapptemplate-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kate-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kate-20.08.2
+2010092209 metadata/md5-cache/kde-apps/katomic-20.04.3
+2010092209 metadata/md5-cache/kde-apps/katomic-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kbackup-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kbackup-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kblackbox-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kblackbox-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kblocks-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kblocks-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kbounce-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kbounce-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kbreakout-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kbreakout-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kbruch-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kbruch-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kcachegrind-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kcachegrind-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kcalc-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kcalc-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kcalutils-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kcalutils-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kcharselect-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kcharselect-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kcolorchooser-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kcolorchooser-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kcron-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kcron-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdav-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kde-apps-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kde-dev-scripts-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kde-dev-utils-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kde-dev-utils-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kde-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdeaccessibility-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdeadmin-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdebase-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdebugsettings-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdebugsettings-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdecore-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdeedu-data-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdeedu-data-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdeedu-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdegames-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdegraphics-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdemultimedia-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdenetwork-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdenlive-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdenlive-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdepim-addons-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdepim-addons-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdepim-apps-libs-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdepim-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
+2010092209 metadata/md5-cache/kde-apps/kdepim-runtime-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdesdk-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdeutils-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdf-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdf-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdialog-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdialog-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kdiamond-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kdiamond-20.08.2
+2010092209 metadata/md5-cache/kde-apps/keditbookmarks-20.04.3
+2010092209 metadata/md5-cache/kde-apps/keditbookmarks-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kfind-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kfind-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kfloppy-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kfloppy-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kfourinline-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kfourinline-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kgeography-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kgeography-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kget-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kget-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kgoldrunner-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kgoldrunner-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kgpg-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kgpg-20.08.2
+2010092209 metadata/md5-cache/kde-apps/khangman-20.04.3
+2010092209 metadata/md5-cache/kde-apps/khangman-20.08.2
+2010092209 metadata/md5-cache/kde-apps/khelpcenter-20.04.3
+2010092209 metadata/md5-cache/kde-apps/khelpcenter-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kidentitymanagement-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kidentitymanagement-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kig-20.04.3
+2010120039 metadata/md5-cache/kde-apps/kig-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kigo-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kigo-20.08.2
+2010092209 metadata/md5-cache/kde-apps/killbots-20.04.3
+2010092209 metadata/md5-cache/kde-apps/killbots-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kimagemapeditor-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kimagemapeditor-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kimap-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kimap-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kio-extras-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kio-extras-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kipi-plugins-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kipi-plugins-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kiriki-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kiriki-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kiten-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kiten-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kitinerary-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kitinerary-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kjumpingcube-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kjumpingcube-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kldap-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kldap-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kleopatra-20.04.3-r1
+2010092209 metadata/md5-cache/kde-apps/kleopatra-20.08.2
+2010092209 metadata/md5-cache/kde-apps/klettres-20.04.3
+2010092209 metadata/md5-cache/kde-apps/klettres-20.08.2
+2010092209 metadata/md5-cache/kde-apps/klickety-20.04.3
+2010092209 metadata/md5-cache/kde-apps/klickety-20.08.2
+2010092209 metadata/md5-cache/kde-apps/klines-20.04.3
+2010092209 metadata/md5-cache/kde-apps/klines-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmag-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmag-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmahjongg-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmahjongg-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmail-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmail-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
+2010092209 metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmailtransport-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmailtransport-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmbox-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmbox-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmime-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmime-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmines-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmines-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmix-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmix-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmousetool-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmousetool-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmouth-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmouth-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kmplot-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kmplot-20.08.2
+2010092209 metadata/md5-cache/kde-apps/knavalbattle-20.04.3
+2010092209 metadata/md5-cache/kde-apps/knavalbattle-20.08.2
+2010092209 metadata/md5-cache/kde-apps/knetwalk-20.04.3
+2010092209 metadata/md5-cache/kde-apps/knetwalk-20.08.2
+2010092209 metadata/md5-cache/kde-apps/knights-20.04.3
+2010092209 metadata/md5-cache/kde-apps/knights-20.08.2
+2010092209 metadata/md5-cache/kde-apps/knotes-20.04.3
+2010092209 metadata/md5-cache/kde-apps/knotes-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kolf-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kolf-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kollision-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kollision-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kolourpaint-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kolourpaint-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kompare-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kompare-20.08.2
+2010092209 metadata/md5-cache/kde-apps/konqueror-20.04.3
+2010092209 metadata/md5-cache/kde-apps/konqueror-20.08.2
+2010092209 metadata/md5-cache/kde-apps/konquest-20.04.3
+2010092209 metadata/md5-cache/kde-apps/konquest-20.08.2
+2010092209 metadata/md5-cache/kde-apps/konsole-20.04.3
+2010092209 metadata/md5-cache/kde-apps/konsole-20.08.2
+2010092209 metadata/md5-cache/kde-apps/konsolekalendar-20.04.3
+2010092209 metadata/md5-cache/kde-apps/konsolekalendar-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kontact-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kontact-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kontactinterface-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kontactinterface-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kopete-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kopete-20.08.2
+2010092209 metadata/md5-cache/kde-apps/korganizer-20.04.3
+2010092209 metadata/md5-cache/kde-apps/korganizer-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kpat-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kpat-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kpimtextedit-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kpimtextedit-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kpkpass-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kpkpass-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kqtquickcharts-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kqtquickcharts-20.08.2
+2010092209 metadata/md5-cache/kde-apps/krdc-20.04.3
+2010092209 metadata/md5-cache/kde-apps/krdc-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kreversi-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kreversi-20.08.2
+2010092209 metadata/md5-cache/kde-apps/krfb-20.04.3
+2010092209 metadata/md5-cache/kde-apps/krfb-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kross-interpreters-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kross-interpreters-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kruler-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kruler-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kshisen-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kshisen-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ksirk-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ksirk-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ksmtp-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ksmtp-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ksnakeduel-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ksnakeduel-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kspaceduel-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kspaceduel-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ksquares-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ksquares-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ksudoku-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ksudoku-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ksystemlog-20.04.3-r1
+2010092209 metadata/md5-cache/kde-apps/ksystemlog-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kteatime-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kteatime-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktimer-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktimer-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktouch-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktouch-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-approver-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-approver-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-auth-handler-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-call-ui-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-call-ui-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-common-internals-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-common-internals-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-contact-list-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-contact-list-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-contact-runner-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-desktop-applets-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-kded-module-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-kded-module-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-send-file-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-send-file-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktp-text-ui-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktp-text-ui-20.08.2
+2010092209 metadata/md5-cache/kde-apps/ktuberling-20.04.3
+2010092209 metadata/md5-cache/kde-apps/ktuberling-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kturtle-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kturtle-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kubrick-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kubrick-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kwalletmanager-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kwalletmanager-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kwave-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kwave-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kwordquiz-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kwordquiz-20.08.2
+2010092209 metadata/md5-cache/kde-apps/kwrite-20.04.3
+2010092209 metadata/md5-cache/kde-apps/kwrite-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libgravatar-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libgravatar-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkcddb-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkcddb-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkcompactdisc-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkcompactdisc-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkdcraw-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkdcraw-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkdegames-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkdegames-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkdepim-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkdepim-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkeduvocdocument-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkexiv2-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkexiv2-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkgapi-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkgapi-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkipi-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkipi-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkleo-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkleo-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkmahjongg-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkmahjongg-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libkomparediff2-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libkomparediff2-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libksane-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libksane-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libksieve-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libksieve-20.08.2
+2010092209 metadata/md5-cache/kde-apps/libktnef-20.04.3
+2010092209 metadata/md5-cache/kde-apps/libktnef-20.08.2
+2010120039 metadata/md5-cache/kde-apps/lokalize-20.04.3-r1
+2010120039 metadata/md5-cache/kde-apps/lokalize-20.08.2
+2010092209 metadata/md5-cache/kde-apps/lskat-20.04.3
+2010092209 metadata/md5-cache/kde-apps/lskat-20.08.2
+2010092209 metadata/md5-cache/kde-apps/mailcommon-20.04.3
+2010092209 metadata/md5-cache/kde-apps/mailcommon-20.08.2
+2010092209 metadata/md5-cache/kde-apps/mailimporter-20.04.3
+2010092209 metadata/md5-cache/kde-apps/mailimporter-20.08.2
+2010092209 metadata/md5-cache/kde-apps/marble-20.04.3
+2010092209 metadata/md5-cache/kde-apps/marble-20.08.2
+2010092209 metadata/md5-cache/kde-apps/mbox-importer-20.04.3
+2010092209 metadata/md5-cache/kde-apps/mbox-importer-20.08.2
+2010092209 metadata/md5-cache/kde-apps/messagelib-20.04.3
+2010092209 metadata/md5-cache/kde-apps/messagelib-20.08.2
+2010092209 metadata/md5-cache/kde-apps/minuet-20.04.3
+2010092209 metadata/md5-cache/kde-apps/minuet-20.08.2
+2010092209 metadata/md5-cache/kde-apps/okular-20.04.3
+2010092209 metadata/md5-cache/kde-apps/okular-20.08.2
+2010092209 metadata/md5-cache/kde-apps/palapeli-20.04.3
+2010092209 metadata/md5-cache/kde-apps/palapeli-20.08.2
+2010092209 metadata/md5-cache/kde-apps/parley-20.04.3
+2010092209 metadata/md5-cache/kde-apps/parley-20.08.2
+2010092209 metadata/md5-cache/kde-apps/picmi-20.04.3
+2010092209 metadata/md5-cache/kde-apps/picmi-20.08.2
+2010092209 metadata/md5-cache/kde-apps/pim-data-exporter-20.04.3
+2010092209 metadata/md5-cache/kde-apps/pim-data-exporter-20.08.2
+2010092209 metadata/md5-cache/kde-apps/pim-sieve-editor-20.04.3
+2010092209 metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.2
+2010092209 metadata/md5-cache/kde-apps/pimcommon-20.04.3
+2010092209 metadata/md5-cache/kde-apps/pimcommon-20.08.2
+2010092209 metadata/md5-cache/kde-apps/plasma-telepathy-meta-20.08.2
+2010092209 metadata/md5-cache/kde-apps/poxml-20.04.3
+2010092209 metadata/md5-cache/kde-apps/poxml-20.08.2
+2010092209 metadata/md5-cache/kde-apps/print-manager-20.04.3
+2010092209 metadata/md5-cache/kde-apps/print-manager-20.08.2
+2010092209 metadata/md5-cache/kde-apps/rocs-20.04.3
+2010092209 metadata/md5-cache/kde-apps/rocs-20.08.2
+2010092209 metadata/md5-cache/kde-apps/signon-kwallet-extension-20.04.3
+2010092209 metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.2
+2010092209 metadata/md5-cache/kde-apps/spectacle-20.04.3
+2010092209 metadata/md5-cache/kde-apps/spectacle-20.08.2
+2010092209 metadata/md5-cache/kde-apps/step-20.04.3
+2010092209 metadata/md5-cache/kde-apps/step-20.08.2
+2010092209 metadata/md5-cache/kde-apps/svgpart-20.04.3
+2010092209 metadata/md5-cache/kde-apps/svgpart-20.08.2
+2010092209 metadata/md5-cache/kde-apps/sweeper-20.04.3
+2010092209 metadata/md5-cache/kde-apps/sweeper-20.08.2
+2010092209 metadata/md5-cache/kde-apps/thumbnailers-20.04.3
+2010092209 metadata/md5-cache/kde-apps/thumbnailers-20.08.2
+2010092209 metadata/md5-cache/kde-apps/umbrello-20.04.3
+2010092209 metadata/md5-cache/kde-apps/umbrello-20.08.2
+2010092209 metadata/md5-cache/kde-apps/yakuake-20.04.3-r1
+2010092209 metadata/md5-cache/kde-apps/yakuake-20.08.2
+2010092209 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3
+2010092209 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.2
 1905280009 metadata/md5-cache/kde-frameworks/kf-env-5
-2009291711 metadata/md5-cache/kde-frameworks/attica-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/baloo-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/breeze-icons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/frameworkintegration-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kactivities-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kactivities-stats-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kapidox-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1
-2009291711 metadata/md5-cache/kde-frameworks/kauth-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcalendarcore-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcmutils-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcodecs-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcompletion-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kconfig-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcontacts-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcoreaddons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kcrash-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdbusaddons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kded-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdelibs4support-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdesignerplugin-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdesu-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdewebkit-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdnssd-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kdoctools-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kemoticons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kfilemetadata-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kglobalaccel-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kguiaddons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kholidays-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/khtml-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/ki18n-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kidletime-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kimageformats-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kinit-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kio-5.70.1-r1
-2009291711 metadata/md5-cache/kde-frameworks/kirigami-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kjs-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kjsembed-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kmediaplayer-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/knewstuff-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/knotifications-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/knotifyconfig-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kpackage-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kparts-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kpeople-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kplotting-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kpty-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kquickcharts-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kross-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/krunner-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kservice-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/ktexteditor-5.70.1
-2009291711 metadata/md5-cache/kde-frameworks/ktextwidgets-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kunitconversion-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kwallet-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kwayland-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kxmlgui-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/plasma-5.70.1
-2009291711 metadata/md5-cache/kde-frameworks/prison-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/purpose-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/solid-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/sonnet-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/syndication-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0
-2009291711 metadata/md5-cache/kde-frameworks/threadweaver-5.70.0
-2010081609 metadata/md5-cache/kde-frameworks/Manifest.gz
-2010080539 metadata/md5-cache/kde-frameworks/attica-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/baloo-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
-2010081609 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kactivities-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kapidox-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/karchive-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kauth-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kconfig-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kcrash-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdav-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
-2010080539 metadata/md5-cache/kde-frameworks/kded-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdesu-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kholidays-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/khtml-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/ki18n-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kidletime-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kinit-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
-2010080539 metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
-2010080539 metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kjs-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/knotifications-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kpackage-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kparts-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kpeople-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kplotting-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kpty-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kross-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/krunner-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kservice-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kwallet-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kwayland-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
-2010080539 metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
-2010080539 metadata/md5-cache/kde-frameworks/prison-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/purpose-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
-2010080539 metadata/md5-cache/kde-frameworks/solid-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/sonnet-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/syndication-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
-2010080539 metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
+2010120039 metadata/md5-cache/kde-frameworks/Manifest.gz
+2010092209 metadata/md5-cache/kde-frameworks/attica-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/attica-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/baloo-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/baloo-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/bluez-qt-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/breeze-icons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/frameworkintegration-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kactivities-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kactivities-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kactivities-stats-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kapidox-5.74.0
+2010120039 metadata/md5-cache/kde-frameworks/kapidox-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/karchive-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/karchive-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kauth-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kauth-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kbookmarks-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcalendarcore-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcmutils-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcodecs-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcompletion-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kconfig-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kconfig-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcontacts-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcoreaddons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kcrash-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kcrash-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdav-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdav-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdbusaddons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
+2010101909 metadata/md5-cache/kde-frameworks/kdeclarative-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kded-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kded-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdelibs4support-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdesignerplugin-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdesu-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdesu-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdewebkit-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdnssd-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kdoctools-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kemoticons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kfilemetadata-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kglobalaccel-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kguiaddons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kholidays-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kholidays-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/khtml-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/khtml-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/ki18n-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/ki18n-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kiconthemes-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kidletime-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kidletime-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kimageformats-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kinit-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kinit-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
+2010101909 metadata/md5-cache/kde-frameworks/kio-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
+2010101909 metadata/md5-cache/kde-frameworks/kirigami-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kitemmodels-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kitemviews-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kjobwidgets-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kjs-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kjs-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kjsembed-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kmediaplayer-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/knewstuff-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/knotifications-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/knotifications-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/knotifyconfig-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kpackage-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kpackage-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kparts-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kparts-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kpeople-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kpeople-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kplotting-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kplotting-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kpty-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kpty-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kquickcharts-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kross-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kross-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/krunner-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/krunner-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kservice-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kservice-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/ktexteditor-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/ktextwidgets-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kunitconversion-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kwallet-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kwallet-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kwayland-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kwayland-5.75.0
+2010101509 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kwindowsystem-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
+2010101909 metadata/md5-cache/kde-frameworks/kxmlgui-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/oxygen-icons-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
+2010101909 metadata/md5-cache/kde-frameworks/plasma-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/prison-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/prison-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/purpose-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/purpose-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
+2010101909 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/solid-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/solid-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/sonnet-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/sonnet-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/syndication-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/syndication-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.75.0
+2010092209 metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
+2010101909 metadata/md5-cache/kde-frameworks/threadweaver-5.75.0
 2009291711 metadata/md5-cache/kde-misc/basket-2.49b
-2009291711 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
-2009291711 metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
-2009291711 metadata/md5-cache/kde-misc/kdiff3-1.8.4
 2009291711 metadata/md5-cache/kde-misc/kdirstat-3.2.1
-2009291711 metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
-2009291711 metadata/md5-cache/kde-misc/kio-fuse-4.95.0
-2009291711 metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
-2009291711 metadata/md5-cache/kde-misc/kio-gdrive-20.08.1
-2009291711 metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
 2009291711 metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3
-2009291711 metadata/md5-cache/kde-misc/kio-stash-1.0-r1
-2009291711 metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5
-2009291711 metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
-2009291711 metadata/md5-cache/kde-misc/kolor-manager-1.1.0
-2009291711 metadata/md5-cache/kde-misc/krename-5.0.0-r1
-2009291711 metadata/md5-cache/kde-misc/krusader-2.7.2
-2009291711 metadata/md5-cache/kde-misc/kshutdown-5.2
 2009291711 metadata/md5-cache/kde-misc/ktoshiba-5.3.1
-2009291711 metadata/md5-cache/kde-misc/latte-dock-0.9.11
-2009291711 metadata/md5-cache/kde-misc/markdownpart-0.1.1
 2009291711 metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
 2009291711 metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1
 2009291711 metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1
-2009291711 metadata/md5-cache/kde-misc/plasma-pass-1.1.0
 2009291711 metadata/md5-cache/kde-misc/playbar2-2.5-r1
-2009291711 metadata/md5-cache/kde-misc/rsibreak-0.12.13
-2009291711 metadata/md5-cache/kde-misc/skanlite-2.2.0
-2009291711 metadata/md5-cache/kde-misc/tellico-3.3.2
-2009291711 metadata/md5-cache/kde-misc/tellico-3.3.3
 2009291711 metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
-2009291711 metadata/md5-cache/kde-misc/wacomtablet-3.2.0
-2009291711 metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
-2009291711 metadata/md5-cache/kde-misc/zanshin-0.5.71-r2
-2010041939 metadata/md5-cache/kde-misc/kdeconnect-20.08.1-r1
-2010052309 metadata/md5-cache/kde-misc/krename-5.0.1
-2010071339 metadata/md5-cache/kde-misc/Manifest.gz
-2010071039 metadata/md5-cache/kde-misc/kdeconnect-20.04.3-r1
-2007060209 metadata/md5-cache/kde-plasma/plasma-meta-5.18.5
-2009012211 metadata/md5-cache/kde-plasma/breeze-grub-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/bluedevil-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/breeze-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/discover-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2
-2009291711 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kde-cli-tools-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kde-gtk-config-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kdecoration-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kgamma-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/khotkeys-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kscreen-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/ksysguard-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/kwin-5.18.5-r1
-2009291711 metadata/md5-cache/kde-plasma/kwin-5.18.5-r3
-2009291711 metadata/md5-cache/kde-plasma/kwrited-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/libkscreen-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/libksysguard-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/libkworkspace-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/milou-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/oxygen-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1
-2009291711 metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r2
-2009291711 metadata/md5-cache/kde-plasma/plasma-integration-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1
-2009291711 metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1
-2009291711 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/powerdevil-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
-2009291711 metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/systemsettings-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/user-manager-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
-2009291711 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
-2010062109 metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
-2010071409 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/Manifest.gz
-2010080539 metadata/md5-cache/kde-plasma/bluedevil-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
-2010080539 metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/discover-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/drkonqi-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kdecoration-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
-2010080539 metadata/md5-cache/kde-plasma/kgamma-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/khotkeys-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kscreen-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
-2010080539 metadata/md5-cache/kde-plasma/ksysguard-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
-2010080539 metadata/md5-cache/kde-plasma/kwrited-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/libkscreen-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/libksysguard-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/milou-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/oxygen-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
+2010092209 metadata/md5-cache/kde-misc/Manifest.gz
+2010092209 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
+2010092209 metadata/md5-cache/kde-misc/kdeconnect-20.04.3-r1
+2010092209 metadata/md5-cache/kde-misc/kdeconnect-20.08.2
+2010092209 metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
+2010092209 metadata/md5-cache/kde-misc/kdiff3-1.8.4
+2010092209 metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
+2010092209 metadata/md5-cache/kde-misc/kio-fuse-4.95.0
+2010092209 metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
+2010092209 metadata/md5-cache/kde-misc/kio-gdrive-20.08.2
+2010092209 metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
+2010092209 metadata/md5-cache/kde-misc/kio-stash-1.0-r1
+2010092209 metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5
+2010092209 metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
+2010092209 metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+2010092209 metadata/md5-cache/kde-misc/krename-5.0.0-r1
+2010092209 metadata/md5-cache/kde-misc/krename-5.0.1
+2010092209 metadata/md5-cache/kde-misc/krusader-2.7.2
+2010092209 metadata/md5-cache/kde-misc/kshutdown-5.2
+2010092209 metadata/md5-cache/kde-misc/latte-dock-0.9.11
+2010092209 metadata/md5-cache/kde-misc/markdownpart-0.1.1
+2010092209 metadata/md5-cache/kde-misc/plasma-pass-1.1.0
+2010092209 metadata/md5-cache/kde-misc/rsibreak-0.12.13
+2010092209 metadata/md5-cache/kde-misc/skanlite-2.2.0
+2010092209 metadata/md5-cache/kde-misc/tellico-3.3.2
+2010092209 metadata/md5-cache/kde-misc/tellico-3.3.3
+2010092209 metadata/md5-cache/kde-misc/wacomtablet-3.2.0
+2010092209 metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
+2010092209 metadata/md5-cache/kde-misc/zanshin-0.5.71-r2
 2010080539 metadata/md5-cache/kde-plasma/plasma-meta-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
-2010080539 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/powerdevil-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/systemsettings-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/user-manager-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
-2010080539 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
+2010092209 metadata/md5-cache/kde-plasma/Manifest.gz
+2010092209 metadata/md5-cache/kde-plasma/bluedevil-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
+2010092209 metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/discover-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/drkonqi-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kdecoration-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
+2010092209 metadata/md5-cache/kde-plasma/kgamma-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/khotkeys-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kscreen-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
+2010092209 metadata/md5-cache/kde-plasma/ksysguard-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
+2010092209 metadata/md5-cache/kde-plasma/kwrited-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/libkscreen-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/libksysguard-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/milou-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/oxygen-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
+2010092209 metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
+2010092209 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/powerdevil-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/systemsettings-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/user-manager-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
+2010092209 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3
 1804072008 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
 1804051913 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r6
@@ -49276,25 +49175,21 @@
 2009131115 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
 2009111825 metadata/md5-cache/mail-client/s-nail-14.9.16
 2009111825 metadata/md5-cache/mail-client/s-nail-14.9.19
-2009131115 metadata/md5-cache/mail-client/thunderbird-bin-68.12.0
 2009141809 metadata/md5-cache/mail-client/aerc-0.4.0
 2009141809 metadata/md5-cache/mail-client/aerc-9999
 2009172012 metadata/md5-cache/mail-client/geary-3.36.3.1
-2009172012 metadata/md5-cache/mail-client/thunderbird-68.12.0
 2009211840 metadata/md5-cache/mail-client/alot-0.9
 2009211840 metadata/md5-cache/mail-client/alot-0.9.1
 2009211840 metadata/md5-cache/mail-client/alot-9999
 2009251709 metadata/md5-cache/mail-client/neomutt-20200925
 2009251809 metadata/md5-cache/mail-client/neomutt-99999999
 2009281909 metadata/md5-cache/mail-client/claws-mail-3.17.7
-2009291711 metadata/md5-cache/mail-client/kube-0.7.0-r1
 2009291711 metadata/md5-cache/mail-client/trojita-0.7-r5
 2009291711 metadata/md5-cache/mail-client/trojita-9999
-2010051909 metadata/md5-cache/mail-client/thunderbird-78.3.1
-2010052009 metadata/md5-cache/mail-client/thunderbird-bin-78.3.1-r2
-2010070439 metadata/md5-cache/mail-client/Manifest.gz
-2010070439 metadata/md5-cache/mail-client/thunderbird-78.3.2
-2010070439 metadata/md5-cache/mail-client/thunderbird-bin-78.3.2
+2010112309 metadata/md5-cache/mail-client/Manifest.gz
+2010101909 metadata/md5-cache/mail-client/kube-0.7.0-r1
+2010112209 metadata/md5-cache/mail-client/thunderbird-78.3.2
+2010112309 metadata/md5-cache/mail-client/thunderbird-bin-78.3.2
 1911061339 metadata/md5-cache/mail-filter/libsieve-2.2.7
 1910111911 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 1906181439 metadata/md5-cache/mail-filter/postforward-1.1.1
@@ -49368,15 +49263,15 @@
 2009211840 metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
 2009211840 metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
 2009211840 metadata/md5-cache/mail-filter/spf-engine-2.9.2
-2009270039 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
 2010011439 metadata/md5-cache/mail-filter/opendkim-2.10.3-r18
 2010021039 metadata/md5-cache/mail-filter/rspamd-2.5
 2010031839 metadata/md5-cache/mail-filter/opendmarc-1.3.3
 2010042009 metadata/md5-cache/mail-filter/spamassassin-3.4.4-r4
 2010062139 metadata/md5-cache/mail-filter/maildrop-3.0.0
-2010071909 metadata/md5-cache/mail-filter/Manifest.gz
-2010071909 metadata/md5-cache/mail-filter/rspamd-2.6
-2010071909 metadata/md5-cache/mail-filter/rspamd-9999
+2010111209 metadata/md5-cache/mail-filter/Manifest.gz
+2010111209 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
+2010082309 metadata/md5-cache/mail-filter/rspamd-2.6-r1
+2010082309 metadata/md5-cache/mail-filter/rspamd-9999
 1910071309 metadata/md5-cache/mail-mta/esmtp-1.2-r1
 2009121921 metadata/md5-cache/mail-mta/courier-1.0.13
 2009121921 metadata/md5-cache/mail-mta/courier-1.0.14
@@ -49434,7 +49329,6 @@
 2009131115 metadata/md5-cache/mate-extra/mate-netbook-1.24.0
 2009131115 metadata/md5-cache/mate-extra/mate-polkit-1.24.0
 2009131115 metadata/md5-cache/mate-extra/mate-power-manager-1.24.1-r2
-2009131115 metadata/md5-cache/mate-extra/mate-screensaver-1.24.0
 2009131115 metadata/md5-cache/mate-extra/mate-sensors-applet-1.24.0
 2009131115 metadata/md5-cache/mate-extra/mate-system-monitor-1.24.0
 2009131115 metadata/md5-cache/mate-extra/mate-user-guide-1.24.0-r1
@@ -49445,7 +49339,6 @@
 2009172012 metadata/md5-cache/mate-extra/caja-admin-9999
 2009172012 metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
 2009172012 metadata/md5-cache/mate-extra/caja-hide-0.9.0
-2009260039 metadata/md5-cache/mate-extra/Manifest.gz
 2009252339 metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
 2009252339 metadata/md5-cache/mate-extra/caja-extensions-1.24.1
 2009252339 metadata/md5-cache/mate-extra/mate-calc-1.24.1
@@ -49454,12 +49347,14 @@
 2009252339 metadata/md5-cache/mate-extra/mate-netbook-1.24.0-r1
 2009252339 metadata/md5-cache/mate-extra/mate-polkit-1.24.0-r1
 2009260039 metadata/md5-cache/mate-extra/mate-power-manager-1.24.2
-2009252339 metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
 2009252339 metadata/md5-cache/mate-extra/mate-sensors-applet-1.24.1
 2009252339 metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1
 2009252339 metadata/md5-cache/mate-extra/mate-user-guide-1.24.0-r2
 2009252339 metadata/md5-cache/mate-extra/mate-user-share-1.24.0-r1
 2009252339 metadata/md5-cache/mate-extra/mate-utils-1.24.0-r3
+2010082309 metadata/md5-cache/mate-extra/Manifest.gz
+2010082309 metadata/md5-cache/mate-extra/mate-screensaver-1.24.0
+2010082309 metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
 1812141339 metadata/md5-cache/media-fonts/solarize-0_pre20140818
 2003300109 metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
 2004032241 metadata/md5-cache/media-fonts/konfont-0.1
@@ -49521,9 +49416,7 @@
 2004181909 metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
 2004211009 metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
 2005222239 metadata/md5-cache/media-fonts/fontawesome-5.13.0
-2006090639 metadata/md5-cache/media-fonts/fira-code-3.1
 2006100509 metadata/md5-cache/media-fonts/cascadia-code-2004.30
-2006121839 metadata/md5-cache/media-fonts/fira-code-5.2
 2006202339 metadata/md5-cache/media-fonts/fontawesome-5.13.1
 2007041709 metadata/md5-cache/media-fonts/ipamonafont-1.0.8
 2007041709 metadata/md5-cache/media-fonts/takao-fonts-003.02.01
@@ -49678,7 +49571,6 @@
 2009172012 metadata/md5-cache/media-fonts/noto-emoji-20200311
 2009172012 metadata/md5-cache/media-fonts/noto-emoji-20200317
 2009172012 metadata/md5-cache/media-fonts/terminus-font-4.48-r2
-2009291711 metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
 2010010209 metadata/md5-cache/media-fonts/fontawesome-5.14.0
 2010030439 metadata/md5-cache/media-fonts/encodings-1.0.5-r1
 2010030439 metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r2
@@ -49719,8 +49611,10 @@
 2010030439 metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2
 2010030439 metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
 2010060839 metadata/md5-cache/media-fonts/noto-emoji-20200317-r1
-2010070409 metadata/md5-cache/media-fonts/Manifest.gz
 2010070409 metadata/md5-cache/media-fonts/ja-ipafonts-003.03
+2010092209 metadata/md5-cache/media-fonts/Manifest.gz
+2010091139 metadata/md5-cache/media-fonts/fira-code-5.2
+2010092209 metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
 1908162118 metadata/md5-cache/media-gfx/cellwriter-1.3.6
 1804080138 metadata/md5-cache/media-gfx/figurine-1.0.5-r1
 1702282325 metadata/md5-cache/media-gfx/gif2png-2.5.9
@@ -49746,11 +49640,9 @@
 1910102139 metadata/md5-cache/media-gfx/ristretto-0.10.0
 1805290208 metadata/md5-cache/media-gfx/rotoscope-0.2
 1911091539 metadata/md5-cache/media-gfx/springgraph-88
-1912101239 metadata/md5-cache/media-gfx/wings-2.2.5
 1912111539 metadata/md5-cache/media-gfx/tuxpaint-stamps-20090628-r1
 1912131839 metadata/md5-cache/media-gfx/gphotofs-0.5-r1
 1912260009 metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.2.1
-2001281139 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r4
 2002112051 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
 2002130739 metadata/md5-cache/media-gfx/grub-splashes-20091109
 2004032241 metadata/md5-cache/media-gfx/exif-0.6.21
@@ -49760,7 +49652,6 @@
 2004261339 metadata/md5-cache/media-gfx/album-4.13-r2
 2004261339 metadata/md5-cache/media-gfx/album-4.15-r1
 2005172009 metadata/md5-cache/media-gfx/igal-2.0-r1
-2005171209 metadata/md5-cache/media-gfx/wings-2.2.6.1
 2006170439 metadata/md5-cache/media-gfx/exif-0.6.22
 2007182209 metadata/md5-cache/media-gfx/jhead-3.04
 2008300639 metadata/md5-cache/media-gfx/qrencode-4.1.0
@@ -49786,8 +49677,6 @@
 2009131115 metadata/md5-cache/media-gfx/colorhug-client-0.2.8
 2009131115 metadata/md5-cache/media-gfx/converseen-0.9.6.2
 2009111825 metadata/md5-cache/media-gfx/crwinfo-0.2
-2009131115 metadata/md5-cache/media-gfx/curaengine-3.4.1
-2009131115 metadata/md5-cache/media-gfx/curaengine-3.6.0
 2009111825 metadata/md5-cache/media-gfx/dawn-3.90b-r1
 2009111825 metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
 2009131115 metadata/md5-cache/media-gfx/ditaa-0.10
@@ -49806,8 +49695,6 @@
 2009131115 metadata/md5-cache/media-gfx/fbida-2.12
 2009131115 metadata/md5-cache/media-gfx/fbida-2.13-r1
 2009111825 metadata/md5-cache/media-gfx/fbida-2.14-r2
-2009131115 metadata/md5-cache/media-gfx/fdm-materials-3.4.1
-2009131115 metadata/md5-cache/media-gfx/fdm-materials-3.6.0
 2009111825 metadata/md5-cache/media-gfx/feh-3.3
 2009111825 metadata/md5-cache/media-gfx/feh-3.4
 2009111825 metadata/md5-cache/media-gfx/feh-3.4.1
@@ -49913,7 +49800,6 @@
 2009131115 metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
 2009131115 metadata/md5-cache/media-gfx/slic3r-1.1.7
 2009131115 metadata/md5-cache/media-gfx/slic3r-1.3.0-r1
-2009131115 metadata/md5-cache/media-gfx/slic3r-9999
 2009131115 metadata/md5-cache/media-gfx/solvespace-2.3
 2009111825 metadata/md5-cache/media-gfx/sxiv-26
 2009111825 metadata/md5-cache/media-gfx/sxiv-9999
@@ -49932,22 +49818,14 @@
 2009111825 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
 2009131115 metadata/md5-cache/media-gfx/viewnior-1.6
 2009111825 metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
-2009111825 metadata/md5-cache/media-gfx/wings-2.1.5
-2009111825 metadata/md5-cache/media-gfx/wings-2.1.6
-2009111825 metadata/md5-cache/media-gfx/wings-2.1.7
 2009111825 metadata/md5-cache/media-gfx/wkhtmltopdf-0.12.5
-2009131115 metadata/md5-cache/media-gfx/xli-1.17.0-r5
 2009121921 metadata/md5-cache/media-gfx/xloadimage-4.1-r12
 2009111825 metadata/md5-cache/media-gfx/xpaint-2.10.2
-2009131115 metadata/md5-cache/media-gfx/xsane-0.999-r2
 2009131115 metadata/md5-cache/media-gfx/xv-3.10a-r19
 2009131115 metadata/md5-cache/media-gfx/xzgv-0.9.1
 2009140109 metadata/md5-cache/media-gfx/iscan-3.63.0
-2009172012 metadata/md5-cache/media-gfx/blender-2.79b-r2
 2009172012 metadata/md5-cache/media-gfx/cropgui-0.4.1
 2009172012 metadata/md5-cache/media-gfx/cropgui-0.5
-2009172012 metadata/md5-cache/media-gfx/cura-3.4.1
-2009172012 metadata/md5-cache/media-gfx/cura-3.6.0
 2009172012 metadata/md5-cache/media-gfx/entangle-3.0
 2009172012 metadata/md5-cache/media-gfx/eog-3.32.2
 2009172012 metadata/md5-cache/media-gfx/eog-3.36.3
@@ -49963,7 +49841,6 @@
 2009172012 metadata/md5-cache/media-gfx/gnome-photos-3.34.2
 2009172012 metadata/md5-cache/media-gfx/gnome-screenshot-3.36.0
 2009172012 metadata/md5-cache/media-gfx/graphviz-2.42.3-r1
-2009172012 metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
 2009172012 metadata/md5-cache/media-gfx/gthumb-3.10.0
 2009172012 metadata/md5-cache/media-gfx/hugin-2019.2.0
 2009172012 metadata/md5-cache/media-gfx/hugin-9999
@@ -49994,10 +49871,6 @@
 2009211840 metadata/md5-cache/media-gfx/xdot-9999
 2009222309 metadata/md5-cache/media-gfx/gimp-2.10.18-r2
 2009230739 metadata/md5-cache/media-gfx/gimp-2.10.20-r2
-2009251309 metadata/md5-cache/media-gfx/asymptote-2.61
-2009251309 metadata/md5-cache/media-gfx/asymptote-2.62
-2009251309 metadata/md5-cache/media-gfx/asymptote-2.65
-2009251309 metadata/md5-cache/media-gfx/asymptote-2.67
 2009252339 metadata/md5-cache/media-gfx/eom-1.24.1
 2009251209 metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
 2009251209 metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
@@ -50007,23 +49880,13 @@
 2009281239 metadata/md5-cache/media-gfx/qrencode-4.1.1
 2009291711 metadata/md5-cache/media-gfx/alembic-1.7.11-r1
 2009291711 metadata/md5-cache/media-gfx/alembic-1.7.12
-2009291711 metadata/md5-cache/media-gfx/blender-2.83.4
-2009291711 metadata/md5-cache/media-gfx/cura-4.2.1
-2009291711 metadata/md5-cache/media-gfx/cura-4.3.0-r1
-2009291711 metadata/md5-cache/media-gfx/curaengine-4.2.0
-2009291711 metadata/md5-cache/media-gfx/curaengine-4.3.0
 2009291711 metadata/md5-cache/media-gfx/curaengine-4.6.1
 2009291711 metadata/md5-cache/media-gfx/curaengine-4.7.0
 2009291711 metadata/md5-cache/media-gfx/darktable-2.6.2
 2009291711 metadata/md5-cache/media-gfx/darktable-3.0.2
 2009291711 metadata/md5-cache/media-gfx/darktable-3.2.1
-2009291711 metadata/md5-cache/media-gfx/digikam-6.4.0-r1
-2009291711 metadata/md5-cache/media-gfx/digikam-7.1.0
 2009291711 metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
 2009291711 metadata/md5-cache/media-gfx/exiv2-0.27.3
-2009291711 metadata/md5-cache/media-gfx/fdm-materials-4.2.0
-2009291711 metadata/md5-cache/media-gfx/fdm-materials-4.3.0
-2009291711 metadata/md5-cache/media-gfx/fdm-materials-4.6.1
 2009291711 metadata/md5-cache/media-gfx/fdm-materials-4.6.1-r1
 2009291711 metadata/md5-cache/media-gfx/fdm-materials-4.7.0
 2009291711 metadata/md5-cache/media-gfx/fontforge-20200314
@@ -50033,18 +49896,10 @@
 2009291711 metadata/md5-cache/media-gfx/inkscape-1.0-r1
 2009291711 metadata/md5-cache/media-gfx/inkscape-1.0.1
 2009291711 metadata/md5-cache/media-gfx/inkscape-9999
-2009291711 metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
-2009291711 metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
-2009291711 metadata/md5-cache/media-gfx/kphotoalbum-5.7.0
-2009291711 metadata/md5-cache/media-gfx/krita-4.2.9
-2009291711 metadata/md5-cache/media-gfx/krita-4.3.0
-2009291711 metadata/md5-cache/media-gfx/kuickshow-0.10.1
-2009291711 metadata/md5-cache/media-gfx/kxstitch-2.2.0
 2009291711 metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
 2009291711 metadata/md5-cache/media-gfx/lximage-qt-0.15.0
 2009291711 metadata/md5-cache/media-gfx/maim-5.6.3
 2009291711 metadata/md5-cache/media-gfx/maim-9999
-2009291711 metadata/md5-cache/media-gfx/nomacs-3.14.2
 2009291711 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
 2009291711 metadata/md5-cache/media-gfx/opentoonz-1.4.0
 2009291711 metadata/md5-cache/media-gfx/openvdb-4.0.2-r4
@@ -50059,7 +49914,6 @@
 2009291711 metadata/md5-cache/media-gfx/rawtherapee-5.7
 2009291711 metadata/md5-cache/media-gfx/rawtherapee-5.8
 2009291711 metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
-2009291711 metadata/md5-cache/media-gfx/symboleditor-2.1.0
 2009291711 metadata/md5-cache/media-gfx/synnefo-1.1.0
 2009291711 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200224
 2009291711 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200414
@@ -50069,20 +49923,52 @@
 2009301109 metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
 2010031709 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20200821
 2010031709 metadata/md5-cache/media-gfx/yafaray-3.4.1
-2010042009 metadata/md5-cache/media-gfx/nomacs-3.16.224
-2010042039 metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718
 2010050009 metadata/md5-cache/media-gfx/imagemagick-6.9.11.31
 2010050009 metadata/md5-cache/media-gfx/imagemagick-7.0.10.31
 2010050239 metadata/md5-cache/media-gfx/zgv-5.9
-2010060539 metadata/md5-cache/media-gfx/blender-2.90.1
 2010060939 metadata/md5-cache/media-gfx/exact-image-1.0.2
 2010060809 metadata/md5-cache/media-gfx/pngquant-2.12.6
 2010060809 metadata/md5-cache/media-gfx/scour-0.37
 2010070409 metadata/md5-cache/media-gfx/cura-4.6.1-r1
 2010070409 metadata/md5-cache/media-gfx/cura-4.7.0
-2010081309 metadata/md5-cache/media-gfx/Manifest.gz
 2010080639 metadata/md5-cache/media-gfx/gimp-2.10.22
 2010081309 metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
+2010120309 metadata/md5-cache/media-gfx/Manifest.gz
+2010091709 metadata/md5-cache/media-gfx/asymptote-2.61
+2010091709 metadata/md5-cache/media-gfx/asymptote-2.62
+2010091709 metadata/md5-cache/media-gfx/asymptote-2.65
+2010091709 metadata/md5-cache/media-gfx/asymptote-2.67
+2010101109 metadata/md5-cache/media-gfx/blender-2.79b-r3
+2010101109 metadata/md5-cache/media-gfx/blender-2.83.4-r1
+2010101109 metadata/md5-cache/media-gfx/blender-2.90.1-r1
+2010111439 metadata/md5-cache/media-gfx/cura-4.7.0-r1
+2010092209 metadata/md5-cache/media-gfx/digikam-6.4.0-r1
+2010092209 metadata/md5-cache/media-gfx/digikam-7.1.0
+2010120039 metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
+2010112209 metadata/md5-cache/media-gfx/imagemagick-6.9.11.34
+2010112209 metadata/md5-cache/media-gfx/imagemagick-7.0.10.34
+2010092209 metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
+2010092209 metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
+2010092209 metadata/md5-cache/media-gfx/kphotoalbum-5.7.0
+2010092209 metadata/md5-cache/media-gfx/krita-4.2.9
+2010092209 metadata/md5-cache/media-gfx/krita-4.3.0
+2010092209 metadata/md5-cache/media-gfx/kuickshow-0.10.1
+2010092209 metadata/md5-cache/media-gfx/kxstitch-2.2.0
+2010091209 metadata/md5-cache/media-gfx/nomacs-3.16.224
+2010111809 metadata/md5-cache/media-gfx/pencil-0.6.5
+2010120309 metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
+2010112239 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r4
+2010111839 metadata/md5-cache/media-gfx/slic3r-1.3.0-r2
+2010111839 metadata/md5-cache/media-gfx/slic3r-9999
+2010092209 metadata/md5-cache/media-gfx/symboleditor-2.1.0
+2010100209 metadata/md5-cache/media-gfx/wings-2.1.5
+2010100209 metadata/md5-cache/media-gfx/wings-2.1.6
+2010100209 metadata/md5-cache/media-gfx/wings-2.1.7
+2010100209 metadata/md5-cache/media-gfx/wings-2.2.5
+2010101439 metadata/md5-cache/media-gfx/wings-2.2.6.1
+2010101039 metadata/md5-cache/media-gfx/xfig-3.2.7b
+2010112239 metadata/md5-cache/media-gfx/xli-1.17.0-r5
+2010112239 metadata/md5-cache/media-gfx/xsane-0.999-r2
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1806121239 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
 1805290208 metadata/md5-cache/media-libs/lastfmlib-0.4.0
@@ -50141,7 +50027,6 @@
 2009131115 metadata/md5-cache/media-libs/a52dec-0.7.4-r6
 2009131115 metadata/md5-cache/media-libs/aften-0.0.8-r2
 2009131115 metadata/md5-cache/media-libs/allegro-4.4.2-r2
-2009131115 metadata/md5-cache/media-libs/ampache_browser-1.0.1
 2009131115 metadata/md5-cache/media-libs/ampache_browser-1.0.2
 2009111825 metadata/md5-cache/media-libs/aribb24-1.0.3
 2009131115 metadata/md5-cache/media-libs/bcg729-1.0.4
@@ -50326,7 +50211,6 @@
 2009172012 metadata/md5-cache/media-libs/libinsane-1.0.7
 2009172012 metadata/md5-cache/media-libs/libiptcdata-1.0.5
 2009172012 metadata/md5-cache/media-libs/libmpdclient-2.16
-2009172012 metadata/md5-cache/media-libs/libmpdclient-2.19
 2009172012 metadata/md5-cache/media-libs/libopenshot-0.2.2
 2009172012 metadata/md5-cache/media-libs/mlt-6.20.0-r2
 2009172012 metadata/md5-cache/media-libs/raul-1.0.0_pre20200718
@@ -50346,7 +50230,6 @@
 2009181540 metadata/md5-cache/media-libs/aribb24-1.0.3-r1
 2009181540 metadata/md5-cache/media-libs/aribb24-1.0.3-r2
 2009181540 metadata/md5-cache/media-libs/dav1d-0.5.2
-2009181540 metadata/md5-cache/media-libs/dav1d-0.7.0
 2009181540 metadata/md5-cache/media-libs/dav1d-9999
 2009181540 metadata/md5-cache/media-libs/dumb-0.9.3-r3
 2009181540 metadata/md5-cache/media-libs/faac-1.29.9.2
@@ -50360,11 +50243,7 @@
 2009181540 metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
 2009181540 metadata/md5-cache/media-libs/freealut-1.1.0-r4
 2009181540 metadata/md5-cache/media-libs/freeglut-3.2.1
-2009181540 metadata/md5-cache/media-libs/freetype-2.10.1
 2009181540 metadata/md5-cache/media-libs/freetype-2.10.2-r1
-2009181540 metadata/md5-cache/media-libs/freetype-2.9.1-r3
-2009181540 metadata/md5-cache/media-libs/freetype-2.9.1-r4
-2009181540 metadata/md5-cache/media-libs/freetype-9999
 2009181540 metadata/md5-cache/media-libs/game-music-emu-0.6.2
 2009181139 metadata/md5-cache/media-libs/ganv-1.6.0-r1
 2009181540 metadata/md5-cache/media-libs/gavl-1.4.0-r1
@@ -50430,7 +50309,6 @@
 2009181540 metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
 2009181540 metadata/md5-cache/media-libs/libdc1394-2.2.6
 2009181540 metadata/md5-cache/media-libs/libdca-0.0.5-r3
-2009181540 metadata/md5-cache/media-libs/libdca-0.0.7
 2009181540 metadata/md5-cache/media-libs/libde265-1.0.3
 2009181540 metadata/md5-cache/media-libs/libde265-1.0.5
 2009181540 metadata/md5-cache/media-libs/libde265-9999
@@ -50486,7 +50364,6 @@
 2009181540 metadata/md5-cache/media-libs/libquvi-0.9.4-r1
 2009181540 metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
 2009181540 metadata/md5-cache/media-libs/libsamplerate-0.1.9
-2009181540 metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
 2009181540 metadata/md5-cache/media-libs/libsamplerate-9999
 2009181540 metadata/md5-cache/media-libs/libsdl-1.2.15-r9
 2009181540 metadata/md5-cache/media-libs/libsdl2-2.0.12-r1
@@ -50500,7 +50377,6 @@
 2009181540 metadata/md5-cache/media-libs/libtheora-1.1.1-r2
 2009181540 metadata/md5-cache/media-libs/libtiger-0.3.4-r1
 2009181540 metadata/md5-cache/media-libs/libtimidity-0.2.4
-2009181540 metadata/md5-cache/media-libs/libtimidity-0.2.6
 2009181540 metadata/md5-cache/media-libs/libv4l-1.10.1
 2009181540 metadata/md5-cache/media-libs/libv4l-1.16.6
 2009181540 metadata/md5-cache/media-libs/libv4l-1.20.0
@@ -50513,7 +50389,6 @@
 2009181540 metadata/md5-cache/media-libs/libwebp-1.1.0
 2009181540 metadata/md5-cache/media-libs/libyami-1.3.2
 2009181540 metadata/md5-cache/media-libs/libyami-9999
-2009181540 metadata/md5-cache/media-libs/lilv-0.24.6-r2
 2009181540 metadata/md5-cache/media-libs/lv2-1.18.0
 2009181540 metadata/md5-cache/media-libs/nas-1.9.4-r2
 2009181540 metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.0
@@ -50554,7 +50429,6 @@
 2009181540 metadata/md5-cache/media-libs/sratom-0.6.4
 2009181540 metadata/md5-cache/media-libs/theoraplay-0_pre20180524
 2009181540 metadata/md5-cache/media-libs/tiff-4.1.0
-2009181540 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1-r1
 2009181540 metadata/md5-cache/media-libs/vo-aacenc-0.1.3
 2009181540 metadata/md5-cache/media-libs/vo-aacenc-9999
 2009181540 metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
@@ -50619,7 +50493,6 @@
 2009291711 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
 2009291711 metadata/md5-cache/media-libs/lib3mf-1.8.1
 2009291711 metadata/md5-cache/media-libs/libaom-1.0.0-r2
-2009291711 metadata/md5-cache/media-libs/libaom-2.0.0
 2009291711 metadata/md5-cache/media-libs/libaom-9999
 2009291711 metadata/md5-cache/media-libs/libavif-9999
 2009291711 metadata/md5-cache/media-libs/libcue-2.2.1
@@ -50656,12 +50529,8 @@
 2009291711 metadata/md5-cache/media-libs/partio-1.10.1
 2009291711 metadata/md5-cache/media-libs/partio-1.5.4
 2009291711 metadata/md5-cache/media-libs/partio-9999
-2009291711 metadata/md5-cache/media-libs/phonon-4.11.1-r1
-2009291711 metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
-2009291711 metadata/md5-cache/media-libs/phonon-vlc-0.11.1
 2009291711 metadata/md5-cache/media-libs/portmidi-217-r3
 2009291711 metadata/md5-cache/media-libs/ptex-2.3.2
-2009291711 metadata/md5-cache/media-libs/pulseaudio-qt-1.2
 2009291711 metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
 2009291711 metadata/md5-cache/media-libs/qtav-1.12.0-r2
 2009291711 metadata/md5-cache/media-libs/shaderc-2020.2
@@ -50679,7 +50548,6 @@
 2009291711 metadata/md5-cache/media-libs/zxing-cpp-1.0.8-r1
 2009302239 metadata/md5-cache/media-libs/libglvnd-9999
 2010010039 metadata/md5-cache/media-libs/mesa-20.1.9
-2010010609 metadata/md5-cache/media-libs/zxing-cpp-1.1.1
 2010020139 metadata/md5-cache/media-libs/libavif-0.8.1
 2010021239 metadata/md5-cache/media-libs/libsndfile-9999
 2010021209 metadata/md5-cache/media-libs/sratom-0.6.6
@@ -50693,42 +50561,59 @@
 2010051939 metadata/md5-cache/media-libs/hamlib-4.0_rc2
 2010060709 metadata/md5-cache/media-libs/libepoxy-1.5.4
 2010060709 metadata/md5-cache/media-libs/libepoxy-9999
-2010060739 metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
 2010062139 metadata/md5-cache/media-libs/quarter-1.1.0
 2010061639 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
 2010061639 metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
-2010071039 metadata/md5-cache/media-libs/coin-4.0.0
-2010071039 metadata/md5-cache/media-libs/glfw-3.3.2
 2010071009 metadata/md5-cache/media-libs/harfbuzz-2.7.2
-2010071039 metadata/md5-cache/media-libs/lcms-2.11
-2010071039 metadata/md5-cache/media-libs/lib3ds-1.3.0-r2
-2010071039 metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1-r1
 2010071039 metadata/md5-cache/media-libs/libaacs-0.11.0
 2010071039 metadata/md5-cache/media-libs/libmediainfo-20.08
-2010071039 metadata/md5-cache/media-libs/libsdl2-2.0.12-r2
-2010071039 metadata/md5-cache/media-libs/lilv-0.24.8-r1
-2010071039 metadata/md5-cache/media-libs/plib-1.8.5-r2
-2010071039 metadata/md5-cache/media-libs/sdl-gfx-2.0.26
-2010071039 metadata/md5-cache/media-libs/sdl2-image-2.0.5
-2010071039 metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
-2010071039 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
 2010071009 metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.2
 2010071039 metadata/md5-cache/media-libs/zita-resampler-1.6.2
-2010080639 metadata/md5-cache/media-libs/Manifest.gz
 2010080639 metadata/md5-cache/media-libs/gegl-0.4.26
 2010072209 metadata/md5-cache/media-libs/libglvnd-1.3.2-r1
 2010072209 metadata/md5-cache/media-libs/libpgf-7.19.3
 2010072209 metadata/md5-cache/media-libs/mesa-20.2.0
 2010072209 metadata/md5-cache/media-libs/mesa-9999
 2010072209 metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.1
-2010072109 metadata/md5-cache/media-libs/opencv-4.4.0
 2010072139 metadata/md5-cache/media-libs/openexr-2.5.2-r1
-2010080539 metadata/md5-cache/media-libs/vulkan-layers-1.2.141
-2010080539 metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
+2010120039 metadata/md5-cache/media-libs/Manifest.gz
+2010101039 metadata/md5-cache/media-libs/ampache_browser-1.0.3
+2010091139 metadata/md5-cache/media-libs/coin-4.0.0
+2010091209 metadata/md5-cache/media-libs/dav1d-0.7.0
+2010111039 metadata/md5-cache/media-libs/freetype-2.10.3
+2010111039 metadata/md5-cache/media-libs/freetype-9999
+2010091139 metadata/md5-cache/media-libs/glfw-3.3.2
+2010091139 metadata/md5-cache/media-libs/lcms-2.11
+2010091139 metadata/md5-cache/media-libs/lib3ds-1.3.0-r2
+2010091139 metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1-r1
+2010111839 metadata/md5-cache/media-libs/libaom-2.0.0
+2010111839 metadata/md5-cache/media-libs/libdca-0.0.7
+2010111909 metadata/md5-cache/media-libs/libmpdclient-2.19
+2010092209 metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
+2010111839 metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
+2010091139 metadata/md5-cache/media-libs/libsdl2-2.0.12-r2
+2010111509 metadata/md5-cache/media-libs/libtimidity-0.2.6
+2010091539 metadata/md5-cache/media-libs/lilv-0.24.10
+2010091139 metadata/md5-cache/media-libs/lilv-0.24.8-r1
+2010091509 metadata/md5-cache/media-libs/mutagen-1.45.1
+2010101709 metadata/md5-cache/media-libs/opencolorio-1.1.1
+2010112239 metadata/md5-cache/media-libs/opencv-4.4.0-r1
+2010100739 metadata/md5-cache/media-libs/openimageio-2.2.7.0
+2010092209 metadata/md5-cache/media-libs/phonon-4.11.1-r1
+2010092209 metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
+2010092209 metadata/md5-cache/media-libs/phonon-vlc-0.11.1
+2010091139 metadata/md5-cache/media-libs/plib-1.8.5-r2
+2010092209 metadata/md5-cache/media-libs/pulseaudio-qt-1.2
+2010091139 metadata/md5-cache/media-libs/sdl-gfx-2.0.26
+2010101139 metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
+2010091139 metadata/md5-cache/media-libs/sdl2-image-2.0.5
+2010091139 metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
+2010091139 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
+2010091209 metadata/md5-cache/media-libs/vulkan-layers-1.2.141
+2010091209 metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
+2010120039 metadata/md5-cache/media-libs/zxing-cpp-1.1.1
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
-1911101439 metadata/md5-cache/media-plugins/xsynth-dssi-0.9.2
-1911101439 metadata/md5-cache/media-plugins/xsynth-dssi-0.9.4
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
 2003152109 metadata/md5-cache/media-plugins/imlib2_loaders-1.6.1
 2005282209 metadata/md5-cache/media-plugins/audacious-plugins-3.10.1-r3
@@ -50844,11 +50729,9 @@
 2009131115 metadata/md5-cache/media-plugins/kodi-visualization-waveform-2.0.1
 2009131115 metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
 2009111825 metadata/md5-cache/media-plugins/live-2020.03.06
-2009111825 metadata/md5-cache/media-plugins/live-2020.05.15
 2009111825 metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1
 2009111825 metadata/md5-cache/media-plugins/rev-plugins-0.7.1
 2009111825 metadata/md5-cache/media-plugins/swh-lv2-1.0.16
-2009111825 metadata/md5-cache/media-plugins/tap-plugins-0.7.3
 2009121921 metadata/md5-cache/media-plugins/tap-plugins-9999
 2009131115 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
 2009111825 metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
@@ -51001,10 +50884,8 @@
 2009172012 metadata/md5-cache/media-plugins/gst-transcoder-1.8.2-r1
 2009172012 metadata/md5-cache/media-plugins/mda-lv2-1.2.4
 2009172012 metadata/md5-cache/media-plugins/mythplugins-31.0
-2009172012 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
 2009181540 metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
 2009181540 metadata/md5-cache/media-plugins/alsaequal-0.7.1
-2009181540 metadata/md5-cache/media-plugins/caps-plugins-0.9.24
 2009181540 metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1
 2009181540 metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
 2009181540 metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
@@ -51146,7 +51027,6 @@
 2009181540 metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
 2009181540 metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.5
 2009181540 metadata/md5-cache/media-plugins/gst-plugins-zbar-1.16.2
-2009181540 metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
 2009231339 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r4
 2009291711 metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
 2009291711 metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
@@ -51231,7 +51111,6 @@
 2009291711 metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
 2009291711 metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
-2009291711 metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
@@ -51260,7 +51139,6 @@
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.1.1
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.0.0
-2009291711 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
 2009291711 metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
@@ -51408,14 +51286,25 @@
 2010051709 metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.2
 2010061739 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.4.0
 2010061739 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.2.1
-2010071039 metadata/md5-cache/media-plugins/caps-plugins-0.9.26
 2010070609 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.0.2
-2010071039 metadata/md5-cache/media-plugins/swh-plugins-0.4.17
-2010071039 metadata/md5-cache/media-plugins/tap-plugins-1.0.1
-2010081639 metadata/md5-cache/media-plugins/Manifest.gz
 2010072209 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
 2010081639 metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1
 2010081639 metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+2010091909 metadata/md5-cache/media-plugins/Manifest.gz
+2010091139 metadata/md5-cache/media-plugins/caps-plugins-0.9.26
+2010082309 metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.1
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.4.1
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.1.0
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2
+2010082309 metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3
+2010091209 metadata/md5-cache/media-plugins/live-2020.05.15
+2010091139 metadata/md5-cache/media-plugins/swh-plugins-0.4.17
+2010091139 metadata/md5-cache/media-plugins/tap-plugins-1.0.1
+2010091139 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
+2010091139 metadata/md5-cache/media-plugins/xsynth-dssi-0.9.4
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -51541,7 +51430,6 @@
 2008191339 metadata/md5-cache/media-sound/scmpc-0.4.1
 2008221939 metadata/md5-cache/media-sound/lltag-0.14.6
 2008241039 metadata/md5-cache/media-sound/mhwaveedit-1.4.24
-2008271839 metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta24
 2008301909 metadata/md5-cache/media-sound/protux-0.50.100
 2009031339 metadata/md5-cache/media-sound/gnomad-2.9.6
 2009050109 metadata/md5-cache/media-sound/moc-2.6_alpha3-r2
@@ -51604,7 +51492,6 @@
 2009111825 metadata/md5-cache/media-sound/flake-0.11
 2009111825 metadata/md5-cache/media-sound/fmdrv-1.0.7
 2009111825 metadata/md5-cache/media-sound/fmit-1.0.15-r3
-2009131115 metadata/md5-cache/media-sound/freebirth-0.3.2-r1
 2009121921 metadata/md5-cache/media-sound/gbsplay-0.0.91-r2
 2009121921 metadata/md5-cache/media-sound/gigedit-1.1.1-r1
 2009121921 metadata/md5-cache/media-sound/gigedit-9999
@@ -51620,7 +51507,6 @@
 2009131115 metadata/md5-cache/media-sound/gramofile-1.6_p9
 2009111825 metadata/md5-cache/media-sound/gstreamripper-0.2
 2009131115 metadata/md5-cache/media-sound/gtkguitune-0.8
-2009131115 metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
 2009131115 metadata/md5-cache/media-sound/herrie-2.2-r1
 2009111825 metadata/md5-cache/media-sound/horgand-1.14-r2
 2009111825 metadata/md5-cache/media-sound/id3-0.15-r1
@@ -51637,7 +51523,6 @@
 2009111825 metadata/md5-cache/media-sound/linuxsampler-2.1.1
 2009111825 metadata/md5-cache/media-sound/linuxsampler-9999
 2009111825 metadata/md5-cache/media-sound/litestream-1.3_rc3
-2009131115 metadata/md5-cache/media-sound/lltag-0.14.5
 2009121921 metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
 2009111825 metadata/md5-cache/media-sound/madplay-0.15.2b-r1
 2009131115 metadata/md5-cache/media-sound/mangler-1.2.5-r1
@@ -51784,7 +51669,6 @@
 2009172012 metadata/md5-cache/media-sound/a2jmidid-9999
 2009172012 metadata/md5-cache/media-sound/ardour-6.3
 2009172012 metadata/md5-cache/media-sound/ardour-9999
-2009172012 metadata/md5-cache/media-sound/codecgraph-20120114-r2
 2009172012 metadata/md5-cache/media-sound/dir2ogg-0.13-r1
 2009172012 metadata/md5-cache/media-sound/ecasound-2.9.3
 2009172012 metadata/md5-cache/media-sound/exaile-4.1.0_alpha1
@@ -51820,7 +51704,6 @@
 2009172012 metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
 2009180109 metadata/md5-cache/media-sound/spotify-1.1.42
 2009172012 metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
-2009181540 metadata/md5-cache/media-sound/apulse-0.1.12-r4
 2009201609 metadata/md5-cache/media-sound/ardour-6.2-r1
 2009181540 metadata/md5-cache/media-sound/bluez-alsa-2.1.0-r1
 2009181540 metadata/md5-cache/media-sound/bluez-alsa-3.0.0
@@ -51858,7 +51741,6 @@
 2009211840 metadata/md5-cache/media-sound/marrie-9999
 2009211840 metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
 2009211840 metadata/md5-cache/media-sound/mps-youtube-9999
-2009211840 metadata/md5-cache/media-sound/picard-2.3.1
 2009211840 metadata/md5-cache/media-sound/picard-9999
 2009212209 metadata/md5-cache/media-sound/pulseeffects-4.8.2
 2009211840 metadata/md5-cache/media-sound/pulsemixer-9999
@@ -51868,7 +51750,6 @@
 2009211840 metadata/md5-cache/media-sound/whipper-0.9.0
 2009231339 metadata/md5-cache/media-sound/apetag-1.12-r3
 2009231339 metadata/md5-cache/media-sound/grip-4.2.0
-2009241009 metadata/md5-cache/media-sound/picard-2.4.2
 2009231339 metadata/md5-cache/media-sound/pulsemixer-1.5.1
 2009231339 metadata/md5-cache/media-sound/qjackctl-0.6.3
 2009260109 metadata/md5-cache/media-sound/aqualung-1.1
@@ -51881,7 +51762,6 @@
 2009272339 metadata/md5-cache/media-sound/ncmpc-0.39
 2009291711 metadata/md5-cache/media-sound/apulse-0.1.13
 2009291711 metadata/md5-cache/media-sound/audacity-2.4.2-r1
-2009291711 metadata/md5-cache/media-sound/audex-0.95_pre20190721
 2009291711 metadata/md5-cache/media-sound/cantata-2.4.1
 2009291711 metadata/md5-cache/media-sound/cantata-2.4.2
 2009291711 metadata/md5-cache/media-sound/clementine-1.4.0_rc1
@@ -51889,8 +51769,6 @@
 2009291711 metadata/md5-cache/media-sound/csound-6.15.0
 2009291711 metadata/md5-cache/media-sound/csound-9999
 2009291711 metadata/md5-cache/media-sound/drumstick-1.1.3
-2009291711 metadata/md5-cache/media-sound/elisa-20.04.3
-2009291711 metadata/md5-cache/media-sound/elisa-20.08.1
 2009291711 metadata/md5-cache/media-sound/flacon-5.5.1
 2009291711 metadata/md5-cache/media-sound/fluidsynth-2.1.0
 2009291711 metadata/md5-cache/media-sound/fluidsynth-2.1.4
@@ -51898,8 +51776,6 @@
 2009291711 metadata/md5-cache/media-sound/guayadeque-9999
 2009291711 metadata/md5-cache/media-sound/hydrogen-9999
 2009291711 metadata/md5-cache/media-sound/jack-keyboard-2.7.2-r1
-2009291711 metadata/md5-cache/media-sound/kid3-3.8.3
-2009291711 metadata/md5-cache/media-sound/kid3-3.8.4
 2009291711 metadata/md5-cache/media-sound/kmetronome-1.0.1
 2009291711 metadata/md5-cache/media-sound/lmms-1.2.2
 2009291711 metadata/md5-cache/media-sound/lmms-9999
@@ -51911,7 +51787,6 @@
 2009291711 metadata/md5-cache/media-sound/musescore-9999
 2009291711 metadata/md5-cache/media-sound/pamix-9999
 2009291711 metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
-2009291711 metadata/md5-cache/media-sound/qastools-0.22.0
 2009292139 metadata/md5-cache/media-sound/qmmp-1.4.1
 2009292139 metadata/md5-cache/media-sound/qmmp-1.4.2
 2009291711 metadata/md5-cache/media-sound/qmmp-9999
@@ -51933,21 +51808,29 @@
 2010031809 metadata/md5-cache/media-sound/cadence-9999
 2010031539 metadata/md5-cache/media-sound/mpg123-1.25.13
 2010042039 metadata/md5-cache/media-sound/darkice-1.4
-2010042009 metadata/md5-cache/media-sound/qastools-0.23.0
 2010060139 metadata/md5-cache/media-sound/xwax-1.7
 2010062339 metadata/md5-cache/media-sound/mpd-0.22-r1
 2010071039 metadata/md5-cache/media-sound/bristol-0.60.11-r1
 2010071139 metadata/md5-cache/media-sound/gpodder-3.10.16-r1
-2010071039 metadata/md5-cache/media-sound/guayadeque-0.4.6
 2010071039 metadata/md5-cache/media-sound/hydrogen-1.0.1
-2010071039 metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
 2010071009 metadata/md5-cache/media-sound/jack2-1.9.14
 2010071039 metadata/md5-cache/media-sound/lilypond-2.21.5
 2010071109 metadata/md5-cache/media-sound/musescore-3.5.1
 2010071039 metadata/md5-cache/media-sound/pulseaudio-ctl-1.68
-2010071639 metadata/md5-cache/media-sound/Manifest.gz
 2010071639 metadata/md5-cache/media-sound/mumble-1.3.3
 2010071639 metadata/md5-cache/media-sound/murmur-1.3.3
+2010120039 metadata/md5-cache/media-sound/Manifest.gz
+2010092209 metadata/md5-cache/media-sound/audex-0.95_pre20190721
+2010092209 metadata/md5-cache/media-sound/elisa-20.04.3
+2010092209 metadata/md5-cache/media-sound/elisa-20.08.2
+2010091139 metadata/md5-cache/media-sound/guayadeque-0.4.6
+2010091139 metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
+2010092209 metadata/md5-cache/media-sound/kid3-3.8.3
+2010092209 metadata/md5-cache/media-sound/kid3-3.8.4
+2010091139 metadata/md5-cache/media-sound/picard-2.4.2
+2010091209 metadata/md5-cache/media-sound/qastools-0.23.0
+2010101909 metadata/md5-cache/media-sound/strawberry-0.8.1
+2010092339 metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -52030,7 +51913,6 @@
 2009121921 metadata/md5-cache/media-video/atomicparsley-0.9.0
 2009131115 metadata/md5-cache/media-video/atomicparsley-wez-0.9.6
 2009111825 metadata/md5-cache/media-video/baka-mplayer-2.0.4
-2009111825 metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
 2009111825 metadata/md5-cache/media-video/baka-mplayer-9999
 2009121921 metadata/md5-cache/media-video/bbtools-1.9
 2009131115 metadata/md5-cache/media-video/bdsup2sub-4.0.0-r2
@@ -52056,7 +51938,6 @@
 2009131115 metadata/md5-cache/media-video/gnome-video-effects-0.4.3
 2009131115 metadata/md5-cache/media-video/google2srt-0.5.6-r1
 2009121921 metadata/md5-cache/media-video/gpac-0.8.1
-2009130109 metadata/md5-cache/media-video/gpac-1.0.1
 2009130109 metadata/md5-cache/media-video/gpac-9999
 2009121921 metadata/md5-cache/media-video/guvcview-2.0.6-r1
 2009131115 metadata/md5-cache/media-video/gxine-0.5.907-r1
@@ -52202,8 +52083,6 @@
 2009291711 metadata/md5-cache/media-video/avidemux-2.7.6-r1
 2009291711 metadata/md5-cache/media-video/bashnapi-2.0.0
 2009291711 metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
-2009291711 metadata/md5-cache/media-video/kaffeine-2.0.18
-2009291711 metadata/md5-cache/media-video/kmplayer-0.12.0b-r3
 2009291711 metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
 2009291711 metadata/md5-cache/media-video/qmplay2-19.12.19-r2
 2009291711 metadata/md5-cache/media-video/qmplay2-20.05.02
@@ -52218,10 +52097,15 @@
 2010040409 metadata/md5-cache/media-video/ffmpeg-9999
 2010071039 metadata/md5-cache/media-video/mediainfo-20.08
 2010071039 metadata/md5-cache/media-video/mkvtoolnix-49.0.0
-2010080539 metadata/md5-cache/media-video/Manifest.gz
-2010080539 metadata/md5-cache/media-video/ffmpeg-4.3.1
 2010080539 metadata/md5-cache/media-video/pipewire-0.3.10
-2010080539 metadata/md5-cache/media-video/rav1e-0.3.3
+2010111709 metadata/md5-cache/media-video/Manifest.gz
+2010100439 metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
+2010091209 metadata/md5-cache/media-video/ffmpeg-4.3.1
+2010091209 metadata/md5-cache/media-video/gpac-1.0.1
+2010092209 metadata/md5-cache/media-video/kaffeine-2.0.18
+2010092209 metadata/md5-cache/media-video/kmplayer-0.12.0b-r3
+2010111709 metadata/md5-cache/media-video/pipewire-0.3.13
+2010091209 metadata/md5-cache/media-video/rav1e-0.3.3
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1702282328 metadata/md5-cache/net-analyzer/calamaris-2.99.4.0
@@ -52641,7 +52525,6 @@
 2009111825 metadata/md5-cache/net-analyzer/vnstat-1.17
 2009111825 metadata/md5-cache/net-analyzer/vnstat-2.4
 2009111825 metadata/md5-cache/net-analyzer/vnstat-2.5
-2009111825 metadata/md5-cache/net-analyzer/vnstat-2.6
 2009111825 metadata/md5-cache/net-analyzer/vnstat-9999
 2009131115 metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r1
 2009111825 metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
@@ -52652,29 +52535,21 @@
 2009131115 metadata/md5-cache/net-analyzer/yersinia-0.8.2
 2009121921 metadata/md5-cache/net-analyzer/yersinia-9999
 2009121921 metadata/md5-cache/net-analyzer/zabbix-3.0.31-r1
-2009121921 metadata/md5-cache/net-analyzer/zabbix-5.0.2
 2009111825 metadata/md5-cache/net-analyzer/zniper-1.0-r1
 2009141809 metadata/md5-cache/net-analyzer/chronograf-1.8.5
 2009140409 metadata/md5-cache/net-analyzer/ossec-hids-3.6.0
 2009141809 metadata/md5-cache/net-analyzer/telegraf-1.14.5
 2009141809 metadata/md5-cache/net-analyzer/telegraf-1.15.2
-2009172012 metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202
 2009172012 metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20200131
 2009172012 metadata/md5-cache/net-analyzer/gr-fosphor-9999
-2009172012 metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10
-2009172012 metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
-2009172012 metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1
-2009172012 metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1
 2009172012 metadata/md5-cache/net-analyzer/netdata-1.23.2
 2009172012 metadata/md5-cache/net-analyzer/netdata-1.24.0
 2009172012 metadata/md5-cache/net-analyzer/netdata-1.25.0
 2009172012 metadata/md5-cache/net-analyzer/netdata-9999
-2009172012 metadata/md5-cache/net-analyzer/suricata-5.0.3
 2009172012 metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1
 2009201809 metadata/md5-cache/net-analyzer/nagios-core-4.4.6-r1
 2009181139 metadata/md5-cache/net-analyzer/nload-0.7.4-r1
 2009191339 metadata/md5-cache/net-analyzer/nmap-9999
-2009181139 metadata/md5-cache/net-analyzer/zabbix-4.0.23
 2009211840 metadata/md5-cache/net-analyzer/2ping-4.4.1
 2009211840 metadata/md5-cache/net-analyzer/2ping-4.5
 2009211840 metadata/md5-cache/net-analyzer/carl-0.9-r3
@@ -52725,7 +52600,6 @@
 2009252009 metadata/md5-cache/net-analyzer/netio-1.33
 2009252039 metadata/md5-cache/net-analyzer/rrdcollect-0.2.10
 2009252209 metadata/md5-cache/net-analyzer/sflowtool-5.06
-2009261339 metadata/md5-cache/net-analyzer/driftnet-1.3.0
 2009271339 metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
 2009271639 metadata/md5-cache/net-analyzer/labrea-2.5_p1
 2009281439 metadata/md5-cache/net-analyzer/nikto-2.1.6_p20200901
@@ -52742,7 +52616,6 @@
 2009291711 metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha2
 2009291711 metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
 2009291711 metadata/md5-cache/net-analyzer/openvas-scanner-7.0.1
-2009291711 metadata/md5-cache/net-analyzer/wireshark-3.2.6
 2009291711 metadata/md5-cache/net-analyzer/wireshark-3.3.0
 2009301309 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
 2010010109 metadata/md5-cache/net-analyzer/bwping-2.1
@@ -52760,12 +52633,19 @@
 2010041039 metadata/md5-cache/net-analyzer/mtr-0.94
 2010041039 metadata/md5-cache/net-analyzer/mtr-9999
 2010050839 metadata/md5-cache/net-analyzer/sslscan-2.0.2
-2010071039 metadata/md5-cache/net-analyzer/Manifest.gz
-2010071039 metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
-2010071039 metadata/md5-cache/net-analyzer/wireshark-3.2.7
-2010071039 metadata/md5-cache/net-analyzer/zabbix-4.0.24
-2010071039 metadata/md5-cache/net-analyzer/zabbix-5.0.3
 2010071039 metadata/md5-cache/net-analyzer/zmap-2.1.1-r2
+2010120639 metadata/md5-cache/net-analyzer/Manifest.gz
+2010101709 metadata/md5-cache/net-analyzer/driftnet-1.3.0
+2010091139 metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+2010091139 metadata/md5-cache/net-analyzer/sslscan-2.0.2-r1
+2010091509 metadata/md5-cache/net-analyzer/suricata-5.0.4
+2010091539 metadata/md5-cache/net-analyzer/suricata-6.0.0
+2010120639 metadata/md5-cache/net-analyzer/vnstat-2.6
+2010091139 metadata/md5-cache/net-analyzer/wireshark-3.2.7
+2010091139 metadata/md5-cache/net-analyzer/zabbix-4.0.24
+2010091939 metadata/md5-cache/net-analyzer/zabbix-4.0.25
+2010091139 metadata/md5-cache/net-analyzer/zabbix-5.0.3
+2010091909 metadata/md5-cache/net-analyzer/zabbix-5.0.4
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2004032241 metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -52836,7 +52716,6 @@
 2009121921 metadata/md5-cache/net-dns/dnsmasq-2.82
 2009111825 metadata/md5-cache/net-dns/dnssec-check-2.2
 2009111825 metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1
-2009111825 metadata/md5-cache/net-dns/dnssec-validator-2.2.3
 2009131115 metadata/md5-cache/net-dns/dnstop-20140915
 2009111825 metadata/md5-cache/net-dns/dnstop-20140915-r2
 2009131115 metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
@@ -52851,7 +52730,6 @@
 2009111825 metadata/md5-cache/net-dns/mydns-1.2.8.31-r2
 2009111825 metadata/md5-cache/net-dns/ndu-0.4-r4
 2009111825 metadata/md5-cache/net-dns/nsd-4.2.4
-2009111825 metadata/md5-cache/net-dns/nsd-4.3.1
 2009111825 metadata/md5-cache/net-dns/nsd-4.3.2
 2009111825 metadata/md5-cache/net-dns/odsclient-1.03-r1
 2009111825 metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
@@ -52868,7 +52746,6 @@
 2009161109 metadata/md5-cache/net-dns/mdns-repeater-1.11
 2009140510 metadata/md5-cache/net-dns/openresolv-3.11.0
 2009140510 metadata/md5-cache/net-dns/openresolv-3.9.0
-2009140510 metadata/md5-cache/net-dns/openresolv-3.9.2
 2009172012 metadata/md5-cache/net-dns/bind-9.16.6
 2009172012 metadata/md5-cache/net-dns/hash-slinger-3.0
 2009172012 metadata/md5-cache/net-dns/maradns-3.5.0005
@@ -52881,7 +52758,6 @@
 2009181540 metadata/md5-cache/net-dns/unbound-1.11.0
 2009211840 metadata/md5-cache/net-dns/dnsviz-0.8.2
 2009211840 metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
-2009232339 metadata/md5-cache/net-dns/ddclient-3.9.1
 2009251309 metadata/md5-cache/net-dns/libidn-1.35
 2009251309 metadata/md5-cache/net-dns/libidn-1.36
 2009291339 metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r2
@@ -52897,8 +52773,13 @@
 2010010009 metadata/md5-cache/net-dns/pdns-4.3.1
 2010021639 metadata/md5-cache/net-dns/dnsdist-1.5.1
 2010062139 metadata/md5-cache/net-dns/pdns-recursor-4.4.0_rc2
-2010081309 metadata/md5-cache/net-dns/Manifest.gz
 2010081309 metadata/md5-cache/net-dns/knot-3.0.0
+2010112339 metadata/md5-cache/net-dns/Manifest.gz
+2010112339 metadata/md5-cache/net-dns/ddclient-3.9.1
+2010112339 metadata/md5-cache/net-dns/dnssec-validator-2.2.3
+2010081909 metadata/md5-cache/net-dns/nsd-4.3.3
+2010112109 metadata/md5-cache/net-dns/s6-dns-2.3.3.0
+2010090209 metadata/md5-cache/net-dns/unbound-1.12.0
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2009111825 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -52974,7 +52855,6 @@
 2009111825 metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.7
 2009131115 metadata/md5-cache/net-fs/openafs-1.6.22.1
 2009131115 metadata/md5-cache/net-fs/openafs-1.6.22.2
-2009131309 metadata/md5-cache/net-fs/openafs-1.8.6
 2009131115 metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1-r1
 2009131115 metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2-r1
 2009111825 metadata/md5-cache/net-fs/s3backer-1.4.5
@@ -52993,15 +52873,16 @@
 2009181540 metadata/md5-cache/net-fs/samba-4.12.6
 2009231339 metadata/md5-cache/net-fs/cifs-utils-6.11
 2009231109 metadata/md5-cache/net-fs/samba-4.12.7
-2009260109 metadata/md5-cache/net-fs/samba-4.11.13
 2009281039 metadata/md5-cache/net-fs/samba-4.13.0
 2009291509 metadata/md5-cache/net-fs/autofs-5.1.6-r1
 2009291711 metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
 2009291711 metadata/md5-cache/net-fs/cvmfs-2.7.3
 2009300139 metadata/md5-cache/net-fs/davfs2-1.5.6-r1
 2010051509 metadata/md5-cache/net-fs/s3fs-1.80
-2010061739 metadata/md5-cache/net-fs/Manifest.gz
 2010061739 metadata/md5-cache/net-fs/docker-volume-netshare-0.35
+2010091839 metadata/md5-cache/net-fs/Manifest.gz
+2010091839 metadata/md5-cache/net-fs/openafs-1.8.6
+2010091139 metadata/md5-cache/net-fs/samba-4.11.13
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 1912111539 metadata/md5-cache/net-ftp/tnftp-20141104
 1912111539 metadata/md5-cache/net-ftp/tnftp-20151004
@@ -53063,7 +52944,6 @@
 2009111825 metadata/md5-cache/net-im/ekg2-0.4_pre20190315
 2009111825 metadata/md5-cache/net-im/ekg2-9999
 2009131115 metadata/md5-cache/net-im/gitter-bin-3.1.0
-2009131115 metadata/md5-cache/net-im/jabber-base-0.01-r1
 2009131115 metadata/md5-cache/net-im/kadu-4.3-r2
 2009131115 metadata/md5-cache/net-im/kouchat-1.1.0
 2009111825 metadata/md5-cache/net-im/libcommuni-3.5.0_p20200711
@@ -53110,22 +52990,25 @@
 2009270609 metadata/md5-cache/net-im/pidgin-2.14.1
 2009272139 metadata/md5-cache/net-im/zoom-5.3.465578.0920-r1
 2009282139 metadata/md5-cache/net-im/zoom-5.3.469451.0927
-2009291711 metadata/md5-cache/net-im/choqok-1.7.0
 2009291711 metadata/md5-cache/net-im/psi-9999
 2009291711 metadata/md5-cache/net-im/psimedia-9999
 2009291711 metadata/md5-cache/net-im/qtox-1.16.3-r1
 2009291711 metadata/md5-cache/net-im/qtox-9999
-2009300139 metadata/md5-cache/net-im/signal-desktop-bin-1.36.2
 2009291711 metadata/md5-cache/net-im/spectrum2-2.0.13-r2
 2009291711 metadata/md5-cache/net-im/telegram-desktop-2.1.13
 2009291711 metadata/md5-cache/net-im/telegram-desktop-2.2.0-r1
 2010011409 metadata/md5-cache/net-im/skypeforlinux-8.65.0.76
 2010031709 metadata/md5-cache/net-im/prosody-0.11.5-r1
-2010032139 metadata/md5-cache/net-im/prosody-0.11.7
-2010080109 metadata/md5-cache/net-im/Manifest.gz
 2010080109 metadata/md5-cache/net-im/prosody-modules-0_pre20201004
 2010080109 metadata/md5-cache/net-im/prosody-modules-9999
 2010071939 metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0
+2010120139 metadata/md5-cache/net-im/Manifest.gz
+2010092209 metadata/md5-cache/net-im/choqok-1.7.0
+2010120139 metadata/md5-cache/net-im/jabber-base-0.01-r1
+2010120139 metadata/md5-cache/net-im/jabber-base-0.01-r2
+2010101909 metadata/md5-cache/net-im/prosody-0.11.7-r1
+2010101109 metadata/md5-cache/net-im/signal-desktop-bin-1.36.3
+2010101809 metadata/md5-cache/net-im/teams-1.3.00.25560
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1802070108 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -53171,14 +53054,10 @@
 2009172012 metadata/md5-cache/net-irc/irker-2.19
 2009172012 metadata/md5-cache/net-irc/polari-3.34.1
 2009172012 metadata/md5-cache/net-irc/polari-3.36.3
-2009172012 metadata/md5-cache/net-irc/znc-palaver-1.2.1
 2009191439 metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r3
 2009211840 metadata/md5-cache/net-irc/limnoria-20191123
 2009211840 metadata/md5-cache/net-irc/limnoria-99999999
-2009272039 metadata/md5-cache/net-irc/ii-1.8
 2009291711 metadata/md5-cache/net-irc/anope-2.0.7
-2009291711 metadata/md5-cache/net-irc/konversation-1.7.5-r2
-2009291711 metadata/md5-cache/net-irc/konversation-1.7.6
 2009291711 metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236
 2009291711 metadata/md5-cache/net-irc/kvirc-9999
 2009291711 metadata/md5-cache/net-irc/quassel-0.13.1-r2
@@ -53189,9 +53068,12 @@
 2009291711 metadata/md5-cache/net-irc/znc-1.8.1
 2009291711 metadata/md5-cache/net-irc/znc-1.8.2
 2009291711 metadata/md5-cache/net-irc/znc-9999
-2010051239 metadata/md5-cache/net-irc/Manifest.gz
 2010051239 metadata/md5-cache/net-irc/irssi-1.2.2-r1
-1801032209 metadata/md5-cache/net-libs/enet-1.2.2-r1
+2010092209 metadata/md5-cache/net-irc/Manifest.gz
+2010091139 metadata/md5-cache/net-irc/ii-1.8
+2010092209 metadata/md5-cache/net-irc/konversation-1.7.5-r2
+2010092209 metadata/md5-cache/net-irc/konversation-1.7.6
+2010091139 metadata/md5-cache/net-irc/znc-palaver-1.2.1
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.3.2
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.4.3
@@ -53253,7 +53135,6 @@
 2009111825 metadata/md5-cache/net-libs/dleyna-connector-dbus-0.3.0
 2009111825 metadata/md5-cache/net-libs/dleyna-core-0.6.0
 2009111825 metadata/md5-cache/net-libs/dleyna-renderer-0.6.0
-2009131115 metadata/md5-cache/net-libs/enet-1.3.13
 2009131115 metadata/md5-cache/net-libs/gnet-2.0.8-r2
 2009131115 metadata/md5-cache/net-libs/gnome-online-accounts-3.34.1
 2009131115 metadata/md5-cache/net-libs/gnome-online-accounts-3.36.0
@@ -53403,7 +53284,6 @@
 2009111825 metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
 2009111825 metadata/md5-cache/net-libs/loudmouth-1.5.3-r2
 2009121921 metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
-2009111825 metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
 2009131115 metadata/md5-cache/net-libs/nDPI-2.0
 2009131115 metadata/md5-cache/net-libs/nDPI-2.2
 2009131115 metadata/md5-cache/net-libs/nDPI-2.8
@@ -53481,7 +53361,6 @@
 2009181540 metadata/md5-cache/net-libs/ldns-1.7.1-r1
 2009181540 metadata/md5-cache/net-libs/libasyncns-0.8-r4
 2009181540 metadata/md5-cache/net-libs/libcapi-3.0.7-r1
-2009181540 metadata/md5-cache/net-libs/libhtp-0.5.33
 2009181540 metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
 2009181540 metadata/md5-cache/net-libs/libmicrohttpd-0.9.68
 2009181540 metadata/md5-cache/net-libs/libmicrohttpd-0.9.69
@@ -53516,7 +53395,6 @@
 2009181540 metadata/md5-cache/net-libs/srt-1.4.1-r1
 2009181540 metadata/md5-cache/net-libs/srt-9999
 2009192309 metadata/md5-cache/net-libs/zeromq-4.3.3
-2009212339 metadata/md5-cache/net-libs/libhtp-0.5.34
 2009212239 metadata/md5-cache/net-libs/libosmo-dsp-0.3
 2009212239 metadata/md5-cache/net-libs/libosmo-dsp-9999
 2009211840 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
@@ -53540,13 +53418,8 @@
 2009291711 metadata/md5-cache/net-libs/grpc-1.32.0
 2009291711 metadata/md5-cache/net-libs/ignition-msgs-5.3.0
 2009291711 metadata/md5-cache/net-libs/jreen-1.3.0-r1
-2009291711 metadata/md5-cache/net-libs/kdav2-0.3.0
 2009291711 metadata/md5-cache/net-libs/kdsoap-1.9.50_pre20200317
 2009291711 metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200317
-2009291711 metadata/md5-cache/net-libs/kimap2-0.3.0
-2009291711 metadata/md5-cache/net-libs/libktorrent-2.2.0-r1
-2009291711 metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1
-2009291711 metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
 2009291711 metadata/md5-cache/net-libs/libproxy-0.4.15-r1
 2009291711 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2
 2009291711 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
@@ -53573,7 +53446,6 @@
 2009291711 metadata/md5-cache/net-libs/qxmpp-1.2.0
 2009291711 metadata/md5-cache/net-libs/qxmpp-9999
 2009291711 metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
-2009291711 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
 2009291711 metadata/md5-cache/net-libs/telepathy-qt-0.9.8
 2009291711 metadata/md5-cache/net-libs/telepathy-qt-9999
 2009291711 metadata/md5-cache/net-libs/tox-0.2.11
@@ -53581,20 +53453,15 @@
 2009291711 metadata/md5-cache/net-libs/tox-9999
 2009291711 metadata/md5-cache/net-libs/xrootd-5.0.2
 2009291711 metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
-2009291711 metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
 2009291711 metadata/md5-cache/net-libs/xrootd-ceph-5.0.2
 2010031809 metadata/md5-cache/net-libs/libssh-0.9.5
 2010050909 metadata/md5-cache/net-libs/libblkmaker-0.6.0
 2010061139 metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
-2010060739 metadata/md5-cache/net-libs/signon-oauth2-0.24
 2010061839 metadata/md5-cache/net-libs/libpsl-0.21.0
 2010061839 metadata/md5-cache/net-libs/libpsl-0.21.1
 2010071209 metadata/md5-cache/net-libs/libhubbub-0.3.7
 2010070339 metadata/md5-cache/net-libs/libwebsockets-4.0.20
 2010070109 metadata/md5-cache/net-libs/pjproject-2.10
-2010071039 metadata/md5-cache/net-libs/xrootd-4.12.4
-2010081039 metadata/md5-cache/net-libs/Manifest.gz
-2010071939 metadata/md5-cache/net-libs/libwebsockets-4.1.2
 2010081039 metadata/md5-cache/net-libs/nodejs-12.18.4-r1
 2010081039 metadata/md5-cache/net-libs/nodejs-12.19.0
 2010081039 metadata/md5-cache/net-libs/nodejs-14.11.0
@@ -53603,7 +53470,25 @@
 2010081039 metadata/md5-cache/net-libs/nodejs-14.13.1
 2010081039 metadata/md5-cache/net-libs/nodejs-14.2.0
 2010081039 metadata/md5-cache/net-libs/nodejs-14.4.0
-2010081039 metadata/md5-cache/net-libs/nodejs-99999999
+2010111239 metadata/md5-cache/net-libs/Manifest.gz
+2010101039 metadata/md5-cache/net-libs/enet-1.2.2-r1
+2010101039 metadata/md5-cache/net-libs/enet-1.3.13
+2010101039 metadata/md5-cache/net-libs/enet-1.3.16
+2010101039 metadata/md5-cache/net-libs/gloox-1.0.24
+2010092209 metadata/md5-cache/net-libs/kdav2-0.3.0
+2010092209 metadata/md5-cache/net-libs/kimap2-0.3.0
+2010091509 metadata/md5-cache/net-libs/libhtp-0.5.35
+2010092209 metadata/md5-cache/net-libs/libktorrent-2.2.0-r1
+2010092209 metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1
+2010092209 metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
+2010111239 metadata/md5-cache/net-libs/libproxy-0.4.15-r2
+2010101709 metadata/md5-cache/net-libs/libwebsockets-4.1.2
+2010110009 metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
+2010091239 metadata/md5-cache/net-libs/nodejs-99999999
+2010090239 metadata/md5-cache/net-libs/signon-oauth2-0.24
+2010092209 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
+2010091439 metadata/md5-cache/net-libs/xrootd-4.12.4
+2010091439 metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -53827,8 +53712,6 @@
 2007201209 metadata/md5-cache/net-misc/netsed-1.3
 2008180039 metadata/md5-cache/net-misc/iperf-3.9
 2008192339 metadata/md5-cache/net-misc/ndisc6-1.0.3
-2008232139 metadata/md5-cache/net-misc/sntpd-2.2018.244-r1
-2008301909 metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
 2009030209 metadata/md5-cache/net-misc/iprange-1.0.4
 2009071439 metadata/md5-cache/net-misc/buka-3.0.1
 2009071209 metadata/md5-cache/net-misc/ethertypes-0
@@ -53940,7 +53823,6 @@
 2009131115 metadata/md5-cache/net-misc/iperf-3.6
 2009131115 metadata/md5-cache/net-misc/iperf-3.7
 2009111825 metadata/md5-cache/net-misc/iperf-3.99999.99999
-2009131115 metadata/md5-cache/net-misc/ipmiview-2.15.0.190109
 2009131115 metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
 2009131115 metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
 2009111825 metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
@@ -54089,8 +53971,6 @@
 2009131115 metadata/md5-cache/net-misc/sipsak-0.9.6_p1-r2
 2009111825 metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
 2009111825 metadata/md5-cache/net-misc/sks-1.1.6-r2
-2009111825 metadata/md5-cache/net-misc/sks-1.1.6-r4
-2009111825 metadata/md5-cache/net-misc/sks-1.1.6-r5
 2009111825 metadata/md5-cache/net-misc/smbc-1.2.2-r3
 2009111825 metadata/md5-cache/net-misc/snarf-7.0-r4
 2009131115 metadata/md5-cache/net-misc/sobby-0.4.8-r1
@@ -54150,7 +54030,6 @@
 2009111825 metadata/md5-cache/net-misc/wget2-1.99.2
 2009111825 metadata/md5-cache/net-misc/whatmask-1.2-r1
 2009111825 metadata/md5-cache/net-misc/whois-9999
-2009111825 metadata/md5-cache/net-misc/wol-0.7.1-r2
 2009111825 metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
 2009111825 metadata/md5-cache/net-misc/x2goclient-4.1.2.2
 2009111825 metadata/md5-cache/net-misc/x2goserver-4.1.0.2
@@ -54185,13 +54064,11 @@
 2009172012 metadata/md5-cache/net-misc/ncman-0.0.1_p20190327-r2
 2009172012 metadata/md5-cache/net-misc/ncman-9999
 2009172339 metadata/md5-cache/net-misc/ncp-1.2.4-r2
-2009172012 metadata/md5-cache/net-misc/networkmanager-1.22.10-r11
 2009172012 metadata/md5-cache/net-misc/ntpsec-1.1.7-r1
 2009172012 metadata/md5-cache/net-misc/ntpsec-1.1.8
 2009172012 metadata/md5-cache/net-misc/ntpsec-9999
 2009172012 metadata/md5-cache/net-misc/omniORB-4.2.2
 2009172012 metadata/md5-cache/net-misc/openvswitch-2.13.0-r1
-2009172012 metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
 2009172012 metadata/md5-cache/net-misc/spice-gtk-0.38
 2009172012 metadata/md5-cache/net-misc/spice-gtk-9999
 2009172012 metadata/md5-cache/net-misc/wget-1.20.3-r1
@@ -54203,12 +54080,6 @@
 2009200239 metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
 2009181540 metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
 2009202009 metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
-2009181540 metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
-2009181540 metadata/md5-cache/net-misc/networkmanager-1.18.6
-2009181540 metadata/md5-cache/net-misc/networkmanager-1.20.12
-2009181540 metadata/md5-cache/net-misc/networkmanager-1.22.14
-2009181540 metadata/md5-cache/net-misc/networkmanager-1.24.2
-2009181540 metadata/md5-cache/net-misc/networkmanager-1.26.2
 2009201709 metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
 2009181409 metadata/md5-cache/net-misc/rsync-3.2.3
 2009181409 metadata/md5-cache/net-misc/rsync-9999
@@ -54216,7 +54087,6 @@
 2009181139 metadata/md5-cache/net-misc/whois-5.5.6-r1
 2009211840 metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
 2009211840 metadata/md5-cache/net-misc/electrum-3.3.8
-2009211840 metadata/md5-cache/net-misc/electrum-4.0.2
 2009211840 metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2
 2009211840 metadata/md5-cache/net-misc/exabgp-4.2.7-r3
 2009211840 metadata/md5-cache/net-misc/gns3-gui-2.2.11
@@ -54229,7 +54099,6 @@
 2009211840 metadata/md5-cache/net-misc/httpie-2.2.0
 2009211840 metadata/md5-cache/net-misc/nyx-2.0.4
 2009211840 metadata/md5-cache/net-misc/nyx-2.1.0-r1
-2009211840 metadata/md5-cache/net-misc/pssh-2.3.1-r2
 2009211840 metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
 2009211840 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
 2009211840 metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
@@ -54241,7 +54110,6 @@
 2009211840 metadata/md5-cache/net-misc/python-x2go-0.6.1.1
 2009211840 metadata/md5-cache/net-misc/python-x2go-0.6.1.2
 2009211840 metadata/md5-cache/net-misc/python-x2go-0.6.1.3
-2009211840 metadata/md5-cache/net-misc/ris-linux-0.4-r1
 2009211840 metadata/md5-cache/net-misc/s3cmd-2.1.0
 2009211840 metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
 2009211840 metadata/md5-cache/net-misc/streamlink-1.3.0-r2
@@ -54251,7 +54119,6 @@
 2009211840 metadata/md5-cache/net-misc/you-get-0.4.1432
 2009211840 metadata/md5-cache/net-misc/youtube-dl-99999999
 2009221709 metadata/md5-cache/net-misc/kafka-bin-2.5.1
-2009241009 metadata/md5-cache/net-misc/networkmanager-1.26.0
 2009241009 metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
 2009220939 metadata/md5-cache/net-misc/youtube-dl-2020.09.20
 2009251039 metadata/md5-cache/net-misc/electrum-4.0.3-r1
@@ -54259,8 +54126,6 @@
 2009251909 metadata/md5-cache/net-misc/nemesis-1.4-r2
 2009252309 metadata/md5-cache/net-misc/nemesis-1.7-r1
 2009271509 metadata/md5-cache/net-misc/openssh-8.3_p1-r5
-2009290539 metadata/md5-cache/net-misc/minissdpd-1.5.20200928
-2009290539 metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
 2009291711 metadata/md5-cache/net-misc/apt-cacher-ng-3.5_p1-r1
 2009291711 metadata/md5-cache/net-misc/apt-cacher-ng-9999999
 2009291009 metadata/md5-cache/net-misc/batctl-2020.3
@@ -54280,7 +54145,6 @@
 2009291711 metadata/md5-cache/net-misc/remmina-1.4.5
 2009291711 metadata/md5-cache/net-misc/remmina-1.4.7
 2009291711 metadata/md5-cache/net-misc/remmina-1.4.8
-2009291711 metadata/md5-cache/net-misc/smb4k-3.0.6
 2010021939 metadata/md5-cache/net-misc/iputils-20190709-r1
 2010021939 metadata/md5-cache/net-misc/iputils-20200821
 2010021939 metadata/md5-cache/net-misc/iputils-99999999
@@ -54295,16 +54159,27 @@
 2010062239 metadata/md5-cache/net-misc/curl-7.72.0-r1
 2010070109 metadata/md5-cache/net-misc/asterisk-11.25.3-r1
 2010070109 metadata/md5-cache/net-misc/asterisk-13.35.0
-2010071039 metadata/md5-cache/net-misc/rabbitmq-server-3.8.7
 2010071039 metadata/md5-cache/net-misc/remmina-1.4.8-r1
-2010071039 metadata/md5-cache/net-misc/sntpd-3.0-r1
-2010081139 metadata/md5-cache/net-misc/Manifest.gz
 2010081139 metadata/md5-cache/net-misc/chrony-4.0
 2010081139 metadata/md5-cache/net-misc/chrony-9999
 2010071739 metadata/md5-cache/net-misc/dropbox-107.4.443
 2010080209 metadata/md5-cache/net-misc/ntpsec-1.1.9
 2010072009 metadata/md5-cache/net-misc/oidc-agent-3.3.1
 2010072009 metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
+2010120109 metadata/md5-cache/net-misc/Manifest.gz
+2010091439 metadata/md5-cache/net-misc/electrum-4.0.2
+2010102239 metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
+2010110009 metadata/md5-cache/net-misc/minissdpd-1.5.20200928
+2010110009 metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
+2010082239 metadata/md5-cache/net-misc/networkmanager-1.22.10-r12
+2010090709 metadata/md5-cache/net-misc/networkmanager-1.26.0-r1
+2010090709 metadata/md5-cache/net-misc/networkmanager-1.26.2-r1
+2010091139 metadata/md5-cache/net-misc/rabbitmq-server-3.8.7
+2010112109 metadata/md5-cache/net-misc/s6-networking-2.3.2.0
+2010090209 metadata/md5-cache/net-misc/sks-1.1.6_p20200624
+2010092209 metadata/md5-cache/net-misc/smb4k-3.0.6
+2010091139 metadata/md5-cache/net-misc/sntpd-3.0-r1
+2010112339 metadata/md5-cache/net-misc/wol-0.7.1-r2
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2004032241 metadata/md5-cache/net-nds/gssproxy-0.8.2
@@ -54322,10 +54197,10 @@
 2009131115 metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
 2009131115 metadata/md5-cache/net-nds/tac_plus-4.0.4.27a
 2009111825 metadata/md5-cache/net-nds/yp-tools-4.2.3
-2009181540 metadata/md5-cache/net-nds/openldap-2.4.50
-2009181540 metadata/md5-cache/net-nds/openldap-2.4.53
-2009211840 metadata/md5-cache/net-nds/Manifest.gz
 2009211840 metadata/md5-cache/net-nds/nsscache-0.39
+2010091909 metadata/md5-cache/net-nds/Manifest.gz
+2010091909 metadata/md5-cache/net-nds/openldap-2.4.50
+2010091909 metadata/md5-cache/net-nds/openldap-2.4.53
 1702282329 metadata/md5-cache/net-news/amphetadesk-0.93.1-r1
 2002112051 metadata/md5-cache/net-news/yydecode-0.2.10-r1
 2009111825 metadata/md5-cache/net-news/newsboat-2.13
@@ -54395,8 +54270,6 @@
 2009131115 metadata/md5-cache/net-p2p/fms-0.3.82
 2009131115 metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
 2009131115 metadata/md5-cache/net-p2p/freenet-0.7.5_p1486
-2009111825 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
-2009111825 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
 2009111825 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.22
 2009121921 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15
 2009121921 metadata/md5-cache/net-p2p/gtk-gnutella-1.2.0
@@ -54437,7 +54310,6 @@
 2009211840 metadata/md5-cache/net-p2p/deluge-9999
 2009211840 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 2009291711 metadata/md5-cache/net-p2p/airdcpp-webclient-2.8.1
-2009291711 metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
 2009291711 metadata/md5-cache/net-p2p/transmission-3.00-r1
 2009291711 metadata/md5-cache/net-p2p/transmission-9999
 2009291711 metadata/md5-cache/net-p2p/xmr-stak-2.10.0
@@ -54461,8 +54333,10 @@
 2010031709 metadata/md5-cache/net-p2p/mldonkey-3.1.6
 2010031709 metadata/md5-cache/net-p2p/mldonkey-3.1.6-r1
 2010071039 metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
-2010072009 metadata/md5-cache/net-p2p/Manifest.gz
 2010072009 metadata/md5-cache/net-p2p/syncthing-1.10.0
+2010101039 metadata/md5-cache/net-p2p/Manifest.gz
+2010101039 metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
+2010092209 metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
 1808280009 metadata/md5-cache/net-print/c2esp-27
 1802061938 metadata/md5-cache/net-print/cups-bjnp-2.0
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
@@ -54571,7 +54445,6 @@
 2009181540 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
 2009181540 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
 2009211840 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
-2009211840 metadata/md5-cache/net-proxy/mitmproxy-5.2
 2009211840 metadata/md5-cache/net-proxy/sshuttle-0.78.5
 2009211840 metadata/md5-cache/net-proxy/sshuttle-1.0.3
 2009221939 metadata/md5-cache/net-proxy/haproxy-1.8.26
@@ -54585,10 +54458,11 @@
 2009281539 metadata/md5-cache/net-proxy/tinyproxy-1.11.0_rc1
 2009291711 metadata/md5-cache/net-proxy/trojan-1.16.0-r1
 2009291711 metadata/md5-cache/net-proxy/trojan-9999
-2010051239 metadata/md5-cache/net-proxy/Manifest.gz
 2010051239 metadata/md5-cache/net-proxy/haproxy-2.0.18
 2010051239 metadata/md5-cache/net-proxy/haproxy-2.1.9
 2010051239 metadata/md5-cache/net-proxy/haproxy-2.2.4
+2010091039 metadata/md5-cache/net-proxy/Manifest.gz
+2010091039 metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
 2009111825 metadata/md5-cache/net-voip/yate-6.0.0
 2009111825 metadata/md5-cache/net-voip/yate-6.1.0
 2009111825 metadata/md5-cache/net-voip/yate-9999
@@ -54643,7 +54517,6 @@
 2009131115 metadata/md5-cache/net-vpn/vpncwatch-1.8.1
 2009131115 metadata/md5-cache/net-vpn/vtun-3.0.3
 2009111825 metadata/md5-cache/net-vpn/vtun-3.0.3-r1
-2009121921 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200908
 2009111825 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
 2009111825 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200827
 2009160009 metadata/md5-cache/net-vpn/httptunnel-3.3-r2
@@ -54660,9 +54533,10 @@
 2009291711 metadata/md5-cache/net-vpn/i2pd-2.32.0
 2009291711 metadata/md5-cache/net-vpn/i2pd-2.32.1
 2009291711 metadata/md5-cache/net-vpn/i2pd-2.33.0
-2010071209 metadata/md5-cache/net-vpn/6tunnel-0.13
-2010071209 metadata/md5-cache/net-vpn/Manifest.gz
 2010071039 metadata/md5-cache/net-vpn/strongswan-5.9.0
+2010091209 metadata/md5-cache/net-vpn/6tunnel-0.13
+2010091209 metadata/md5-cache/net-vpn/Manifest.gz
+2010091139 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200908
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -54758,16 +54632,11 @@
 2009172012 metadata/md5-cache/net-wireless/gr-baz-9999
 2009172012 metadata/md5-cache/net-wireless/gr-doa-9999
 2009172012 metadata/md5-cache/net-wireless/gr-foo-9999
-2009172012 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606
 2009172012 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
 2009172012 metadata/md5-cache/net-wireless/gr-ieee802154-9999
-2009172012 metadata/md5-cache/net-wireless/gr-iio-0.3-r3
-2009172012 metadata/md5-cache/net-wireless/gr-iqbal-0.37.3
 2009172012 metadata/md5-cache/net-wireless/gr-ntsc-9999
 2009172012 metadata/md5-cache/net-wireless/gr-ntsc-rc-9999
-2009172012 metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
 2009172012 metadata/md5-cache/net-wireless/gr-osmosdr-0.2.0
-2009172012 metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418
 2009172012 metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
 2009172012 metadata/md5-cache/net-wireless/gr-paint-9999
 2009172012 metadata/md5-cache/net-wireless/gr-ppm-wiegand-9999
@@ -54775,15 +54644,12 @@
 2009172012 metadata/md5-cache/net-wireless/gr-specest-9999
 2009172012 metadata/md5-cache/net-wireless/kismet-2020.04.3
 2009172012 metadata/md5-cache/net-wireless/kismet-9999
-2009172012 metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2
 2009172012 metadata/md5-cache/net-wireless/soapysdr-0.7.1
 2009172012 metadata/md5-cache/net-wireless/soapysdr-9999
 2009172012 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
 2009172012 metadata/md5-cache/net-wireless/uhd-4.0.0.0
 2009181540 metadata/md5-cache/net-wireless/bluez-5.54
 2009181540 metadata/md5-cache/net-wireless/bluez-5.55
-2009181339 metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3
-2009181339 metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4
 2009181540 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
 2009211840 metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
 2009211840 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
@@ -54797,7 +54663,6 @@
 2009211840 metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
 2009211840 metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1
 2009211840 metadata/md5-cache/net-wireless/lorcon-9999
-2009211840 metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
 2009211840 metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
 2009211840 metadata/md5-cache/net-wireless/soapy_power-9999
 2009211840 metadata/md5-cache/net-wireless/urh-2.8.8
@@ -54844,19 +54709,19 @@
 2009291711 metadata/md5-cache/net-wireless/ubertooth-9999
 2009302139 metadata/md5-cache/net-wireless/unifi-6.1.16
 2010021509 metadata/md5-cache/net-wireless/unifi-6.0.26
-2010031809 metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
 2010031439 metadata/md5-cache/net-wireless/iw-5.9
-2010032009 metadata/md5-cache/net-wireless/hostapd-2.9-r3
 2010062009 metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1
 2010062009 metadata/md5-cache/net-wireless/nanovna-saver-9999
-2010071039 metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
-2010072339 metadata/md5-cache/net-wireless/Manifest.gz
 2010072339 metadata/md5-cache/net-wireless/gr-m2k-9999
 2010072339 metadata/md5-cache/net-wireless/gr-scopy-0.0_p20201005
 2010072339 metadata/md5-cache/net-wireless/gr-scopy-9999
 2010072339 metadata/md5-cache/net-wireless/libm2k-0.0_p20201005
 2010072339 metadata/md5-cache/net-wireless/libm2k-9999
 2010071839 metadata/md5-cache/net-wireless/unifi-6.0.27
+2010111809 metadata/md5-cache/net-wireless/Manifest.gz
+2010091209 metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
+2010091209 metadata/md5-cache/net-wireless/hostapd-2.9-r3
+2010091139 metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
 1910170740 metadata/md5-cache/perl-core/JSON-PP-2.273.0
 1912110241 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2002110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -54909,123 +54774,123 @@
 2009291711 metadata/md5-cache/ros-meta/ament_cmake-0.9.6
 2009291711 metadata/md5-cache/ros-meta/ament_cmake-1.0.0
 2009291711 metadata/md5-cache/ros-meta/ament_cmake-9999
-2009291711 metadata/md5-cache/ros-meta/audio_common-0.3.6
-2009291711 metadata/md5-cache/ros-meta/audio_common-0.3.7
-2009291711 metadata/md5-cache/ros-meta/audio_common-9999
-2009291711 metadata/md5-cache/ros-meta/bond_core-1.8.5
-2009291711 metadata/md5-cache/ros-meta/bond_core-1.8.6
-2009291711 metadata/md5-cache/ros-meta/bond_core-9999
-2009291711 metadata/md5-cache/ros-meta/calibration-0.10.14
-2009291711 metadata/md5-cache/ros-meta/calibration-9999
-2009291711 metadata/md5-cache/ros-meta/common_msgs-1.13.0
-2009291711 metadata/md5-cache/ros-meta/common_msgs-9999
-2009291711 metadata/md5-cache/ros-meta/common_tutorials-0.1.12
-2009291711 metadata/md5-cache/ros-meta/common_tutorials-0.2.0
-2009291711 metadata/md5-cache/ros-meta/common_tutorials-9999
-2009291711 metadata/md5-cache/ros-meta/desktop-1.5.0
-2009291711 metadata/md5-cache/ros-meta/desktop-9999
-2009291711 metadata/md5-cache/ros-meta/desktop_full-1.5.0
-2009291711 metadata/md5-cache/ros-meta/desktop_full-9999
-2009291711 metadata/md5-cache/ros-meta/diagnostics-1.10.1
-2009291711 metadata/md5-cache/ros-meta/diagnostics-1.9.4
-2009291711 metadata/md5-cache/ros-meta/diagnostics-1.9.6
-2009291711 metadata/md5-cache/ros-meta/diagnostics-9999
-2009291711 metadata/md5-cache/ros-meta/driver_common-1.6.8
-2009291711 metadata/md5-cache/ros-meta/driver_common-9999
-2009291711 metadata/md5-cache/ros-meta/executive_smach-2.5.0
-2009291711 metadata/md5-cache/ros-meta/executive_smach-9999
-2009291711 metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
-2009291711 metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
-2009291711 metadata/md5-cache/ros-meta/geographic_info-0.5.5
-2009291711 metadata/md5-cache/ros-meta/geographic_info-9999
-2009291711 metadata/md5-cache/ros-meta/geometry-1.13.2
-2009291711 metadata/md5-cache/ros-meta/geometry-9999
-2009291711 metadata/md5-cache/ros-meta/geometry2-0.7.2
-2009291711 metadata/md5-cache/ros-meta/geometry2-0.7.3
-2009291711 metadata/md5-cache/ros-meta/geometry2-0.7.5
-2009291711 metadata/md5-cache/ros-meta/geometry2-9999
-2009291711 metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
-2009291711 metadata/md5-cache/ros-meta/geometry_tutorials-9999
-2009291711 metadata/md5-cache/ros-meta/hector_localization-0.3.0
-2009291711 metadata/md5-cache/ros-meta/hector_localization-9999
-2009291711 metadata/md5-cache/ros-meta/hector_slam-0.4.1
-2009291711 metadata/md5-cache/ros-meta/hector_slam-9999
-2009291711 metadata/md5-cache/ros-meta/image_common-1.12.0
-2009291711 metadata/md5-cache/ros-meta/image_common-9999
-2009291711 metadata/md5-cache/ros-meta/image_pipeline-1.15.2
-2009291711 metadata/md5-cache/ros-meta/image_pipeline-9999
-2009291711 metadata/md5-cache/ros-meta/image_transport_plugins-1.14.0
-2009291711 metadata/md5-cache/ros-meta/image_transport_plugins-9999
-2009291711 metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
-2009291711 metadata/md5-cache/ros-meta/imu_pipeline-9999
-2009291711 metadata/md5-cache/ros-meta/imu_tools-1.2.2
-2009291711 metadata/md5-cache/ros-meta/imu_tools-9999
-2009291711 metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
-2009291711 metadata/md5-cache/ros-meta/laser_pipeline-9999
-2009291711 metadata/md5-cache/ros-meta/navigation-1.17.0
-2009291711 metadata/md5-cache/ros-meta/navigation-9999
-2009291711 metadata/md5-cache/ros-meta/nodelet_core-1.10.0
-2009291711 metadata/md5-cache/ros-meta/nodelet_core-9999
-2009291711 metadata/md5-cache/ros-meta/perception-1.5.0
-2009291711 metadata/md5-cache/ros-meta/perception-9999
-2009291711 metadata/md5-cache/ros-meta/perception_pcl-1.7.1
-2009291711 metadata/md5-cache/ros-meta/perception_pcl-9999
-2009291711 metadata/md5-cache/ros-meta/pr2_common-1.12.4
-2009291711 metadata/md5-cache/ros-meta/pr2_common-9999
-2009291711 metadata/md5-cache/ros-meta/qt_gui_core-0.4.1
-2009291711 metadata/md5-cache/ros-meta/qt_gui_core-0.4.2
-2009291711 metadata/md5-cache/ros-meta/qt_gui_core-9999
-2009291711 metadata/md5-cache/ros-meta/robot-1.5.0
-2009291711 metadata/md5-cache/ros-meta/robot-9999
-2009291711 metadata/md5-cache/ros-meta/robot_model-1.12.11
-2009291711 metadata/md5-cache/ros-meta/robot_model-9999
-2009291711 metadata/md5-cache/ros-meta/ros-1.15.5
-2009291711 metadata/md5-cache/ros-meta/ros-1.15.6
-2009291711 metadata/md5-cache/ros-meta/ros-9999
-2009291711 metadata/md5-cache/ros-meta/ros_base-1.5.0
-2009291711 metadata/md5-cache/ros-meta/ros_base-9999
-2009291711 metadata/md5-cache/ros-meta/ros_comm-1.15.7
-2009291711 metadata/md5-cache/ros-meta/ros_comm-1.15.8
-2009291711 metadata/md5-cache/ros-meta/ros_comm-9999
-2009291711 metadata/md5-cache/ros-meta/ros_control-0.19.1
-2009291711 metadata/md5-cache/ros-meta/ros_control-0.19.2
-2009291711 metadata/md5-cache/ros-meta/ros_control-9999
-2009291711 metadata/md5-cache/ros-meta/ros_core-1.5.0
-2009291711 metadata/md5-cache/ros-meta/ros_core-9999
-2009291711 metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
-2009291711 metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
-2009291711 metadata/md5-cache/ros-meta/ros_tutorials-9999
-2009291711 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
-2009291711 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
-2009291711 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
-2009291711 metadata/md5-cache/ros-meta/rosbridge_suite-9999
-2009291711 metadata/md5-cache/ros-meta/roscpp_core-0.7.2
-2009291711 metadata/md5-cache/ros-meta/roscpp_core-9999
-2009291711 metadata/md5-cache/ros-meta/rosserial-0.8.0
-2009291711 metadata/md5-cache/ros-meta/rosserial-9999
-2009291711 metadata/md5-cache/ros-meta/rqt-0.5.2
-2009291711 metadata/md5-cache/ros-meta/rqt-9999
-2009291711 metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.9
-2009291711 metadata/md5-cache/ros-meta/rqt_common_plugins-9999
-2009291711 metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.8
-2009291711 metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
-2009291711 metadata/md5-cache/ros-meta/simulators-1.5.0
-2009291711 metadata/md5-cache/ros-meta/simulators-9999
-2009291711 metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
-2009291711 metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
-2009291711 metadata/md5-cache/ros-meta/slam_gmapping-9999
-2009291711 metadata/md5-cache/ros-meta/unique_identifier-1.0.6
-2009291711 metadata/md5-cache/ros-meta/unique_identifier-9999
-2009291711 metadata/md5-cache/ros-meta/vision_opencv-1.15.0
-2009291711 metadata/md5-cache/ros-meta/vision_opencv-9999
-2009291711 metadata/md5-cache/ros-meta/vision_visp-0.11.1
-2009291711 metadata/md5-cache/ros-meta/vision_visp-9999
-2009291711 metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
-2009291711 metadata/md5-cache/ros-meta/visualization_tutorials-9999
-2009291711 metadata/md5-cache/ros-meta/viz-1.5.0
-2009291711 metadata/md5-cache/ros-meta/viz-9999
-2009301439 metadata/md5-cache/ros-meta/Manifest.gz
 2009301439 metadata/md5-cache/ros-meta/ament_cmake-1.0.1
+2010111509 metadata/md5-cache/ros-meta/Manifest.gz
+2010111509 metadata/md5-cache/ros-meta/audio_common-0.3.6
+2010111509 metadata/md5-cache/ros-meta/audio_common-0.3.7
+2010111509 metadata/md5-cache/ros-meta/audio_common-9999
+2010111509 metadata/md5-cache/ros-meta/bond_core-1.8.5
+2010111509 metadata/md5-cache/ros-meta/bond_core-1.8.6
+2010111509 metadata/md5-cache/ros-meta/bond_core-9999
+2010111509 metadata/md5-cache/ros-meta/calibration-0.10.14
+2010111509 metadata/md5-cache/ros-meta/calibration-9999
+2010111509 metadata/md5-cache/ros-meta/common_msgs-1.13.0
+2010111509 metadata/md5-cache/ros-meta/common_msgs-9999
+2010111509 metadata/md5-cache/ros-meta/common_tutorials-0.1.12
+2010111509 metadata/md5-cache/ros-meta/common_tutorials-0.2.0
+2010111509 metadata/md5-cache/ros-meta/common_tutorials-9999
+2010111509 metadata/md5-cache/ros-meta/desktop-1.5.0
+2010111509 metadata/md5-cache/ros-meta/desktop-9999
+2010111509 metadata/md5-cache/ros-meta/desktop_full-1.5.0
+2010111509 metadata/md5-cache/ros-meta/desktop_full-9999
+2010111509 metadata/md5-cache/ros-meta/diagnostics-1.10.1
+2010111509 metadata/md5-cache/ros-meta/diagnostics-1.9.4
+2010111509 metadata/md5-cache/ros-meta/diagnostics-1.9.6
+2010111509 metadata/md5-cache/ros-meta/diagnostics-9999
+2010111509 metadata/md5-cache/ros-meta/driver_common-1.6.8
+2010111509 metadata/md5-cache/ros-meta/driver_common-9999
+2010111509 metadata/md5-cache/ros-meta/executive_smach-2.5.0
+2010111509 metadata/md5-cache/ros-meta/executive_smach-9999
+2010111509 metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
+2010111509 metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
+2010111509 metadata/md5-cache/ros-meta/geographic_info-0.5.5
+2010111509 metadata/md5-cache/ros-meta/geographic_info-9999
+2010111509 metadata/md5-cache/ros-meta/geometry-1.13.2
+2010111509 metadata/md5-cache/ros-meta/geometry-9999
+2010111509 metadata/md5-cache/ros-meta/geometry2-0.7.2
+2010111509 metadata/md5-cache/ros-meta/geometry2-0.7.3
+2010111509 metadata/md5-cache/ros-meta/geometry2-0.7.5
+2010111509 metadata/md5-cache/ros-meta/geometry2-9999
+2010111509 metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
+2010111509 metadata/md5-cache/ros-meta/geometry_tutorials-9999
+2010111509 metadata/md5-cache/ros-meta/hector_localization-0.3.0
+2010111509 metadata/md5-cache/ros-meta/hector_localization-9999
+2010111509 metadata/md5-cache/ros-meta/hector_slam-0.4.1
+2010111509 metadata/md5-cache/ros-meta/hector_slam-9999
+2010111509 metadata/md5-cache/ros-meta/image_common-1.12.0
+2010111509 metadata/md5-cache/ros-meta/image_common-9999
+2010111509 metadata/md5-cache/ros-meta/image_pipeline-1.15.2
+2010111509 metadata/md5-cache/ros-meta/image_pipeline-9999
+2010111509 metadata/md5-cache/ros-meta/image_transport_plugins-1.14.0
+2010111509 metadata/md5-cache/ros-meta/image_transport_plugins-9999
+2010111509 metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
+2010111509 metadata/md5-cache/ros-meta/imu_pipeline-9999
+2010111509 metadata/md5-cache/ros-meta/imu_tools-1.2.2
+2010111509 metadata/md5-cache/ros-meta/imu_tools-9999
+2010111509 metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
+2010111509 metadata/md5-cache/ros-meta/laser_pipeline-9999
+2010111509 metadata/md5-cache/ros-meta/navigation-1.17.0
+2010111509 metadata/md5-cache/ros-meta/navigation-9999
+2010111509 metadata/md5-cache/ros-meta/nodelet_core-1.10.0
+2010111509 metadata/md5-cache/ros-meta/nodelet_core-9999
+2010111509 metadata/md5-cache/ros-meta/perception-1.5.0
+2010111509 metadata/md5-cache/ros-meta/perception-9999
+2010111509 metadata/md5-cache/ros-meta/perception_pcl-1.7.1
+2010111509 metadata/md5-cache/ros-meta/perception_pcl-9999
+2010111509 metadata/md5-cache/ros-meta/pr2_common-1.12.4
+2010111509 metadata/md5-cache/ros-meta/pr2_common-9999
+2010111509 metadata/md5-cache/ros-meta/qt_gui_core-0.4.1
+2010111509 metadata/md5-cache/ros-meta/qt_gui_core-0.4.2
+2010111509 metadata/md5-cache/ros-meta/qt_gui_core-9999
+2010111509 metadata/md5-cache/ros-meta/robot-1.5.0
+2010111509 metadata/md5-cache/ros-meta/robot-9999
+2010111509 metadata/md5-cache/ros-meta/robot_model-1.12.11
+2010111509 metadata/md5-cache/ros-meta/robot_model-9999
+2010111509 metadata/md5-cache/ros-meta/ros-1.15.5
+2010111509 metadata/md5-cache/ros-meta/ros-1.15.6
+2010111509 metadata/md5-cache/ros-meta/ros-9999
+2010111509 metadata/md5-cache/ros-meta/ros_base-1.5.0
+2010111509 metadata/md5-cache/ros-meta/ros_base-9999
+2010111509 metadata/md5-cache/ros-meta/ros_comm-1.15.7
+2010111509 metadata/md5-cache/ros-meta/ros_comm-1.15.8
+2010111509 metadata/md5-cache/ros-meta/ros_comm-9999
+2010111509 metadata/md5-cache/ros-meta/ros_control-0.19.1
+2010111509 metadata/md5-cache/ros-meta/ros_control-0.19.2
+2010111509 metadata/md5-cache/ros-meta/ros_control-9999
+2010111509 metadata/md5-cache/ros-meta/ros_core-1.5.0
+2010111509 metadata/md5-cache/ros-meta/ros_core-9999
+2010111509 metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
+2010111509 metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
+2010111509 metadata/md5-cache/ros-meta/ros_tutorials-9999
+2010111509 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
+2010111509 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
+2010111509 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
+2010111509 metadata/md5-cache/ros-meta/rosbridge_suite-9999
+2010111509 metadata/md5-cache/ros-meta/roscpp_core-0.7.2
+2010111509 metadata/md5-cache/ros-meta/roscpp_core-9999
+2010111509 metadata/md5-cache/ros-meta/rosserial-0.8.0
+2010111509 metadata/md5-cache/ros-meta/rosserial-9999
+2010111509 metadata/md5-cache/ros-meta/rqt-0.5.2
+2010111509 metadata/md5-cache/ros-meta/rqt-9999
+2010111509 metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.9
+2010111509 metadata/md5-cache/ros-meta/rqt_common_plugins-9999
+2010111509 metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.8
+2010111509 metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
+2010111509 metadata/md5-cache/ros-meta/simulators-1.5.0
+2010111509 metadata/md5-cache/ros-meta/simulators-9999
+2010111509 metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
+2010111509 metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
+2010111509 metadata/md5-cache/ros-meta/slam_gmapping-9999
+2010111509 metadata/md5-cache/ros-meta/unique_identifier-1.0.6
+2010111509 metadata/md5-cache/ros-meta/unique_identifier-9999
+2010111509 metadata/md5-cache/ros-meta/vision_opencv-1.15.0
+2010111509 metadata/md5-cache/ros-meta/vision_opencv-9999
+2010111509 metadata/md5-cache/ros-meta/vision_visp-0.11.1
+2010111509 metadata/md5-cache/ros-meta/vision_visp-9999
+2010111509 metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
+2010111509 metadata/md5-cache/ros-meta/visualization_tutorials-9999
+2010111509 metadata/md5-cache/ros-meta/viz-1.5.0
+2010111509 metadata/md5-cache/ros-meta/viz-9999
 1707052239 metadata/md5-cache/sci-astronomy/fitsh-0.9.2
 1702282330 metadata/md5-cache/sci-astronomy/fitspng-0.3.5
 1707301308 metadata/md5-cache/sci-astronomy/idlastro-20161220
@@ -55075,15 +54940,15 @@
 2009211840 metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
 2009291711 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316
 2009291711 metadata/md5-cache/sci-astronomy/celestia-9999
-2009291711 metadata/md5-cache/sci-astronomy/kstars-3.4.3
-2009291711 metadata/md5-cache/sci-astronomy/stellarium-0.20.1
 2009291711 metadata/md5-cache/sci-astronomy/stellarium-0.20.2
-2010041639 metadata/md5-cache/sci-astronomy/Manifest.gz
 2010040009 metadata/md5-cache/sci-astronomy/galaxy-2.2-r1
 2010041639 metadata/md5-cache/sci-astronomy/missfits-2.8.0
 2010041639 metadata/md5-cache/sci-astronomy/sextractor-2.19.5-r1
 2010040239 metadata/md5-cache/sci-astronomy/skymaker-3.10.5
 2010040239 metadata/md5-cache/sci-astronomy/stuff-1.26.0
+2010101039 metadata/md5-cache/sci-astronomy/Manifest.gz
+2010092209 metadata/md5-cache/sci-astronomy/kstars-3.4.3
+2010101039 metadata/md5-cache/sci-astronomy/stellarium-0.20.3
 1806091739 metadata/md5-cache/sci-biology/aaindex-9.1-r1
 1910170740 metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r1
 1703082208 metadata/md5-cache/sci-biology/biosql-1.0.1-r1
@@ -55144,7 +55009,6 @@
 2009131115 metadata/md5-cache/sci-biology/embassy-esim4-1.0.0.660
 2009131115 metadata/md5-cache/sci-biology/embassy-hmmer-2.3.2.660
 2009131115 metadata/md5-cache/sci-biology/embassy-iprscan-4.3.1.660
-2009131115 metadata/md5-cache/sci-biology/embassy-meme-4.7.660
 2009131115 metadata/md5-cache/sci-biology/embassy-mse-3.0.0.660
 2009131115 metadata/md5-cache/sci-biology/embassy-phylipnew-3.69.660
 2009131115 metadata/md5-cache/sci-biology/embassy-signature-0.1.660
@@ -55232,21 +55096,17 @@
 2009111825 metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
 2009131115 metadata/md5-cache/sci-biology/wise-2.4.0_alpha
 2009111825 metadata/md5-cache/sci-biology/yass-1.14-r2
-2009172012 metadata/md5-cache/sci-biology/amos-3.1.0-r4
 2009172012 metadata/md5-cache/sci-biology/bcftools-1.10.2
 2009172012 metadata/md5-cache/sci-biology/bedtools-2.29.2
-2009172012 metadata/md5-cache/sci-biology/meme-4.11.2_p2
-2009172012 metadata/md5-cache/sci-biology/shrimp-2.2.3
 2009211840 metadata/md5-cache/sci-biology/HTSeq-0.12.4
 2009211840 metadata/md5-cache/sci-biology/HTSeq-9999
 2009211840 metadata/md5-cache/sci-biology/biopandas-0.2.7
 2009211840 metadata/md5-cache/sci-biology/biopython-1.77
 2009211840 metadata/md5-cache/sci-biology/pysam-0.16.0.1
-2009211840 metadata/md5-cache/sci-biology/vienna-rna-2.1.8
 2009261309 metadata/md5-cache/sci-biology/bwa-0.7.17
-2009291711 metadata/md5-cache/sci-biology/Manifest.gz
 2009291711 metadata/md5-cache/sci-biology/bamtools-2.5.1
 2009291711 metadata/md5-cache/sci-biology/bamtools-9999
+2010091039 metadata/md5-cache/sci-biology/Manifest.gz
 1812231809 metadata/md5-cache/sci-calculators/datamash-1.4
 1909181309 metadata/md5-cache/sci-calculators/datamash-1.5
 1702282330 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
@@ -55271,12 +55131,12 @@
 2009131115 metadata/md5-cache/sci-calculators/tiemu-3.03-r1
 2009131115 metadata/md5-cache/sci-calculators/wcalc-2.5
 2009201709 metadata/md5-cache/sci-calculators/tilp2-1.18
-2009291711 metadata/md5-cache/sci-calculators/keurocalc-1.3.0
-2010041539 metadata/md5-cache/sci-calculators/Manifest.gz
 2010041539 metadata/md5-cache/sci-calculators/units-2.16-r1
 2010041539 metadata/md5-cache/sci-calculators/units-2.18
 2010041539 metadata/md5-cache/sci-calculators/units-2.19-r1
 2010041539 metadata/md5-cache/sci-calculators/units-2.20
+2010092209 metadata/md5-cache/sci-calculators/Manifest.gz
+2010092209 metadata/md5-cache/sci-calculators/keurocalc-1.3.0
 1808262139 metadata/md5-cache/sci-chemistry/xds-bin-20170930
 2002230040 metadata/md5-cache/sci-chemistry/bodr-10
 2002230040 metadata/md5-cache/sci-chemistry/bodr-9-r1
@@ -55366,7 +55226,6 @@
 2009211840 metadata/md5-cache/sci-chemistry/propka-3.2.0
 2009211840 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
 2009241809 metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
-2009291711 metadata/md5-cache/sci-chemistry/Manifest.gz
 2009291711 metadata/md5-cache/sci-chemistry/gromacs-2018.8
 2009291711 metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
 2009291711 metadata/md5-cache/sci-chemistry/gromacs-2019.6
@@ -55383,13 +55242,14 @@
 2009291711 metadata/md5-cache/sci-chemistry/votca-csgapps-9999
 2009291711 metadata/md5-cache/sci-chemistry/votca-xtp-1.6.2
 2009291711 metadata/md5-cache/sci-chemistry/votca-xtp-9999
+2010100039 metadata/md5-cache/sci-chemistry/Manifest.gz
+2010100039 metadata/md5-cache/sci-chemistry/gromacs-2020.4
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
 1804171239 metadata/md5-cache/sci-electronics/vbs-1.4.0
 1911262256 metadata/md5-cache/sci-electronics/fasthenry-3.0_p082514
 1912132109 metadata/md5-cache/sci-electronics/netgen-1.4.52
-1912172139 metadata/md5-cache/sci-electronics/kicad-meta-5.1.5
 2002230040 metadata/md5-cache/sci-electronics/petrify-4.2-r1
 2003201239 metadata/md5-cache/sci-electronics/geda-suite-20171223-r1
 2006062109 metadata/md5-cache/sci-electronics/kicad-meta-5.1.6
@@ -55426,7 +55286,6 @@
 2009131115 metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
 2009111825 metadata/md5-cache/sci-electronics/pcb-4.2.2
 2009121921 metadata/md5-cache/sci-electronics/puff-20100127-r1
-2009111825 metadata/md5-cache/sci-electronics/qelectrotech-0.61
 2009111825 metadata/md5-cache/sci-electronics/qelectrotech-9999
 2009131115 metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
 2009131115 metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
@@ -55440,33 +55299,35 @@
 2009131115 metadata/md5-cache/sci-electronics/xoscope-2.0
 2009131115 metadata/md5-cache/sci-electronics/xoscope-2.1
 2009142209 metadata/md5-cache/sci-electronics/iverilog-10.3-r2
-2009142139 metadata/md5-cache/sci-electronics/iverilog-9999
 2009172012 metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
 2009172012 metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1-r1
 2009172012 metadata/md5-cache/sci-electronics/sigrok-cli-9999
 2009200209 metadata/md5-cache/sci-electronics/klayout-0.26.5
 2009291711 metadata/md5-cache/sci-electronics/gazebo-11.1.0-r1
-2009291711 metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
-2009291711 metadata/md5-cache/sci-electronics/kicad-5.1.6
-2009291711 metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5
 2009291711 metadata/md5-cache/sci-electronics/kicad-footprints-5.1.6
-2009291711 metadata/md5-cache/sci-electronics/kicad-i18n-5.1.5
 2009291711 metadata/md5-cache/sci-electronics/kicad-i18n-5.1.6
-2009291711 metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5
 2009291711 metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.6
-2009291711 metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5
 2009291711 metadata/md5-cache/sci-electronics/kicad-symbols-5.1.6
-2009291711 metadata/md5-cache/sci-electronics/kicad-templates-5.1.5
 2009291711 metadata/md5-cache/sci-electronics/kicad-templates-5.1.6
 2009291239 metadata/md5-cache/sci-electronics/klayout-0.26.8
 2009291239 metadata/md5-cache/sci-electronics/klayout-9999
-2009291711 metadata/md5-cache/sci-electronics/ktechlab-0.50.0
 2009291711 metadata/md5-cache/sci-electronics/pulseview-0.4.2
 2009291711 metadata/md5-cache/sci-electronics/pulseview-9999
 2010031939 metadata/md5-cache/sci-electronics/gtkwave-3.3.106
-2010042009 metadata/md5-cache/sci-electronics/qelectrotech-0.70
 2010071039 metadata/md5-cache/sci-electronics/xnec2c-4.1.1
-2010071809 metadata/md5-cache/sci-electronics/Manifest.gz
+2010111239 metadata/md5-cache/sci-electronics/Manifest.gz
+2010111239 metadata/md5-cache/sci-electronics/iverilog-11.0
+2010111239 metadata/md5-cache/sci-electronics/iverilog-9999
+2010111239 metadata/md5-cache/sci-electronics/kicad-5.1.6
+2010111239 metadata/md5-cache/sci-electronics/kicad-5.1.7
+2010111239 metadata/md5-cache/sci-electronics/kicad-footprints-5.1.7
+2010111239 metadata/md5-cache/sci-electronics/kicad-i18n-5.1.7
+2010111239 metadata/md5-cache/sci-electronics/kicad-meta-5.1.7
+2010111239 metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.7
+2010111239 metadata/md5-cache/sci-electronics/kicad-symbols-5.1.7
+2010111239 metadata/md5-cache/sci-electronics/kicad-templates-5.1.7
+2010092209 metadata/md5-cache/sci-electronics/ktechlab-0.50.0
+2010091209 metadata/md5-cache/sci-electronics/qelectrotech-0.70
 1805212239 metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
 1902251809 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
 1702282330 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1
@@ -55573,8 +55434,9 @@
 2009291711 metadata/md5-cache/sci-geosciences/qgis-3.10.9
 2009291711 metadata/md5-cache/sci-geosciences/qgis-9999
 2010041839 metadata/md5-cache/sci-geosciences/grass-7.8.3
-2010061739 metadata/md5-cache/sci-geosciences/Manifest.gz
 2010061739 metadata/md5-cache/sci-geosciences/gpsd-3.21
+2010120039 metadata/md5-cache/sci-geosciences/Manifest.gz
+2010120039 metadata/md5-cache/sci-geosciences/gnome-maps-3.36.4.1
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -55615,7 +55477,6 @@
 2007191909 metadata/md5-cache/sci-libs/suitesparse-5.4.0
 2007201609 metadata/md5-cache/sci-libs/coinor-osi-0.108.6
 2008130009 metadata/md5-cache/sci-libs/libhomfly-1.02.6
-2008232009 metadata/md5-cache/sci-libs/colamd-2.9.6
 2008232009 metadata/md5-cache/sci-libs/spqr-2.0.9
 2008251339 metadata/md5-cache/sci-libs/mpfi-1.5.3
 2009021410 metadata/md5-cache/sci-libs/idlcoyote-99999999
@@ -55870,7 +55731,6 @@
 2009172012 metadata/md5-cache/sci-libs/blis-0.5.2
 2009172012 metadata/md5-cache/sci-libs/blis-0.6.0
 2009172012 metadata/md5-cache/sci-libs/cantera-2.4.0-r4
-2009172012 metadata/md5-cache/sci-libs/cantera-2.4.0-r5
 2009172012 metadata/md5-cache/sci-libs/clblas-2.10
 2009172012 metadata/md5-cache/sci-libs/dlib-19.9
 2009172012 metadata/md5-cache/sci-libs/eccodes-2.16.0
@@ -55890,7 +55750,6 @@
 2009172012 metadata/md5-cache/sci-libs/scikits-0.1-r2
 2009190209 metadata/md5-cache/sci-libs/arpack-3.7.0
 2009181540 metadata/md5-cache/sci-libs/cfitsio-3.410
-2009181540 metadata/md5-cache/sci-libs/cxsparse-3.2.0
 2009181540 metadata/md5-cache/sci-libs/djbfft-0.76-r2
 2009181540 metadata/md5-cache/sci-libs/fftw-3.3.8-r1
 2009181540 metadata/md5-cache/sci-libs/fftw-9999
@@ -55898,15 +55757,12 @@
 2009200009 metadata/md5-cache/sci-libs/libint-2.6.0
 2009182009 metadata/md5-cache/sci-libs/mumps-5.1.2-r1
 2009190139 metadata/md5-cache/sci-libs/mumps-5.3.3
-2009190239 metadata/md5-cache/sci-libs/openblas-0.3.10
 2009211139 metadata/md5-cache/sci-libs/plplot-5.15.0-r1
 2009182009 metadata/md5-cache/sci-libs/scotch-6.0.4-r2
 2009181339 metadata/md5-cache/sci-libs/shogun-5.0.0-r1
 2009181540 metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
 2009182009 metadata/md5-cache/sci-libs/ufconfig-3.7.1
 2009181540 metadata/md5-cache/sci-libs/xdrfile-1.1.1
-2009211840 metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
-2009211840 metadata/md5-cache/sci-libs/Rtree-0.9.4
 2009211840 metadata/md5-cache/sci-libs/Shapely-1.6.4_p2-r1
 2009211840 metadata/md5-cache/sci-libs/bmrblib-1.0.3
 2009211840 metadata/md5-cache/sci-libs/bmrblib-1.0.4
@@ -55971,7 +55827,6 @@
 2009291711 metadata/md5-cache/sci-libs/octomap-1.9.5
 2009291711 metadata/md5-cache/sci-libs/opencascade-7.4.0-r2
 2009291711 metadata/md5-cache/sci-libs/sundials-5.1.0
-2009291711 metadata/md5-cache/sci-libs/sundials-5.2.0
 2009291711 metadata/md5-cache/sci-libs/symengine-0.6.0
 2009291711 metadata/md5-cache/sci-libs/volk-2.3.0-r2
 2009291711 metadata/md5-cache/sci-libs/votca-tools-1.6.2
@@ -55982,8 +55837,16 @@
 2010040239 metadata/md5-cache/sci-libs/brial-1.2.10
 2010040009 metadata/md5-cache/sci-libs/xylib-1.6
 2010051809 metadata/md5-cache/sci-libs/libecpint-1.0.2
-2010070039 metadata/md5-cache/sci-libs/Manifest.gz
 2010070039 metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
+2010111909 metadata/md5-cache/sci-libs/Manifest.gz
+2010091839 metadata/md5-cache/sci-libs/cantera-2.4.0-r5
+2010091709 metadata/md5-cache/sci-libs/colamd-2.9.6
+2010091709 metadata/md5-cache/sci-libs/cxsparse-3.2.0
+2010081739 metadata/md5-cache/sci-libs/openblas-0.3.10
+2010111909 metadata/md5-cache/sci-libs/rtree-0.9.4
+2010091839 metadata/md5-cache/sci-libs/sundials-5.2.0
+2010090709 metadata/md5-cache/sci-libs/tensorflow-2.3.1
+2010090709 metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -56097,10 +55960,7 @@
 2009192209 metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
 2009192209 metadata/md5-cache/sci-mathematics/octave-epstk-2.4
 2009211840 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
-2009251309 metadata/md5-cache/sci-mathematics/agda-2.4.2.5-r2
-2009251309 metadata/md5-cache/sci-mathematics/agda-2.5.2-r1
 2009251309 metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
-2009251309 metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5
 2009251309 metadata/md5-cache/sci-mathematics/agda-stdlib-2.5.2.0.13
 2009251309 metadata/md5-cache/sci-mathematics/fricas-1.3.4
 2009251309 metadata/md5-cache/sci-mathematics/fricas-1.3.5
@@ -56117,7 +55977,6 @@
 2009251309 metadata/md5-cache/sci-mathematics/singular-4.0.3
 2009251309 metadata/md5-cache/sci-mathematics/twelf-1.7.1
 2009251309 metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
-2009291711 metadata/md5-cache/sci-mathematics/rkward-0.7.1b
 2009291711 metadata/md5-cache/sci-mathematics/rstudio-1.3.1056
 2009291711 metadata/md5-cache/sci-mathematics/rstudio-1.3.1093
 2009291711 metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
@@ -56126,8 +55985,9 @@
 2010040009 metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
 2010042009 metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
 2010062009 metadata/md5-cache/sci-mathematics/wxmaxima-20.09.0
-2010070039 metadata/md5-cache/sci-mathematics/Manifest.gz
 2010070039 metadata/md5-cache/sci-mathematics/octave-5.2.0
+2010092209 metadata/md5-cache/sci-mathematics/Manifest.gz
+2010092209 metadata/md5-cache/sci-mathematics/rkward-0.7.1b
 1908291909 metadata/md5-cache/sci-misc/ViSP-images-3.2.0
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 1911262256 metadata/md5-cache/sci-misc/cdfplayer-11.2.0
@@ -56154,10 +56014,9 @@
 2009172012 metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
 2009172012 metadata/md5-cache/sci-misc/mendeleydesktop-1.19.5
 2009172012 metadata/md5-cache/sci-misc/mendeleydesktop-1.19.6
-2009211840 metadata/md5-cache/sci-misc/gato-1.2.2
 2009211840 metadata/md5-cache/sci-misc/vitables-3.0.0-r1
-2009251539 metadata/md5-cache/sci-misc/Manifest.gz
 2009251539 metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+2010091039 metadata/md5-cache/sci-misc/Manifest.gz
 1906300709 metadata/md5-cache/sci-physics/geant-data-4.10.05
 1805170109 metadata/md5-cache/sci-physics/h2o-gtk-0.1-r1
 1702282331 metadata/md5-cache/sci-physics/siscone-3.0.3
@@ -56213,15 +56072,10 @@
 2009172012 metadata/md5-cache/sci-physics/lammps-20190807
 2009172012 metadata/md5-cache/sci-physics/lammps-20190807-r1
 2009172012 metadata/md5-cache/sci-physics/lammps-20200303
-2009172012 metadata/md5-cache/sci-physics/rivet-2.6.0-r2
 2009211840 metadata/md5-cache/sci-physics/lhapdf-6.2.3
 2009211840 metadata/md5-cache/sci-physics/qmeq-1.0-r1
 2009211840 metadata/md5-cache/sci-physics/qmeq-1.0_p202004
 2009251309 metadata/md5-cache/sci-physics/root-6.18.04-r3
-2009251309 metadata/md5-cache/sci-physics/thepeg-1.9.2
-2009251309 metadata/md5-cache/sci-physics/thepeg-2.0.0
-2009251309 metadata/md5-cache/sci-physics/thepeg-2.0.4
-2009291711 metadata/md5-cache/sci-physics/Manifest.gz
 2009291711 metadata/md5-cache/sci-physics/bullet-2.86
 2009291711 metadata/md5-cache/sci-physics/bullet-2.89
 2009291711 metadata/md5-cache/sci-physics/espresso-4.1.3
@@ -56239,6 +56093,11 @@
 2009291711 metadata/md5-cache/sci-physics/vgm-9999
 2009291711 metadata/md5-cache/sci-physics/vmc-1.0_p2
 2009291711 metadata/md5-cache/sci-physics/vmc-9999
+2010101039 metadata/md5-cache/sci-physics/Manifest.gz
+2010101039 metadata/md5-cache/sci-physics/bullet-3.05
+2010091139 metadata/md5-cache/sci-physics/thepeg-1.9.2
+2010091139 metadata/md5-cache/sci-physics/thepeg-2.0.0
+2010091139 metadata/md5-cache/sci-physics/thepeg-2.0.4
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
 2009111825 metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
 2009131115 metadata/md5-cache/sci-visualization/g3data-1.5.4
@@ -56253,7 +56112,6 @@
 2009131115 metadata/md5-cache/sci-visualization/grace-5.1.25
 2009111825 metadata/md5-cache/sci-visualization/grace-5.1.25_p7
 2009131115 metadata/md5-cache/sci-visualization/gwyddion-2.55-r4
-2009131115 metadata/md5-cache/sci-visualization/gwyddion-2.56
 2009131115 metadata/md5-cache/sci-visualization/kst-2.0.8
 2009111825 metadata/md5-cache/sci-visualization/nonolith-connect-1.1
 2009131115 metadata/md5-cache/sci-visualization/opendx-4.4.4-r7
@@ -56280,523 +56138,268 @@
 2009251309 metadata/md5-cache/sci-visualization/gri-2.12.23-r1
 2009251539 metadata/md5-cache/sci-visualization/tensorboard-2.2.1-r1
 2009291711 metadata/md5-cache/sci-visualization/gr-0.50.0-r1
-2009291711 metadata/md5-cache/sci-visualization/labplot-2.7.0
-2009291711 metadata/md5-cache/sci-visualization/labplot-9999
-2010040009 metadata/md5-cache/sci-visualization/Manifest.gz
 2010040009 metadata/md5-cache/sci-visualization/fityk-1.3.1
+2010092309 metadata/md5-cache/sci-visualization/Manifest.gz
+2010092309 metadata/md5-cache/sci-visualization/gwyddion-2.56
+2010092209 metadata/md5-cache/sci-visualization/labplot-2.7.0
+2010092209 metadata/md5-cache/sci-visualization/labplot-9999
+2010090709 metadata/md5-cache/sci-visualization/tensorboard-2.3.0
 2002151740 metadata/md5-cache/sec-policy/selinux-abrt-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-accountsd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-acct-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ada-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-afs-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-aide-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-alsa-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-amanda-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-amavis-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-android-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-apache-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-apm-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-asterisk-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-at-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-automount-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-avahi-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-awstats-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-backup-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-bacula-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-base-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-bind-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-brctl-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-calamaris-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-canna-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ccs-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ceph-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cgroup-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-chromium-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-chronyd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-clamav-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-collectd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-corosync-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-couchdb-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-courier-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cups-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cvs-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-daemontools-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dante-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dbadm-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dbskk-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dbus-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dcc-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ddclient-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-devicekit-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dhcp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dictd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-distcc-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-djbdns-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dkim-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dovecot-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dpkg-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dracut-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-dropbox-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-entropyd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-evolution-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-exim-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-finger-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-flash-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-fprintd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ftp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-games-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-git-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gitosis-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gnome-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-googletalk-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gorg-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gpg-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gpm-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gpsd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-howl-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-icecast-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-imaze-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-inetd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-inn-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ipsec-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-irc-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ircd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-jabber-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-java-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-kdump-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-kerberos-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-kismet-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-kudzu-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ldap-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-links-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-lircd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-lockdev-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-logrotate-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-logsentry-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-logwatch-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-lpd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mailman-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mandb-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mcelog-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-memcached-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-milter-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mono-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mozilla-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mpd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mplayer-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mrtg-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-munin-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mutt-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-mysql-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-nagios-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ncftool-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-nginx-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-nslcd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ntop-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ntp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-nut-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-nx-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-oddjob-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-oident-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-openct-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-openrc-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-openvpn-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-pan-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-pcscd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-policykit-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-portmap-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-postfix-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-postgresql-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-postgrey-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ppp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-prelink-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-prelude-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-privoxy-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-procmail-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-psad-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-publicfile-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-puppet-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-pyzor-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-qemu-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-qmail-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-quota-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-radius-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-radvd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-razor-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-redis-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rngd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-roundup-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rpc-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rpm-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rssh-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rtkit-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-salt-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-samba-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sasl-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-screen-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sendmail-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sensord-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-shorewall-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-shutdown-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-skype-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-slocate-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-smartmon-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-smokeping-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-snmp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-snort-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-soundserver-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-squid-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sssd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-stunnel-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-subsonic-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sudo-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sxid-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-syncthing-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-sysstat-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tboot-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tcpd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tcsd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-telnet-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tftp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tgtd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-timidity-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tor-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-tripwire-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-ulogd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-uml-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-unconfined-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-uptime-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-uucp-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-uwimap-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-varnishd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vbetool-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vdagent-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vde-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-virt-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vlock-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vmware-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-vpn-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-watchdog-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-webalizer-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-wine-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-wireshark-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-wm-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-xen-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-xfs-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-xprint-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-xserver-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
 2002151740 metadata/md5-cache/sec-policy/selinux-zabbix-2.20190201-r1
-2002151740 metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
-2002161139 metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
 2003191139 metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
 2009021410 metadata/md5-cache/sec-policy/apparmor-profiles-9999
 2009021410 metadata/md5-cache/sec-policy/selinux-abrt-9999
@@ -57056,7 +56659,265 @@
 2009021410 metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
 2009021410 metadata/md5-cache/sec-policy/selinux-xserver-9999
 2009021410 metadata/md5-cache/sec-policy/selinux-zabbix-9999
-2010041809 metadata/md5-cache/sec-policy/Manifest.gz
+2010120609 metadata/md5-cache/sec-policy/Manifest.gz
+2010101309 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
+2010120609 metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
+2010120609 metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
 1910170740 metadata/md5-cache/sys-apps/ack-3.0.0
 1704141039 metadata/md5-cache/sys-apps/aix-miscutils-0.1.1671
 1910111911 metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
@@ -57108,7 +56969,6 @@
 1912110241 metadata/md5-cache/sys-apps/sydbox-1.0.7
 2001091509 metadata/md5-cache/sys-apps/daemonize-1.7.8
 2002031539 metadata/md5-cache/sys-apps/input-utils-1.3
-2002042139 metadata/md5-cache/sys-apps/smc-sum-2.4.0.20191206
 2002042139 metadata/md5-cache/sys-apps/superdiag-1.3.0.20200109
 2002100339 metadata/md5-cache/sys-apps/gpet-0.4
 2002100339 metadata/md5-cache/sys-apps/gscanbus-0.8
@@ -57152,7 +57012,6 @@
 2007151539 metadata/md5-cache/sys-apps/s6-rc-0.5.1.1
 2008051909 metadata/md5-cache/sys-apps/apply-default-acl-0.4.4
 2008081739 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r2
-2008091909 metadata/md5-cache/sys-apps/ipmicfg-1.31.1.200623
 2008131609 metadata/md5-cache/sys-apps/man-pages-5.07
 2008131609 metadata/md5-cache/sys-apps/man-pages-5.08
 2008160409 metadata/md5-cache/sys-apps/logwatch-7.5.3
@@ -57160,7 +57019,6 @@
 2008201839 metadata/md5-cache/sys-apps/cciss_vol_status-1.12a
 2008221709 metadata/md5-cache/sys-apps/inxi-3.1.06.1
 2008302139 metadata/md5-cache/sys-apps/osinfo-db-20200529
-2008301909 metadata/md5-cache/sys-apps/smcipmitool-2.23.0.191216
 2008310109 metadata/md5-cache/sys-apps/yarn-1.22.5
 2009021410 metadata/md5-cache/sys-apps/firejail-9999
 2009021410 metadata/md5-cache/sys-apps/logwatch-9999
@@ -57218,7 +57076,6 @@
 2009111825 metadata/md5-cache/sys-apps/dog-1.7-r6
 2009131115 metadata/md5-cache/sys-apps/dtc-1.5.0
 2009121921 metadata/md5-cache/sys-apps/dtc-1.5.0-r2
-2009121921 metadata/md5-cache/sys-apps/dtc-1.6.0
 2009121921 metadata/md5-cache/sys-apps/dtc-9999
 2009111825 metadata/md5-cache/sys-apps/duc-1.4.1-r1
 2009111825 metadata/md5-cache/sys-apps/duc-1.4.3-r1
@@ -57262,7 +57119,6 @@
 2009131115 metadata/md5-cache/sys-apps/gradm-3.1.201708012022
 2009121921 metadata/md5-cache/sys-apps/gradm-3.1.201903191516
 2009131115 metadata/md5-cache/sys-apps/grep-3.3-r1
-2009121921 metadata/md5-cache/sys-apps/grep-3.4
 2009111825 metadata/md5-cache/sys-apps/grepcidr-2.0
 2009111825 metadata/md5-cache/sys-apps/groff-1.22.4
 2009131115 metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
@@ -57425,7 +57281,6 @@
 2009121921 metadata/md5-cache/sys-apps/shadow-4.8.1-r3
 2009131115 metadata/md5-cache/sys-apps/smartmontools-9999
 2009121921 metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
-2009131115 metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029
 2009131115 metadata/md5-cache/sys-apps/sparc-utils-1.9-r6
 2009131115 metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
 2009111825 metadata/md5-cache/sys-apps/superiotool-6637
@@ -57434,7 +57289,6 @@
 2009131115 metadata/md5-cache/sys-apps/sysvinit-2.93
 2009121921 metadata/md5-cache/sys-apps/sysvinit-2.96
 2009121921 metadata/md5-cache/sys-apps/sysvinit-2.97
-2009111825 metadata/md5-cache/sys-apps/tas-1.6.0.200601
 2009131115 metadata/md5-cache/sys-apps/texinfo-6.6-r1
 2009121921 metadata/md5-cache/sys-apps/texinfo-6.7
 2009111825 metadata/md5-cache/sys-apps/the_silver_searcher-2.0.0
@@ -57472,7 +57326,6 @@
 2009121921 metadata/md5-cache/sys-apps/watchdog-5.16
 2009131115 metadata/md5-cache/sys-apps/which-2.21
 2009111825 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r2
-2009111825 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre
 2009131115 metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
 2009131115 metadata/md5-cache/sys-apps/xinetd-2.3.15.3
 2009131115 metadata/md5-cache/sys-apps/xinetd-2.3.15.3-r2
@@ -57587,7 +57440,6 @@
 2009211840 metadata/md5-cache/sys-apps/pkgcore-9999
 2009211840 metadata/md5-cache/sys-apps/portage-2.3.99-r2
 2009211840 metadata/md5-cache/sys-apps/portage-3.0.4-r1
-2009211840 metadata/md5-cache/sys-apps/portage-3.0.8
 2009211840 metadata/md5-cache/sys-apps/portage-9999
 2009231339 metadata/md5-cache/sys-apps/gawk-5.1.0
 2009240109 metadata/md5-cache/sys-apps/hw-probe-1.5-r1
@@ -57596,7 +57448,6 @@
 2009241809 metadata/md5-cache/sys-apps/systemd-245.7-r1
 2009241809 metadata/md5-cache/sys-apps/systemd-9999
 2009251539 metadata/md5-cache/sys-apps/fakeroot-1.25.1
-2009251309 metadata/md5-cache/sys-apps/qingy-1.0.0-r4
 2009271939 metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
 2009281239 metadata/md5-cache/sys-apps/debianutils-4.11.2
 2009281039 metadata/md5-cache/sys-apps/grep-3.5
@@ -57632,9 +57483,28 @@
 2010061709 metadata/md5-cache/sys-apps/yarn-1.22.10
 2010071409 metadata/md5-cache/sys-apps/bolt-0.9-r1
 2010071039 metadata/md5-cache/sys-apps/moreutils-0.64
-2010080639 metadata/md5-cache/sys-apps/Manifest.gz
-2010080639 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
 2010080539 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0
+2010120109 metadata/md5-cache/sys-apps/Manifest.gz
+2010110739 metadata/md5-cache/sys-apps/apparmor-3.0.0
+2010101309 metadata/md5-cache/sys-apps/apparmor-utils-3.0.0
+2010101639 metadata/md5-cache/sys-apps/cpuid-20201006
+2010111209 metadata/md5-cache/sys-apps/dtc-1.6.0
+2010090209 metadata/md5-cache/sys-apps/fakeroot-1.25.3
+2010082039 metadata/md5-cache/sys-apps/grep-3.4
+2010101109 metadata/md5-cache/sys-apps/i2c-tools-4.2
+2010091709 metadata/md5-cache/sys-apps/ipmicfg-1.32.0.200820
+2010111839 metadata/md5-cache/sys-apps/portage-3.0.8
+2010082239 metadata/md5-cache/sys-apps/qingy-1.0.0-r4
+2010120109 metadata/md5-cache/sys-apps/s6-2.9.2.0
+2010112109 metadata/md5-cache/sys-apps/s6-linux-init-1.0.4.2
+2010112109 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.3
+2010112109 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.0
+2010112109 metadata/md5-cache/sys-apps/s6-rc-0.5.2.0
+2010091909 metadata/md5-cache/sys-apps/smc-sum-2.5.0.20200722
+2010091909 metadata/md5-cache/sys-apps/smcipmitool-2.23.0.191216
+2010091909 metadata/md5-cache/sys-apps/tas-1.6.0.200601
+2010091139 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
+2010102209 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 1702282333 metadata/md5-cache/sys-auth/ykclient-2.15
 2001012339 metadata/md5-cache/sys-auth/pam_mount-2.16
@@ -57678,8 +57548,6 @@
 2009121921 metadata/md5-cache/sys-auth/pam_ssh_agent_auth-9999
 2009131115 metadata/md5-cache/sys-auth/pam_u2f-1.0.8
 2009131115 metadata/md5-cache/sys-auth/pam_yubico-2.26
-2009131115 metadata/md5-cache/sys-auth/passwdqc-1.3.0
-2009121921 metadata/md5-cache/sys-auth/passwdqc-1.4.0-r1
 2009111825 metadata/md5-cache/sys-auth/rtkit-0.12-r1
 2009111825 metadata/md5-cache/sys-auth/skey-1.1.5-r11
 2009121921 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -57703,10 +57571,6 @@
 2009181540 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
 2009181540 metadata/md5-cache/sys-auth/nss_ldap-265-r5
 2009181540 metadata/md5-cache/sys-auth/pam_ldap-186-r1
-2009201209 metadata/md5-cache/sys-auth/pambase-20200917
-2009181540 metadata/md5-cache/sys-auth/sssd-1.16.3-r3
-2009181540 metadata/md5-cache/sys-auth/sssd-2.1.0-r1
-2009181540 metadata/md5-cache/sys-auth/sssd-2.2.0-r1
 2009181540 metadata/md5-cache/sys-auth/sssd-2.2.2
 2009181540 metadata/md5-cache/sys-auth/sssd-2.2.3
 2009211840 metadata/md5-cache/sys-auth/keystone-17.0.0
@@ -57714,23 +57578,26 @@
 2009211840 metadata/md5-cache/sys-auth/solo-python-0.0.26
 2009211840 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
 2009231339 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
-2009290009 metadata/md5-cache/sys-auth/sssd-2.3.1-r1
 2009291711 metadata/md5-cache/sys-auth/AusweisApp2-9999
 2009291711 metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
 2009291711 metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
 2009291711 metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
-2009291711 metadata/md5-cache/sys-auth/polkit-qt-0.113.0
 2009291711 metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1
 2009291711 metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r1
 2009291711 metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
-2010042309 metadata/md5-cache/sys-auth/pambase-20200304
 2010042309 metadata/md5-cache/sys-auth/ykpers-1.19.3-r1
 2010042309 metadata/md5-cache/sys-auth/ykpers-1.20.0
 2010062139 metadata/md5-cache/sys-auth/polkit-0.116-r1
 2010062139 metadata/md5-cache/sys-auth/polkit-0.117
 2010062139 metadata/md5-cache/sys-auth/polkit-0.118
 2010071039 metadata/md5-cache/sys-auth/AusweisApp2-1.20.2
-2010071839 metadata/md5-cache/sys-auth/Manifest.gz
+2010120109 metadata/md5-cache/sys-auth/Manifest.gz
+2010101239 metadata/md5-cache/sys-auth/pambase-20200917
+2010101909 metadata/md5-cache/sys-auth/pambase-20201010
+2010101239 metadata/md5-cache/sys-auth/passwdqc-1.4.0-r1
+2010092209 metadata/md5-cache/sys-auth/polkit-qt-0.113.0
+2010101509 metadata/md5-cache/sys-auth/sssd-2.2.0-r1
+2010120109 metadata/md5-cache/sys-auth/sssd-2.3.1-r2
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -57848,9 +57715,9 @@
 2009211840 metadata/md5-cache/sys-block/seekwatcher-0.13
 2009211840 metadata/md5-cache/sys-block/targetcli-fb-2.1.53
 2009242239 metadata/md5-cache/sys-block/megacli-8.07.14-r3
-2009291711 metadata/md5-cache/sys-block/partitionmanager-4.1.0
-2010021539 metadata/md5-cache/sys-block/Manifest.gz
 2010021539 metadata/md5-cache/sys-block/mbuffer-20200929
+2010092209 metadata/md5-cache/sys-block/Manifest.gz
+2010092209 metadata/md5-cache/sys-block/partitionmanager-4.1.0
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.1
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
@@ -58041,9 +57908,7 @@
 2009141809 metadata/md5-cache/sys-cluster/minikube-1.10.1
 2009141809 metadata/md5-cache/sys-cluster/minikube-1.11.0
 2009141809 metadata/md5-cache/sys-cluster/nomad-0.12.3
-2009172012 metadata/md5-cache/sys-cluster/charliecloud-0.16
 2009172012 metadata/md5-cache/sys-cluster/charliecloud-0.18
-2009172012 metadata/md5-cache/sys-cluster/charliecloud-9999
 2009172012 metadata/md5-cache/sys-cluster/crmsh-3.0.3
 2009172012 metadata/md5-cache/sys-cluster/crmsh-4.1.0
 2009172012 metadata/md5-cache/sys-cluster/galera-25.3.25
@@ -58054,11 +57919,6 @@
 2009172012 metadata/md5-cache/sys-cluster/galera-26.4.3
 2009172012 metadata/md5-cache/sys-cluster/galera-26.4.4
 2009172012 metadata/md5-cache/sys-cluster/galera-26.4.5
-2009172012 metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
-2009172012 metadata/md5-cache/sys-cluster/heartbeat-3.0.6
-2009172012 metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
-2009172012 metadata/md5-cache/sys-cluster/pacemaker-1.1.19
-2009172012 metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
 2009172012 metadata/md5-cache/sys-cluster/sanlock-3.6.0
 2009172012 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2009181540 metadata/md5-cache/sys-cluster/mpich-3.3
@@ -58084,19 +57944,11 @@
 2009211840 metadata/md5-cache/sys-cluster/swift-2.25.0
 2009211840 metadata/md5-cache/sys-cluster/swift-2020.1.9999
 2009242009 metadata/md5-cache/sys-cluster/kubeletctl-1.6
-2009230239 metadata/md5-cache/sys-cluster/swift-2.26.0
-2009230239 metadata/md5-cache/sys-cluster/swift-2020.2.9999
-2009251309 metadata/md5-cache/sys-cluster/glusterfs-6.8
-2009251309 metadata/md5-cache/sys-cluster/glusterfs-6.9
-2009251309 metadata/md5-cache/sys-cluster/glusterfs-7.5
-2009251309 metadata/md5-cache/sys-cluster/glusterfs-7.6
 2009251309 metadata/md5-cache/sys-cluster/glusterfs-9999
 2009280039 metadata/md5-cache/sys-cluster/neutron-16.1.0
 2009280039 metadata/md5-cache/sys-cluster/nova-21.1.0
-2009271309 metadata/md5-cache/sys-cluster/pacemaker-1.1.16
 2009291711 metadata/md5-cache/sys-cluster/ceph-14.2.11
 2009291711 metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
-2009300509 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
 2009291711 metadata/md5-cache/sys-cluster/hpx-1.4.1
 2009291711 metadata/md5-cache/sys-cluster/hpx-9999
 2009291711 metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
@@ -58110,36 +57962,46 @@
 2010040639 metadata/md5-cache/sys-cluster/k9scli-0.22.1
 2010032139 metadata/md5-cache/sys-cluster/kube-apiserver-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kube-apiserver-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kube-apiserver-1.19.2
 2010032139 metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.2
 2010032139 metadata/md5-cache/sys-cluster/kube-proxy-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kube-proxy-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kube-proxy-1.19.2
 2010032139 metadata/md5-cache/sys-cluster/kube-scheduler-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kube-scheduler-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.2
 2010032139 metadata/md5-cache/sys-cluster/kubeadm-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kubeadm-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kubeadm-1.19.2
 2010032139 metadata/md5-cache/sys-cluster/kubectl-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kubectl-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kubectl-1.19.2
 2010032139 metadata/md5-cache/sys-cluster/kubelet-1.17.12
 2010032139 metadata/md5-cache/sys-cluster/kubelet-1.18.9
-2010032139 metadata/md5-cache/sys-cluster/kubelet-1.19.2
 2010040109 metadata/md5-cache/sys-cluster/minikube-1.13.1
 2010050209 metadata/md5-cache/sys-cluster/hpl-2.0-r4
 2010050209 metadata/md5-cache/sys-cluster/hpl-2.3
-2010071009 metadata/md5-cache/sys-cluster/glusterfs-7.7
-2010070109 metadata/md5-cache/sys-cluster/glusterfs-7.8
-2010071939 metadata/md5-cache/sys-cluster/Manifest.gz
 2010071839 metadata/md5-cache/sys-cluster/heat-14.1.0
 2010071839 metadata/md5-cache/sys-cluster/heat-2020.1.9999
 2010071939 metadata/md5-cache/sys-cluster/kube-router-1.1.0
 2010071839 metadata/md5-cache/sys-cluster/neutron-16.2.0
 2010071839 metadata/md5-cache/sys-cluster/neutron-2020.1.9999
+2010110239 metadata/md5-cache/sys-cluster/Manifest.gz
+2010091039 metadata/md5-cache/sys-cluster/charliecloud-0.19
+2010091039 metadata/md5-cache/sys-cluster/charliecloud-9999
+2010091209 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
+2010091209 metadata/md5-cache/sys-cluster/glusterfs-7.7
+2010091539 metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
+2010102139 metadata/md5-cache/sys-cluster/kube-apiserver-1.19.2
+2010102139 metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.2
+2010102139 metadata/md5-cache/sys-cluster/kube-proxy-1.19.2
+2010102139 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.2
+2010102139 metadata/md5-cache/sys-cluster/kubeadm-1.19.2
+2010102139 metadata/md5-cache/sys-cluster/kubectl-1.19.2
+2010102139 metadata/md5-cache/sys-cluster/kubelet-1.19.2
+2010100009 metadata/md5-cache/sys-cluster/nomad-0.12.5
+2010091139 metadata/md5-cache/sys-cluster/pacemaker-1.1.16
+2010091139 metadata/md5-cache/sys-cluster/pacemaker-1.1.19
+2010091139 metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
+2010102239 metadata/md5-cache/sys-cluster/swift-2.25.1
+2010110239 metadata/md5-cache/sys-cluster/swift-2.26.0
+2010110239 metadata/md5-cache/sys-cluster/swift-2020.2.9999
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
@@ -58203,25 +58065,17 @@
 2009111825 metadata/md5-cache/sys-devel/clang-common-9.0.1
 2009111825 metadata/md5-cache/sys-devel/ct-ng-1.23.0
 2009111825 metadata/md5-cache/sys-devel/dev86-0.16.21-r3
-2009121921 metadata/md5-cache/sys-devel/gcc-10.2.0-r1
 2009121921 metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999
 2009121921 metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
-2009121921 metadata/md5-cache/sys-devel/gcc-5.5.0
 2009121921 metadata/md5-cache/sys-devel/gcc-6.5.0-r2
 2009121921 metadata/md5-cache/sys-devel/gcc-6.5.0-r3
 2009121921 metadata/md5-cache/sys-devel/gcc-7.5.0-r1
 2009121921 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
 2009121921 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
 2009131115 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
-2009111825 metadata/md5-cache/sys-devel/gcc-config-2.3.2
 2009111825 metadata/md5-cache/sys-devel/gcc-config-9999
 2009131115 metadata/md5-cache/sys-devel/gdb-apple-1752
-2009121921 metadata/md5-cache/sys-devel/kgcc64-10.1.0
 2009121921 metadata/md5-cache/sys-devel/kgcc64-10.2.0
-2009131115 metadata/md5-cache/sys-devel/kgcc64-4.9.4
-2009131115 metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
-2009131115 metadata/md5-cache/sys-devel/kgcc64-5.4.0
-2009121921 metadata/md5-cache/sys-devel/kgcc64-5.5.0
 2009131115 metadata/md5-cache/sys-devel/kgcc64-6.4.0
 2009121921 metadata/md5-cache/sys-devel/kgcc64-6.5.0
 2009131115 metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -58318,20 +58172,22 @@
 2010031239 metadata/md5-cache/sys-devel/binutils-2.32-r2
 2010031239 metadata/md5-cache/sys-devel/binutils-2.33.1-r1
 2010060739 metadata/md5-cache/sys-devel/binutils-2.34-r2
-2010061709 metadata/md5-cache/sys-devel/clang-10.0.1
-2010061709 metadata/md5-cache/sys-devel/clang-common-10.0.1
-2010061709 metadata/md5-cache/sys-devel/clang-runtime-10.0.1
-2010061709 metadata/md5-cache/sys-devel/lld-10.0.1
-2010061709 metadata/md5-cache/sys-devel/llvm-10.0.1
-2010061709 metadata/md5-cache/sys-devel/llvm-common-10.0.1
 2010071009 metadata/md5-cache/sys-devel/gcc-config-2.3.1
-2010081109 metadata/md5-cache/sys-devel/Manifest.gz
 2010072209 metadata/md5-cache/sys-devel/clang-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-devel/clang-common-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-devel/clang-runtime-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-devel/lld-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-devel/llvm-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc6
+2010112039 metadata/md5-cache/sys-devel/Manifest.gz
+2010110939 metadata/md5-cache/sys-devel/clang-10.0.1
+2010110939 metadata/md5-cache/sys-devel/clang-common-10.0.1
+2010110939 metadata/md5-cache/sys-devel/clang-runtime-10.0.1
+2010102039 metadata/md5-cache/sys-devel/gcc-config-2.3.2
+2010110939 metadata/md5-cache/sys-devel/lld-10.0.1
+2010110939 metadata/md5-cache/sys-devel/llvm-10.0.1
+2010110939 metadata/md5-cache/sys-devel/llvm-common-10.0.1
+2010112039 metadata/md5-cache/sys-devel/rust-std-1.47.0
 2009131115 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2009131115 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2009131115 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
@@ -58407,9 +58263,9 @@
 2009192109 metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
 2009260239 metadata/md5-cache/sys-firmware/vgabios-0.7a
 2009260239 metadata/md5-cache/sys-firmware/vgabios-0.7a-r1
-2010021709 metadata/md5-cache/sys-firmware/Manifest.gz
 2010021439 metadata/md5-cache/sys-firmware/edk2-ovmf-201905
-2010021709 metadata/md5-cache/sys-firmware/edk2-ovmf-202008
+2010120309 metadata/md5-cache/sys-firmware/Manifest.gz
+2010120309 metadata/md5-cache/sys-firmware/edk2-ovmf-202008
 1812311909 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
@@ -58612,7 +58468,6 @@
 2009181540 metadata/md5-cache/sys-fs/udev-245.5-r1
 2009181540 metadata/md5-cache/sys-fs/udev-246-r1
 2009181540 metadata/md5-cache/sys-fs/udev-9999
-2009211840 metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
 2009211840 metadata/md5-cache/sys-fs/udiskie-2.1.0
 2009211840 metadata/md5-cache/sys-fs/udiskie-2.1.1
 2009220209 metadata/md5-cache/sys-fs/zfs-0.8.4-r2
@@ -58636,14 +58491,16 @@
 2010020139 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc3
 2010042039 metadata/md5-cache/sys-fs/mergerfs-2.31.0
 2010061709 metadata/md5-cache/sys-fs/fuse-overlayfs-1.1.2
-2010071039 metadata/md5-cache/sys-fs/Manifest.gz
 2010071039 metadata/md5-cache/sys-fs/mergerfs-2.30.0
 2010070709 metadata/md5-cache/sys-fs/rar2fs-1.29.1
-2010071039 metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
 2010071009 metadata/md5-cache/sys-fs/udev-init-scripts-34
 2010071039 metadata/md5-cache/sys-fs/udiskie-2.2.0
 2010070309 metadata/md5-cache/sys-fs/zfs-0.8.5
 2010070309 metadata/md5-cache/sys-fs/zfs-kmod-0.8.5
+2010111239 metadata/md5-cache/sys-fs/Manifest.gz
+2010111239 metadata/md5-cache/sys-fs/bashmount-4.3.2
+2010101339 metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4
+2010091139 metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4903.241.1-r5
@@ -58823,13 +58680,22 @@
 2010040439 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236
 2010040439 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66
 2010051209 metadata/md5-cache/sys-kernel/git-sources-5.9_rc8
-2010081009 metadata/md5-cache/sys-kernel/Manifest.gz
 2010071739 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.150
 2010071739 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.70
 2010071739 metadata/md5-cache/sys-kernel/gentoo-sources-5.8.14
 2010071709 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.150
 2010071709 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.70
 2010071709 metadata/md5-cache/sys-kernel/vanilla-sources-5.8.14
+2010091039 metadata/md5-cache/sys-kernel/Manifest.gz
+2010081909 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.70
+2010081909 metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.14
+2010081909 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.70
+2010090839 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.70-r1
+2010081909 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.14
+2010090839 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.14-r1
+2010091039 metadata/md5-cache/sys-kernel/pf-sources-5.8_p7
+2010081909 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.70
+2010081909 metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.14
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -58983,8 +58849,6 @@
 2009181540 metadata/md5-cache/sys-libs/ncurses-compat-5.9
 2009181540 metadata/md5-cache/sys-libs/ncurses-compat-6.1_p20190609
 2009181540 metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta
-2009181540 metadata/md5-cache/sys-libs/pam-1.3.1_p20200128-r1
-2009181540 metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
 2009181540 metadata/md5-cache/sys-libs/readline-6.3_p8-r3
 2009181540 metadata/md5-cache/sys-libs/readline-7.0_p5-r1
 2009181540 metadata/md5-cache/sys-libs/readline-8.0_p4
@@ -59009,7 +58873,6 @@
 2009291711 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc3
 2009291711 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc4
 2009291711 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
-2009291711 metadata/md5-cache/sys-libs/kpmcore-4.1.0
 2009291711 metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
 2009291711 metadata/md5-cache/sys-libs/libcxx-11.0.0_rc3
 2009291711 metadata/md5-cache/sys-libs/libcxx-11.0.0_rc4
@@ -59028,24 +58891,15 @@
 2009291711 metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
 2009291711 metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
 2009291711 metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
-2009291009 metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
-2009291009 metadata/md5-cache/sys-libs/openipmi-2.0.28
 2009291711 metadata/md5-cache/sys-libs/pam_wrapper-1.1.3
 2009291711 metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
 2009291711 metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
 2009302139 metadata/md5-cache/sys-libs/glibc-2.31-r7
-2009302139 metadata/md5-cache/sys-libs/glibc-2.32-r2
-2009302139 metadata/md5-cache/sys-libs/glibc-9999
 2010042009 metadata/md5-cache/sys-libs/db-5.3.28-r4
 2010060739 metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
-2010061709 metadata/md5-cache/sys-libs/compiler-rt-10.0.1
-2010061709 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
 2010061709 metadata/md5-cache/sys-libs/libcxx-10.0.1
 2010061709 metadata/md5-cache/sys-libs/libcxxabi-10.0.1
-2010061709 metadata/md5-cache/sys-libs/libomp-10.0.1
 2010061709 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
-2010071039 metadata/md5-cache/sys-libs/openipmi-2.0.29
-2010072209 metadata/md5-cache/sys-libs/Manifest.gz
 2010072209 metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-libs/libcxx-11.0.0_rc6
@@ -59053,6 +58907,17 @@
 2010072209 metadata/md5-cache/sys-libs/libomp-11.0.0_rc6
 2010072209 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc6
 2010072039 metadata/md5-cache/sys-libs/timezone-data-2020b
+2010110939 metadata/md5-cache/sys-libs/Manifest.gz
+2010110939 metadata/md5-cache/sys-libs/compiler-rt-10.0.1
+2010110939 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
+2010100009 metadata/md5-cache/sys-libs/glibc-2.32-r2
+2010100009 metadata/md5-cache/sys-libs/glibc-9999
+2010092209 metadata/md5-cache/sys-libs/kpmcore-4.1.0
+2010101309 metadata/md5-cache/sys-libs/libapparmor-3.0.0
+2010090209 metadata/md5-cache/sys-libs/libcap-2.44
+2010110939 metadata/md5-cache/sys-libs/libomp-10.0.1
+2010091139 metadata/md5-cache/sys-libs/openipmi-2.0.29
+2010101239 metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -59103,8 +58968,8 @@
 2009242009 metadata/md5-cache/sys-power/powertop-2.13-r1
 2009221209 metadata/md5-cache/sys-power/thermald-2.3-r1
 2009251309 metadata/md5-cache/sys-power/suspend-1.0_p20200924
-2010071039 metadata/md5-cache/sys-power/Manifest.gz
-2010071039 metadata/md5-cache/sys-power/acpid-2.0.32-r2
+2010091139 metadata/md5-cache/sys-power/Manifest.gz
+2010091139 metadata/md5-cache/sys-power/acpid-2.0.32-r2
 1702282334 metadata/md5-cache/sys-process/tiptop-2.2
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2003261841 metadata/md5-cache/sys-process/psmisc-23.2-r2
@@ -59196,8 +59061,8 @@
 2009270039 metadata/md5-cache/sys-process/psmisc-23.3-r1
 2009290839 metadata/md5-cache/sys-process/systemd-cron-1.5.14
 2009300009 metadata/md5-cache/sys-process/parallel-20200922
-2010071039 metadata/md5-cache/sys-process/Manifest.gz
-2010071039 metadata/md5-cache/sys-process/parallel-20200822
+2010091139 metadata/md5-cache/sys-process/Manifest.gz
+2010091139 metadata/md5-cache/sys-process/parallel-20200822
 1910111911 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 1910111911 metadata/md5-cache/virtual/blas-3.6
 1910111911 metadata/md5-cache/virtual/blas-3.7
@@ -59251,7 +59116,6 @@
 2004032241 metadata/md5-cache/virtual/w3m-0
 2004062109 metadata/md5-cache/virtual/httpd-fastcgi-0-r1
 2004062109 metadata/md5-cache/virtual/mysql-5.6-r13
-2004211009 metadata/md5-cache/virtual/awk-1
 2004211009 metadata/md5-cache/virtual/checkpassword-0
 2004211009 metadata/md5-cache/virtual/daemontools-0
 2004211009 metadata/md5-cache/virtual/eject-0-r1
@@ -59468,9 +59332,11 @@
 2009181540 metadata/md5-cache/virtual/rust-1.45.2
 2010050609 metadata/md5-cache/virtual/udev-217-r2
 2010062139 metadata/md5-cache/virtual/qmail-1.03
-2010071139 metadata/md5-cache/virtual/Manifest.gz
-2010071009 metadata/md5-cache/virtual/jack-1
-2010071139 metadata/md5-cache/virtual/rust-1.46.0
+2010100009 metadata/md5-cache/virtual/Manifest.gz
+2010100009 metadata/md5-cache/virtual/awk-1
+2010082039 metadata/md5-cache/virtual/jack-1
+2010091209 metadata/md5-cache/virtual/rust-1.46.0
+2010090939 metadata/md5-cache/virtual/rust-1.47.0
 1907262139 metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
 1909061809 metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
 1808151104 metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r1
@@ -59526,8 +59392,8 @@
 2009260639 metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
 2009260639 metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1
 2010071039 metadata/md5-cache/www-apache/mod_security-2.9.3
-2010072209 metadata/md5-cache/www-apache/Manifest.gz
-2010072209 metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
+2010091839 metadata/md5-cache/www-apache/Manifest.gz
+2010091839 metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
 1905211209 metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
 1902211339 metadata/md5-cache/www-apps/dokuwiki-20180422a
 1902211339 metadata/md5-cache/www-apps/dokuwiki-20180422b
@@ -59554,7 +59420,6 @@
 2005172009 metadata/md5-cache/www-apps/baikal-0.6.0
 2005172009 metadata/md5-cache/www-apps/baikal-0.6.1
 2006141209 metadata/md5-cache/www-apps/baikal-0.7.1
-2006290009 metadata/md5-cache/www-apps/mediawiki-1.34.2
 2007142139 metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
 2007142309 metadata/md5-cache/www-apps/chromedriver-bin-84.0.4147.30
 2008120539 metadata/md5-cache/www-apps/dokuwiki-20200729
@@ -59621,7 +59486,6 @@
 2009131115 metadata/md5-cache/www-apps/webdavcgi-1.1.1
 2009111825 metadata/md5-cache/www-apps/webmcp-1.2.6
 2009141809 metadata/md5-cache/www-apps/gitea-9999
-2009141809 metadata/md5-cache/www-apps/hugo-0.69.0
 2009160139 metadata/md5-cache/www-apps/nextcloud-19.0.3
 2009171909 metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
 2009171939 metadata/md5-cache/www-apps/drupal-7.73
@@ -59652,11 +59516,12 @@
 2009240109 metadata/md5-cache/www-apps/tt-rss-20200922
 2009240109 metadata/md5-cache/www-apps/tt-rss-99999999
 2009261139 metadata/md5-cache/www-apps/mediawiki-1.35.0
-2010071039 metadata/md5-cache/www-apps/mediawiki-1.34.4
-2010080339 metadata/md5-cache/www-apps/Manifest.gz
 2010080339 metadata/md5-cache/www-apps/chromedriver-bin-86.0.4240.22
 2010072009 metadata/md5-cache/www-apps/gitea-1.12.4
 2010080009 metadata/md5-cache/www-apps/nextcloud-20.0.0
+2010101539 metadata/md5-cache/www-apps/Manifest.gz
+2010101539 metadata/md5-cache/www-apps/hugo-0.76.3
+2010091139 metadata/md5-cache/www-apps/mediawiki-1.34.4
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2003261841 metadata/md5-cache/www-client/lynx-2.9.0_pre4
 2006150539 metadata/md5-cache/www-client/lynx-2.8.9_p1
@@ -59664,9 +59529,6 @@
 2009111825 metadata/md5-cache/www-client/dillo-3.0.5-r3
 2009111825 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2009121921 metadata/md5-cache/www-client/dillo-9999
-2009131115 metadata/md5-cache/www-client/firefox-bin-68.12.0
-2009131115 metadata/md5-cache/www-client/firefox-bin-80.0
-2009131115 metadata/md5-cache/www-client/firefox-bin-80.0.1
 2009121921 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2009131115 metadata/md5-cache/www-client/jd-2.8.5_p120826
 2009131115 metadata/md5-cache/www-client/jd-2.8.9_p150226
@@ -59693,10 +59555,6 @@
 2009172012 metadata/md5-cache/www-client/epiphany-3.32.6
 2009172012 metadata/md5-cache/www-client/epiphany-3.36.3
 2009172012 metadata/md5-cache/www-client/epiphany-3.36.4
-2009172012 metadata/md5-cache/www-client/firefox-68.12.0
-2009172012 metadata/md5-cache/www-client/firefox-80.0
-2009172012 metadata/md5-cache/www-client/firefox-80.0.1
-2009172012 metadata/md5-cache/www-client/firefox-80.0.1-r1
 2009172012 metadata/md5-cache/www-client/seamonkey-2.53.2
 2009172012 metadata/md5-cache/www-client/seamonkey-2.53.3
 2009201639 metadata/md5-cache/www-client/elinks-0.13.4-r1
@@ -59715,7 +59573,6 @@
 2009241609 metadata/md5-cache/www-client/vivaldi-3.3.2022.47_p1
 2009241609 metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1
 2009281239 metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1
-2009291711 metadata/md5-cache/www-client/falkon-3.1.0-r1
 2009300209 metadata/md5-cache/www-client/netsurf-3.10-r3
 2009300609 metadata/md5-cache/www-client/opera-developer-73.0.3827.0
 2009291711 metadata/md5-cache/www-client/otter-1.0.01-r1
@@ -59725,10 +59582,6 @@
 2010011809 metadata/md5-cache/www-client/opera-beta-72.0.3815.49
 2010011039 metadata/md5-cache/www-client/seamonkey-2.53.4
 2010011309 metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2059.2_p1
-2010052209 metadata/md5-cache/www-client/chromium-87.0.4278.0
-2010052009 metadata/md5-cache/www-client/firefox-bin-78.3.1-r1
-2010052009 metadata/md5-cache/www-client/firefox-bin-81.0.1-r1
-2010070439 metadata/md5-cache/www-client/firefox-78.3.1
 2010070439 metadata/md5-cache/www-client/firefox-81.0.1
 2010071009 metadata/md5-cache/www-client/google-chrome-86.0.4240.75
 2010071009 metadata/md5-cache/www-client/google-chrome-beta-86.0.4240.75
@@ -59736,10 +59589,18 @@
 2010070939 metadata/md5-cache/www-client/opera-71.0.3770.228
 2010070939 metadata/md5-cache/www-client/opera-developer-73.0.3834.0
 2010070939 metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2064.6_p1
-2010080939 metadata/md5-cache/www-client/Manifest.gz
 2010080539 metadata/md5-cache/www-client/chromium-86.0.4240.75
 2010072239 metadata/md5-cache/www-client/google-chrome-unstable-87.0.4280.11
 2010072039 metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.7_p1
+2010112309 metadata/md5-cache/www-client/Manifest.gz
+2010091009 metadata/md5-cache/www-client/chromium-87.0.4280.11
+2010092209 metadata/md5-cache/www-client/falkon-3.1.0-r1
+2010112209 metadata/md5-cache/www-client/firefox-78.3.1
+2010112209 metadata/md5-cache/www-client/firefox-81.0.1-r1
+2010112309 metadata/md5-cache/www-client/firefox-bin-78.3.1-r1
+2010112309 metadata/md5-cache/www-client/firefox-bin-81.0.1-r1
+2010081739 metadata/md5-cache/www-client/opera-beta-72.0.3815.86
+2010091509 metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.37_p1
 1808151104 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -59813,7 +59674,6 @@
 2009141809 metadata/md5-cache/www-servers/caddy-2.0.0
 2009161439 metadata/md5-cache/www-servers/tomcat-8.5.58
 2009161439 metadata/md5-cache/www-servers/tomcat-9.0.38
-2009172012 metadata/md5-cache/www-servers/cherokee-1.2.104-r2
 2009172012 metadata/md5-cache/www-servers/nginx-unit-1.17.0
 2009172012 metadata/md5-cache/www-servers/nginx-unit-1.18.0
 2009172012 metadata/md5-cache/www-servers/varnish-6.0.6
@@ -59837,8 +59697,9 @@
 2010011739 metadata/md5-cache/www-servers/apache-2.4.46-r1
 2010020239 metadata/md5-cache/www-servers/varnish-6.5.0
 2010062009 metadata/md5-cache/www-servers/uwsgi-2.0.19.1
-2010071109 metadata/md5-cache/www-servers/Manifest.gz
 2010070409 metadata/md5-cache/www-servers/gunicorn-20.0.4
+2010111239 metadata/md5-cache/www-servers/Manifest.gz
+2010111239 metadata/md5-cache/www-servers/nginx-unit-1.20.0
 2004032241 metadata/md5-cache/x11-apps/luit-20190106
 2009111825 metadata/md5-cache/x11-apps/amlc-0.5.1
 2009131115 metadata/md5-cache/x11-apps/appres-1.0.5
@@ -59936,8 +59797,8 @@
 2010030439 metadata/md5-cache/x11-apps/xstdcmap-1.0.4
 2010030439 metadata/md5-cache/x11-apps/xvinfo-1.1.4
 2010030439 metadata/md5-cache/x11-apps/xwininfo-1.1.5
-2010072109 metadata/md5-cache/x11-apps/Manifest.gz
-2010072109 metadata/md5-cache/x11-apps/xdm-1.1.12
+2010090909 metadata/md5-cache/x11-apps/Manifest.gz
+2010090909 metadata/md5-cache/x11-apps/xdm-1.1.12
 2004032241 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
 2005031239 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2005190009 metadata/md5-cache/x11-base/xorg-drivers-9999
@@ -60183,9 +60044,9 @@
 2010030439 metadata/md5-cache/x11-libs/xtrans-1.4.0
 2010060709 metadata/md5-cache/x11-libs/libxcb-1.14
 2010070039 metadata/md5-cache/x11-libs/gl2ps-1.4.2
-2010071039 metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1
-2010072339 metadata/md5-cache/x11-libs/Manifest.gz
 2010072339 metadata/md5-cache/x11-libs/qwt-6.1.5
+2010091139 metadata/md5-cache/x11-libs/Manifest.gz
+2010091139 metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
@@ -60306,7 +60167,6 @@
 2009111825 metadata/md5-cache/x11-misc/dunst-9999
 2009131115 metadata/md5-cache/x11-misc/dzen-0.9.5-r1
 2009111825 metadata/md5-cache/x11-misc/dzen-0.9.5_p1
-2009131115 metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
 2009131115 metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
 2009111825 metadata/md5-cache/x11-misc/fireflies-2.08-r1
 2009111825 metadata/md5-cache/x11-misc/fluxter-0.1.0
@@ -60346,7 +60206,6 @@
 2009111825 metadata/md5-cache/x11-misc/kdocker-5.3
 2009111825 metadata/md5-cache/x11-misc/ktsuss-2.1
 2009121921 metadata/md5-cache/x11-misc/light-locker-1.9.0-r2
-2009121921 metadata/md5-cache/x11-misc/lightdm-1.30.0-r1
 2009111825 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
 2009111825 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
 2009111825 metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.3.4
@@ -60405,8 +60264,6 @@
 2009131115 metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
 2009121921 metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
 2009111825 metadata/md5-cache/x11-misc/skippy-0.5.0-r1
-2009131115 metadata/md5-cache/x11-misc/slim-1.3.6-r5
-2009131115 metadata/md5-cache/x11-misc/slim-9999
 2009111825 metadata/md5-cache/x11-misc/slock-1.4
 2009121921 metadata/md5-cache/x11-misc/snixembed-0.2.2
 2009121921 metadata/md5-cache/x11-misc/snixembed-0.3.0
@@ -60558,7 +60415,6 @@
 2009172012 metadata/md5-cache/x11-misc/alacarte-3.36.0
 2009172012 metadata/md5-cache/x11-misc/compton-0.1_beta2-r1
 2009172012 metadata/md5-cache/x11-misc/dex-0.8.0
-2009172012 metadata/md5-cache/x11-misc/dsx-0.1-r1
 2009172012 metadata/md5-cache/x11-misc/libinput-gestures-2.48
 2009172012 metadata/md5-cache/x11-misc/libinput-gestures-9999
 2009172012 metadata/md5-cache/x11-misc/menumaker-0.99.11
@@ -60606,7 +60462,6 @@
 2009291711 metadata/md5-cache/x11-misc/birdtray-9999
 2009291711 metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
 2009291711 metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1
-2009291711 metadata/md5-cache/x11-misc/kronometer-2.2.3
 2009291711 metadata/md5-cache/x11-misc/obconf-qt-0.15.0
 2009291711 metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
 2009291711 metadata/md5-cache/x11-misc/polybar-3.4.3
@@ -60626,26 +60481,30 @@
 2009291711 metadata/md5-cache/x11-misc/virtualgl-9999
 2009291711 metadata/md5-cache/x11-misc/xcalib-0.10
 2009301209 metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
-2009301209 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08
 2010030439 metadata/md5-cache/x11-misc/imake-1.0.8
 2010030439 metadata/md5-cache/x11-misc/makedepend-1.0.6
 2010030439 metadata/md5-cache/x11-misc/xcompmgr-1.1.8
 2010031809 metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18
 2010041809 metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
 2010041809 metadata/md5-cache/x11-misc/cdm-0.7
-2010041509 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha09
 2010060709 metadata/md5-cache/x11-misc/xkeyboard-config-2.30
 2010060709 metadata/md5-cache/x11-misc/xkeyboard-config-9999
 2010062139 metadata/md5-cache/x11-misc/sddm-0.15.0
-2010062139 metadata/md5-cache/x11-misc/sddm-0.18.1-r1
 2010062139 metadata/md5-cache/x11-misc/sddm-0.18.1-r3
 2010071109 metadata/md5-cache/x11-misc/revelation-0.5.4
 2010071009 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha10
-2010081409 metadata/md5-cache/x11-misc/Manifest.gz
 2010080539 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
 2010081409 metadata/md5-cache/x11-misc/vym-2.7.1
 2010081409 metadata/md5-cache/x11-misc/vym-9999
 2010080539 metadata/md5-cache/x11-misc/xsettingsd-1.0.0
+2010112139 metadata/md5-cache/x11-misc/Manifest.gz
+2010111209 metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
+2010092209 metadata/md5-cache/x11-misc/kronometer-2.2.3
+2010111009 metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
+2010082309 metadata/md5-cache/x11-misc/slim-1.3.6-r5
+2010082309 metadata/md5-cache/x11-misc/slim-9999
+2010111239 metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
+2010112139 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -60867,7 +60726,6 @@
 2009121921 metadata/md5-cache/x11-terms/mrxvt-0.5.4
 2009121921 metadata/md5-cache/x11-terms/root-tail-1.2-r4
 2009131115 metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r1
-2009111825 metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r3
 2009111825 metadata/md5-cache/x11-terms/rxvt-unicode-9999
 2009121921 metadata/md5-cache/x11-terms/sakura-3.7.0
 2009111825 metadata/md5-cache/x11-terms/st-0.8.4
@@ -60908,8 +60766,9 @@
 2009291711 metadata/md5-cache/x11-terms/roxterm-3.9.3
 2009291711 metadata/md5-cache/x11-terms/roxterm-3.9.4
 2009291711 metadata/md5-cache/x11-terms/sakura-3.7.1
-2010071039 metadata/md5-cache/x11-terms/Manifest.gz
 2010071039 metadata/md5-cache/x11-terms/terminator-1.92-r2
+2010112109 metadata/md5-cache/x11-terms/Manifest.gz
+2010112109 metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r3
 1707301038 metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
@@ -61091,18 +60950,16 @@
 2009220039 metadata/md5-cache/x11-themes/fvwm_sounds-1.0
 2009252339 metadata/md5-cache/x11-themes/mate-icon-theme-1.24.0-r1
 2009251309 metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
-2009291711 metadata/md5-cache/x11-themes/Manifest.gz
 2009291711 metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
 2009291711 metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
 2009291711 metadata/md5-cache/x11-themes/kvantum-0.16.1
 2009291711 metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
 2009291711 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
 2009291711 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
-2009291711 metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
-2009291711 metadata/md5-cache/x11-themes/qtcurve-9999
-1908192239 metadata/md5-cache/x11-wm/e16-1.0.20
+2010092209 metadata/md5-cache/x11-themes/Manifest.gz
+2010092209 metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
+2010092209 metadata/md5-cache/x11-themes/qtcurve-9999
 1805240409 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
-1912220239 metadata/md5-cache/x11-wm/e16-1.0.21
 2009111825 metadata/md5-cache/x11-wm/2bwm-0.3
 2009111825 metadata/md5-cache/x11-wm/2bwm-9999
 2009111825 metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
@@ -61126,7 +60983,6 @@
 2009111825 metadata/md5-cache/x11-wm/echinus-0.4.9
 2009111825 metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
 2009111825 metadata/md5-cache/x11-wm/evilwm-1.1.1
-2009121921 metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
 2009131115 metadata/md5-cache/x11-wm/fvwm-2.6.5-r3
 2009121921 metadata/md5-cache/x11-wm/fvwm-2.6.8-r2
 2009121921 metadata/md5-cache/x11-wm/fvwm-2.6.9
@@ -61214,8 +61070,10 @@
 2009291711 metadata/md5-cache/x11-wm/wmfs-201003
 2010030439 metadata/md5-cache/x11-wm/twm-1.0.11
 2010041939 metadata/md5-cache/x11-wm/i3-gaps-4.18.2
-2010071039 metadata/md5-cache/x11-wm/Manifest.gz
 2010071039 metadata/md5-cache/x11-wm/spectrwm-3.4.1
+2010111309 metadata/md5-cache/x11-wm/Manifest.gz
+2010111209 metadata/md5-cache/x11-wm/e16-1.0.21
+2010111309 metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2003191509 metadata/md5-cache/xfce-base/exo-0.12.11
 2003261841 metadata/md5-cache/xfce-base/garcon-0.6.4-r2
@@ -61265,12 +61123,10 @@
 2002112051 metadata/md5-cache/xfce-extra/xfce4-dict-0.8.3
 2002112051 metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r4
 2002112051 metadata/md5-cache/xfce-extra/xfce4-verve-plugin-2.0.0
-2003060642 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0
 2003091039 metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.2
 2003152212 metadata/md5-cache/xfce-extra/tumbler-0.2.8
 2003261841 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7
 2004192139 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1
-2004231409 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6
 2006292139 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
 2006292139 metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.1
 2006292139 metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
@@ -61303,6 +61159,8 @@
 2009181139 metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.1
 2009241009 metadata/md5-cache/xfce-extra/tumbler-0.2.9
 2009291711 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
-2010062139 metadata/md5-cache/xfce-extra/Manifest.gz
 2010062139 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
-2010081639 metadata/md5-cache/Manifest.gz
+2010090009 metadata/md5-cache/xfce-extra/Manifest.gz
+2010090009 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6-r1
+2010090009 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0-r1
+2010120809 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fb98b6bc196d..edfa05576b17 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 08 Oct 2020 14:00:01 +0000
+Mon, 12 Oct 2020 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 649a9649a591..5fddd2886a6b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b4c03874df5d69f1080a6c449b3d4b717fbaef82 1602163086 2020-10-08T13:18:06+00:00
+28bcc6b1ec1a829fc77379228b09fe9fa2d8415b 1602478380 2020-10-12T04:53:00+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ca0938979b19..a0f1a2079628 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1602164101 Thu 08 Oct 2020 01:35:01 PM UTC
+1602479101 Mon 12 Oct 2020 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 197a7573e11a..f1baf1c687c4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 08 Oct 2020 13:38:36 +0000
+Mon, 12 Oct 2020 05:08:37 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0bab6c144817..c80f8bd08557 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 001a078f3a54..925b42fa28d2 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -4,5 +4,5 @@ AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f
 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-1.3.0.ebuild 1345 BLAKE2B af0fd32a79845b824a57ed6e059caae0c330efacfd89944733996e5ef448b76f7c9de32fc55c400ad1b2b0983df11ff56a7c839163360c26b25430213cc9fd6e SHA512 4c1085b74a40d3af3265a829f6c146f6b7f6cc3cc34fb425ce8c83396c2385d1c43074c86245a615df16b88434b5a243f9a7bcebb263c373c8d4857e20466f83
+EBUILD driftnet-1.3.0.ebuild 1350 BLAKE2B f4361cf5365dc28fe2137d030fc7660b4b942bb0a622e7718eb31ca0545c6d7419e17bb008b1c73ca45cc5872a28dfa3dc9259914583374dfb10aaad48185d71 SHA512 675fc93a31985730a5e9191fdf84baef6a0f935050b7f5d6c326227f227b8fbe86c4969ae1da58e71ff3a38c81b8cd0fbe02b930e47149b33d80c1841d95704c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 5472c3464801..b20c9b846b70 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~ppc -sparc ~x86"
 SLOT="0"
 IUSE="debug gtk suid test"
 
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index e52f36f808e8..e6e6478588df 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,6 +1,4 @@
-DIST gr-fosphor-0.0_p20191202.tar.gz 254103 BLAKE2B 460b4ff2ff9f4a6faa70c541dd8ce936ba8419a89cca7715913b6f93f07a151c467a5737860a362198d609dfe0e4bfc4a476278bfc720d89c1876ff56addf226 SHA512 6bc26be4aa3116af33a214046c76e5a7623e049e27e86d866892de611ffd4bfa4bd841b66535fc40320fa7c7a46d19af2d391ee594f9a7ed997355cd2ade6fa1
 DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
-EBUILD gr-fosphor-0.0_p20191202.ebuild 1379 BLAKE2B e24557d185a06d139ba915dfadb23eb99d434f88f09bb006fcbb7cfc0d565905bc095cd83e630d4b80b97c1fc25b906b5eefa5b8ecba00f5b7b950bda869c53a SHA512 c764a9ed59af2a4b929add701485cf89a5ed0563f0caddf29dc71fb23cc8e0fe00c92a834ad4acbdbd95fd335648d4d0c3f71f4bcccc84d455cd5086decfb873
 EBUILD gr-fosphor-0.0_p20200131.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02
 EBUILD gr-fosphor-9999.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
deleted file mode 100644
index 78c0f817bcf6..000000000000
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
+++ /dev/null
@@ -1,64 +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 cmake-utils python-single-r1
-
-DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
-HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-else
-	COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
-	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="glfw qt5 wxwidgets"
-
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	=net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
-	media-libs/freetype
-	dev-libs/boost:=
-	glfw? ( >=media-libs/glfw-3 )
-	virtual/opencl
-	virtual/opengl
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	dev-util/cppunit
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	default
-}
-
-src_configure() {
-	# tries to run OpenCL test program, but failing doesn't hurt
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GLFW="$(usex glfw)"
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WX="$(usex wxwidgets)"
-		-DENABLE_PYTHON=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index f2d51c8428a8..edbe808a6e4f 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,5 +1,5 @@
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
 DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6
-EBUILD linkchecker-10.0.0_pre20200729.ebuild 1503 BLAKE2B 0cf7b199901d3bdce48fdd15004c1c59e48419ffc68dfaf8d44bcf3c7b04906cdb2dee80ec5fc6de26dccedf6c37fe5dccd332e9a5f34e5834beeabf94622c6a SHA512 a54046ddf3eded565d4ca59f94bc75c9e032ee37e6b684975c2c81b700ce1fdc73b48460cd501abf47c7ea27d56f760e917bb933a7f998b271c7100dbb19d8e5
+EBUILD linkchecker-10.0.0_pre20200729.ebuild 1502 BLAKE2B 8c268cb3cdde5b1ef62078978350376de8e051f5dc7c9e6131932b30b9572bbcb4c2160f477d6e6666b9079dd67cc1772cfe6f924fc926d3f52a02dbe7460ab9 SHA512 134d6e1fcadf01f4532d156f6cf39832542d5be6908f64c2e86c5570def8c06a33b8621ca3d05e407cd9aebe7df759cc9e5d81147af32f5304731c8cbdc42901
 EBUILD linkchecker-9999.ebuild 1327 BLAKE2B b6160741da9a3532ef70d05706d53806a79e1cea88a0a1e8a815b1865d7c72ad7c4efdce86dc27b7fc593c4d6e31e2c89f79c0b8e4e6bd7001c6f68d9a94b106 SHA512 93a08f43960426f83cf14a19974707ffd69c067fb952200d44582180451e34a46e1b0dae838c0cb375d5432a1e493b35f2fa015841d798b781461b0d8ff3bf7e
 MISC metadata.xml 544 BLAKE2B 4ab01a5626c5397e7b550b717902525a6e3b5b8e3a7b1c916a48abc7181a1c1486a53ecb9e68e06ece5bcf5bcdf67167b0ab60186291033e84d2ed9237bfa35c SHA512 c0f91900f87cc48adc5628264a1948400da60d444c4c5ca251d4edc23a9042616fd90d60e4493e5e458c47991aeace55725bd181c82d6188be398cda2347a64c
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
index 0bf389cb6351..69dd01691653 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
@@ -18,7 +18,7 @@ else
 	GIT_COMMIT="a977e4d7129450ba9fda8389724c80c1bde66883"
 	SRC_URI="https://github.com/linkchecker/linkchecker/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
deleted file mode 100644
index e6c008e9dd53..000000000000
--- a/net-analyzer/mk-livestatus/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 BLAKE2B f02aee31116dede718ef3671fe86b228ce3031f01fad987ed8622e7e434747e07fc535798f9c5122125f951257a7446f76fc42f7b1f063cc1b5897eeca0cfbf2 SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf
-AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BLAKE2B fb036de5371602ad2ef36ad4916d2f6193a8e8fef4ea2adebe1ace6225ae9c76ffc3ec72ec6649b3ed45e423e3cf6351f86d82d0f524c1a6842066f1e43be99e SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404
-AUX mk-livestatus-1.2.8_p26-fno-common.patch 671 BLAKE2B a0f49e00c040cc8fab5bc343042195d62087172c549d331375d51832a3234e56cff09a0f0c3c9a53ddeb7e824db26084ac16ce7051d1c4bc885e4d8610ebae06 SHA512 067b1c5af81ff668dda6a713306bedb9b3c6795a1bc146988ff9f351a62cb39cea889bfe77474a918ab69c8f97fee506372ff3115deabea400ced605e60f0520
-AUX mk-livestatus-1.2.8_p26-rm.patch 254 BLAKE2B 789318a34cbedb65595e930c3e9c3f3a641d581cc1f9045c54445f501c8173475bb4fef49bc16352749036ceff380e81c83e18aff386150ed85014ef8d490bf2 SHA512 df8b7337206922a7aa5f980e19a5f1d4b0a8a92d5b0603339a7437d5eb4a78a3a3148d9c27f84869d91e73b42b7aa18e2c3868650efe179cc856cb90491f392c
-AUX mk-livestatus-1.5.0_p22-rm.patch 306 BLAKE2B ac45ad1c89a8a067cf780ae13d24a50e4a983c619846ee1e6dcc5a56e3fe8d541b82b8a3f14e7b32f934acefdaa8890635e1745a6e7f17e04f46dd603e461803 SHA512 b172fbd35f7d9b06017bf9df56f8c8ec106f1d71e77dbf6a6a55d974dcf4ccf3548379164c7b4fdac8c1b28456268433d061049c0d2781d9cf3434682e32ebb7
-DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d
-DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4
-DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014
-DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6
-EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
-EBUILD mk-livestatus-1.2.8_p16.ebuild 3420 BLAKE2B 0931d1ec0fdb6dc496ad76a14ecc829d7b389e9a0ef9cfe55ed7f3d9e8447ef570bbaedce501eb7c9739853212dfd012e8a55be87540b31d6fb73a09f8e7dbea SHA512 5a453d138453916c5ac46ad5b7c916bbf5dc8c0ae196ec66da4e8da25179a4816d4588e84fa89e978296b74d013f08c5df0224dc749547480a6be665d7869e45
-EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3456 BLAKE2B 5aa345a5411a3fb01cc9a120f27bb19dd84c92f9c2ae26f4c11461baafdc86db14306b401bd44c2bf2dc5598afff21174ca84ed664c065020c485092ddad93bc SHA512 1af491259f2c8c6ad0cf1d2ad2414cab89a3df7dbb820ed2f80f61c1417fde1a099e4efd7cafd9b9c949fb9b20831e2f6d2bc9fe347bee2eb10b6131a709e2a5
-EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3562 BLAKE2B 26e5dbf7ab2d0fba9d357f55dbcf665d510f1a9f27aa2f2827711224d44524a462106b3e39aa091e8ab8009db1d404ed6a0a0e8e4fb8b526d182f8a5ce652d9c SHA512 0a7854b54d63c01473f07a01ab5888d3b0fa62288599ecb552142123a9154af15c5697deb7c36c7e13c8910f976e86f553f7bf65b19f9196965df4fce8dcc328
-MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
deleted file mode 100644
index 5b5009bfaa01..000000000000
--- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Wed, 21 Aug 2013 23:00:21 +0200
-Subject: [PATCH 1/2] MEDIUM: Drop default strip
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=482026
-
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index deab289..126b503 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -55,7 +55,7 @@ livestatus_so_CFLAGS   = -fPIC
- 
- livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
- 	-rm -f plugin.so
--	$(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
-+	$(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
- 
- all-local: livestatus.o
- 
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
deleted file mode 100644
index 264d9bb899b6..000000000000
--- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Wed, 21 Aug 2013 23:00:21 +0200
-Subject: [PATCH 2/2] MINOR: test: Remove the usage of
- Perl::Critic::Policy::Modules::ProhibitAutomaticExportation
-
-This does not exist since
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=482026
----
- api/perl/t/perlcriticrc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc
-index f7e4721..f686dca 100644
---- a/api/perl/t/perlcriticrc
-+++ b/api/perl/t/perlcriticrc
-@@ -133,8 +133,6 @@ severity   = 3
- [Perl::Critic::Policy::Miscellanea::ProhibitTies]
- severity   = 4
- 
--[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
--
- [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
- severity   = 4
- 
-@@ -283,4 +281,4 @@ severity   = 5
- severity   = 5
- 
- [Perl::Critic::Policy::Variables::RequireNegativeIndices]
--severity   = 4
-\ No newline at end of file
-+severity   = 4
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
deleted file mode 100644
index e0dc8469c15a..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/logger.h
-+++ b/src/logger.h
-@@ -27,6 +27,7 @@
- 
- #include "config.h"  // IWYU pragma: keep
- #include <syslog.h>
-+#include <pthread.h>
- 
- #ifdef CMC
- #define LG_DEBUG LOG_INFO
-@@ -49,6 +50,8 @@
- extern "C" {
- #endif
- 
-+extern pthread_t g_mainthread_id;
-+
- void logger(int priority, const char *loginfo, ...)
-     __attribute__((format(printf, 2, 3)));
- void open_logfile();
---- a/src/module.c
-+++ b/src/module.c
-@@ -95,7 +95,6 @@
- char g_logfile_path[4096];
- int g_debug_level = 0;
- int g_should_terminate = false;
--pthread_t g_mainthread_id;
- pthread_t *g_clientthread_id;
- unsigned long g_max_cached_messages = 500000;
- unsigned long g_max_lines_per_logfile =
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
deleted file mode 100644
index abdb2e01691b..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -62,7 +62,6 @@
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
--	rm -f $(DESTDIR)$(pkglibdir)/livestatus.so
- 
- clean-local:
- 	rm -f *~
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
deleted file mode 100644
index 5c267ae2f4cd..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -201,7 +201,6 @@
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
--	rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a
- 
- clean-local:
- 	rm -rf *~ compile_commands.json cppcheck-result.xml html
diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
deleted file mode 100644
index 4a90a3fdc4d8..000000000000
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bertrand@jacquin.bzh</email>
-		<name>Bertrand Jacquin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag>
-		<flag name="boost">Use <pkg>dev-libs/boost</pkg> for ASIO support</flag>
-		<flag name="re2">Use <pkg>dev-libs/re2</pkg> for regex support</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
deleted file mode 100644
index b36094f1ee3e..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-MEDIUM-Drop-default-strip.patch"
-	"${FILESDIR}/${PV}-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
-)
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nagios4)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_foreach_impl python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
deleted file mode 100644
index f0e770a07ddb..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
-	"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
-)
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nagios4)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	# install a config file showing whats needed to enable livestatus for nagios
-	cat <<EOF >"${T}"/nagios.cfg
-# Ensure all data is set to event brokers
-event_broker_options=-1
-broker_module=${EPREFIX}/usr/$(get_libdir)/mk-livestatus/livestatus.o
-EOF
-	# same for icigna
-	cat <<EOF >"${T}"/icigna.cfg
-define module{
-        module_name             mk-livestatus
-        module_type             neb
-        path                    /usr/$(get_libdir)/mk-livestatus/livestatus.o
-        args                    /var/lib/icigna/rw/live
-        }
-EOF
-	insinto /usr/share/mk-livestatus
-	doins "${T}"/{nagios,icigna}.cfg
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_foreach_impl python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Sample configurations for icigna and nagios are available in"
-	elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
deleted file mode 100644
index 071250a73b6b..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
-	"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
-	"${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch
-	"${FILESDIR}"/${PN}-1.2.8_p26-rm.patch
-)
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with nagios4)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	# install a config file showing whats needed to enable livestatus for nagios
-	cat <<EOF >"${T}"/nagios.cfg
-# Ensure all data is set to event brokers
-event_broker_options=-1
-broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
-EOF
-	# same for icigna
-	cat <<EOF >"${T}"/icigna.cfg
-define module{
-        module_name             ${PN}
-        module_type             neb
-        path                    /usr/$(get_libdir)/${PN}/livestatus.o
-        args                    /var/lib/icigna/rw/live
-        }
-EOF
-	insinto /usr/share/${PN}
-	doins "${T}"/{nagios,icigna}.cfg
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Sample configurations for icigna and nagios are available in"
-	elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
deleted file mode 100644
index a0d42e5b3a7e..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="https://checkmk.com/"
-SRC_URI="https://checkmk.com/support/${PV/_}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="boost examples nagios4 perl python re2 test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	!sys-apps/ucspi-unix:0
-	net-analyzer/rrdtool:=
-	boost? ( dev-libs/boost )
-	perl? (
-		dev-lang/perl:0
-		virtual/perl-Digest-MD5:0
-		virtual/perl-Scalar-List-Utils:0
-		>=virtual/perl-Thread-Queue-2.11:0
-		virtual/perl-Encode:0
-		dev-perl/JSON-XS:0
-	)
-	python? ( ${PYTHON_DEPS} )
-	re2? ( dev-libs/re2:= )
-"
-DEPEND="
-	${RDEPEND}
-	perl? (
-		dev-perl/Module-Install:0
-		virtual/perl-ExtUtils-MakeMaker:0
-		virtual/perl-File-Path:0
-		virtual/perl-File-Spec:0
-		virtual/perl-File-Temp:0
-		test? (
-			dev-perl/File-Copy-Recursive:0
-			dev-perl/Test-Pod:0
-			dev-perl/Test-Perl-Critic:0
-			dev-perl/Test-Pod-Coverage:0
-			dev-perl/Perl-Critic:0
-			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
-			dev-perl/Perl-Critic-Deprecated:0
-			dev-perl/Perl-Critic-Nits:0
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
-	"${FILESDIR}"/${PN}-1.5.0_p22-rm.patch
-)
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	default
-
-	# Use system Module::Install instead, it will be copied to $S by
-	# Module::install itself.
-	rm -rf api/perl/inc || die
-
-	# failing test
-	rm -rf api/perl/t/20-Monitoring-Livestatus-test_socket.t || die
-
-	if use perl; then
-		# Ensure patches are not applied twice
-		unset PATCHES
-		perl-module_src_prepare
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	econf \
-		$(use_with boost boost-asio) \
-		$(use_with nagios4) \
-		$(use_with re2)
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd api/perl || die
-
-		SRC_TEST="parallel"
-		export TEST_AUTHOR="Test Author"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED}"/usr/$(get_libdir)/${PN}/liblivestatus.a || die
-
-	# install a config file showing whats needed to enable livestatus for nagios
-	cat <<EOF >"${T}"/nagios.cfg
-# Ensure all data is set to event brokers
-event_broker_options=-1
-broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
-EOF
-	# same for icinga
-	cat <<EOF >"${T}"/icinga.cfg
-define module{
-        module_name             ${PN}
-        module_type             neb
-        path                    /usr/$(get_libdir)/${PN}/livestatus.o
-        args                    /var/lib/icinga/rw/live
-        }
-EOF
-	insinto /usr/share/${PN}
-	doins "${T}"/{nagios,icinga}.cfg
-
-	if use perl; then
-		cd api/perl || die
-		perl-module_src_install
-		cd "${S}"
-
-		if use examples; then
-			docinto /
-			newdoc api/perl/README README.perl
-
-			docinto examples
-			dodoc api/perl/examples/dump.pl
-		fi
-	fi
-
-	if use python; then
-		python_domodule api/python/livestatus.py
-
-		if use examples; then
-			docinto /
-			newdoc api/python/README README.python
-
-			docinto examples
-			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Sample configurations for icinga and nagios are available in"
-	elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 123ddc9aef36..18097c36b3ae 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -4,8 +4,10 @@ DIST sslscan-2.0.0.tar.gz 109677 BLAKE2B 728ca5f59e7d46cf6bf4ac03fce8eb8b7183f99
 DIST sslscan-2.0.1.tar.gz 109709 BLAKE2B d0aabebe208529122d9d4d63d39b13c3cc9128dce552cc773b32e02ade87fcb91d5ad7e13a5dfd4883f73153d3ec19b91b16166a756c38df92c96a2f9e8606bb SHA512 d8e9b66b110d7a76ffa7cc3b52f6f5614998ab08e91d12aa92d604ff3320dff6bec0e9a9017ab9c2dea204d9f51b5c729215836fd8f0dce0c5817e28b2eef63f
 DIST sslscan-2.0.2.tar.gz 109798 BLAKE2B 4ed599578a3ee1bd0296c237f8f751aa9f95b96ab7592d0d8f7d117879e7058a92f28d5361658e144eb461fd1bb11739e79e2ae030ac9fb0430924ecca53dfd6 SHA512 ffe12315942c9b9a5f28766768c2202ef09d82977a42c5d114ba2bb7354e694df6262377288ca788e185e0b9423a78c9ebe2fcc02923bd8522c0b9b98df43453
 DIST sslscan-OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4
+DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa
 EBUILD sslscan-1.11.13-r1.ebuild 1029 BLAKE2B 3e0c3fa00d0a29907180b2307efe0e628305951d614613dead3fe4580d000f13151bbfa88070240048e5e2cb02e0699355312cca6947d19c1fcba3c0b3178ff7 SHA512 92032809178fcd9bbf769059afd3f31fbda24f9b8e6ace40acbca7c09a7de314ac94408ad2b8c00daf181fa89ddf376cc00ab7bf3662c38dae68d1a88a4fc63c
 EBUILD sslscan-2.0.0.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
 EBUILD sslscan-2.0.1.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
+EBUILD sslscan-2.0.2-r1.ebuild 1257 BLAKE2B c17e33c3509ec360f5a62ebefb0eb6e773a5f6ee2827722aa9457258dc84d695a266a21bae23ab5a0bcb78713b41487692c74c273e3ac2e4e9230579791516be SHA512 94b770ab86e5c88b348a221a3c3e9bfaf0aebea0ad841377827ea51360cdd6b2f5a98b04f10e21c0f06151461f00823229b24c451edeb6c0d2446ad1d13af140
 EBUILD sslscan-2.0.2.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..b90f6d3563b4
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+#MY_FORK="rbsec"
+#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+#	https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index ed8dd86cf388..d81fab9cdc5f 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,8 +2,11 @@ AUX suricata-5.0.1-conf 2771 BLAKE2B c9f9ac6707f71ace993bcf730df5aab11a6e59fcbb6
 AUX suricata-5.0.1-init 5480 BLAKE2B 48c9484c824f7216d1c4d64394a60b5a5b2c1f5781e8faa775d56765680dd27cb886daf61da7e93f78469f2947f38bd044804acc79f2fb3c40477aff0f470f13 SHA512 6756cebe424b057884904e716af05e74bf2cfc47461a6081b4ff45144d1fefb568ffc3aaffb8162efa3272fea535d0f93632b4778d9c80d64fca26740471ed49
 AUX suricata-5.0.1_configure-no-lz4-automagic.patch 601 BLAKE2B 01874b39d89a8872a35a102018e2e11208549f60790e88f988a689ba09c59fb915bbffccb6db454a8d8d4fee0ccf69b51cd5d2cde11cb6f2a1c401cb74c5c49d SHA512 d26fc7e0193ea3ddd5436964a26bbbfed847890d513c4e7181a0faceb0a688df8ca35ad68045ecd006a25da93d345a942c593f8711f81dff5f63d13e599f78b0
 AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83bd35927cf90b66a10e51e5058869e09c05810c037da025a9d26486e33077a06bfe8ba08698618e091bdc40a255d8322062c7 SHA512 0f6337d5bff60cd57f3a3a3edcb82abde9acc6848b158cac1b8f945fc7a228340c420d53a2c5f558d5b5e2b7645f6b104e8105b260245209ba782966d6f04a7c
+AUX suricata-6.0.0_default-config.patch 833 BLAKE2B a8a63f838452531feb9f1b69e9756c0385338f4a1b8f6c36b22052cc7f8a41cd07e31b882e2e89402c5eb43e599390cf6922f9dcfc869416d57aa3426516f8f9 SHA512 8edff1be84dbe29a140889040a7d9310ee8dc5ab82cf9ff64298ecfab07a75853caa7ac907cf191a62a1c2de9833311fd090eb2f82c9d3745b5f3fc01adf6efd
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
-DIST suricata-5.0.3.tar.gz 23744731 BLAKE2B 51dfd6fb8a1208e4999999f178f679f2b3cf6a2632a659fb5b58baa747da64fb37a1c9345b51b2bb3f5c33f9a3fc9208ab52cb6e8dc6ddb38b7c19124f7345ca SHA512 4e0ad2ae33537cb074d549b3cc162c5ed115605cb142a96cbf66d1341799eaad96b307fd6ad4679e344e51d00065b3573bfb26bd60468f12addb144b112e4f72
-EBUILD suricata-5.0.3.ebuild 6182 BLAKE2B 0467639af68bfb855f72dc0097856688f6a3f2a28b0a9a2d37e419b3220cb6350bfc30ac0defbf46990ad72ad4d47cab818d40ec28674638cd45fb680fbabfb9 SHA512 19d4a32238228d5d4779870dcb75e55caebdf841bc74b39b6cd0bccd5494496def82cdf2c63cc2472db4612e4dc468148f2206e47beaad2c9d33231625274183
+DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6
+DIST suricata-6.0.0.tar.gz 30832555 BLAKE2B 9cea05b07520924706e961efed6a45b9ba73388a25777f43c1a90497aa00ec200bad15863b7b17b84e622c79309365596853423776da9c3d103c2a8c1126a0d2 SHA512 3c30f6f57c0e8a24992ff2b4ce8ce166d3c0d4b28c8f5e79434d04de9f2016773be01a1689fedfc9e54ff1c8bc9838206bc28f3ff2e47d60102a7016f1062ec3
+EBUILD suricata-5.0.4.ebuild 6182 BLAKE2B 39f9cc7a0a7510e36bb1365a40eb3ddfce15cd42a427a314ac775ca50d51ebf5aeabc36eca89be9dae30de7f8f78112fea959f88d5360bb990828a395153906f SHA512 62256f5377e72a91d6d7e6faef585fdbec8adaf191f9e7008ee41422039d1b59ef77b7fb50975ab7606ef12f445d7257321ad3d1b5310fa32145d1107bcbe26e
+EBUILD suricata-6.0.0.ebuild 6486 BLAKE2B 8cf5048478d9f3d59dde49205720ea344eabb1c1dfafa63a047fcb657dce1195de126c4032557268db93bbe971e9c7e559f51127bc2e1f7722e38bb8f8e20269 SHA512 1050838e4093e5601f66caee1ee850b21ab7cbaaeab8f919ffccf80f95bd577a014bba68d7f99da39fa0e1c8fca993e188923583ed869c7585ba54eabae585ac
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch b/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch
new file mode 100644
index 000000000000..03e0f1cda944
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch
@@ -0,0 +1,27 @@
+--- a/suricata.yaml.in
++++ b/suricata.yaml.in
+@@ -209,8 +209,9 @@
+             # https://suricata.readthedocs.io/en/latest/output/eve/eve-json-output.html#dns-v1-format
+ 
+             # As of Suricata 5.0, version 2 of the eve dns output
+-            # format is the default.
+-            #version: 2
++            # format is the default - but the daemon produces a warning to that effect
++            # at start-up if this isn't explicitly set.
++            version: 2
+ 
+             # Enable/disable this logger. Default: enabled.
+             #enabled: yes
+@@ -988,9 +989,9 @@
+ ##
+ 
+ # Run Suricata with a specific user-id and group-id:
+-#run-as:
+-#  user: suri
+-#  group: suri
++run-as:
++  user: suricata
++  group: suricata
+ 
+ # Some logging modules will use that name in event as identifier. The default
+ # value is the hostname
diff --git a/net-analyzer/suricata/suricata-5.0.3.ebuild b/net-analyzer/suricata/suricata-5.0.3.ebuild
deleted file mode 100644
index d159cf584dac..000000000000
--- a/net-analyzer/suricata/suricata-5.0.3.ebuild
+++ /dev/null
@@ -1,197 +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 autotools flag-o-matic linux-info python-single-r1 systemd
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata-ids.org/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( lua luajit )
-	bpf? ( af-packet )"
-
-RDEPEND="${PYTHON_DEPS}
-	acct-group/suricata
-	acct-user/suricata
-	dev-libs/jansson
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	>=net-libs/libhtp-0.5.33
-	net-libs/libpcap
-	sys-apps/file
-	sys-libs/libcap-ng
-	bpf?        ( >=dev-libs/libbpf-0.0.6 )
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/libmaxminddb )
-	logrotate?  ( app-admin/logrotate )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	lz4?        ( app-arch/lz4 )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.69-r5
-	virtual/rust"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
-	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
-)
-
-pkg_pretend() {
-	if use bpf && use kernel_linux; then
-		if kernel_is -lt 4 15; then
-			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
-		fi
-
-		CONFIG_CHECK="~XDP_SOCKETS"
-		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
-		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var" \
-		"--runstatedir=/run" \
-		"--enable-non-bundled-htp" \
-		"--enable-gccmarch-native=no" \
-		"--enable-python" \
-		$(use_enable af-packet) \
-		$(use_enable bpf ebpf) \
-		$(use_enable control-socket unix-socket) \
-		$(use_enable cuda) \
-		$(use_enable detection) \
-		$(use_enable geoip) \
-		$(use_enable hardened gccprotect) \
-		$(use_enable hardened pie) \
-		$(use_enable lua) \
-		$(use_enable luajit) \
-		$(use_enable lz4) \
-		$(use_enable nflog) \
-		$(use_enable nfqueue) \
-		$(use_enable redis hiredis) \
-		$(use_enable test unittests) \
-		"--disable-coccinelle"
-	)
-
-	if use debug; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
-	else
-		econf ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize
-
-	if use bpf; then
-		rm -f ebpf/Makefile.{am,in}
-		dodoc -r ebpf/
-		keepdir /usr/libexec/suricata/ebpf
-	fi
-
-	insinto "/etc/${PN}"
-	doins etc/{classification,reference}.config threshold.config suricata.yaml
-
-	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-	keepdir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
-	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
-	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins etc/${PN}.logrotate ${PN}
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	if use systemd; then
-		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
-		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
-		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
-		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
-		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
-		elog "For details, see the section on drop-in directories in systemd.unit(5)."
-	else
-		elog "The ${PN} init script expects to find the path to the configuration"
-		elog "file as well as extra options in /etc/conf.d."
-		elog ""
-		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-		elog "then create a symlink to the init script from a link called"
-		elog "${PN}.foo - like so"
-		elog "   cd /etc/${PN}"
-		elog "   ${EDITOR##*/} suricata-foo.yaml"
-		elog "   cd /etc/init.d"
-		elog "   ln -s ${PN} ${PN}.foo"
-		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-		elog ""
-		elog "You can create as many ${PN}.foo* services as you wish."
-	fi
-
-	if use bpf; then
-		elog ""
-		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
-		elog "because their configuration is hard-coded. You can find the default ones in"
-		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
-		elog "and the common location for eBPF bytecode is"
-		elog "    ${EPREFIX}/usr/libexec/${PN}"
-		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
-	fi
-
-	if use debug; then
-		elog ""
-		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-
-	elog ""
-	elog "To download and install an initial set of rules, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog ""
-}
-
-pkg_config() {
-	suricata-update
-}
diff --git a/net-analyzer/suricata/suricata-5.0.4.ebuild b/net-analyzer/suricata/suricata-5.0.4.ebuild
new file mode 100644
index 000000000000..e618aa1e0bcc
--- /dev/null
+++ b/net-analyzer/suricata/suricata-5.0.4.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools flag-o-matic linux-info python-single-r1 systemd
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( lua luajit )
+	bpf? ( af-packet )"
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.35
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	logrotate?  ( app-admin/logrotate )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable lua) \
+		$(use_enable luajit) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in}
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins etc/${PN}.logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog ""
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog ""
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog ""
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog ""
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog ""
+	elog "To download and install an initial set of rules, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog ""
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/suricata/suricata-6.0.0.ebuild b/net-analyzer/suricata/suricata-6.0.0.ebuild
new file mode 100644
index 000000000000..5f5d14e3eec3
--- /dev/null
+++ b/net-analyzer/suricata/suricata-6.0.0.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools flag-o-matic linux-info python-single-r1 systemd
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( lua luajit )
+	bpf? ( af-packet )"
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.35
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	logrotate?  ( app-admin/logrotate )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-6.0.0_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable lua) \
+		$(use_enable luajit) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in}
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins etc/${PN}.logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used"
+		ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2."
+		ewarn "If you need unified2 support, please continue to use suricata-5."
+	else
+		elog "To download and install an initial set of rules, run:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+	elog
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index b2af48b7036f..2ec28c3e841a 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -16,6 +16,6 @@ DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b
 EBUILD vnstat-1.17.ebuild 1456 BLAKE2B 33050a01343457432c73bd2018a443a649faa7d34c8f68bda4f0eed5285dbd2c21dc6166fe94f8cc7011b957c4c4c60b51e3ba369899ae3e0b68f65b86d79053 SHA512 8465ee23f4ceadb1e9fb485bc992eb9196b75e747c7833c9d2a9ad12e86c79255667ed706b62b1131301d3b8d29221d6517fb4fd36bc1b06f52e13c2e29d3c2c
 EBUILD vnstat-2.4.ebuild 1552 BLAKE2B 84bc2e8bbbc9dd8187865e7c7850ef9392c1adcc81b5c3af7001630389115d0ea076e20a89127ca32de26cf8713e0ab910408bb5d9ae6e991beea8b737185868 SHA512 b3dcdda38271d8e1f454c1d99270967e9c1a361533425cf57eea490e7094a2ce6ff96611c9766e0ab25a33a78fdff86a17e38c3ed087cccac1501e93339e12dc
 EBUILD vnstat-2.5.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
-EBUILD vnstat-2.6.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
+EBUILD vnstat-2.6.ebuild 1558 BLAKE2B 826665e07787f51949930831d574be0aa2284c7394b8b68058a89f5a6f95d0c1b8973a5e48512afce1b3ba4d994cfa8885fedcbc1f0e836e81bb7200fe320a2f SHA512 9ad59c4efcdf042edd9aa030efa4a1fb3d5685a3515d079da6e4cda83f579492e89afc013e73698acc55a7c70ed3795e83facfa05a427f8aca82dd175da02651
 EBUILD vnstat-9999.ebuild 1529 BLAKE2B ebc7b0f707be6e17a4592107c159e128420350e3ed03963bd60915ed044df6d65485beb008113864ebe40de4b9d7b642f4a46dd818bb68edb519f38a4986b9c4 SHA512 3491048ea7993c399e220760774814e8df47d416dcfedf99bddf074be1d4c6addbf804fbd0179b13c809ea6df9b6e01c8e60f5368a556fe789ffad460452a143
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild
index 12983f11d965..6e3eb56ef4ce 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a793a43e2226..880ada039b8c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,11 +4,9 @@ AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a
 AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d885616754c3645b6b658eb2e43988137a651dc3cdd34e21064ffa3b9ccf61011cc8542a5ad8ef817c497a679ef0aae2d7ba463ab2f61 SHA512 6f5dcf91cadc96272f8b9e7002319dc3c91b2a2495477da0102b87ba73a3240fea29c6c9ea655953290d4f6ed1799c049ec23b0b0cff498e2b7b6e78f49f784e
 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 7046 BLAKE2B e086c450f39764d0ff5bf551d90b89255d28f2b99fd9fac4a51e73636286cef501ca1b73a9e38a713474775bbfc542f72bd1d5863c57bfef7efa0e48e535949e SHA512 534c1d648b2749269ba76d1a7433a18925c01e1405f76a831f92259e59e29613ff860ceca42b96127179430f3920045b0921f6f8b4dadc1800a724bce12cd480
+EBUILD wireshark-3.2.7.ebuild 7045 BLAKE2B 2a0720dae27a7107ee5d4befc453381bbe823f5ca5a79ead2064922ed124901f03060b631b56d28f08b8ff62dffd6b83fb829aed035d4a856d733e93c6c98647 SHA512 f06a5f4253320cfd44cfdd55fa03cba0222fab6310ae7fdfafb475c95e9c879e1c889370f5a67a757c73a3f71e68b67f4f1493044adfc6d810256b1ee5a9c2cc
 EBUILD wireshark-3.3.0.ebuild 6958 BLAKE2B 7cc52200981228568376a3ffdab962a7d610ead91dfa67237fcf313f5fe8a564acf8d578f82c9815dded47795ca1b43f082938896b04a3f6e41d95bfcd20bac3 SHA512 50af2109a63fb3672afa55906a9d7aa7dfe0c5a7cee6fc4b06b4e9d429af664949e258bd3478aeb46ad1f2decece5b9dfbd3487183d39a3d21c106ecbe4bc8ea
 EBUILD wireshark-99999999.ebuild 6878 BLAKE2B 9c596b5c732650d51c5d06716bb8c202a6b8e0755dca244ee85d85d0aaa8272f172bd26f71c777ebae984b1497e8f069edb6834b2607e327e52f1499c249a4d7 SHA512 e5dee52dbe377a2d79a61d285af02e16635cbbde09df5b91db5e35c3002effc8e726bf05ba5a5e44d49f824983576f9ba2070af6e81e04e757d9faeb2e719793
 MISC metadata.xml 5040 BLAKE2B f90a667752c84ec9f7098916a62d280caa2abde9c02eb751e9564ace0e4832f58a277d0a379fc549145488442463e7885d89c235ed707f09e167afe98fb0a380 SHA512 67a13228dcbecbeff78cabdf8de7f6b6dd0836321f5d17e09f65866d8258688dea033cdbccd8447c8f857637da55228c5c74ac9311543b74f574510aa0d6935c
diff --git a/net-analyzer/wireshark/wireshark-3.2.6.ebuild b/net-analyzer/wireshark/wireshark-3.2.6.ebuild
deleted file mode 100644
index 275d063e26e3..000000000000
--- a/net-analyzer/wireshark/wireshark-3.2.6.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
-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-analyzer/wireshark/wireshark-3.2.7.ebuild b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
index 5a2c985a4643..275d063e26e3 100644
--- a/net-analyzer/wireshark/wireshark-3.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 380e028f6bc4..b4856f8a0843 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -14,13 +14,13 @@ AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b70639
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.23.tar.gz 17398767 BLAKE2B e1a2dba3c5d0eff6e5b277beb3b0fcfc931883f4ccd9ab458dde4115f997c37ae813804d890f586c560191523b8ed5b2fde72c71910436ab33ea953373316641 SHA512 7d78bf21cc9df6a924543b4ce0ba1ea5e5de4b169fd2333cafbac7eb8a757d2db32dcbbc8783ed0c95dfdddb7dadd6109352f2544d3c92f6f410d2116bf72ca2
 DIST zabbix-4.0.24.tar.gz 17404177 BLAKE2B 3c2e9d6f69ad32c5fbee4d4f57661dffa9afafd98056f199658e05ff6c241149c5f23bb3a71a8524e3d83b33a6635b78713e8ec7a77457ae62550f9580715969 SHA512 ec4d4bbfc3ce1ea10a4e6cf96c10e4495ce2ea154dc297544ae107d4cb7451e3fc76e25d7822f40a809a87a268c54abb8a9d49869942f2009c0a7f92ff6abaf3
-DIST zabbix-5.0.2.tar.gz 18823956 BLAKE2B 170b64a15ac8dfbf16264e4973b16130f8066a7b08e579265ae17132d9b78f43bcc8840606c0413a4db199e237ba92989556cbd12f76e595f2999cfe9ff041a0 SHA512 81cf26d67e4e4df388dd6505db6f7451cf2f05aa6ac7b5d043c32eec89053cf133075bbb289cfb5b15f48a3eb94f6462427047777035ab09cc1dfeefba926dd6
+DIST zabbix-4.0.25.tar.gz 17414403 BLAKE2B 5b84c5d61c90b4fbc94ea64994a7b4216fe1e728e3bf71afb5cfa674f3f24bd8d9ab91dbd9d869d5bef8fc83ef168a952ba45db8abeabf51402d92dd4487d8dc SHA512 741373adeab5ad4adccc8909e7adf7c8d2172b49e6c5e23cda057be3b82ea237fabcaa787557ea391861a6c2ad42efb695d36836ce8dfd1532e8a3cf394a7cfb
 DIST zabbix-5.0.3.tar.gz 18893485 BLAKE2B fd0225b86337a80f92a32647027e2265394ba766b304e305813b9edcfd2cc979dc4b6b4072dcd043e3b043b5f64a3fb28d36dd0dde18d216d877534ca2725d85 SHA512 d08a031b334f531320f6b695af3ed7e3514c802ea28e0cec75040c518409e16ab4c591b389091aa12c07129f9b758d050c958967e3e86e725f4595f3b3a90d97
+DIST zabbix-5.0.4.tar.gz 19039167 BLAKE2B 82fb27076febe5ba43ff6c829ae22c5b4928d74f14e429c602442c90dfd5d1ce112b66d1782bd313b3300c66c774da4403a2150be7ed6ae56ae4b03a608dd018 SHA512 8ac6b56a221fe73982c30dc7dd2f2b036fa10a2fc38ef54e24dc0dd5d56a096f9c0779965afcaa5d26ee893a9f5fc8189ebc67d4244b325acb851cd8b5b6af73
 EBUILD zabbix-3.0.31-r1.ebuild 9257 BLAKE2B 0fdd5d2a46f61939912b2ad0ebc088f4b77ee1792ee5876845f6aee190396c1418ca40f7da3ab3973f457f66bb0b94a8ac4f98e5fee18a24c35ac86491f294c4 SHA512 fe6705253dec2a4b82698cfc17963d55bee700b974ce6be5c848f0029a875a84599b3919e78915a9662cf47360154cfef60f2604dacd8414f2ca3a7dff46cb47
-EBUILD zabbix-4.0.23.ebuild 9231 BLAKE2B d51de21f9a13f9b4812eef4c3e052f4d807efeb2dfa0ad36cdcbb964e4295fd5cf6642a5f8d578fd9c84f3e43c15ea7a1e7121071cf0bdb2429327c3f627372b SHA512 f35b6ede0825eac946723baf4e5fd75a86d336c2e6df154225c549c8c3097b9c0098c10cee55ebbb39c6cee32d70891d7f131d9fb4525c36fa6e3dfce911fc12
-EBUILD zabbix-4.0.24.ebuild 9232 BLAKE2B 9e27ccc7726b65f0c16ba5ce46356975cafc36760da49a5ec08b50c58b03cba697c81dc543f2e95eb02d4f01c7852d2c2595629a7a36f804d90e5e6673c00b9c SHA512 d23f2c9c4500b853905d13f0a463980b6276cf91dab7b76fa02645565f122fc4b2b7aa7978dab099ebecc491f24834aef76634c1da3531184db20b7218deabed
-EBUILD zabbix-5.0.2.ebuild 9100 BLAKE2B 58767e6ebb13985bf734c2afde4c28f49ee125328934cac0e82d8ec6b6fbfd82472c007d7d8821f20e1414659356fe0f2be2b7efe4350e27405c69018b7d8a0d SHA512 afd232493c12f1f2494e31a8776b57fc22d269d2f6f7c1341757ebf3e4808ffd0de06a75e5d16fb1a904a766545c831aa65ddd2b6c1e06b83d1c9969b1525af3
-EBUILD zabbix-5.0.3.ebuild 9101 BLAKE2B 4d2882b54f64c23acc250da2de5787cec25cf9bf9ee4b4eb1332cc43e6408d0d888a49d9bcbb560d095d54e3b7f34210c1f4bc03547f0df3d3c61ad0c81e2e24 SHA512 9244c71faef8a4945f0b0fd03235426966f7abecf3fa8d28034df340375fdf684bf5fd695c06ba94d4411ba0a4db17dcc64d757d135f9b4853a993cf53a0154c
+EBUILD zabbix-4.0.24.ebuild 9231 BLAKE2B d51de21f9a13f9b4812eef4c3e052f4d807efeb2dfa0ad36cdcbb964e4295fd5cf6642a5f8d578fd9c84f3e43c15ea7a1e7121071cf0bdb2429327c3f627372b SHA512 f35b6ede0825eac946723baf4e5fd75a86d336c2e6df154225c549c8c3097b9c0098c10cee55ebbb39c6cee32d70891d7f131d9fb4525c36fa6e3dfce911fc12
+EBUILD zabbix-4.0.25.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
+EBUILD zabbix-5.0.3.ebuild 9100 BLAKE2B 58767e6ebb13985bf734c2afde4c28f49ee125328934cac0e82d8ec6b6fbfd82472c007d7d8821f20e1414659356fe0f2be2b7efe4350e27405c69018b7d8a0d SHA512 afd232493c12f1f2494e31a8776b57fc22d269d2f6f7c1341757ebf3e4808ffd0de06a75e5d16fb1a904a766545c831aa65ddd2b6c1e06b83d1c9969b1525af3
+EBUILD zabbix-5.0.4.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.23.ebuild b/net-analyzer/zabbix/zabbix-4.0.23.ebuild
deleted file mode 100644
index 065c01ba723d..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.23.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.0.24.ebuild b/net-analyzer/zabbix/zabbix-4.0.24.ebuild
index 53b0392d99ff..065c01ba723d 100644
--- a/net-analyzer/zabbix/zabbix-4.0.24.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-4.0.25.ebuild b/net-analyzer/zabbix/zabbix-4.0.25.ebuild
new file mode 100644
index 000000000000..844a2e68741e
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.25.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.2.ebuild b/net-analyzer/zabbix/zabbix-5.0.2.ebuild
deleted file mode 100644
index c105a7d5d7ea..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.2.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.3.ebuild b/net-analyzer/zabbix/zabbix-5.0.3.ebuild
index 0918dc7c5b0f..c105a7d5d7ea 100644
--- a/net-analyzer/zabbix/zabbix-5.0.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.4.ebuild b/net-analyzer/zabbix/zabbix-5.0.4.ebuild
new file mode 100644
index 000000000000..e393d4a24eba
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.4.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d14630f31066..7e6ed08e6e41 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index dc398466bfbb..9df110c5cd4c 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -3,5 +3,5 @@ AUX ddclient.initd-r6 584 BLAKE2B 6f1c9ddf862e50013208adbbd77f471ed03faf59381ed3
 AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
 AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
 DIST ddclient-3.9.1.tar.gz 63469 BLAKE2B 8ae6543353d96f76d926117ae53d74da6e8bc8f116fa15b8b0d39bc29a4c334bfc3d673b8f1c57139213b91414d1b9a2063fde9e1015f03fb76ba70a60956a7e SHA512 a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346
-EBUILD ddclient-3.9.1.ebuild 1555 BLAKE2B 63f0c6b33b6ad1b8e98b0b9eace7f4a97791fbb59391e24d024914b62e8c9ea5a8b91d30f8af5764517b5c3a716b6cb6d597c05f0e288b3c1a9cb62c90975dff SHA512 fe06dbcab32adec9d4aac73a85f0ce123926cca165d07d300975722b5d66c07f46209bb94b0bb4640831ad3969fe284837540c7fd21a2672b7f9ffea83da5d2b
+EBUILD ddclient-3.9.1.ebuild 1562 BLAKE2B 794aee9b51e1380f0b6b8063e033a53803db76daad761cbde224e7955c6c9b94642c4c4aa1a2ac6313104d36c3e750105cd916741d599acc224d5c6502d570ae SHA512 d40f8c1a5172c24e9e0bab90f598715ef10368340d73dc78f920be4bb11c3bca43649a25b25aee4f5ccd6c017339313e262901107035ae7f73d7c96678ea8739
 MISC metadata.xml 999 BLAKE2B 03fc5ec95eaabd6a8c15006f04ffa5e1c9d809719629319a8f919237a1d7359d8ea82ffa29b2796099eafd7ee152e81b544971734f1d751bf8f61e2cb51c1f0c SHA512 f70662793b7eca94703847084e4c0882ab6a6ec891383bd012c03afbb26c7b252db5adfdfaa9937dce1988b1c88bcd91f1a7a3c318b1fe3a5a6479d74de4a6b0
diff --git a/net-dns/ddclient/ddclient-3.9.1.ebuild b/net-dns/ddclient/ddclient-3.9.1.ebuild
index 8cdf7b8d9a91..eb32b5024e2b 100644
--- a/net-dns/ddclient/ddclient-3.9.1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://ddclient.net/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-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+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index d37e6515fed2..4f765101bfe8 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,4 +1,4 @@
 AUX dnssec-validator-2.2.3-ldflags.patch 955 BLAKE2B b6cf8f7e812d4ed14dfafde00afabdd30f2fb54ae604613d0f43520eb683e5f19113477421d9aba86ecc7f89a2706f12c713c19a3690bd93bb7c284123b08a71 SHA512 dfa88f661318b0f3406ce984455b3890ddc891ec2e4ac20ce5eb46d47b22014b001f447fbf69ac1a5d2a3239dfe4d6a330040d768ef4b1ad3ee4923ca06f95d0
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-EBUILD dnssec-validator-2.2.3.ebuild 1423 BLAKE2B 0381189199d06e47a57509710fc116ebeff264d28fca09618930e02f397ee8b68a8d95a82944e731f52b500c87a85db2190f4e3b31f9d1d221f0709889aec7a2 SHA512 0ed2dacc6153088482dbaff631f93ca93d00cb584039fe7633d8ac9b03eaa2696759c927d06236757e579d4ddef2c3cd893b92b69254dbf1e73603f5ddf8cab3
+EBUILD dnssec-validator-2.2.3.ebuild 1430 BLAKE2B c84e68ed7736062742a54c5a5a943f04c2d6530ecb426786d726fd02656079c8c47e7b04caed410f50bca8f88cfb3dd998ff7ac1797126b9a563f3f365ee2d83 SHA512 b8b3e802abd035f6114a67346f346d791cee61ac3ee0b3a29be1f3c513fd8976152ad98c5ff6d7fc726635da763181862819fdf16ece210dc719176f2604fdff
 MISC metadata.xml 798 BLAKE2B 50d4cacfbbb5365e56e569dd0bad78b5c39c725f6dafd88567178aec43e6cbf1a0dfd303dc886551ce2c079730ca77bb0de1d4b01c0cf954afdd619d2b356d74 SHA512 d8b2d3c8fc121598f2a236159751b0666d8ab75d400fce99389299ad7ef9d6c95327047331f8414d133ae808d916e6b5fe93724fdb0b9d55c06073beffb61f74
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
index aa9cff550d40..42ab6d5081c3 100644
--- a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="dlv +ipv6 +nsec3 static-libs +threads"
 
 RDEPEND=">=dev-libs/openssl-1.1.0:0"
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index fe3fb2846639..8876726a4ddb 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,9 +3,9 @@ AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1d
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
-DIST nsd-4.3.1.tar.gz 1173582 BLAKE2B 4766beefa9578bf11de9c8aeb4d0729b248893f36ffa72c699a134d0dcf758a247f8a9e31e8da182db982a8717f6cd737e95dac236420b18d34d7dc38bff0e57 SHA512 58b6e964795d6c796b547e1134cef954e5f4adf4e976db830ff7900892327154dab2a607ceadbb99072d6e5495d62c808c8fb8c94359ae93f636d11925c0d261
 DIST nsd-4.3.2.tar.gz 1177939 BLAKE2B 3c1eac9065c5c8aae3b0a98d43cdbc5d757712656efc7ed912b51b91f4b3b84672a15de8476eba40642d766abd9499bbdeaf71aa6e6720a67ac83a1ed0ea274c SHA512 0423aeddc7f60e04718b6ee0954fbdc274576b6ef61472324256e5db696f41e47899b645cbc4d6d8cc2a7dd00190b72f3ef0476c4640dbb80d36ec39f1c9f5c8
+DIST nsd-4.3.3.tar.gz 1181082 BLAKE2B 611027e015f89a6aef0bc9e0b74242e683a1475f5cd2a79dc16a30011989c33a4d3bd21aced24dc6040469a304414b7e775261b097beb007e06c3c025dbf2b9e SHA512 5e7e2037e0939af20af137c913943904e36cf7da517292d40dbbd4f7ebc878b0e97acd7f6cbbaaebbb525a84f6d6ae9e82c34df9c8482075653c4802777a9fa6
 EBUILD nsd-4.2.4.ebuild 3013 BLAKE2B ea358a487f8e18f40a6d5018c04994607c9f7a66e53b31ea70eb24e0386ae15d8e7ac7c0c7196980241420a5de90fd30c980b03f30914febbe725608341fde6a SHA512 52b615e9b4676a35ebf0d3b413ed703c10b65f860adbdc490f9624d31e898dcee34fd01efc8d294b83a517ac54ddd713ab010fb296ade398a1ce4257f0054d01
-EBUILD nsd-4.3.1.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
 EBUILD nsd-4.3.2.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
+EBUILD nsd-4.3.3.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.3.1.ebuild b/net-dns/nsd/nsd-4.3.3.ebuild
similarity index 100%
rename from net-dns/nsd/nsd-4.3.1.ebuild
rename to net-dns/nsd/nsd-4.3.3.ebuild
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index a53d5bcbe1b6..b38984e9b588 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,9 +1,7 @@
 DIST openresolv-3.10.0.tar.xz 20296 BLAKE2B 2e4fc22aebeb345fcdcc5395603a183a978e2ea24a4b419d76ab41e5179b640e3a317d5f1ef36bc6901d933b20daaca615489c785a41d76a89abc938c20e2723 SHA512 f28fc43887f18f6cbdcdabbb48777fc704ed653e77f34caf349b5c4e5f5f6e7686242ea9f2617f2f65d40d14c794ce28cffee0ec5e5c7b8a19566f3bd72e9ec5
 DIST openresolv-3.11.0.tar.xz 20552 BLAKE2B 5564ecac60124fa391a13979da533c4f7cf99601acc896cb5d3cc029bff15ef48ea36e867a0fc6d1e6e475a7536660fbd819120b3066dd2aadc12abf0e16c8ff SHA512 09708b8a1abf7de926f75a1825d4243be6e59fc1de7cc3d7ab7f5a317e11175bd24af03bff2c878ccc54c96913feed27630765647c70fec8a9f9aa7370744e24
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-DIST openresolv-3.9.2.tar.xz 20200 BLAKE2B 25cb56fd85114c3866207a3bf83d1295eb135f1746f141d8cb8f0fb18cdd96e184ad3fbb47d1f65ce4193b57da61e918ca4306a502eaba650ca438589be9a29b SHA512 2f88ccbb53c6e830eeb7dd53666ee72b9fa30f38324766e1d1734896bc9b7f531e42e234c882b921c79604a3bde2877db2681bab9dd8c590f02779da908d0649
 EBUILD openresolv-3.10.0.ebuild 1046 BLAKE2B 0d2d2c8b93a27d02d1dc3ce6321c550dd99e98c50cacc55b6357f7b12e4aed44468e17c8c6c41bebce7f183616f506adcfc76867a51f7208a65dd94f2cfe2e73 SHA512 03a64836140098e17b58eb63ffa87a60175eaa5f3e0d21faf7bacf6ae38a20a7282180852eb53d32fb7d65c85cc7ed84d8f4efde9aa15fa5dd02da66e90cc6d7
 EBUILD openresolv-3.11.0.ebuild 1062 BLAKE2B 538be446ae6edf9228ddfd1153ad0f44fcbe54ee71f335146502ce1bf545ce95a1a435ba015e0ea805a7608977809714fdc9808bdf98fa3691c7218569ffd043 SHA512 05d4e01fc8877fb161dd7d3c5ac758a2e73819d2163b979af183be7e65739a176fb8c716d5623d5c7df2e05a3b33c0d822e8ed9f7a9f9a2224fa56b83289d7e3
 EBUILD openresolv-3.9.0.ebuild 988 BLAKE2B 9eeaa5bb03ff5da326a9c421364216eb0c89f4e2d3ca9f5df64c3a036cd1006393c705ce1761a6f963849d4b896b1101ebc60b7bbee3fa6aaa8d17c19680a570 SHA512 b490a9558d670c224bc714d5b6b8b4b2f00025c6629e6750d2a460188f375c7571ef39ab67aeff369cb7d7a129b34e4f339522ed8db80dee102d6503f0f3b11c
-EBUILD openresolv-3.9.2.ebuild 1034 BLAKE2B 192b98ad3b90077a8ac9766bef6376af62ef875e8a50735ae6b261b89873390855e13fede12540f4d8f460eab26f3007cad52e3fd3bf68c8d73e6b04209d4d76 SHA512 4bc67276c583ea3d3977adff12020ee34b12e735c5c136e44decac970e9290004f188c50c1e0759dbca4d1ecebd4c3b5a30d394a43c5baee9c39fc8798542eb6
 MISC metadata.xml 396 BLAKE2B 225458f3e84955b1864d1d3fb1e33d1621d59ca00860da438d2e4d1e5cb07db50a8910bc25c7372491ef637b03f264073c881ae157691a25665f10c176d02ca8 SHA512 125584791b7eedd8077834628835c5f03c891cc7d0cb498a8a8a356b72dd57edf680b019e416bc4f38ae6647dc6075a59b61d6fdbb98c392ec1f63fa66eee370
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
deleted file mode 100644
index 763dc738699d..000000000000
--- a/net-dns/openresolv/openresolv-3.9.2.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
-
-DESCRIPTION="A framework for managing DNS information"
-HOMEPAGE="https://roy.marples.name/projects/openresolv"
-SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
-
-src_configure() {
-	local myeconfargs=(
-		--prefix="${EPREFIX}"
-		--rundir="${EPREFIX}"/var/run
-		--libexecdir="${EPREFIX}"/lib/resolvconf
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_config() {
-	if [[ ${ROOT} != / ]]; then
-		eerror "We cannot configure unless \$ROOT=/"
-		return 1
-	fi
-
-	if [[ -n "$(resolvconf -l)" ]]; then
-		einfo "${PN} already has DNS information"
-	else
-		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
-		resolvconf -a dummy </etc/resolv.conf
-		eend $? || return $?
-		einfo "The dummy interface will disappear when you next reboot"
-	fi
-}
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 578ec2147b56..94d24d47012f 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -3,9 +3,11 @@ DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d5273
 DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157
 DIST s6-dns-2.3.0.2.tar.gz 77885 BLAKE2B 354a44d47f4fbc964c41999a442f730a738be361bc9633502c3c54f38d25060c58ef2ecfea764f1f5d3243a2e24f92e8b54abfaf61f76f7d155f93a53de2d1db SHA512 fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33
 DIST s6-dns-2.3.1.1.tar.gz 78171 BLAKE2B 0949a48a0c48a8c3ffa27794309efa4489cd15102b3a7c29a6dfbbe22cebd0d207417fbe687160266fcda6ff04174b538d7844ef7811e06f8c8bd9a91e4d013e SHA512 e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9
+DIST s6-dns-2.3.3.0.tar.gz 83398 BLAKE2B dc4408a608324bdecd363c8a7a92d878983075e93af66905e4315e34e8d1fb1fdecc78fcd7e56fabdfdcbdcda81cc39bc93044730a0bafed26df40ca70110a71 SHA512 f711ff3f7ea7ae2eecf46b6742f61e970aed8776fcaa4f7902da0864c97f71296bc1651c08ff6f98d6474ccb0ee904c2d7497d7a1d28d48db8df78865b2a9e79
 EBUILD s6-dns-2.2.0.1.ebuild 1316 BLAKE2B e413614e39b05f07c616d83e5f3d7998ad33948bd67d96eb4653e1c81865b33209fe9efb16dc5731fd093f7ee87eb662974475426b9d8cc7b7590c879e8d09ad SHA512 a0153e3c80f54fd744dc5e1412672857280e3204da461e8eb75e2c06133a9d4162eccec950ebed272061a1614e00e04ce8024be8ac1a001ae0e57187ff064557
 EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f455e1e0d8f5080061d8019c0824d12923c9182c8a6b3e84ab09fa0d7add2a8e99a9c9f27f8a3a74265042768a0b SHA512 61865257ed9b3e1321bd9aa0694cba91dc12402a76ed8db9c24f7d99566b4e060120d070122af7eb24cb13d7353f8ad16b8de252f39b5cd9e447dea67582ea73
 EBUILD s6-dns-2.3.0.1.ebuild 1211 BLAKE2B e74799d0b902714589cdb91b305ca8ea69939dd13f69cde242ac17292225f66802c89b421a6c2dc6f543a20b1f174d0c675b077a0150e2bc6a29f5e89fe1b243 SHA512 670fc13663ec03faf9f86ce6f4777730341c19783b6671249debfc0ac3594a1e2d33967f7b041778ff69388c7b56554ef679e246b0e6cd172a50c1b98b828342
 EBUILD s6-dns-2.3.0.2.ebuild 1096 BLAKE2B 53389e651100b3171221f91b34d7b728a3a85986c37cb284436eda902bcf99a52ae9c460f38b71c049654b8cd3dde05b1479c9b2c4aaa50e057fef111489de1c SHA512 30935ee14fcd1e63f248e2093c89ee11e65cfdafa6143d36eb0034de08072556b0993b46f7d08d2a6b9d84da024f84303b6b90e97170f425a43eb09946bc4a12
 EBUILD s6-dns-2.3.1.1.ebuild 1096 BLAKE2B 25dce0059e773e0f43a0fce14826851711a25380414bb83039940c2a6e6cc464dce9d0dd6950d4e266dfb038c50426728232ec076843a5f93c4dd63296f757a7 SHA512 59470d1c20fdd791ee7d31e4b0af021b4c3f7718a2e62d8466948e85638f533183b92795de765a710375d718975f905a22ae92f209ed84be529f6214c97e1a0c
+EBUILD s6-dns-2.3.3.0.ebuild 1096 BLAKE2B f7d0bed25ea1145d1d6be735422c9cd1da5dc7be3ee265a66e581fa662b6fee577d4ce10b117676a869d936fcb3fd966c8e27d774d5c98492ec323ce44a32a6a SHA512 7b56afabfb9be8dd3d48f04740a893126720a5315623c7761b05eecd033f350805121ac16ae5a6c0a8df4b49c33abd596c4d172a7276fcd3f4b6038856034db2
 MISC metadata.xml 434 BLAKE2B e3d888f7fcec185687045f1a5ba7da4fdd481dc2d5f7727be63c9b013ceb0c82e337ff843447810d4a26af7b957c9249efbdb110f565188c906748e4aa33ee84 SHA512 da245c4a5afc048f3010be4fe77901917b0687d84bdd7c764883c9df48abad24ae6711330b1d7f4fdc468ae7c26a148e67fd4f6674068ab7def5eb8f2117bae8
diff --git a/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
new file mode 100644
index 000000000000..879134405322
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-libs/skalibs-2.9.3.0:=[static-libs?]"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index b9e4765edb37..00f55562524a 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,6 +9,8 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85
 DIST unbound-1.11.0.tar.gz 5900967 BLAKE2B 3119bbcd78fa19c610937215abc64abcc1ca96ba42b6753a1e36fef501f68971ac2ee0cb9bde377e0b257c57f505aeac2315a6bf031626874d30967b0a5eb46a SHA512 511e787c5f9647286b07028702a8909390e0e6eafe7224459d5f1eee8a8dfb09c71e33f291e30851dc57411123b91dfe0e124787109a7e4afdf6f3b02768e7cd
+DIST unbound-1.12.0.tar.gz 5918399 BLAKE2B b3dccecb1fd019f36e47c62583348a375f5eed7c84094c48def1ff9e73dc283911a2a9b318c8a4be45f5cd4bfb17f26722a9b900aa1980f49790cc55f6412d1d SHA512 90d99bc65e9ba62e50a7809dbf1e98889d0fc9fd50cf3cc99b726c67bcaeda0c2bc176d09f84771adb9796833b595591462f96e949d6969a47d6898d8fae3479
 EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99959566a7f63b9407d3c19311d420e98cfb29674538325740b485b48351a2e7621f6afdeb13c4f3152bff8c880b996 SHA512 8d65dadb63f9a70ee72e7cbadfc45a5921d4ec886540d01cab588696b0bbf7b30d502bcef1c0ae38d0e554979ca9cbe90bb7444ed00e87defb687640f9ea0546
 EBUILD unbound-1.11.0.ebuild 6003 BLAKE2B 5e92333ca334d085b994fd9dcfc4b9eb97c0355b130472dd434b6a892bcde8439ae33f4413f8aa5e9e6867891750e152c28892a88f9d88e5848f20ebcee459b0 SHA512 4d6061372950b54091b0fae9c1e2d8eb93b75a60a081d0f8431239457bd5311bdb78109f55e08779c50cab4a8bc0f07281f95d51b8b1dd83f4eac03b40b6e2b7
+EBUILD unbound-1.12.0.ebuild 6008 BLAKE2B dd27e2b8d4d1c320af8e268ae5f0d9f95d26782137bfb11deebe44533904da8716d894bfacdcd3bbd187c0d1d52d9e6a57a330f75ced2cb3d1b802f705bc352e SHA512 df2940e7037f61717bc8c53a6ce386d189b4bffbb4a8881074798718087ab78e10e5c840070f629432f2ca328727b585ba2695703f9572ba5913fe8ad461d415
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.12.0.ebuild b/net-dns/unbound/unbound-1.12.0.ebuild
new file mode 100644
index 000000000000..30cafd751b15
--- /dev/null
+++ b/net-dns/unbound/unbound-1.12.0.ebuild
@@ -0,0 +1,200 @@
+# 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 flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 3480de2319ec..c2d61c48e539 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index ea18ff727f1b..00ec2d0075c8 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -8,5 +8,5 @@ DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0
 DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6 SHA512 ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820
 EBUILD openafs-1.6.22.1.ebuild 6969 BLAKE2B 38d0afcf387995157317252cfad1ea5d831e89779c02a2635b600be0f0dc279357cc989b6982d5fab3b3e51acb7cf5d86eb97d0c07b9d5340e843861ecede6ee SHA512 96acce6ba9b8d4847ddaaaf459516f1b159bc27b9f9faa3c00909926d9a8aad3158864a2ccc74f83357419d31ccd8a94df994dd7f65f54e4513f532c47e02869
 EBUILD openafs-1.6.22.2.ebuild 6971 BLAKE2B 2cb82e548ec3c46082c4ebb2aa6c85387e0c8d6914fa772b23e02a94d94ac4cf41ff74749a6e94de235e980630991b629ed0b72639eb7e8e76501146fbc154b1 SHA512 eab046105a4744c1a3b21b29e436f028138333a182ee1d759e9d351fcd23fe9d218c21161131f4f381448a1f2c477cfec992efffa451e9178e00b856ae8a0d1e
-EBUILD openafs-1.8.6.ebuild 10942 BLAKE2B 91c35347837a66a2e5df21b7e5993b492a137060d78c964e112085466164fd567767f600d008c2faecec7f7372980ea980a362ebb1af24b89b06e6f4e3de67c1 SHA512 fcdfb50c478746c24d2640170f0d1e098d44a4cd874cf0d4ccf3e111c149d2efc104cbe4720d0b89bb6a6b884d9845d7d3813526a7c964c7142e2228a8052951
+EBUILD openafs-1.8.6.ebuild 10940 BLAKE2B e5b3387b6320fdaf374e63fa3f3e33f38f9417d56c42689ff2f6b228a856bae3de78db6fa6b589b0ab6c89feac89e24ce880f5f6e36be168b4418546b2612772 SHA512 6db82a6605b116e92958db7e44fb706443b4cd4e48dd6bfb7ab9eca4d71008f8ef538c69ef6818f3b3946e369ed4ab92e623cdfb0337f0105441411760f8997e
 MISC metadata.xml 1433 BLAKE2B 649cbf6ca873658e3f4829223f60cf646dcd601eb1f0aadefe24a0ecf561367988c4e63b37550693b56fd74adbffe8ce27db526ec1f175536a7d2d5f184204c5 SHA512 a4f1ecf4833e0f8491ee7b2a0ae6f1baa8a19125971c8bc19f44ff4bb3d229c08870699207269be797af31dde53417577779e43f3a723ec621d04571b6a75df5
diff --git a/net-fs/openafs/openafs-1.8.6.ebuild b/net-fs/openafs/openafs-1.8.6.ebuild
index dcf7a9a179c0..c76c6d0c78f6 100644
--- a/net-fs/openafs/openafs-1.8.6.ebuild
+++ b/net-fs/openafs/openafs-1.8.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0faf4788e6ed..11325ceb66cf 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -12,7 +12,7 @@ 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 9508 BLAKE2B 6de73c6d30018cddcbbe6c5dd567a9028606d8363159108cc10ff58e401937905bcee8ac17911b5bba466a40a4b367613f22e7c621f706965856b894af10e8cc SHA512 f130d0baccec67e11fc231e1ba1dd5a2b520d664c191af99dcd8ba6f8e7b1b37c709ab6bd1a63ea752984e748057b2dfbaf3ed34b878f86a602031501dcfcb7e
+EBUILD samba-4.11.13.ebuild 9507 BLAKE2B 0b7db425eb6ef3183c7574d16227928877addbdadcc88ff87d84786d0011179e4a8d6ec4cbfef885974de638ed175a577678b3e76fde49f58c8b77a97c42877b SHA512 13d5c274e40d7e87081c4884cde042f8ccc0d07471415000a34dbbf453be46eeeb04fc12fcf9899a311babc8eac0dc4d836a9bc11b7ebcf874c3f77e275bc2c9
 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 9407 BLAKE2B 3239b18d7448abd0c9d00bff3698449d72b8c307291c17a464ac1ad7b3297414dee3752fcb13a7c54989ef47c04261b27c839ad2d4f0255583f3200cc5d2d841 SHA512 f923e719848c8dd60fc454cf6993220a1666aa4a9548bbd5ad947639ae3d51bf87fc54ce95545b791a53e5431f1830a6aab02ce9e77a5ee1a1dad0e1c717fd7f
diff --git a/net-fs/samba/samba-4.11.13.ebuild b/net-fs/samba/samba-4.11.13.ebuild
index 6916d566573c..95fda93f2461 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-im/Manifest.gz b/net-im/Manifest.gz
index 5cb080942ae2..3b752be5abe8 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index a25541d522d0..468e318bb94e 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,2 +1,3 @@
-EBUILD jabber-base-0.01-r1.ebuild 1523 BLAKE2B 5a6b5e838f60306102b7ad4f9670397b0d793cbd3e3061c0b5516007f5ae0fc35afed8909f8d1d3e79e68be80af2989547c610fe4618bd17a63df8f954c741d9 SHA512 b6adbf729cb5e49080c07994cd729c357d91b2571b2d025246793c14256811d6643be53b8f6f6e9fba22196bb12913e810bd2590f3fc0ae01bff1fd0c53c0a4a
-MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
+EBUILD jabber-base-0.01-r1.ebuild 1537 BLAKE2B 0006571ec7b6664f6db5f2bfd8c7759188ff761bf5297f23539f7089bd6923333d20475dffad96d920b5b5d164a86b92722798cbbb7386b59c795b1f18325830 SHA512 58f3538994ec05e7e5230583d42b133784259130efe4574677edc048785582cda74826036bfcf946246920b0507fedb905c538b2452ac288019077ec5451bc34
+EBUILD jabber-base-0.01-r2.ebuild 1254 BLAKE2B f796d4dcf2b06ea3a945d9e91c03380a7ed3de392f4ab0ae76d9363e9fc1752383e9d227c15c2cda198e79bf2862409310f5d1c954b18d45ae0228757583f38e SHA512 738334312e459fa736bb13085ef04bff742d0e73f4d948c3503c42d98ef161a759476c2ecf1712e99236d79c29b28227ca51b166df54ca1ce348445c5291a94c
+MISC metadata.xml 408 BLAKE2B b86bd098ebac23fbdf6e51d0f0cb08c76cb9adcb3abfe5fd77518bd7a0c3ef9ef1a7adf8b450bc07ac4bd353b26e0be45f37108c733da9814d604409fe7619dd SHA512 5fabc8f4c6731b94042520f96800985f01bfa831e9fa63b3136b5bd7b85c5b4682ee49dd41adf9dba752e2a6e5c509948e20646d203e8ed4af2b28256e7ae668
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
index ea75b4d57216..b953357c0647 100644
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-im/jabber-base/jabber-base-0.01-r2.ebuild b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
new file mode 100644
index 000000000000..eba2cc85d74a
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Base layout package for various jabber services"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	acct-group/jabber
+	acct-user/jabber
+"
+
+# This package provides the base layout for all jabber related services.
+# Each service should use the user 'jabber' and the group 'jabber.
+#
+# The base layout contains of the following directories:
+# '/etc/jabber/'	: All main configuration, by jabber services used, is stored here.
+# '(/var)/run/jabber'	: All pid files, used by jabber services, are stored here.
+#			: Please note, that this directory should be
+#			: created dynamically by each jabber service during startup.
+# '/var/log/jabber/'	: All log files, used by jabber services, are stored here.
+# '/var/spool/jabber'	: All (flat) database files, used by jabber services, are stored here.
+
+src_install() {
+	local paths=(
+		"/etc/jabber"
+		"/var/log/jabber"
+		"/var/spool/jabber"
+	)
+
+	for path in ${paths[@]}; do
+		keepdir "${path}"
+		fowners "jabber:jabber" "${path}"
+		fperms 770 "${path}"
+	done
+}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index 1eebfe0ed7d2..5e50b4ff31a5 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/metadata.xml
@@ -2,10 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<longdescription>
-		Package that creats the users and directory's for jabber
-		related packages. See ebuild for more info.
+		This package creates the base layout,
+		which is used by several jabber services.
+		See ebuild for more information.
 	</longdescription>
 </pkgmetadata>
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index d5ee7a1a0ed8..2a9937d6d1b3 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,10 +1,14 @@
 AUX prosody-0.11.2-r1-gentoo.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
+AUX prosody-0.11.7-bit32.patch 599 BLAKE2B 880d11d8730f77322372efbfdb80c64a523844a47aae60a0f04b831262dc2e61c141247902b0872ff73fa02497dbfc75e3fc0cdbf9396c124c6c080bbbe181cd SHA512 e1783fceaca93acde37a3fffc5052eb9799faff59ce13e394358a21f24513e193ffa498218766b87718bac55f6425694106494abf05080203c5af01a52c03edb
+AUX prosody-0.11.7-gentoo.patch 1419 BLAKE2B 30a1ef43f6d3b00a07f621dc701e97ba45fb8b6d6ed67f95e5feff7bad32a4d037f0d00301c60bb05e1d5cb85bc1b78451ca0a989d7fda893f8b433ee50cc2f5 SHA512 9f5490ce156ef7d69f8daee7f274edc4d56da93dcbcfaf1a28f33ee8a0b5c6cb6a8f4f6f50cfd0cd3defad1ae90603803e6328ca3e160c4b3fa6aeadbd7104f3
 AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfeee09c939a2c9449a7f5994d984ed68ffbd015344db8f99fc9e5f5a16c4196d767c1768140d4880becc SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da
-AUX prosody.initd-r3 1075 BLAKE2B 5d180f529515143f0fd4a3fb88c83706d8100e70f15cfa3d6aad0ad432a15a50c4b4247211962f0af68102ca3019d6d560eed3f73550b775a00b421b8ae2b662 SHA512 e6eaaf8e1edde6c00f606300e60478785fd88737897b4c22d60c01324238bbe2ddc6d94271c4c1cbd7c58e06758a7e308f330d5039a4d922a3de1b092fc116f3
+AUX prosody.initd-r4 955 BLAKE2B 4d9a7e9cda70a901478734a7ba81480374e9a4db069a91920f03fa2de35b85f3d6f62c7e85ee622646d77c660f039370217e968e5a3d6d88c6e9ab20e6362ea3 SHA512 a0e92aaba052c50748911caf0005b154eb14c6af142a36492c938da04633c5ac397f1baebe133f366b7fc9547e360265ade75ab58bcaf7bffeca7c84f98547b6
 AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
+AUX prosody.service-r1 232 BLAKE2B 0ea62948b5ab206339f534b5f32a04a9c9dbcd45c6bbfa191b6c7de9c9c100a6e3f918670934ababdf5b0435937c6fa1a0d89412f42133fc4dc97780a99e38b1 SHA512 a4956a726b922366463c225562763e4e0592a04073a017e8e9e2f28bdff68bd5e501bffaf69b05bc2365d808e9c321a257419f930e97112ff10e8801e9517886
 AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
+AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
 DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
 EBUILD prosody-0.11.5-r1.ebuild 2085 BLAKE2B 635d42bd9df55770be24797e63666c07e6c16f240be5a641164f29de52bbb3dd8e070f9cf708a947482267d592c27adc92f2dc64903d8cdbff7fc90be504420b SHA512 6b0fdfc3901f2227007408108e7f647218dbe5ea06aae3ffeb197b92837cdded1841f39a1bb990235149c7c7ae9784002e60b5fca1bc540f8ce27886a4514761
-EBUILD prosody-0.11.7.ebuild 1983 BLAKE2B 9afd0c3114b8245f635c749014a4ab3e5edbc24a354c5d6d54f6012ed69888ba1fb6996995550044ac6192ca4bec087e2c4983f74100fff0c19bacf7cb81c66b SHA512 15c9ad66eaf86797e9c8d23bc6792e47cafaf2eea7c6e484a8922333c89901c64ac356c48a33b36c7f10aad10a7acd5eed79da74bdb60a751a358d8923268ac4
+EBUILD prosody-0.11.7-r1.ebuild 2249 BLAKE2B dd3ae2944f66878c911d5e4ddb704a26d6b3b3f1e819f4a6bc2172b8259a2d5019bfc1cb2fbeff7d2cd928ab12268639bd30d5979300ccc9b07df0c7c8d7537c SHA512 2cac193a0ceb2afb88c08e68cf83199fc9d3dcc5e12b6ba02e4eb516d07ede913647dd4e14fab03b33f826e5e8b6c2dd5ab9a87a00c234fcf70b314ffbdd3a68
 MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
diff --git a/net-im/prosody/files/prosody-0.11.7-bit32.patch b/net-im/prosody/files/prosody-0.11.7-bit32.patch
new file mode 100644
index 000000000000..fb7b55f6bbef
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.11.7-bit32.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Kim Alvefur <zash@zash.se>
+# Date 1601928749 -7200
+# Node ID e17b98feb0b7cad6539ee25c5cc7728911349a6d
+# Parent  c3eefb517b7b934dbf4f78244c18f7e91b852846
+util.dependencies: Check for bitop library same way as net.websocket.frames (fixes #1594)
+
+diff -r c3eefb517b7b -r e17b98feb0b7 util/dependencies.lua
+--- a/util/dependencies.lua
++++ b/util/dependencies.lua
+@@ -90,7 +90,7 @@
+ 			}, "SSL/TLS support will not be available");
+ 	end
+ 
+-	local bit = _G.bit32 or softreq"bit";
++	local bit = softreq"bit" or softreq"bit32";
+ 
+ 	if not bit then
+ 		missingdep("lua-bitops", {
+
diff --git a/net-im/prosody/files/prosody-0.11.7-gentoo.patch b/net-im/prosody/files/prosody-0.11.7-gentoo.patch
new file mode 100644
index 000000000000..e571066874b7
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.11.7-gentoo.patch
@@ -0,0 +1,29 @@
+--- a/prosody.cfg.lua.dist
++++ b/prosody.cfg.lua.dist
+@@ -17,6 +17,15 @@
+ -- Settings in this section apply to the whole server and are the default settings
+ -- for any virtual hosts
+ 
++-- Prosody will use this user and group for launching the service.
++-- Gentoo uses by default jabber:jabber (uid:gid) for all Jabber related services.
++prosody_user = "jabber"
++prosody_group = "jabber"
++
++-- Prosody will create this pid file after it has been successfully started.
++-- Please don't change that path, as it's being used by the Gentoo init scripts.
++pidfile = "/run/jabber/prosody.pid"
++
+ -- This is a (by default, empty) list of accounts that are admins
+ -- for the server. Note that you must create the accounts separately
+ -- (see https://prosody.im/doc/creating_accounts for info)
+@@ -30,7 +39,9 @@
+ -- Prosody will always look in its source directory for modules, but
+ -- this option allows you to specify additional locations where Prosody
+ -- will look for modules first. For community modules, see https://modules.prosody.im/
+---plugin_paths = {}
++-- The default included path is for the optional net-im/prosody-modules package,
++-- which provides additional community maintained modules.
++plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/community-modules" };
+ 
+ -- This is the list of modules Prosody will load on startup.
+ -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
diff --git a/net-im/prosody/files/prosody.initd-r3 b/net-im/prosody/files/prosody.initd-r3
deleted file mode 100644
index 3126cc8e1e20..000000000000
--- a/net-im/prosody/files/prosody.initd-r3
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prosody is a server for Jabber/XMPP written in Lua."
-description_reload="Reload configuration and reopen log files."
-extra_started_commands="reload"
-pidfile="/var/run/jabber/prosody.pid"
-
-depend() {
-	need net
-	provide jabber-server
-	use dns postgresql
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
-		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
-		return 1
-	fi
-	luac -p /etc/jabber/prosody.cfg.lua
-	return $?
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
-	checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
-	checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
-	ebegin "Starting Prosody XMPP Server"
-	prosodyctl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Prosody XMPP Server"
-	prosodyctl stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration of Prosody XMPP Server"
-	prosodyctl reload
-	eend $?
-}
diff --git a/net-im/prosody/files/prosody.initd-r4 b/net-im/prosody/files/prosody.initd-r4
new file mode 100644
index 000000000000..1282e9dc4561
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r4
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Prosody XMPP server"
+extra_started_commands="reload"
+jabber_pid="/run/jabber"
+jabber_logs="/var/log/jabber"
+pidfile="${jabber_pid}/prosody.pid"
+prosody_config="/etc/jabber/prosody.cfg.lua"
+
+command="/usr/bin/prosody"
+command_group="jabber"
+command_user="jabber"
+
+checkconfig() {
+	if [ ! -f "${prosody_config}" ]; then
+		eerror "Please create ${prosody_config} before starting Prosody!"
+		return 1
+	fi
+
+	luac -p "${prosody_config}"
+	return $?
+}
+
+depend() {
+	need net
+	provide jabber-server
+	use dns postgresql
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_logs}"
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_pid}"
+}
diff --git a/net-im/prosody/files/prosody.service-r1 b/net-im/prosody/files/prosody.service-r1
new file mode 100644
index 000000000000..608423869fd6
--- /dev/null
+++ b/net-im/prosody/files/prosody.service-r1
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prosody XMPP server
+After=network.target
+
+[Service]
+Group=jabber
+PIDFile=/run/jabber/prosody.pid
+ExecStart=/usr/bin/prosody
+ExecReload=/usr/bin/kill -HUP $MAINPID
+User=jabber
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd-r1 b/net-im/prosody/files/prosody.tmpfilesd-r1
new file mode 100644
index 000000000000..7fcdd539decc
--- /dev/null
+++ b/net-im/prosody/files/prosody.tmpfilesd-r1
@@ -0,0 +1 @@
+d /run/jabber 750 jabber jabber - -
diff --git a/net-im/prosody/prosody-0.11.7-r1.ebuild b/net-im/prosody/prosody-0.11.7-r1.ebuild
new file mode 100644
index 000000000000..89566c865a54
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.7-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	|| (
+		>=dev-lang/lua-5.2:*
+		dev-lua/lua-bit32
+	)
+	net-dns/libidn
+	net-im/jabber-base
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-lua/busted )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lua/luaexpat
+	dev-lua/luafilesystem
+	dev-lua/luasocket
+	libevent? ( dev-lua/luaevent )
+	mysql? ( dev-lua/luadbi[mysql] )
+	postgres? ( dev-lua/luadbi[postgres] )
+	sqlite? ( dev-lua/luadbi[sqlite] )
+	ssl? ( dev-lua/luasec )
+	zlib? ( dev-lua/lua-zlib )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.7-bit32.patch"
+	"${FILESDIR}/${PN}-0.11.7-gentoo.patch"
+)
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/spool/jabber"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="$(usex luajit luajit lua)"
+		--sysconfdir="${EPREFIX}/etc/jabber"
+		--with-lua-include="${EPREFIX}/usr/include"
+		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/prosody.initd-r4 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r1 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
+
+	keepdir /var/spool/jabber
+}
+
+pkg_postinst() {
+	tmpfiles_process prosody.conf
+}
diff --git a/net-im/prosody/prosody-0.11.7.ebuild b/net-im/prosody/prosody-0.11.7.ebuild
deleted file mode 100644
index 041e5c27e526..000000000000
--- a/net-im/prosody/prosody-0.11.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libevent libressl luajit mysql postgres sqlite ssl test zlib"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-lua/LuaBitOp
-	net-dns/libidn
-	net-im/jabber-base
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-lua/busted )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	~dev-lua/luaexpat-1.3.0
-	dev-lua/luafilesystem
-	dev-lua/luasocket
-	libevent? ( dev-lua/luaevent )
-	mysql? ( dev-lua/luadbi[mysql] )
-	postgres? ( dev-lua/luadbi[postgres] )
-	sqlite? ( dev-lua/luadbi[sqlite] )
-	ssl? ( dev-lua/luasec )
-	zlib? ( dev-lua/lua-zlib )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		--c-compiler="$(tc-getCC)"
-		--datadir="${EPREFIX}/var/spool/jabber"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--linker="$(tc-getCC)"
-		--ostype="linux"
-		--prefix="${EPREFIX}/usr"
-		--runwith="$(usex luajit luajit lua)"
-		--sysconfdir="${EPREFIX}/etc/jabber"
-		--with-lua-include="${EPREFIX}/usr/include"
-		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua"
-	)
-
-	# Since the configure script is handcrafted,
-	# and yells at unknown options, do not use 'econf'.
-	./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die
-
-	rm makefile || die
-	mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/spool/jabber
-
-	newinitd "${FILESDIR}"/prosody.initd-r3 prosody
-
-	systemd_dounit "${FILESDIR}"/prosody.service
-	systemd_newtmpfilesd "${FILESDIR}"/prosody.tmpfilesd prosody.conf
-}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 08e725639527..2edc2f6dd285 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-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
+DIST signal-desktop_1.36.3_amd64.deb 108645210 BLAKE2B 220ffa7decab333bb095025b202e4a250360348e5bc9bb70cc70a7d3994eecaf5be209e8c28351c90417d446d2e1f1fd4868795ca578b2b09e40ab0c84d33c40 SHA512 fdc72bc82ab038a7b72f3e5a040236c15f820e20606213794028a7efe05818041be82a9085fc1e3d14260b60880c9ede1938d8aca1da3d8bc2cecfaaba581510
+EBUILD signal-desktop-bin-1.36.3.ebuild 3426 BLAKE2B 10f46c6fd6effca044b986f1607dcd0020d967dc543d4830e4cf1f6c87da254f348c7cede1dcdafe14c56cc96eaad0d2c57079e9f86703e7be4a31bcf658b8d1 SHA512 9d18454f4775f9d71ddf3fe39dc8e54507a5e7d40ea5db65c392f4707503dd369f023ad050ad5fe429dbfba984ad82427ada808be33aacc0d6b17b8926955382
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild
deleted file mode 100644
index 7a50112a339f..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-
-inherit optfeature pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-BDEPEND="app-admin/chrpath"
-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
-"
-
-QA_PREBUILT="opt/Signal/signal-desktop
-	opt/Signal/chrome-sandbox
-	opt/Signal/crashpad_handler
-	opt/Signal/libffmpeg.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libnode.so
-	opt/Signal/libVkICD_mock_icd.so
-	opt/Signal/libvk_swiftshader.so
-	opt/Signal/swiftshader/libGLESv2.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/electron-v8.3-linux-x64/node_sqlite3.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
-
-RESTRICT="splitdebug"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
-		-e 's| --no-sandbox||g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-	# Fix Bug 706352
-	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libjpeg.so.8.2.2 -r '$ORIGIN:/target/lib' || die
-	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libffi.so.6.0.4 -d || die
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
-	fperms u+s /opt/Signal/chrome-sandbox
-	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
-	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.3.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.36.3.ebuild
new file mode 100644
index 000000000000..512552ce2693
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.36.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+
+inherit optfeature pax-utils unpacker xdg
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/signalapp/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+BDEPEND="app-admin/chrpath"
+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(+)]
+	media-sound/pulseaudio
+	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
+"
+
+QA_PREBUILT="opt/Signal/signal-desktop
+	opt/Signal/chrome-sandbox
+	opt/Signal/crashpad_handler
+	opt/Signal/libffmpeg.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libnode.so
+	opt/Signal/libVkICD_mock_icd.so
+	opt/Signal/libvk_swiftshader.so
+	opt/Signal/swiftshader/libGLESv2.so
+	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/electron-v8.3-linux-x64/node_sqlite3.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
+
+RESTRICT="splitdebug"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
+		-e 's| --no-sandbox||g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+	# Fix Bug 706352
+	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libjpeg.so.8.2.2 -r '$ORIGIN:/target/lib' || die
+	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libffi.so.6.0.4 -d || die
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	doins -r opt
+	insinto /usr/share
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
+	fperms u+s /opt/Signal/chrome-sandbox
+	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
+	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index cbca05e60e6f..2ce793817c85 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,3 +1,5 @@
 DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4
+DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043
 EBUILD teams-1.3.00.16851-r2.ebuild 2764 BLAKE2B 7b85ba3edb7dde83b06a3e3680138b773d17f0284f556ce5f768bfa7969c46a51f2d1f9caa37131f86fc918ffb9d0ec516bc594344ac1c3ff1143608c43e22b4 SHA512 119bde21b42d0369e4144ff4d085f9979b3ee394842336c6d3e7b635b311697b0fbab861440b196c8a190cd34dd0fe17ca2deac11fdf44e5f77e8fb5e6615517
-MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
+EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
+MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml
index 80a71f597854..a141f350b4fe 100644
--- a/net-im/teams/metadata.xml
+++ b/net-im/teams/metadata.xml
@@ -5,4 +5,8 @@
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <use>
+    <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
+    <flag name="system-mesa">Use the system-wide <pkg>media-libs/mesa</pkg> instead of bundled.</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-im/teams/teams-1.3.00.25560.ebuild b/net-im/teams/teams-1.3.00.25560.ebuild
new file mode 100644
index 000000000000..6f18946cc3f1
--- /dev/null
+++ b/net-im/teams/teams-1.3.00.25560.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg-utils
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="system-ffmpeg system-mesa"
+
+QA_PREBUILT="*"
+
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
+# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
+# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
+# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
+# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	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/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+	system-mesa? ( media-libs/mesa )
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	rm _gpgorigin || die
+	doins -r .
+
+	fperms +x /usr/bin/teams
+	fperms +x /usr/share/teams/teams
+
+	if use system-ffmpeg ; then
+		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+
+		cat > 99teams <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		EOF
+		doenvd 99teams
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if use system-mesa ; then
+		rm -f "${D}"/usr/share/teams/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		elog "Using system mesa. This is experimental and may lead to crashes."
+	fi
+
+	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
+
+	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
+	domenu usr/share/applications/teams.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ac6b50f16fa8..693c65d5d462 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 57740db3f4f1..0d0b3c41e3fb 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 697 BLAKE2B 5bf58333b62042b53070269898b63c9fd99b0aab09f12d0bf723a4d76a9945e8efa812025992fdb6f7e1c4a070ea6c58c4a9257276dc1624c109e891ba8e971a SHA512 3b304b910445d37a829c1f01ae370faf0e3f78bdd04b92ee4d3a0018a48d82d63801f1b92854dc2588f531f15a0d6829d79900d95d03b743ecc1aeba556cff37
+EBUILD ii-1.8.ebuild 696 BLAKE2B 4b7433bde11c0c3894c715062fed65800ee132ff607f70ae378e677ca67b024c986a6ebeeaba61e06ae8a463825bef9cc98436e1a251cfe62c0395f90beec4d3 SHA512 db7a7af35ea085f1126c228d6ec4278f0e14a64660b989be6eead6a26098b1f1a1720b2a96374a2a55eb3cfc041deea479af057b62095cbd5485f729cad0fcb7
 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 c079034f9bfb..2bb1b227445e 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 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 
 src_prepare() {
 	default
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index daca1bdc69e3..9b968a6a043f 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1,5 +1,5 @@
 AUX znc-palaver-1.2.1-python310.patch 2084 BLAKE2B c764435ddcbe2ae6a00b4c937e030b5bb9f8c5f612d97dab6c655c4658523b66dcd8b0bf99a00dbcaffca704e61e191b2bcce43abbd79952b1f156e47bff2564 SHA512 171307c0cc374fe88bb59f5c344d14fc85088edc34b8ff2d85efb731efdeff8159a6ac640e36aec308b1bb3a39d8991323f956937482636aec46ffd6ee379f56
 AUX znc-palaver-1.2.1-xunit2.patch 803 BLAKE2B c56e25f2961257f2a02e6f50d22542c484285460c51cba2b7e7ae9b115a182d79a2f1f2785f5bbc64381bf33062c0d2ffcad2569670e139f8360c769470fe136 SHA512 d37c7ef8e50852096ac152a984a67802ff65002ce94ae0d3e8fed76ebed8aa3b79f04cbc6587b316522cbb1d12f69e82693892e5f273600c5ce72553d03dc032
 DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
-EBUILD znc-palaver-1.2.1.ebuild 1128 BLAKE2B dd573e514eab21e07ad7943481645f631569850efc145660b8b12d8c81bdd3217f7634cdacdb11bd35a4c644a652a862921cb6f5607ba2091065f3f8fec6ed74 SHA512 b25a09298ca4bcfcc7a2ea3478842df9b4d40e94adf164220408d98e293ce2bf417ce949d09175f40af84a963f13b6a8db6e8fcfba48c87d6d12bc3d523da480
+EBUILD znc-palaver-1.2.1.ebuild 1127 BLAKE2B ce58a1fae193c795427cd288604bbd029ec1d0ba0a767ae520bd00ebe38ffe5108b1d2432295b85c68da09b72b3431dd514799f43d5ea6580468a28f26c42492 SHA512 abf5ea1110bf4c2de40d8300046861596adbdc1e9c7950114a3b92d37b9c3f8fa171368c0167be0f8e366e5cbecade3884a81e29e97bf9da4d29b7e42870e181
 MISC metadata.xml 572 BLAKE2B fad08970b057379dcfe02d6450cbe7a67f4d5f9470bf575c0eb2de733e7ac63fe2d620f8df5e923b23335ccadac1569da7ee2783d08d1e33c466b05dea36c6ac SHA512 6eca6cd820299e817e07720dc21c9843af259467fce8a79a6f76cca3bc0ed7b3ab03757c91ffe15429780f8f54a372d9e54111d9f7d18672337b71314a05229c
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index 45c850d4f1f7..bf8f2d320881 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4b26612ff809..7b1ef5fb2e95 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index bc87301a3042..7fc673da578b 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,5 +1,7 @@
 DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
 DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
-EBUILD enet-1.2.2-r1.ebuild 432 BLAKE2B 0ecff244e19cf28f3d10ccda1dffaa128de330313e8926dd53a0fd0bf2832da3738d4e74b5ad6925ded4fdd52aa09b24a8d6dec7dc6819de25c814255ee0f8eb SHA512 5d8df97625fa840418aeb15a9a804042ca714cf4bcbb0b2d68d7c8b3c5da9747e1b4859cd549f23ae979cf974316ad72ba7e347951b9486d181a4dd74f7fa819
-EBUILD enet-1.3.13.ebuild 545 BLAKE2B 7430ea25eb67c8a54555fc53ce0359648599c57ea5f9f30755c84a3de70a2f589308a383fff1fc2c3feb825526db09c9ec3f3d0173b364b91eea8142e2a0b024 SHA512 81cb8b631b1ac0f3970ee3579ecda67be7a57bdd8111a5344e0527a1c24c597d3e7533c3f8b934589cd3aae5b70f5598f3a09c761a310e2df508beae4fe03c62
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST enet-1.3.16.tar.gz 703461 BLAKE2B 30046a50a00eb3ccdb24e69a7f315555b1b395f42e30efff55c09bab28f4f2404c5183da2bce166f719956a9286ebfbc91d184cb146c252351909eb04ac1b345 SHA512 79761749d0f127c30b3c7186ca3c73795532d2e96ac1c152cd1fb5ca422b020f75e0c08ef9c9744e16866f8e5261dc24985e0421be56bcb0a4b072411af425ae
+EBUILD enet-1.2.2-r1.ebuild 499 BLAKE2B 05ec1dc7aaecfb189a06dfdba15f4770491062f334830e6f9eb1ea5a3729f3ebd39951f6d5008902ba66f84640aca16c74473fc7705e00c6eeeb7b257bbc2a3b SHA512 1700ffc1e2129992d9f1bd4fac27a033a948e237349b38ac75cae19ccd479f1b8b2b1bcee114db196c8b8e24ba58a4fcb3e17cbcd194a32b63925302799cf3ec
+EBUILD enet-1.3.13.ebuild 543 BLAKE2B 77646d41979e890867c803d1e7056b17b63ffb76ec70d6ad5fe9eed99603634946a783e86dba66a957cf90609227e5c4d7d32fcafaf991df89e79eb864498002 SHA512 437dcd55c7d87514cde3c4a0a821cb7615349cdeacfab1be8759a0a9b318881d50f0c1dfbf4f097c9ec1426c63ea47b437d93b1f664ec7246aa4c1ca157017a7
+EBUILD enet-1.3.16.ebuild 579 BLAKE2B 56d7f9aa4a91a58d15f73442f00ab6c4933e83eb609957ac08ac158898ef8a8ae580b976574d391725c60ce27fcb5e2f6574f092916237182707727906cbe173 SHA512 518d5fc298c1bb0460f7d6a18157057a49ea0183fcb6d5c7cb26f35cd146abc8dcd601efae18b1662a5368b37187861db08c47f9e44cbc3f898582fb5969e7a3
+MISC metadata.xml 325 BLAKE2B 7cd79c3bb3092d60d0e02dddddcfd62c4a3992b1701f4092b234efaebc5010a3ed0755b7be879f59adb0d36b53d8ba5e39dde647080e45b2799985401f81ca8a SHA512 2f3908ab3033a97cad879679339bc29743107baa299dae476d3cbc728a7b5267b215467a6908996da25832cc6045b7b1aa67bf23b728fb74656a69988d5a026c
diff --git a/net-libs/enet/enet-1.2.2-r1.ebuild b/net-libs/enet/enet-1.2.2-r1.ebuild
index b38533678dda..a0ddb70b8e30 100644
--- a/net-libs/enet/enet-1.2.2-r1.ebuild
+++ b/net-libs/enet/enet-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
 HOMEPAGE="http://enet.bespin.org/"
 SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
@@ -15,3 +15,8 @@ IUSE="static-libs"
 src_configure() {
 	econf $(use_enable static-libs static)
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
index 55c0fcdcfa0b..0e307002387a 100644
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ b/net-libs/enet/enet-1.3.13.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
-DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
 HOMEPAGE="http://enet.bespin.org/"
 SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
@@ -21,5 +20,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/enet/enet-1.3.16.ebuild b/net-libs/enet/enet-1.3.16.ebuild
new file mode 100644
index 000000000000..89a85f45470f
--- /dev/null
+++ b/net-libs/enet/enet-1.3.16.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/ https://github.com/lsalzman/enet/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.3/7"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="!${CATEGORY}/${PN}:0"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/enet/metadata.xml b/net-libs/enet/metadata.xml
index 6f49eba8f496..5b861b1b37a3 100644
--- a/net-libs/enet/metadata.xml
+++ b/net-libs/enet/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://github.com/lsalzman/enet/blob/master/ChangeLog</changelog>
+		<remote-id type="github">lsalzman/enet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 5d64eb306df1..5e0d9730a736 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,3 +1,7 @@
+AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
+AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
+DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
 EBUILD gloox-1.0.22.ebuild 1124 BLAKE2B 5dd191732bd7ee3c09bbb262189a5ad2d6fe73a4f6fa8834f804072771a5e3624f4504a1678b02fa8c3957502d7187a7832dfcabc878409a9c6f6f15dec6f65d SHA512 a12832ab6146e042f88bedab8c53ad683c46379fde248f61da2d103b90e06977d27ad32fded46eeb32fca873e156ad5b794c0e126110e76cc3bad594dbdcf2c6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD gloox-1.0.24.ebuild 1327 BLAKE2B c0ea949018b1ea4cc27d7f71dd63160f6f85bd51b1e8e2be1547ebacabc21bf56cf5569e2879097f354a4f354e1f07fed1f72c10fcf2d996632921838c4ad4f5 SHA512 d0e22822f288c91e0f938b4b41ceb06fc944700777bbbe73e8ff8ef18e432db1130abcfba8ae90ba3b9ec8f4f83436533c19997c484966eb2a34eafd3a781a1a
+MISC metadata.xml 253 BLAKE2B d71cef1027d455987adc9c6421216c7c2c1db2615b0e7beeb8e8ea22fb64f1d6da1067363164f9d4d970af759d9a71be31eb55890a6bba420efb09efbe917c66 SHA512 4a632f8fe7d7808076ecc07be60de72762423ecea35ef546a6e2b0a15eb90c018e1ab06c5169b1b5613451049965bd8d3a4ad6cf898845f6a871b46135f8d186
diff --git a/net-libs/gloox/files/gloox-1.0.24-Makefile.patch b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch
new file mode 100644
index 000000000000..40fed6900f0d
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch
@@ -0,0 +1,36 @@
+Call make with the current instance if possible.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,12 +17,12 @@ apidox:
+ check: test
+ 
+ test:
+-	make -C src test
++	$(MAKE) -C src test
+ 
+ leakcheck: leaktest
+ 
+ leaktest:
+-	make -C src leaktest
++	$(MAKE) -C src leaktest
+ 
+ includetest:
+-	make -C src includetest
++	$(MAKE) -C src includetest
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -117,12 +117,12 @@ noinst_HEADERS = config.h prep.h dns.h nonsaslauth.h mucmessagesession.h stanzae
+ EXTRA_DIST = version.rc
+ 
+ test:
+-	make -C tests test
++	$(MAKE) -C tests test
+ 
+ check: test
+ 
+ leaktest:
+-	make -C tests leaktest
++	$(MAKE) -C tests leaktest
+ 
+ leakcheck: leaktest
+ 
diff --git a/net-libs/gloox/files/gloox-1.0.24-musl.patch b/net-libs/gloox/files/gloox-1.0.24-musl.patch
new file mode 100644
index 000000000000..041841ef345e
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-musl.patch
@@ -0,0 +1,13 @@
+https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/gloox/patches/gloox-musl.patch
+https://bugs.gentoo.org/713224
+--- a/src/connectiontcpserver.cpp
++++ b/src/connectiontcpserver.cpp
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ #include <cstdlib>
+-#include <string>
++#include <string.h>
+ 
+ #ifndef _WIN32_WCE
+ # include <sys/types.h>
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild
new file mode 100644
index 000000000000..e7a34c9e3dc3
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.24.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+# Check upstream changelog: https://camaya.net/gloox/changelog/
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnutls idn libressl ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-musl.patch"
+	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Examples are not installed anyway, so - why should we build them?
+	local myeconfargs=(
+		--without-examples
+		$(usex debug "--enable-debug" '')
+		$(use_enable static-libs static)
+		$(use_with idn libidn)
+		$(use_with gnutls)
+		$(use_with ssl openssl)
+		$(use_with test tests)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
index 6f49eba8f496..f9695bd1f37a 100644
--- a/net-libs/gloox/metadata.xml
+++ b/net-libs/gloox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://camaya.net/gloox/changelog/</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index ace692d894a0..912f4ecd4d85 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,5 +1,3 @@
-DIST libhtp-0.5.33.tar.gz 496010 BLAKE2B 9648632e9f37c20a3efa5edf9b5ee5ed97b5ba767faf6b276c4d38760422b601f9443cfaf30e60c6e6dd555d259a3b5613f0370040753d7336f6ef5e94b32d55 SHA512 52bbb72710fd0f5fc917d62f5a2b659092669eda0553586e75c17c558e3f6559dcf8eb7707db931045af532592cbad691461af2dd5362f95e2a4884e7475bf94
-DIST libhtp-0.5.34.tar.gz 496765 BLAKE2B 8f4eb6b074d9a84fa872ff963f20b4a52f86d171a03fe2347affa9b9383d0d4ba4633b03ec5ca2a9a923c28d16e3f2304f0b4e32c8c4385c0333ba2f280ad21a SHA512 dc86c6b3a90439e9e2d5375b64119d80771e2dc076670f49b9d5f252d7b16fe5b643a16577ce50189c289e7baf16fcb84d86254d965a11ab1d148ad59455c20f
-EBUILD libhtp-0.5.33.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
-EBUILD libhtp-0.5.34.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
+DIST libhtp-0.5.35.tar.gz 496852 BLAKE2B 21ee020f94ea351f408eb3d0d2f99b01f054341a390c9cc42c44a1f2237a1fe965e12797ecc04cf9a519e34fcf495fae4b4119bca6c38ef1d1fa0a9d35c243fe SHA512 d88a8b5f93759a348d0cb039dd95c5504b09b6ff577138cebbaaccf06a6e7ab682e8b61d904e005af67ea4887492d949cdb466d1cbbd9b970a94a30e8b26564e
+EBUILD libhtp-0.5.35.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.34.ebuild b/net-libs/libhtp/libhtp-0.5.34.ebuild
deleted file mode 100644
index 4c0e8229142d..000000000000
--- a/net-libs/libhtp/libhtp-0.5.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
-HOMEPAGE="https://github.com/OISF/libhtp"
-SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="sys-libs/zlib[static-libs?]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# The debug configure logic is broken.
-	ECONF_SOURCE=${S} \
-	econf \
-		$(usex debug '--enable-debug' '') \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
-	fi
-}
diff --git a/net-libs/libhtp/libhtp-0.5.33.ebuild b/net-libs/libhtp/libhtp-0.5.35.ebuild
similarity index 100%
rename from net-libs/libhtp/libhtp-0.5.33.ebuild
rename to net-libs/libhtp/libhtp-0.5.35.ebuild
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 322c2ca5359b..37f5cd348ce8 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,10 +1,12 @@
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.15-avoid-nm-build-dep.patch 3445 BLAKE2B b5094d1b5869321a1fe4d289f5834f70a0422d001a583aa79eb3a9b1e3e84c3060098908c096398dd6186e9b00e88bceed1464952daa1e782ae862e0fc636e55 SHA512 6f0945337b9fe5586cc38e902526a5473e354143eb26db5a05c02a911ecc9de650f22a3f7b68cbb9e90e737f8001adaa1a6d17fcded5f7cab0462b14cc196111
+AUX libproxy-0.4.15-gcc-11.patch 3850 BLAKE2B 365313af90b676d471bf7d5b2fe13358d3fdc902e6dc7da37a56b5f186d36b61fd730d5b15511e29aec8a332c1ab622c98e27237d29b31a2448909c308e6da82 SHA512 dc211ddd3e68ed62f505297ffab08ebd6733b1bb9fa1376b69e69e7db67a875067b802209334d7901994eac115b692eda30abc284dd2fc42f0ce9678fcbcc581
 AUX libproxy-0.4.15-mozjs-52-1.patch 3771 BLAKE2B c5b760979a0c8188ada05e2842d65fd108451d57255c12e971a99f42e373e77c1ac069506085c1d8d20f395551b140dac77a0d33b009b760632921c9452c5d34 SHA512 6572bd725662533aa5a2660461606bc101bb75edfe21021a73f2faa4d3f5d91fb83637ac43e448ad124abfc1c6e59c82f96ae9cd571289767ee6c193be552fbf
 AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db67b4db426e0fe87830c0ca51f9da3c0fc6afc39ee22f13af5c4e3abcf587765b1de0bddc508530302dded86eb1e547b8f SHA512 e1f3fd54ea7fba12d019fe9388236eba1afb73a7e9978c4bbcf9309f9d3aa246747f15e1e62a1d86eba05147b62b2d97d45d1b4547f08a01e4ddef8a8b0746ad
 AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac
+EBUILD libproxy-0.4.15-r2.ebuild 2749 BLAKE2B 731c5c169fdb244d023fe13c3a527ff5bab3e3d1ad06ebf133f7cb735ccfff5af55627def215ef6bc2caf1d2d33fb4c3fc71086e9bc6b0705c19e1bb59de81da SHA512 1923237894e97d2ff10bfde1a281718489b1dbd90883b27b1a0b30066923ff558c9ad3cc4b5e83696f01d92b92656bc7356877187efc242b212eadb840cf7fdb
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
new file mode 100644
index 000000000000..2d40a6c1600d
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
@@ -0,0 +1,118 @@
+https://bugs.gentoo.org/732700
+https://github.com/libproxy/libproxy/issues/127
+
+--- a/libproxy/extension_config.hpp
++++ b/libproxy/extension_config.hpp
+@@ -31,7 +31,7 @@ using namespace libmodman;
+ class DLL_PUBLIC config_extension : public extension<config_extension> {
+ public:
+ 	// Abstract methods
+-	virtual vector<url>      get_config(const url &dst) throw (runtime_error)=0;
++	virtual vector<url>      get_config(const url &dst)=0;
+ 
+ 	// Virtual methods
+ 	virtual string   get_ignore(const url &dst);
+--- a/libproxy/extension_pacrunner.cpp
++++ b/libproxy/extension_pacrunner.cpp
+@@ -30,7 +30,7 @@ pacrunner_extension::~pacrunner_extension() {
+ 	if (this->pr) delete this->pr;
+ }
+ 
+-pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
++pacrunner* pacrunner_extension::get(string pac, const url& pacurl) {
+ 	if (this->pr) {
+ 		if (this->last == pac)
+ 			return this->pr;
+--- a/libproxy/extension_pacrunner.hpp
++++ b/libproxy/extension_pacrunner.hpp
+@@ -26,7 +26,7 @@
+ #define PX_PACRUNNER_MODULE_EZ(name, symb, smod) \
+ 	class name ## _pacrunner_extension : public pacrunner_extension { \
+ 	protected: \
+-		virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \
++		virtual pacrunner* create(string pac, const url& pacurl) { \
+ 			return new name ## _pacrunner(pac, pacurl); \
+ 		} \
+ 	}; \
+@@ -41,13 +41,13 @@ class DLL_PUBLIC pacrunner {
+ public:
+ 	pacrunner(string pac, const url& pacurl);
+ 	virtual ~pacrunner() {};
+-	virtual string run(const url& url) throw (bad_alloc)=0;
++	virtual string run(const url& url)=0;
+ };
+ 
+ class DLL_PUBLIC pacrunner_extension : public extension<pacrunner_extension, true> {
+ public:
+ 	// Virtual methods
+-	virtual pacrunner* get(string pac, const url& pacurl) throw (bad_alloc);
++	virtual pacrunner* get(string pac, const url& pacurl);
+ 	virtual ~pacrunner_extension();
+ 
+ 	// Final methods
+@@ -55,7 +55,7 @@ public:
+ 
+ protected:
+ 	// Abstract methods
+-	virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc)=0;
++	virtual pacrunner* create(string pac, const url& pacurl)=0;
+ 
+ private:
+ 	pacrunner* pr;
+--- a/libproxy/modules/config_envvar.cpp
++++ b/libproxy/modules/config_envvar.cpp
+@@ -24,7 +24,7 @@ using namespace libproxy;
+ 
+ class envvar_config_extension : public config_extension {
+ public:
+-	vector<url> get_config(const url &dst) throw (runtime_error) {
++	vector<url> get_config(const url &dst) {
+ 		const char *proxy = NULL;
+                 vector<url> response;
+ 
+--- a/libproxy/modules/config_sysconfig.cpp
++++ b/libproxy/modules/config_sysconfig.cpp
+@@ -124,7 +124,7 @@ public:
+ 	~sysconfig_config_extension() {
+ 	}
+    
+-	vector<url> get_config(const url &dst) throw (runtime_error) {
++	vector<url> get_config(const url &dst) {
+ 		map<string,string>::const_iterator it = _data.find("PROXY_ENABLED");
+ 		vector<url> response;
+ 
+--- a/libproxy/url.cpp
++++ b/libproxy/url.cpp
+@@ -115,7 +115,7 @@ string url::encode(const string &data, const string &valid_reserved) {
+ 	return encoded.str();
+ }
+ 
+-url::url(const string &url) throw(parse_error)
++url::url(const string &url)
+ 	: m_orig(url), m_port(0), m_ips(NULL) {
+ 	size_t idx = 0;
+ 	size_t hier_part_start, hier_part_end;
+@@ -298,7 +298,7 @@ url& url::operator=(const url& url) {
+ 	return *this;
+ }
+ 
+-url& url::operator=(string strurl) throw (parse_error) {
++url& url::operator=(string strurl) {
+ 	url tmp(strurl);
+ 	*this = tmp;
+ 	return *this;
+--- a/libproxy/url.hpp
++++ b/libproxy/url.hpp
+@@ -50,10 +50,10 @@ public:
+ 
+ 	~url();
+ 	url(const url& url);
+-	url(const string& url) throw (parse_error);
++	url(const string& url);
+ 	bool operator==(const url& url) const;
+ 	url& operator=(const url& url);
+-	url& operator=(string url) throw (parse_error);
++	url& operator=(string url);
+ 
+ 	string   get_host()     const;
+ 	sockaddr const* const* get_ips(bool usedns);
diff --git a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild b/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
new file mode 100644
index 000000000000..cbec1147443c
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic mono-env
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gnome kde mono networkmanager spidermonkey test webkit"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	mono? ( dev-lang/mono )
+	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
+	spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
+	webkit? ( net-libs/webkit-gtk:4 )
+"
+RDEPEND="${DEPEND}
+	kde? ( kde-frameworks/kconfig:5 )
+"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+PATCHES=(
+	# get-pac-test freezes when run by the ebuild, succeeds when building
+	# manually; virtualx.eclass doesn't help :(
+	"${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+
+	# https://github.com/libproxy/libproxy/issues/27
+	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	# https://github.com/libproxy/libproxy/issues/28
+	"${FILESDIR}/${P}-avoid-nm-build-dep.patch"
+
+	# backports from git master:
+	"${FILESDIR}"/${P}-python-3.7.patch # find python-3.7 and 3.8 as well
+	"${FILESDIR}"/${P}-mozjs-52-{1,2}.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DWITH_NATUS=OFF
+		-DWITH_PYTHON2=OFF
+		# WITH_VALA just copies the .vapi file over and needs no deps,
+		# hence always enable it unconditionally
+		-DWITH_VALA=ON
+		-DWITH_WEBKIT=OFF
+		$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
+		-DWITH_GNOME3=$(usex gnome)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
+		-DWITH_NM=$(usex networkmanager)
+		-DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
+		-DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
+		-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+	doman "${FILESDIR}"/proxy.1
+}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index ef40dab2baf0..2fbbb6e9c188 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -5,5 +5,5 @@ DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6f
 DIST libwebsockets-4.1.2.tar.gz 12676362 BLAKE2B 9b65217d799ffa6637dc79630224f3ec9e8c7e8075b7eebfc55a111d9ade534b912059c170bc4f435d2d8424340d5ccda75f3a8992a45ef128ea82bfc789391f SHA512 1aeb105191191c55eb01f0cf565d7d16e32e8239af3a3ee653dfb4bcccc5dfc42302490dfbdeac9c9cab0759e016a4a1c8c05938f26ce62a024e0d50600cdd86
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
 EBUILD libwebsockets-4.0.20.ebuild 2519 BLAKE2B 88c178b4a7ab0704bdb0660274d59488ed14d7e365c92a991f90963789cb4ea6409f3774e710617ae254f3e1a525d255dc66d21b8c30200bf714fe67be422b4d SHA512 d1ec85cf9704f300ec40186226960fde1474a7654b93665025a4b8ee37b17147d95ff7179e276763b3d23f83b6eab7cfbe52c532475023ec8a5af2e838632f91
-EBUILD libwebsockets-4.1.2.ebuild 2363 BLAKE2B 02adfa35fcb00a6e153503a9b01cdae4fc7c801b7d9b737512ce8059c74e70343062108d2711728bf6da18c9ed6a996826f4440c4efed1f1e4963381c4737f4f SHA512 d66dd287d1b52dd9b195f640e028a992e9418f4f1c4a1e4f1c6257fb1ef5970f14d9288df73b71ef1a114164394252c85824abb7ce1a2c0908470a763f63745e
+EBUILD libwebsockets-4.1.2.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344
 MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.2.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.2.ebuild
index 037328b71c72..30dbd55c5f2f 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.2.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index b3af941a3299..5962cce9ecb5 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,4 @@
 DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20191224.ebuild 1323 BLAKE2B 28df43609d2274aae43c47ec35fcd5f813ced3935eca25b3f700ae91f0293a1df9fd4f39559fd41296bbc676ed0e263e448c1953fef7dad902379a347d5a1df1 SHA512 465c177828696c55f15983fdb49b330c4f1e6c19c47961f112ca24813a01a2c339f2af0091bd36daa974cd875ec449b4dedf695a10ce4fab318bdacd1cfea6e9
+DIST miniupnpc-2.1.20191224.tar.gz.sig 543 BLAKE2B ddbde04faa7bce62fdbb5b555bda9dc9ff69f09cc97442049adc787a03ec91824f14cdddaef6e577cf8d08fa96202fc792333b8dab7e6e8c30847fa9302a35d0 SHA512 b8885d2002259c95ede7ab57aaf82db83c2bd7ace3d0986179efac4245ffd42161049e0167a9ac1ff18de6c8df4d39356f0fb6aa6dada7523a238b4db4838887
+EBUILD miniupnpc-2.1.20191224.ebuild 1523 BLAKE2B 53a24a8767c864c6b82f54f2822e79b9670f632a872fb10f798af381001ea65d4a7de3f2f11dd8e6c5d82eab943f3b1a69fc7953868b2578fbf33dce0e253114 SHA512 2b60ca7a7b798953a969f28aef2a325175bff279996edc332423a9088f620c295c2879377cae3859244deafd7e9fa5c23cf6c28a487b8725723bff4e330ae061
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
index 7c74096859fc..939ae17cc4ef 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="UPnP client library and a simple UPnP client"
 HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -15,7 +16,11 @@ KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_prepare() {
 	eapply_user
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f69490c5cf02..ff524eab5dce 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -18,5 +18,5 @@ EBUILD nodejs-14.13.0-r1.ebuild 5957 BLAKE2B bd8ccbb0d8c80f586ecbbee270da0dcb0b8
 EBUILD nodejs-14.13.1.ebuild 5957 BLAKE2B bd8ccbb0d8c80f586ecbbee270da0dcb0b80b20c1f6a2220a9d8df73297cdb57768a592b8f8fe6d8f66185aa906fe0d388584c0f62fb8eb22fc10aebe5fa0579 SHA512 ac7afa1cbf01a5172982114476c219a7d5ac4623dd21b6e9e5d167da298108e0dc2e09eea71bd2ab40de312654829916c649d32b12443c3ef937a1e6b4e1c35e
 EBUILD nodejs-14.2.0.ebuild 5898 BLAKE2B d29b447cdaa6571dcc5c707e683df97a74a8d78901b43cf1aec93ad81973800d07683945284c16d6de8019123160d5e6291341bce879c66053152c5be9142b91 SHA512 4672745ddbf4b65eefcaabcd257de277a9ca15fb5a6c2e65e7beac9a355c39f7c0ebc7409695e8bc1c932d6727e18d42a5b8e240eb0177cea3b301e3847b141c
 EBUILD nodejs-14.4.0.ebuild 5904 BLAKE2B 51884460c0a7df6746a9d0626440e84cfd2f04b6a95e8a3a4ffbc84c009049a41d6fe0625a131740bb12c167c2d07807ccadc3f08360b4835a57426430f64832 SHA512 370de9daf60b97172debe418868f9433d11b0aef521bb50d0db70dc753292ed6b686bc5c4093e5021f20f1bc4dcd3f8d9ecd6e0658337a1025d64db5bece98ec
-EBUILD nodejs-99999999.ebuild 5875 BLAKE2B 3874382b29017bd337653a042b3a880c46e18c6c7d9049652d714391a53b98a69157ae4eb23a80b6f92520202bf8f80ef91874059170adacbb73713c3047360b SHA512 d3a83fcd2ef5bbd53bab82653679b040b1b382ba00ff41cafdd2eb17ff530ab82cfe99a8fdb706f8359035f042aa13acbec0a5592ac813121f0ce1c1771c2153
+EBUILD nodejs-99999999.ebuild 5811 BLAKE2B fa5f65bf9b29b39fab93459a01774b5237e185af99af95f0e0c51e6b282d158ee01701e216eafecd74849f991ebc4858cf527405d1e39fea1da69f19e68ac2ba SHA512 0d7f317b4fa2ecc450dd2c12ccad524be2a20ca255953b64eb012e46333b940baa3dc652353825fc7444834d8be17a33681c7d63f1d1f008fa0ab5d99f95c501
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index f5b9e1eee3d6..e7a2c7c7eb93 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -40,9 +40,6 @@ BDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index a8f91682afe6..c148aa103a7e 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,5 +1,5 @@
 AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d
 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
-EBUILD signon-oauth2-0.24.ebuild 1124 BLAKE2B e0773d098a4b863929db80fb96dc38868249c715d00713f32c55338334c810b726e7faf4cac0eed12ca3bd85bb705b75f70204fcd0b04c468dbac8e1caeff57a SHA512 45fac9764227313cb46a997229b5b7b6bda7c086fccc41b4fe485cc9785aba70933668f6db5e8766233e501eb8924377793ad39a9e2d64d9fa71ae9cc11e4d10
+EBUILD signon-oauth2-0.24.ebuild 1131 BLAKE2B 2b2e88b2ef23769ca79cd86427e365e10108dccc1a313f6c6e7fdd07db2c4a2bd23381f5a2c68a9483937c0c726239fc5ba0988991b1f296f02ce950f701bfb4 SHA512 ddfb2cdfc778813d176b8fb31346626b5140eefe22b55bbd4a61ffab6fa33d9e9b0603f8a33aa49c3daf2e899e354f58f5a3cee6aa2edc3d6ac61b2e37d37461
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index 4b610ba173e5..5317e17cef7b 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index b3e20359dc4c..2e9fdfdb2bc3 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -2,6 +2,6 @@ DIST xrootd-ceph-4.12.0.tar.gz 80601 BLAKE2B 05e31ec3a03d50f36f7ef368705ca8ad064
 DIST xrootd-ceph-4.12.4.tar.gz 81253 BLAKE2B 0b3d0e347e02b6948550c44487e0edb1c65075407b444b6242fb3e647e3fe91ff2d03ca10f13b5ae05ffa931eaf0b73a75055999a55b74ec20d8e6b853865f67 SHA512 cd793d18f6162a98f50f605177aae1421227226540fe3e632adae3632c053e78f3b53b1e09f6f60a9c64a5a5e5d019aceaf1ab1c11dde81e5c36512b47ac0ac9
 DIST xrootd-ceph-5.0.2.tar.gz 81255 BLAKE2B 529d2c361cc7660cdbb481cdbae1fbf4cd706f29df868c645775b96efa7efaaecd9ea8b7d915c15b5ff78ad1395bb8271a3f1c1105ea0b42dced77efa33acaa7 SHA512 9f8de694a9a864ee0a963bb47c603d2cd3a77b4e13efacdd7f35674016358ce3b0a3fc5850098a29774749f54fa82db12c0e56b55d814873c124d9e19c7c23c5
 EBUILD xrootd-ceph-4.12.0.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
-EBUILD xrootd-ceph-4.12.4.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
+EBUILD xrootd-ceph-4.12.4.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
 EBUILD xrootd-ceph-5.0.2.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
index f701427b94c7..9936f476eb33 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 
 DEPEND="net-libs/xrootd
 	!<net-libs/xrootd-4.10.0[rbd]
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 6a0eeeb688c2..0f055824afe3 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -9,6 +9,6 @@ DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34
 DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364
 DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255
 EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d
-EBUILD xrootd-4.12.4.ebuild 2602 BLAKE2B 3089dc47bf32b1e065b8682f73d485c5bb4ac8d66f28bea070b9ff8a829f7b3f90775300ef1cd5c293912c6f574a71f90d8a1e081c3e95c2676674049c44f850 SHA512 45f865f01b6e91a8cb846fb6d4b31dc615a9284fd75eda628e53245c4599bd5a2544f021875b35f45b35c46b3733832eb844903a53c6aba40c17a4a9942925e4
+EBUILD xrootd-4.12.4.ebuild 2601 BLAKE2B f611a35164556ebe4a73b94b5bdf1a95c0d7c2babb35f7db432a73772c4c0344e4e4296f159960157059ae78bc8b73c50caa545ef0c2aa429dbd044b0f732a3c SHA512 091c283618469e7f247d0ac83c37be8c231c13343159fba60a3f45f95a700f26a8c5ee3790d7cab18503d4c4704aa30a3a018e5ef05a60614d2e0da2e00f8bb5
 EBUILD xrootd-5.0.2.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-4.12.4.ebuild b/net-libs/xrootd/xrootd-4.12.4.ebuild
index 8c12b39a0212..89ccb0b92650 100644
--- a/net-libs/xrootd/xrootd-4.12.4.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b1d4306c57c7..e1cacc3f60d1 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6121e0bbf7bc..efa04b5e39a3 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -4,6 +4,6 @@ DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e
 DIST electrum-4.0.2.gh.tar.gz 4395620 BLAKE2B 27d5e74ea85d792f73a01d41528dc9a84af374d672e7c7101a82e18634a32d7ebdb039571bde36625b460c6c7634ec75848711dc4cabfbd1be46f16d18e35df2 SHA512 8b03d60cb549315c9f8a2cb4f02e3a483b8e8f9ee0461bb9d54acca0d9cf96d38a158bb6bccdb1bb584fd5a3f4fd8ffbcb0d45244f41dc5636689adb514f1681
 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.2.ebuild 2399 BLAKE2B 3bda29f73f9968ed37ae7c4cc556b07cd866194f454b56b1665d60e37a7feeb3f7cf3f71dd31a031a32a4a3904806caeef5ecacc12f0d794af3c82edea637002 SHA512 bf758fc80e582088bc328e4bf6fc39954c480855858d08d1157abe22d6cc3cda811145e0929ff60f38178ce225343cb4d91bf085c55a86a920c780c5438df4f5
 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.2.ebuild b/net-misc/electrum/electrum-4.0.2.ebuild
index cad41a9dfc26..5f1d63884893 100644
--- a/net-misc/electrum/electrum-4.0.2.ebuild
+++ b/net-misc/electrum/electrum-4.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index dabc5e48c36c..395837962ce2 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,8 +1,5 @@
 AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
-DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux.tar.gz 138691420 BLAKE2B 7f2d8e9519d6a9651d09c8b55e6a530266b809e437132ac4a814473ec25622663a0fb455a3b078fd5e79194e82d24d1b324369799f15bd1d4dbb6b607cdada76 SHA512 17078c8480579e63391a8cfb7af5033510ca3a9c5616b2af0af7679bbd6592f4f7fbe68dc01194aa11c1b481bc1c4089339adb42c22a687effa05dd728984579
-DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz 135584164 BLAKE2B d74ade013d00e7c7dd5d79b808d158519a520603931dfe9bd44f4dc64911b066f0e9f61bdff7386ee30d2d5b1f4fb86477ee339e76f00746f0b119c3a4b49e82 SHA512 2409f79850cafb2af5f34ec3fd755a6438ef7abef3c1a014df95d4ccc49d9b151ddfba7c1824de9c0f00234ea36b2fa6bb519f5035321dccae9ac06fa2f9458a
 DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B 915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766 SHA512 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
-EBUILD ipmiview-2.15.0.190109.ebuild 2389 BLAKE2B 251caeefbe35ea4f88c6fb9f6c4dc3e3ac8beb992aab4fe91bd1037cd1ffdae21e4daee57af69a026e48715d7f9e3bb822482d408442eb72dfa81438233e2d4d SHA512 ec5dfc4088d33cfd70b704e263518424f26aba1c3c6ffe0ee4e43533cd60edf9f29e96a8480aab147e73439833a6180cdc817639b4a080278887acd0862c26fa
-EBUILD ipmiview-2.17.0.200505.ebuild 2197 BLAKE2B fe4c5b9f9358e32fe42696f2a6cfcabead5ff37c84ada6b36ca33ff1ad357d30f7fed6c5bf0b14e3228c68f5a0d905e592f2dbf6ec3e07a100610f6c094b4712 SHA512 06fcadc842fb8abfbdd876e677f31bf6a77de45f59b30a2403ac0b5bcc154c7e30890cbabaeec4ead1f35acc9d219e6dd2376c580e5b0bf10f0cf5f44ef12390
+EBUILD ipmiview-2.17.0.200505.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
 MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce
diff --git a/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild b/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
deleted file mode 100644
index 7d565a17b74c..000000000000
--- a/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eapi7-ver java-pkg-2 prefix
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="IPMIView"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="
-	amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )
-"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	net-misc/stunnel
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist fetch mirror strip"
-
-DIR="/usr/share/${PN}"
-QA_PREBUILT="usr/lib*"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Extract icons for menu entries
-	unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
-
-	# Don't use their scary launchers
-	rm -v lax.jar || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_doso $(usex amd64 '*64.so' '*32.so')
-
-	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
-	java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
-	java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
-
-	exeinto ${DIR}/jre/bin
-	newexe $(prefixify_ro "${FILESDIR}"/fake-java-r1.bash) java
-
-	insinto ${DIR}/lib/BMCSecurity
-	doins BMCSecurity/*.{crt,key,pem,txt}
-
-	insinto ${DIR}/lib/BMCSecurity/linux
-	doins BMCSecurity/linux/stunnel.conf
-
-	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
-	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
-
-	doicon ipmi{view,trap}.ico
-	make_desktop_entry ipmiview IPMIView ipmiview.ico
-	make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
-
-	local DOCS=( *.pdf *.txt )
-	einstalldocs
-}
diff --git a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
index 664d3944d27e..e6d9549403ff 100644
--- a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+++ b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
@@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)"
 
 DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
 HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
 
 LICENSE="supermicro"
 SLOT="0"
@@ -19,22 +19,17 @@ KEYWORDS="-* ~amd64"
 
 RDEPEND="
 	net-misc/stunnel
+	sys-libs/ncurses-compat:5
 	virtual/jre:1.8
 "
 
 BDEPEND="app-arch/unzip"
 
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist mirror"
 
 DIR="/usr/share/${PN}"
 QA_PREBUILT="usr/lib*"
 
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
 src_unpack() {
 	unpack ${A}
 	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64 ${P} || die
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 0c5061b598df..9b9bc890f977 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -2,6 +2,7 @@ AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46
 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
+DIST minissdpd-1.5.20200928.tar.gz.sig 543 BLAKE2B 5fdedfe4b042924667c329aa964e006cc9a5aad1e2d4f11d46c6689e7d88b4614c383bfb666ca9a7c90b37256a4e38dcc85e479687688578dd198893fcf5d3cf SHA512 15477061b009991a05323a66582bd7ba9c9aa3a1a7c84eca93b27adf1b11ede81063d9de4695fcf3567f3c367a730afe4cee0fa95cccdecd316d08021956cf6b
 EBUILD minissdpd-1.5.20190824.ebuild 675 BLAKE2B e45aa1fc469be382e2b90c22d1af62522ebcc4059e89bc6a902fb7c25c0f07b3c8a2655b7237b3ac77f4aeca36681dba6d94cbb09f26c0a7dad2b4919def5342 SHA512 ca94ce5f8c01f040587ae4772cf80d3fc2977216d9d9e897c9cc0e62019e23c52619c77eba8b5ecb4faa2f5ba2d731ce0d16fbc84207e1f678cec9dcda2c58c6
-EBUILD minissdpd-1.5.20200928.ebuild 769 BLAKE2B e1f593ce0c940c315e92d516281747d103d7ee3de6fac8ad24ce443fb7cf9c60b7479d8ccab0624dc002e504ee52deb1398703f0195eabfcf26b7af8b0ca91c9 SHA512 85e3d092f256e8a15bfe44a62b3e8cb1fbfcc7635ae1a5087224c3ca7e689491dd2434fc76a623233ea86ff0b3a247fd9854ed14a5b2022c3fc341a9851bdf00
+EBUILD minissdpd-1.5.20200928.ebuild 970 BLAKE2B 19e025bb874e1ef5554a2f18a5794cf0f9f5194d6a3d7d111e4321d0f7d347c4acbaad0cee3fe5c8e410ab8ad8464cbc206038ae339796feb4ee768b42ce07b4 SHA512 9f70df6c063235fb790dcd39cfc33eff8226d2a531afe733921713a16e0f6861b9612bd21106b6bb87c528cc6ef57637b95c5d53cb289af39c3493583cf96f46
 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
index fd2d7685e495..f6632eade218 100644
--- a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
@@ -2,21 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
+RDEPEND="${DEPEND}
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+BDEPEND="
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_configure() {
 	sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 075e6b8fec6c..200b68ee027f 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -2,6 +2,7 @@ AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20c
 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
+DIST miniupnpd-2.2.0-RC2.tar.gz.sig 543 BLAKE2B 678b76fcc994d66dad6988a272d99db1f1eb89096b72e171f9ee94c59734ff5a1885316ac2564119614b0a9c653cf7e7d88a6b9f291a6588d4577e669d2b4775 SHA512 fa6c93501b6bf5eef763d0ee637233458ddb6e2aac0ec92554c803ed29e6d3fb35e8618a7316fddc07a009a5a7b702351226ef2eaec6dd5404bea47d5fb0ebe2
 EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
-EBUILD miniupnpd-2.2.0_rc2.ebuild 1877 BLAKE2B 8932e7d747cb064f04d7de06e51649a344cc2feebed2880c8a9afef85deaf62442b7c94dcfb5653a19cd2e080c1e14abf0cadaf9f8c69b84cda72305933f166e SHA512 dd355469690c59df2a19b74f75d58aabd0cbbc3056d53628fcef599be5bfb2db2c2a8d981f913db2a9dbbd51b6a5708ffd3a45d36246b1e66377fcc27c84236e
+EBUILD miniupnpd-2.2.0_rc2.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
 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
index e80efef5db1b..1c2981def4c4 100644
--- a/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
+MY_P=${P/_rc/-RC}
 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}
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,8 +31,12 @@ RDEPEND="
 		net-libs/libnftnl:=
 		net-libs/libmnl:=
 	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_configure() {
 	local opts=(
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 7df3d3a5c97d..1b2bf52ec4f3 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,25 +1,12 @@
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 058694194cacd2c42f9f327f6f9b100eb0c8f73a634c0125d448ca5a486a919ae8b305832c1b39c74cd0dadd7bbbce80e3403ba42d9d7ce5fc9146cfb7d2c97a SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214
-AUX 1.18.4-iwd1-compat.patch 3033 BLAKE2B 4f25f0f425ad13a91776d11d3df4d153f0ebdd67a91d5da756af45753241455d2393955ba7281b6339b39b77639f5ebf30253cbdff5ad44ba9717387f71f1f2d SHA512 aac04da2da739d068f353144a5b792b106defc426677e28cdb9eb3c70af783265b905b516b168d068b6bf0c0fb98987a5395721ccf6fee4eec1acde98b413505
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
-AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273
-AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
-DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
-DIST NetworkManager-1.18.6.tar.xz 4845144 BLAKE2B cf66789c025d9ec2007d1fe541acb8fd2b5204796ff8498fc5689124016e84a7e76509bee1b6650c796f0429cce6748c7b99e1976d95ac12bc31a1f1e67289b0 SHA512 92ab648e689dd903279fe676e867d7929f616c96dd478b2132854145a29debfcac5b083d70652ea0c7bccb0eb132534133fc9c005527237c47e2802556a29b92
-DIST NetworkManager-1.20.12.tar.xz 4663320 BLAKE2B c0faab91a50ee38d6c884dd4f753d642e5c21c268814cd6badc8a8dc3b654f54d1ff60b362d6e3cb4b254218618f16dd7a1fde153879907b5b3538a92086e5af SHA512 97dacee9b0720b864c941c139579d84d98d1b2f74dfc97fd0a6ed35ed9ae0b45d40553f8d79c4d7c4d3958228a2e6035555069c94040ecbe4a34457bce8d5f60
 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
-DIST NetworkManager-1.22.14.tar.xz 4771180 BLAKE2B d0133c2de2fd8a7932be7699bcef7e8e32083e6f908de0eaa3875a862329a1a302245d66dbba8a90a691245897b7a943a35785da21f394a7cf2659eb9cceb866 SHA512 81ccb634c3583406d52c159d1b0903f98c2732f9cd6962f3d6d71940d05cba32e262219de4f09c0cc687beff57bd7ba425f06d9a9c1bfa60aef11d427e91f453
-DIST NetworkManager-1.24.2.tar.xz 4848624 BLAKE2B f8030159d6f645c3015cfb9cf41ffbf30f052592e04c27a2a378e6d7c0ac86f521a5147229b84e68adb7835ebac8b8ad094977f0783b3fa794149190d809a098 SHA512 34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923
 DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d
 DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
-EBUILD networkmanager-1.18.4-r3.ebuild 11431 BLAKE2B 76cb824cea61c07fb21a59dc8bee989eddcaf2ad289a899d8aa5c3a865331dc5298f5e3ca92caf1e32cb081f3ab83138df56066b8ef0ac0708cf63998e002295 SHA512 a791b582b8f90aeb845f2f04052ac24ef11a5dfc6427205a76255a625e6a26cb00ac87e0b5bd5b5fb20e44259417ccd6a039a0f97cd1989b922f1f369eb609e0
-EBUILD networkmanager-1.18.6.ebuild 11432 BLAKE2B 2ef7ce19c9cd88dc3164ac651d766bbbb7fbbe2175e58fcf4eabd613cfe8cf1457678cddf0d2383fa021824e83a55d0d44734294933d95f86487b8883a8fd3f2 SHA512 852ccdbdd1c6c46ec6301f97b3108d202c1eeed3827a4cec9098a3c6d91eabb26b43f591d6bc7d2c3bbc746433efb5ba7416fe9623a5606e62fd19e317f6e323
-EBUILD networkmanager-1.20.12.ebuild 11088 BLAKE2B 0dbdfd04968daad96115958bc1340fb16dec34ec8f43f0d51acee7ecd46c310b0e041130318420d5436c78134d88f13594b5201adf710c66fc5a3a4e6318e680 SHA512 c07598b70aad185a490a179f5e92b80c62af536a77dbcde44a9506d034ae0c48d4b2a4dc115a66778dfe92650605aac353ff764389f3709d642b3053744c139d
-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 11142 BLAKE2B d90518063b598948f8e2e738ed8840c2f343447ed5e94fa5013dbf9a990e232ffd261da6ad2a97d6d7567f32563292fc145e03ff92e78cec3015e3007187348e SHA512 ff34f2ab285394818399535fdda1d3e3752c72cb1c6b4bb0c5aa6ee97e5c46c1ad25fa6016f14d4deacdcef79aa207c51710cf74aa9d460312b0bd168d7de665
-EBUILD networkmanager-1.26.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a
-MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89
+EBUILD networkmanager-1.22.10-r12.ebuild 8550 BLAKE2B 2bc90b456b46a5240e05c52a6afe59b4320d905363a3bad0ae4d0f41e3d0584d2743a76c255be198cc0dffacfd29109deb59d67749b06423e3155c1f624c9150 SHA512 00e785287a1ff4cf9260b8cb5d342ead2c1e3568095d5a7074b72df8269940a46e257b95f36a335055ec3de17de8fae527b99434253dd06d1bc04e0108b0e1f0
+EBUILD networkmanager-1.26.0-r1.ebuild 11208 BLAKE2B f69905ebe2031f6e707c9c1907e03f0c80fdb2546bec7964a9b21b3a8a6008c023a630e9cfbca5cef00ff937056d816755d62884428fc972814ac67cee755a51 SHA512 40009fa98e7a6317d87a22e8ab559e70d229bdbd0bfc91e49cfcff36f5bc551d86d16f9fdd2e52e3e2821123dd47eb4e3efb0a79d873a91d34eefcbaf9c50e2d
+EBUILD networkmanager-1.26.2-r1.ebuild 11214 BLAKE2B b9bf75442380146f2b7eb73f8022cbd30eaecb47e9f48ab96300e26471ecfa1949f076749b23604cc8c5b34264858788cf638c74221bbc5bef2d04e0f219e19d SHA512 eb92e2db85fb28e961494c6425eab2f3a03d61c4efa94d5cdbf1393b7f4d90e55b6cc958f2ec7c0079250f8a51827d42a477ec459bffaa508e6817f4ab8c0d12
+MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch b/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch
deleted file mode 100644
index 12c8b873e6a1..000000000000
--- a/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 59923ad85d1a1cf2216a4f14649702d24d3f2360 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Sat, 2 Nov 2019 06:55:54 +0100
-Subject: [PATCH 1/2] iwd: add some missing error handling
-
-g_dbus_object_manager_get_interface() can happily return NULL and we
-need to check for that.
----
- src/devices/wifi/nm-iwd-manager.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
-index dd1cad480..e83f8063c 100644
---- a/src/devices/wifi/nm-iwd-manager.c
-+++ b/src/devices/wifi/nm-iwd-manager.c
-@@ -136,6 +136,11 @@ agent_dbus_method_cb (GDBusConnection *connection,
- 	network = g_dbus_object_manager_get_interface (priv->object_manager,
- 	                                               network_path,
- 	                                               NM_IWD_NETWORK_INTERFACE);
-+	if (!network) {
-+		_LOGE ("unable to find the network object");
-+		return;
-+	}
-+
- 
- 	device_path = get_property_string_or_null (G_DBUS_PROXY (network), "Device");
- 	if (!device_path) {
-@@ -260,6 +265,11 @@ register_agent (NMIwdManager *self)
- 	                                                     "/",
- 	                                                     NM_IWD_AGENT_MANAGER_INTERFACE);
- 
-+	if (!agent_manager) {
-+		_LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work");
-+		return;
-+	}
-+
- 	/* Register our agent */
- 	g_dbus_proxy_call (G_DBUS_PROXY (agent_manager),
- 	                   "RegisterAgent",
--- 
-2.20.1
-
-
-From 186d22a9634e2bf94658ed6f1cf2b332ecb3a32c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Sat, 2 Nov 2019 07:01:28 +0100
-Subject: [PATCH 2/2] iwd: unbreak iwd-1.0
-
-The upstream apparently thought it's a great idea to change the agent
-manager path. This fixes things for those unfortunate enough to run
-IWD.
----
- src/devices/wifi/nm-iwd-manager.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
-index e83f8063c..470cb1c90 100644
---- a/src/devices/wifi/nm-iwd-manager.c
-+++ b/src/devices/wifi/nm-iwd-manager.c
-@@ -262,9 +262,17 @@ register_agent (NMIwdManager *self)
- 	GDBusInterface *agent_manager;
- 
- 	agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
--	                                                     "/",
-+	                                                     "/net/connman/iwd",
- 	                                                     NM_IWD_AGENT_MANAGER_INTERFACE);
- 
-+	if (!agent_manager) {
-+		/* IWD prior to 1.0 dated 30 October, 2019 has the agent manager on a
-+		 * different path. */
-+		agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
-+		                                                     "/",
-+		                                                     NM_IWD_AGENT_MANAGER_INTERFACE);
-+	}
-+
- 	if (!agent_manager) {
- 		_LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work");
- 		return;
--- 
-2.20.1
-
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r1 b/net-misc/networkmanager/files/init.d.NetworkManager-r1
deleted file mode 100644
index 3209644c511f..000000000000
--- a/net-misc/networkmanager/files/init.d.NetworkManager-r1
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
-# Copyright 2013-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="NetworkManager daemon. The service is marked as started only \
-when a network connection is established."
-
-depend() {
-	need dbus
-	use consolekit
-	provide net
-}
-
-start() {
-	# If we are re-called by a dispatcher event, we want to mark the service
-	# as started without starting the daemon again
-	yesno "${IN_BACKGROUND}" && return 0
-
-	[ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
-
-	ebegin "Starting NetworkManager"
-	start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \
-		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
-	local _retval=$?
-	eend "${_retval}"
-	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
-		einfo "Marking NetworkManager as inactive. It will automatically be marked"
-		einfo "as started after a network connection has been established."
-		mark_service_inactive
-	fi
-	return "${_retval}"
-}
-
-stop() {
-	# If we are re-called by a dispatcher event, we want to mark the service
-	# as inactive without stopping the daemon
-	if yesno "${IN_BACKGROUND}"; then
-		mark_service_inactive "${SVCNAME}"
-		return 0
-	fi
-
-	ebegin "Stopping NetworkManager"
-	local pidfile=/run/NetworkManager/NetworkManager.pid
-	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
-		# Try stopping the pid file used by <0.9.7
-		pidfile=/var/run/NetworkManager.pid
-		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
-		ret=$?
-		[ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}"
-		eend ${ret}
-	else
-		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
-		eend $?
-	fi
-}
-
-# vim: set ft=gentoo-init-d ts=4 :
diff --git a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch b/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch
deleted file mode 100644
index 1b94ab478d8b..000000000000
--- a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27d380b70ea839c7badab420361e4e65e023e8e9 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 16 Aug 2019 13:22:09 +0200
-Subject: [PATCH] data: fix the ID_NET_DRIVER udev rule
-
-Systemd v243 is complaining about the wrong substitution there. That is
-sort of harmless, because systemd-udevd in that version doesn't need the
-rule anyway. But still fix it, to avoid a warning.
-
-Also, newer udevd's $PATH doesn't include sbin. That is also okay,
-because we don't need the rule to actually work there. But fix it
-anyway.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1740655
----
- data/84-nm-drivers.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
-index d246ef6ce..e398cb9f2 100644
---- a/data/84-nm-drivers.rules
-+++ b/data/84-nm-drivers.rules
-@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
- # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
- ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
- DRIVERS=="?*", GOTO="nm_drivers_end"
--PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
-+PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
- 
- LABEL="nm_drivers_end"
--- 
-2.21.0
-
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 91e9ff45256e..808f71c51288 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -9,8 +9,6 @@
 		<flag name="concheck">Enable connectivity checking support</flag>
 		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
 			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
-		<flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session
-			tracking</flag>
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
 			getting ip</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
deleted file mode 100644
index 453af4ab92ad..000000000000
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch
-	"${FILESDIR}"/${PV}-iwd1-compat.patch # included in 1.21.3+
-)
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable policykit polkit-agent)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
deleted file mode 100644
index 070ae215d272..000000000000
--- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch
-	"${FILESDIR}"/1.18.4-iwd1-compat.patch # included in 1.21.3+
-)
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable policykit polkit-agent)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.20.12.ebuild b/net-misc/networkmanager/networkmanager-1.20.12.ebuild
deleted file mode 100644
index 81c6f70ed900..000000000000
--- a/net-misc/networkmanager/networkmanager-1.20.12.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable policykit polkit-agent)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild
deleted file mode 100644
index b2cd3babde33..000000000000
--- a/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson linux-info python-any-r1 systemd udev vala
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${PV}/NetworkManager-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd "
-IUSE+="debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux "
-IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux "
-IUSE+="syslog systemd teamd test +tools vala wext +wifi"
-
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	^^ ( gnutls nss )
-	?? ( consolekit elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-DEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	net-libs/libndp
-	sys-apps/dbus
-	sys-kernel/linux-headers
-	virtual/libudev
-	audit? ( sys-process/audit )
-	bluetooth? ( net-wireless/bluez )
-	concheck? ( net-misc/curl )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables
-	)
-	consolekit? ( sys-auth/consolekit )
-	dhclient? ( net-misc/dhcp[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( sys-auth/elogind )
-	gnutls? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
-	json? ( dev-libs/jansson )
-	libpsl? ( net-libs/libpsl )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		net-misc/modemmanager
-	)
-	nss? ( dev-libs/nss )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	policykit? ( sys-auth/polkit )
-	ppp? ( net-dialup/ppp[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:= )
-	teamd? (
-		dev-libs/jansson
-		net-misc/libteam
-	)
-	tools? (
-		dev-libs/newt
-		sys-libs/ncurses
-		sys-libs/readline:0=
-	)
-"
-RDEPEND="${DEPEND}
-	acct-group/plugdev
-	|| (
-		net-analyzer/arping
-		net-misc/iputils[arping(+)]
-	)
-	wifi? (
-		iwd? ( net-wireless/iwd )
-		!iwd? ( net-wireless/wpa_supplicant[dbus] )
-	)
-"
-BDEPEND="dev-util/intltool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	sys-devel/gettext
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-libs/libxslt
-		dev-lang/perl
-	)
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}"/NetworkManager-${PV}
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch"
-)
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile "
-		eerror "your kernel or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend ${?}
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, "
-			ewarn "NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BPF"
-
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-	fi
-
-	linux-info_pkg_setup
-
-	# if use introspection || use test; then
-	if use introspection; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-D systemdsystemunitdir=$(systemd_get_systemunitdir)
-		-D system_ca_path=/etc/ssl/certs
-		-D udev_dir=$(get_udevdir)
-		-D dbus_conf_dir=/usr/share/dbus-1/system.d
-		-D kernel_firmware_dir=/lib/firmware
-		-D iptables=/sbin/iptables
-		#-D dnsmasq=
-		#-D dnssec_trigger=
-
-		-D dist_version=${PVR}
-		$(meson_use policykit polkit)
-		-D modify_system=true
-		$(meson_use policykit polkit_agent)
-		$(meson_use policykit config_auth_polkit_default)
-		$(meson_use selinux)
-		$(meson_use systemd systemd_journal)
-		-D hostname_persist=gentoo
-		-D libaudit=$(usex audit yes no)
-
-		$(meson_use wext)
-		$(meson_use wifi)
-		$(meson_use iwd)
-		$(meson_use ppp)
-		#-D pppd='path to pppd binary'
-		#-D pppd_plugin_dir='path to the pppd plugins directory'
-		$(meson_use modemmanager modem_manager)
-		$(meson_use ofono)
-		$(meson_use concheck)
-		$(meson_use teamd teamdctl)
-		$(meson_use ovs)
-		$(meson_use tools nmcli)
-		$(meson_use tools nmtui)
-		$(meson_use tools nm_cloud_setup)
-		$(meson_use bluetooth bluez5_dun)
-		-D ebpf=true
-
-		-D config_plugins_default=keyfile
-		-D ifcfg_rh=false
-		-D ifupdown=false
-
-		$(meson_feature resolvconf)
-		-D netconfig=disable
-		-D config_dns_rc_manager_default=symlink
-
-		$(meson_feature dhclient)
-		-D dhcpcanon=disable
-		$(meson_feature dhcpcd)
-
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc docs)
-		# $(meson_use debug more_asserts)
-		-D more_asserts=0
-		$(meson_use debug more_logging)
-		-D valgrind=no
-		-D valgrind_suppressions=
-		$(meson_use debug ld_gc)
-		$(meson_use libpsl)
-		$(meson_use json json_validation)
-		-D qt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if use consolekit; then
-		emesonargs+=( -D session_tracking_consolekit=true )
-		emesonargs+=( -D session_tracking=no )
-		emesonargs+=( -D suspend_resume=consolekit )
-	elif use systemd; then
-		emesonargs+=( -D session_tracking_consolekit=false )
-		emesonargs+=( -D session_tracking=systemd )
-		emesonargs+=( -D suspend_resume=systemd )
-	elif use elogind; then
-		emesonargs+=( -D session_tracking_consolekit=false )
-		emesonargs+=( -D session_tracking=elogind )
-		emesonargs+=( -D suspend_resume=elogind )
-	else
-		emesonargs+=( -D session_tracking_consolekit=false )
-		emesonargs+=( -D session_tracking=none )
-		emesonargs+=( -D suspend_resume=auto )
-	fi
-
-	if use syslog; then
-		emesonargs+=( -D config_logging_backend_default=syslog )
-	elif use systemd; then
-		emesonargs+=( -D config_logging_backend_default=journal )
-	else
-		emesonargs+=( -D config_logging_backend_default=default )
-	fi
-
-	if use dhclient; then
-		emesonargs+=( -D config_dhcp_default=dhclient )
-	elif use dhcpcd; then
-		emesonargs+=( -D config_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -D config_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -D crypto=nss )
-	else
-		emesonargs+=( -D crypto=gnutls )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* || die
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		insinto /usr/lib/NetworkManager/conf.d/
-		newins - iwd.conf <<- _EOF_
-			[device]
-			wifi.backend=iwd
-		_EOF_
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples/
-
-		insinto /usr/lib/NetworkManager/conf.d
-		doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf
-
-		# Temporary workaround
-		cp "${ED}"/usr/share/doc/NetworkManager/examples/server.conf \
-			"${ED}"/usr/share/doc/${PF}/examples/ ||
-			die "Failed to copy server.conf example."
-	fi
-
-	# Temporary workaround,
-	# The file will be installed regargless of 'examples' USE.
-	rm "${ED}"/usr/share/doc/NetworkManager/examples/server.conf || die
-	rm -r "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty dirs
-	rm -r "${ED}/var" || die
-}
-
-pkg_postinst() {
-	systemd_reenable NetworkManager.service
-}
diff --git a/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
new file mode 100644
index 000000000000..7fb85f509cd4
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
@@ -0,0 +1,329 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson linux-info python-any-r1 systemd udev vala
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${PV}/NetworkManager-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audit bluetooth +concheck connection-sharing +dhclient dhcpcd "
+IUSE+="debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux "
+IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux "
+IUSE+="syslog systemd teamd test +tools vala wext +wifi"
+
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	iwd? ( wifi )
+	vala? ( introspection )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+DEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	net-libs/libndp
+	sys-apps/dbus
+	sys-kernel/linux-headers
+	virtual/libudev
+	audit? ( sys-process/audit )
+	bluetooth? ( net-wireless/bluez )
+	concheck? ( net-misc/curl )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables
+	)
+	dhclient? ( net-misc/dhcp[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( sys-auth/elogind )
+	gnutls? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	json? ( dev-libs/jansson )
+	libpsl? ( net-libs/libpsl )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		net-misc/modemmanager
+	)
+	nss? ( dev-libs/nss )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	policykit? ( sys-auth/polkit )
+	ppp? ( net-dialup/ppp[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:= )
+	teamd? (
+		dev-libs/jansson
+		net-misc/libteam
+	)
+	tools? (
+		dev-libs/newt
+		sys-libs/ncurses
+		sys-libs/readline:0=
+	)
+"
+RDEPEND="${DEPEND}
+	acct-group/plugdev
+	|| (
+		net-analyzer/arping
+		net-misc/iputils[arping(+)]
+	)
+	wifi? (
+		iwd? ( net-wireless/iwd )
+		!iwd? ( net-wireless/wpa_supplicant[dbus] )
+	)
+"
+BDEPEND="dev-util/intltool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-libs/libxslt
+		dev-lang/perl
+	)
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}"/NetworkManager-${PV}
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch"
+)
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile "
+		eerror "your kernel or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend ${?}
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, "
+			ewarn "NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BPF"
+
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+	fi
+
+	linux-info_pkg_setup
+
+	# if use introspection || use test; then
+	if use introspection; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-D systemdsystemunitdir=$(systemd_get_systemunitdir)
+		-D system_ca_path=/etc/ssl/certs
+		-D udev_dir=$(get_udevdir)
+		-D dbus_conf_dir=/usr/share/dbus-1/system.d
+		-D kernel_firmware_dir=/lib/firmware
+		-D iptables=/sbin/iptables
+		#-D dnsmasq=
+		#-D dnssec_trigger=
+
+		-D dist_version=${PVR}
+		$(meson_use policykit polkit)
+		-D modify_system=true
+		$(meson_use policykit polkit_agent)
+		$(meson_use policykit config_auth_polkit_default)
+		$(meson_use selinux)
+		$(meson_use systemd systemd_journal)
+		-D hostname_persist=gentoo
+		-D libaudit=$(usex audit yes no)
+
+		$(meson_use wext)
+		$(meson_use wifi)
+		$(meson_use iwd)
+		$(meson_use ppp)
+		#-D pppd='path to pppd binary'
+		#-D pppd_plugin_dir='path to the pppd plugins directory'
+		$(meson_use modemmanager modem_manager)
+		$(meson_use ofono)
+		$(meson_use concheck)
+		$(meson_use teamd teamdctl)
+		$(meson_use ovs)
+		$(meson_use tools nmcli)
+		$(meson_use tools nmtui)
+		$(meson_use tools nm_cloud_setup)
+		$(meson_use bluetooth bluez5_dun)
+		-D ebpf=true
+
+		-D config_plugins_default=keyfile
+		-D ifcfg_rh=false
+		-D ifupdown=false
+
+		$(meson_feature resolvconf)
+		-D netconfig=disable
+		-D config_dns_rc_manager_default=symlink
+
+		$(meson_feature dhclient)
+		-D dhcpcanon=disable
+		$(meson_feature dhcpcd)
+
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc docs)
+		# $(meson_use debug more_asserts)
+		-D more_asserts=0
+		$(meson_use debug more_logging)
+		-D valgrind=no
+		-D valgrind_suppressions=
+		$(meson_use debug ld_gc)
+		$(meson_use libpsl)
+		$(meson_use json json_validation)
+		-D qt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if use systemd; then
+		emesonargs+=( -D session_tracking_consolekit=false )
+		emesonargs+=( -D session_tracking=systemd )
+		emesonargs+=( -D suspend_resume=systemd )
+	elif use elogind; then
+		emesonargs+=( -D session_tracking_consolekit=false )
+		emesonargs+=( -D session_tracking=elogind )
+		emesonargs+=( -D suspend_resume=elogind )
+	else
+		emesonargs+=( -D session_tracking_consolekit=false )
+		emesonargs+=( -D session_tracking=none )
+		emesonargs+=( -D suspend_resume=auto )
+	fi
+
+	if use syslog; then
+		emesonargs+=( -D config_logging_backend_default=syslog )
+	elif use systemd; then
+		emesonargs+=( -D config_logging_backend_default=journal )
+	else
+		emesonargs+=( -D config_logging_backend_default=default )
+	fi
+
+	if use dhclient; then
+		emesonargs+=( -D config_dhcp_default=dhclient )
+	elif use dhcpcd; then
+		emesonargs+=( -D config_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -D config_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -D crypto=nss )
+	else
+		emesonargs+=( -D crypto=gnutls )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* || die
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		insinto /usr/lib/NetworkManager/conf.d/
+		newins - iwd.conf <<- _EOF_
+			[device]
+			wifi.backend=iwd
+		_EOF_
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples/
+
+		insinto /usr/lib/NetworkManager/conf.d
+		doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf
+
+		# Temporary workaround
+		cp "${ED}"/usr/share/doc/NetworkManager/examples/server.conf \
+			"${ED}"/usr/share/doc/${PF}/examples/ ||
+			die "Failed to copy server.conf example."
+	fi
+
+	# Temporary workaround,
+	# The file will be installed regargless of 'examples' USE.
+	rm "${ED}"/usr/share/doc/NetworkManager/examples/server.conf || die
+	rm -r "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty dirs
+	rm -r "${ED}/var" || die
+}
+
+pkg_postinst() {
+	systemd_reenable NetworkManager.service
+}
diff --git a/net-misc/networkmanager/networkmanager-1.22.14.ebuild b/net-misc/networkmanager/networkmanager-1.22.14.ebuild
deleted file mode 100644
index c7d5376f75d7..000000000000
--- a/net-misc/networkmanager/networkmanager-1.22.14.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	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:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable policykit polkit-agent)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.24.2.ebuild b/net-misc/networkmanager/networkmanager-1.24.2.ebuild
deleted file mode 100644
index 91ce0e3aeda7..000000000000
--- a/net-misc/networkmanager/networkmanager-1.24.2.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	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:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..021a54dfe6ac
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	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[${MULTILIB_USEDEP}] )
+	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:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	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 )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.26.0.ebuild b/net-misc/networkmanager/networkmanager-1.26.0.ebuild
deleted file mode 100644
index e3cf77c51fed..000000000000
--- a/net-misc/networkmanager/networkmanager-1.26.0.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	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:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
new file mode 100644
index 000000000000..3c513d596fc9
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	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[${MULTILIB_USEDEP}] )
+	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:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	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 )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.26.2.ebuild b/net-misc/networkmanager/networkmanager-1.26.2.ebuild
deleted file mode 100644
index 91ce0e3aeda7..000000000000
--- a/net-misc/networkmanager/networkmanager-1.26.2.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	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:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	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 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
deleted file mode 100644
index cf86f6aec58c..000000000000
--- a/net-misc/pssh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pssh-2.3.1.tar.gz 23427 BLAKE2B 7297ec83d31272506a34ca771a4476deb0e22f6d85f770cd380d6122e2e39c40f6767b84286efd9980c53729f5f7e0ed19af566cc1eea358ffd9fb0820eca167 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f
-EBUILD pssh-2.3.1-r2.ebuild 726 BLAKE2B 9a7ae47d5674f7f29f2a4a362e0b69f443d9239338022b78a4f91c06157df61304cf755bf61092f6d7b69abf2af8324dde966ac3360cf0898a0ccd17a5c537b2 SHA512 7335dcb8885b4dc12e147ca114d1ee45ac2049f4083a11fdfee54f6df59651bab761131ec82b119e984ae158898c57e5231963c206f34895753198ef291a6731
-MISC metadata.xml 339 BLAKE2B fd5344fdf419b900b25c757d4f4bee0084c9493f73f77dd4d760ca8c438bb71e00fecf2aab2acbb62c2d824e149e4db8a1b6fa32814b945ed56969612f36e21f SHA512 bcea2011bb23b0796bbfa66c6cadedbd03d06ab15f9254c444d6cfe6c1985a41ad37dbafc214cbcdba73f3cb789ac3ec4a42fdb5a20cf9d38a88ef0d23c588ff
diff --git a/net-misc/pssh/metadata.xml b/net-misc/pssh/metadata.xml
deleted file mode 100644
index b6d9446e89b5..000000000000
--- a/net-misc/pssh/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>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">parallel-ssh</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/pssh/pssh-2.3.1-r2.ebuild b/net-misc/pssh/pssh-2.3.1-r2.ebuild
deleted file mode 100644
index eb333cc8d3a5..000000000000
--- a/net-misc/pssh/pssh-2.3.1-r2.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
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
-HOMEPAGE="https://code.google.com/p/parallel-ssh/"
-SRC_URI="https://parallel-ssh.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-misc/openssh
-	!net-misc/putty"
-DEPEND="${RDEPEND}"
-
-# Requires ssh access to run.
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	sed -i -e "s|man/man1'|share/&|g" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 6433fb135fda..ae53486930c2 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,8 +1,6 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
-DIST rabbitmq-server-3.8.4.tar.xz 3086216 BLAKE2B c1c22ebca1b66aa210b45b3fccfffd89f3bb9312d37c78362db6d728456c8b7f3a0d787bcd411909509130307faf8457e4a7becb40cbf76ebb1cd1f1b615cce6 SHA512 2dee202b0a39f3d3d4314c4a5ee812d1c2b85225c6cdfc9ddb887285176df8d7009ca4ac8c3ab61cc3a943d32fa7665124dbf51ed18a322a280a3590601f118d
 DIST rabbitmq-server-3.8.7.tar.xz 3074228 BLAKE2B 131e79cc97c64fb5ba8d0c4906501da34e8569cb498ec61fe16be05923e2e2787a3d4ae5291f27efa619a0988b3c98ab8109ec2c0bc2c74da48c4ddc2f5e2cd7 SHA512 0d9771576f5b0b3ee68386ad02c7b01aa9939c38ab1aa8a8e2fe5f5b494b5cd855d2a5029a74364c6bf5097e8a70ef95e325ef9a9945576344c1a33ace0998ac
-EBUILD rabbitmq-server-3.8.4.ebuild 2374 BLAKE2B 3befa2b1082a817401324e00a571f3e59bb66cd97e1249adb791edfe3b78e005d3169af7068e3cad23595196873b6bbc127c8b668091bb859c06aaffd0cfe8c5 SHA512 4386018e0dd428346285d082681b43b0e3fd2c25be676301ef176e18e7c475e2e9cfb85eede2a7d4e18b2964f1b7e9db696986eb52a71f8e5b63c141a98ec92a
-EBUILD rabbitmq-server-3.8.7.ebuild 2154 BLAKE2B 577411d76bd0a4a70d97e26a93afd1db7a40d61a36f3dbd3859b08b07cb20f7e3d9a5abdfb125ace71302cd2d2eeaec959b5b25713faac825247eb394a23dc58 SHA512 56e19e73fee02e122f5b6e4ae3c9274e1e7c24676de2b0b4aaf702c6fa5aa18733dfbb9840285e627f8e08cf23499e1ae6708a96304a31be0e1e2aa9e9f366b6
+EBUILD rabbitmq-server-3.8.7.ebuild 2153 BLAKE2B 80232bb0dd47451e989863a342287e949db51ab0c7172ab58ce5b9f8576b1c5b05fddbd68c40d00eb4d171fa4ac80d35f3c68a1bd94672d65e5a271041aff402 SHA512 fe4ac55311bb94881d53f16ba122afea441aff216e04a1ffb5aebef93d62e270d2e0cde9e1d62974d0739b54e7fc8aa66950c8599566b7ea52a831cee9c1ae14
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
deleted file mode 100644
index 99334121ba05..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
+++ /dev/null
@@ -1,84 +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 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-RESTRICT="test"
-
-# This is the first release to officially support Erlang 23.
-# There is one remaining known Erlang 23 incompatibility:
-# rabbitmq-diagnostics observer will fail on Erlang 23.
-# This will be addressed in a future release.
-RDEPEND=">=dev-lang/erlang-21.3[ssl]
-	<dev-lang/erlang-23.0[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.8.0
-	<dev-lang/elixir-1.11.0
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
index 2020f62e5c61..b52690d167bc 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra
 
 LICENSE="GPL-2 MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-misc/ris-linux/Manifest b/net-misc/ris-linux/Manifest
deleted file mode 100644
index f3fa47e53c62..000000000000
--- a/net-misc/ris-linux/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX binlsrv.confd 90 BLAKE2B c4cf8149e8fa970f76682701e1aa8248292cfc95f0094537381b85754ca166151b5a9985a17b7185572cf6a966fb07951bfcabc4df41fc59238b8ad2baacf97c SHA512 82ba3c67e5a4df2092bc4abc7ad27d70f3a315551ac871d3019f0c37e7aa6360893dfcf615def300963d1a48e66f19da79aec2444fc366fb1ee6e19ecdd3c8d0
-AUX binlsrv.initd 775 BLAKE2B 9bf7fd79566a35ca4ea4836b6b0733ae76322b7780f4346ab74d10e5114c42baf963634d9cf819d0f14f1a0473789f565387c522b3ccc716c7bceec3f9e8ec89 SHA512 2555500d462907daa6c6027b30fb67a32d453dd611ee5a9e71e5ed8cdd2943dbb5ebc0c1ce7de7ce70f0c1158afe475a56156da4ca611c8bd30ea5b95d546419
-AUX setup.py 204 BLAKE2B 82bf28846611f2d4e24b62ccc945359055ee20ce492703da6fd9452fa4475cba507ccf47feef81f6a099afb125466cafbd1ec06bfffdcc39a6f45175a56f4f5e SHA512 a2e3482ae7d4cec63230d0e787c6ff6af8fc749d84aa74de51152bc5f8aa5f9d29b6578a82141fdbc15c61786d7e8a9cfdd14b885d5ed2b62f30033548a4f240
-DIST ris-linux-0.4.tar.gz 21634 BLAKE2B 815b54eec6ff29f06f5d1be0e8eb597c6118ecf7698d6d99e2b887ea8b1919d861feb445f2bf9f58c28c0cbb3304b168f9d3937331e65511023ac6281b4ea309 SHA512 e9eea14b45c060844e22dc3baa9cd15e7d202bcb3cb8b069b084115b05c0700bd563ed6322d675eee9baf72e8d530429d0c3137386377b6785ebc9007dbfd040
-EBUILD ris-linux-0.4-r1.ebuild 790 BLAKE2B d15a9513ce381f0f70311db403bf50fead7d0cdb4984c9b791397b3a3c33032923757436641d385cb19cd2d22b99a2e7b3dab6d7f1cb8ee27b51a79e7830228a SHA512 000f2f82c62a4a7bdd7909abc5b5a9d1209973a6a5be6ed5449d597bcb6544ebf2154e9c4c089a6b3d9eee978f215cf8110963a6e6c94c2e921571674b706f85
-MISC metadata.xml 217 BLAKE2B 19c9d1fa32b1387c2578d4acf482cfddbc144decd961796c2dabfe02ad2b11e232eee8fc02c900f176f7cbba0ecc741c66b1a55d3734b2901c40a98194a78433 SHA512 892fa1b0f9fef66cd02147277c70b886bfef9d36817e024d35216a14bd1a2bd640ffb8d6f57bed87cd06b7c4cce17eb3c8fe4255cdc62972b551c73509c0dfe7
diff --git a/net-misc/ris-linux/files/binlsrv.confd b/net-misc/ris-linux/files/binlsrv.confd
deleted file mode 100644
index 2e6ed9f9090f..000000000000
--- a/net-misc/ris-linux/files/binlsrv.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-#Specify here path to directory with 'devlist.cache' file
-INFILE_PATH="/var/lib/ris/binl"
diff --git a/net-misc/ris-linux/files/binlsrv.initd b/net-misc/ris-linux/files/binlsrv.initd
deleted file mode 100644
index f247a39db4ed..000000000000
--- a/net-misc/ris-linux/files/binlsrv.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting binlsrv"
-	if [ -z "$INFILE_PATH" ]; then
-		eerror "Path to devlist.cache not set, please set \$INFILE_PATH in /etc/conf.d/binlsrv"
-		return 1
-	fi
-	if [ ! -e "$INFILE_PATH/devlist.cache" ]; then
-		eerror "devlist.cache not generated, please make it with infparser.py"
-	fi
-
-	start-stop-daemon --start -i --exec /usr/bin/binlsrv.py --background \
-		--make-pidfile --pidfile /var/run/binlsrv.pid --chdir "$INFILE_PATH" \
-		--stdout /var/log/binlsrv.log
-	
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping binlsrv"
-	start-stop-daemon --stop -i --exec /usr/bin/binlsrv.py --pidfile /var/run/binlsrv.pid
-	eend $?
-}
\ No newline at end of file
diff --git a/net-misc/ris-linux/files/setup.py b/net-misc/ris-linux/files/setup.py
deleted file mode 100644
index 0873f2512c99..000000000000
--- a/net-misc/ris-linux/files/setup.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-from distutils.core import setup
-
-setup(
-    name = 'ris-linux',
-    version = 'VERSION',
-    scripts = [ 'binlsrv.py', 'decode.py', 'infparser.py', 'fixloader.py', 'modldr.py' ]
-)
diff --git a/net-misc/ris-linux/metadata.xml b/net-misc/ris-linux/metadata.xml
deleted file mode 100644
index 8f93e4dab3d6..000000000000
--- a/net-misc/ris-linux/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="person">
-	<email>maksbotan@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
deleted file mode 100644
index 282889fbed0b..000000000000
--- a/net-misc/ris-linux/ris-linux-0.4-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="BINL server to doing Windows(r) RIS"
-HOMEPAGE="https://oss.netfarm.it/guides/pxe.php"
-SRC_URI="https://oss.netfarm.it/guides/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	|| ( net-ftp/atftp net-ftp/tftp-hpa )
-	net-misc/dhcp
-	net-fs/samba
-	sys-boot/syslinux"
-
-python_prepare_all() {
-	sed "s:VERSION:${PV}:" "${FILESDIR}"/setup.py > "${S}"/setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/binlsrv.initd binlsrv
-	newconfd "${FILESDIR}"/binlsrv.confd binlsrv
-}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index fd7c100ca262..90ac1df4ad1b 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -2,8 +2,10 @@ DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb
 DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762
 DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3
 DIST s6-networking-2.3.1.1.tar.gz 87461 BLAKE2B 43cbb0762c48c31f0ee2f73605436397c2f7ae34bc788844c9fac0f15bd5a5693a8499c808f913b3cd5db53b30c7ffa425ce764c1d701b950c8b18421ff3e8d3 SHA512 3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b
+DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d
 EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3761879665c771fd465e22e0cf095a76127f0b01eb891316366452d8fbe4065ddaaec7f157549ca72e6f21e97cc9d4cafe SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c
 EBUILD s6-networking-2.3.0.3.ebuild 1627 BLAKE2B 3d7db35321240f1445f904066c3b5d686c7533df0ef5b67c2264374b12f149d67039602e2a9ff4d8ec841c6bc8e91b51e06e06235a3c99abee99f08def666865 SHA512 804818cb31c44e11aa9d9a43c5c1a2f9a62cadd93abc9994d6ff9d77ed1e08dbab56a1940f1d092ec38a160d98bc3147f6583cd093b5f0e16d03dc163b7ef9e9
 EBUILD s6-networking-2.3.0.4.ebuild 1472 BLAKE2B 295b4795452b0f531e4a499346380f61addf9af31597471872ced7930ddde99c94f07accc1456b467333e9acb383493a0c76152b38f28486ad5156113679853d SHA512 88fb58f470a98c77d898dc7fb3d5c1817c319f7c75136aac0428135694186ceef766d2e1fd9371535d6143566f2780a1532159fbdfcb1dbc2e847ad54c20d2e0
 EBUILD s6-networking-2.3.1.1.ebuild 1472 BLAKE2B c660eb7f0c4161a6dd9d7f6fa3744c1bf876858c797b1c7a146253e2d562a21f8ffb1d3543fad14cfcdd5d8706ba3b7e9569f7e81093ae087614f5ef34ff7dcf SHA512 ad13653e8c3441d681555986c2e51eec0b7a3ef7e50f2ee398121d656a047819ee87b65d4142b33894291a6940a3b1f469611c726ff8cb3c27b86ee6a385ff80
+EBUILD s6-networking-2.3.2.0.ebuild 1481 BLAKE2B d2a06215ae86827004dcf95beab6504a6395470f5b8c89005b06c9f618b35b29cef899b8b1c3e6133eca002229cba7a71b6dc2db646db1f802d34d8dd50581d1 SHA512 f38cdb34b1bcd5bf23d02d682a1bb212057a4e48f50de0e37862f485556fa64df4db4e20de7b68b95ad46d5b634d69c8d3ad3b3912d0cb0d35f7dc5ca7afdf7e
 MISC metadata.xml 640 BLAKE2B b658892b1a86aa08807ad2c488f6c0540c999d2e996bfe8d4c66fa8eb61fc9bc2c2411664c9d625f1926ca3a3ca951e3c9e58bb345a8b70c4101a87f39eec08f SHA512 755a43469ee11e14b3503200b96b981145b4039fb8eae703ff8bf5e606d21fd2948cddd7f2c42d2793ace18942d261a9796706f704a7ba44f569bae2b7dbda74
diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
new file mode 100644
index 000000000000..a33079fa4a71
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
+	>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+	!static? (
+		>=net-dns/s6-dns-2.3.3.0:=
+		ssl? ( >=dev-libs/libressl-3.1.4:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=net-dns/s6-dns-2.3.3.0[static-libs?]
+	ssl? ( >=dev-libs/libressl-3.1.4[static-libs?] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index a2d499dd22ca..00b5a20e5ad9 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -2,13 +2,15 @@ AUX sks-1.1.6-unbundle-cryptokit.patch 2051 BLAKE2B 6d9f7e499ab281f3f233fce5e8d7
 AUX sks-1.1.6-use-ocamlfind.patch 1259 BLAKE2B 1c1539612b70ad0f35478bd8952926b7bd9bb8d9864fa9964668e315a4488a9ecb8debbecb8892566abd83a081175aba0335d01de4885421c018c3cc52430aad SHA512 7fff2dbcad7f3c73e53b99d856cb1da52125e5dc51b84959be9ddc555dc34e1e39a049aa3946f350a15d9a5ed74f4bc0a58f2ea3523c4cc3675bf3901db11238
 AUX sks-1.1.6-use-ocamlfind2.patch 671 BLAKE2B 04c36f4f2955b7f3256fed668f945966cdddf8f67054031589bf1efedb486ca03b4746269ff314571fff32013613b45d751bb0b9cd0605c1ec808cfc3fc29bdb SHA512 555a688be1e4bb1c7fb2e1bbeb4661e6dd0bc04d94a2ff3c5a12e7979549efc79531ee8cba01f6150610b633cce20072367a42eda2870f0755adf69b24cfaa7f
 AUX sks-1.1.6-use-ocamlfind3.patch 665 BLAKE2B 011922893b145d2d619e93ec3baf5117e0273289256228b895c54f9ef48300ef524640faec5f037393ab7f3880774a306b0033d03e545874a9f14f6d8523591b SHA512 cae267036bbe65701f06a1aec4f3cfb30d7a8f5bd8859d8eaa73b2d66438b5fe0c6ceb42cc810951dd4233b0b162091dcfd760ff9c22b3a3e39ed99e239ca13a
+AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd7721be01e29e0822c5512ac8c033b215ecf3c92ea97e0f5aeae02343d5efbbba05c87c4ff28b994d0c3b7b8974210d9ca1984 SHA512 8b384f82df6348df31710de1e2c6fabc8979daee2bf6f83a87399f63adbbd4a40f7bb99247caba343b45eb30fdf2e4bbb3d769974003bda264c484f35b6c5974
+AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088
 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6
 AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cbeaf22e6278922ef34daf9dbda14217377f12c831836a64b4e1a9b4868be41db834fa024a59be35b SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e
 AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fdb79a8e75facbcf256dfdaff8ebf4f4f04885e0d0e52591cc0c3b1c0e0ed84fbd39c2f7ab8cd2bf4d SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c
 AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef
 AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660
 DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
+DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a
 EBUILD sks-1.1.6-r2.ebuild 3677 BLAKE2B 354a2b89fcab9050ba7551ecff8da54b5ab8011605e936157396cde5cda30855a341042a9654737b26722fba81964036be394b048d3360ad99a075c0b1145a39 SHA512 0b37213e24548699dec3874a7e2bb9185df65d701f67f13ec7584ecde220c32a95aa9b7012fe2dee2fcd8a7972541dd0c785a5b17daaca976c0ced61699e4c59
-EBUILD sks-1.1.6-r4.ebuild 3546 BLAKE2B 8be2010b861536d6ac2307648728e54e5d2b9cc254252ffc3d88de1ef93cf38fa4bbd4a512ccf75378987319bddf142e8d91a2d656191f1f15904e9aae38a372 SHA512 2dbc5eb84b4d4b00c6ec2b01bd7f2323ab916337f9bdf10f06ba9b7d500c4b64b4625613cbd3e1755275ff44ff85d366c824b42fa51c18b88ef6985a537f8cce
-EBUILD sks-1.1.6-r5.ebuild 3689 BLAKE2B 5b1b9cb2b694b8e8415e29e93c0276d42e81f22873c721f67676a82f5da3de0d4b4026e72fd9275f70d2e3375ac974ac6a5597317d43c54654678600b4277afc SHA512 b9f0db5da7805b6748ca118c3feaf88f84ab1fa8a12ad7cf6d47547557a414d8240398577b5e6beaf8d2d08ea0a1c02f34685a1071c1a72df2a1b9c528830580
-MISC metadata.xml 337 BLAKE2B 136350a55fd572e1bec89457974f2d2722af1a74ae710bab541f1979d3294e6f44b1519e13ddcba242807d6d2f96ac11071126facdec62597d3201327e84e7f9 SHA512 977596797db2915f728f8c6661a5c90a3348691b357f0e2c9ddab662cc50bd8e426bc35f14e9a8ffa3ad6938fc206859e865fd9f4f6a02f45f377a1adec7d38b
+EBUILD sks-1.1.6_p20200624.ebuild 3761 BLAKE2B 95d5e7e41d505c0ee5b8cc6fd555e4fe62bbce317c71ea71b44b5cd4ddcff1d9cf1db514a689aac4df42252edead5953eadb39dbc7513281dcbbf0a144e5b922 SHA512 5aeb17f34e1a52649c92565385d40ec892accf05f39e7fd0240c8ffa2f8d3eb6cc116bb5ab52448f3755280e25a86acb9f68c323255baa59c716ef9cda9b7bec
+MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff
diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch
new file mode 100644
index 000000000000..3657a8bd5f07
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch
@@ -0,0 +1,71 @@
+diff --git a/Makefile b/Makefile
+index f182225..c84368e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,8 @@
+ #   USA
+ #
+ CINCLUDES=-I$(shell ocamlc -where)
+-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+-CXXFLAGS+=-O3 $(CINCLUDES) -I .
++CFLAGS+=$(CINCLUDES) -I .
++CXXFLAGS+=$(CINCLUDES) -I .
+ 
+ ifndef OCAMLC
+ 	OCAMLC=ocamlfind ocamlc
+@@ -60,8 +60,8 @@ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+ 
+ EXE=sks sks_add_mail
+-ALL=$(EXE) sks.8.gz
+-ALL.bc=$(EXE:=.bc) sks.8.gz
++ALL=$(EXE) sks.8
++ALL.bc=$(EXE:=.bc) sks.8
+ 
+ all: $(ALL)
+ all.bc: $(ALL.bc)
+@@ -132,13 +132,13 @@ install:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8
+-	install sks.8.gz $(DESTDIR)$(MANDIR)/man8
++	install sks.8 $(DESTDIR)$(MANDIR)/man8
+ 
+ install.bc:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8
+-	install sks.8.gz $(DESTDIR)$(MANDIR)/man8
++	install sks.8 $(DESTDIR)$(MANDIR)/man8
+ 
+ 
+ Makefile.local:
+@@ -151,9 +151,6 @@ src:
+ 
+ # Ordinary targets
+ 
+-sks.8.gz: sks.8
+-	gzip -9nf sks.8
+-
+ sks.8: sks.pod
+ 	pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8
+ 
+diff --git a/bdb/Makefile b/bdb/Makefile
+index 0913014..4a68399 100644
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -15,11 +15,11 @@
+ -include ../Makefile.local
+ 
+ CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
+-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+-CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
++CFLAGS+=$(CINCLUDES) $(BDBLIB) -I .
++CXXFLAGS+=$(CINCLUDES) $(BDBLIB) -I .
+ 
+ MKLIB=ocamlmklib
+-RANLIB=ranlib
++RANLIB?=ranlib
+ OCAMLDEP=ocamldep $(PP)
+ CAMLINCLUDE=
+ COMMONCAMLFLAGS= $(CAMLINCLUDE) $(PP) #-thread
diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch
new file mode 100644
index 000000000000..02da8d2d2e76
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch
@@ -0,0 +1,81 @@
+https://sources.debian.org/src/sks/1.1.6+git20200620.9e9d504-1/debian/patches/0008-accept-and-use-CFLAGS-and-CPPFLAGS-from-environment.patch/
+----
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 8 Aug 2016 13:20:38 -0400
+Subject: accept and use CFLAGS and CPPFLAGS from environment
+
+---
+ Makefile     |  9 +++++----
+ bdb/Makefile | 14 ++++++++------
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@
+ #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ #   USA
+ #
+-CINCLUDES=-I`ocamlc -where`
++CINCLUDES=-I$(shell ocamlc -where)
+ CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+ CXXFLAGS+=-O3 $(CINCLUDES) -I .
+ 
+@@ -43,6 +43,7 @@ else
+ endif
+ 
+ CAMLLDFLAGS=$(foreach x, $(LDFLAGS), -ccopt $(x))
++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
+ 
+ SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
+ ifeq ($(strip $(SKSVS)),)
+@@ -52,7 +53,7 @@ WARNERR=-warn-error A
+ endif
+ 
+ CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I bdb
+-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR)
++COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLCFLAGS) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR)
+ OCAMLDEP=ocamldep
+ CAMLLIBS=bdb.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -14,7 +14,7 @@
+ # $Id: Makefile,v 1.6 2003/07/05 15:16:29 yminsky Exp $
+ -include ../Makefile.local
+ 
+-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
++CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
+ CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+ CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
+ 
+@@ -27,6 +27,8 @@ CAMLLIBS=unix.cma str.cma mylibs.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -g
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
+ 
++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
++
+ ifndef LIBDB
+ LIBDB=-ldb-4.6
+ endif
+@@ -37,7 +39,7 @@ ocextr: ocextr.ml
+ 	$(OCAMLC) -o ocextr ocextr.ml
+ 
+ libbdb.a: $(COBJS)
+-	$(MKLIB) -custom -o bdb $(COBJS)
++	$(MKLIB) $(CAMLCFLAGS) -custom -o bdb $(COBJS)
+ 
+ bdb_stubs.o: bdb_stubs.h bdb_stubs.c
+ 
+@@ -45,10 +47,10 @@ bdb.ml: ocextr bdb_stubs.c
+ 	./ocextr bdb_stubs.c > bdb.ml
+ 
+ bdb.cma: bdb.cmo libbdb.a
+-	$(MKLIB) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
++	$(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
+ 
+ bdb.cmxa: bdb.cmx libbdb.a
+-	$(MKLIB) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
++	$(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
+ 
+ bdbcaml: bdb.cma
+ 	ocamlmktop -o bdbcaml -custom unix.cma bdb.cma $^
diff --git a/net-misc/sks/metadata.xml b/net-misc/sks/metadata.xml
index 7bc958a5ed9b..5b240d62d857 100644
--- a/net-misc/sks/metadata.xml
+++ b/net-misc/sks/metadata.xml
@@ -6,6 +6,6 @@
 		<flag name="optimize">Enables bytecode optimization</flag>
 	</use>
 	<upstream>
-		<remote-id type="bitbucket">skskeyserver/sks-keyserver</remote-id>
+		<remote-id type="github">SKS-Keyserver/sks-keyserver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild
deleted file mode 100644
index 89cc2ec999a4..000000000000
--- a/net-misc/sks/sks-1.1.6-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib user readme.gentoo-r1 systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize test"
-RESTRICT="!test? ( test )"
-DOC_CONTENTS="To get sks running, first build the database,
-start the database, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-RDEPEND=">=dev-lang/ocaml-4.0:=
-	dev-ml/camlp4:=
-	dev-ml/cryptokit:=
-	sys-libs/db:5.3"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
-		   "${FILESDIR}/${P}-use-ocamlfind.patch"
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-	eapply_user
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6-r5.ebuild
deleted file mode 100644
index 6555ea2c8bf6..000000000000
--- a/net-misc/sks/sks-1.1.6-r5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib user readme.gentoo-r1 systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize test"
-RESTRICT="!test? ( test )"
-DOC_CONTENTS="To get sks running, first build the database,
-start the database, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-RDEPEND=">=dev-lang/ocaml-4.0:=
-	dev-ml/camlp4:=
-	dev-ml/cryptokit:=
-	sys-libs/db:5.3"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
-			"${FILESDIR}/${P}-use-ocamlfind.patch" \
-			"${FILESDIR}/${P}-use-ocamlfind2.patch" \
-			"${FILESDIR}/${P}-use-ocamlfind3.patch"
-
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-	dosym /usr/bin/sks_build.sh /usr/bin/sks_build.bc.sh
-	eapply_user
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.6_p20200624.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild
new file mode 100644
index 000000000000..7c9d13994f7d
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd toolchain-funcs
+
+COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7"
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver"
+SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-keyserver-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+RESTRICT="!test? ( test )"
+
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+RDEPEND="
+	acct-user/sks
+	acct-group/sks
+	>=dev-lang/ocaml-4.0:=
+	dev-ml/camlp4:=
+	dev-ml/cryptokit:=
+	dev-ml/num:=
+	sys-libs/db:5.3
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch"
+	"${FILESDIR}/${PN}-1.1.6_p20200624-QA-fixups.patch"
+)
+
+QA_FLAGS_IGNORED=(
+	/usr/bin/sks_add_mail
+)
+
+src_prepare() {
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+
+	dosym sks_build.sh /usr/bin/sks_build.bc.sh
+	default
+}
+
+src_compile() {
+	tc-export CC CXX RANLIB
+
+	emake dep
+	# sks build fails with parallel build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym sks.bc usr/bin/sks
+		dosym sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+
+	insinto /var/lib/sks
+	fowners sks:sks /var/lib/sks
+
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest
index 0c703e113ec8..9aaecf587f69 100644
--- a/net-misc/sntpd/Manifest
+++ b/net-misc/sntpd/Manifest
@@ -1,8 +1,5 @@
-AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f
 AUX sntpd.initd-r1 281 BLAKE2B e16573772a24d6c6380dcb769a2f87f73249aff34c4bc6ffa67700374ede21ba318d0d5c0c444f304cbea5feb613a2eb70d07e8aebf5fe291f3da0358becc487 SHA512 38d3950d774132114fe7270c8c39a44428e89372bcdb7833cef75e5775579dc88679b9f167ed29e3e7e620927a0365d2de7c94fb263b414439deb061a8c1db9d
-DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
 DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea
-EBUILD sntpd-2.2018.244-r1.ebuild 861 BLAKE2B 453645dce4a010fa7b58164ee9229204e5b697754320e5b31c0d8fa27229fbe2e21022343585e2503e8074e40fd4d278ec6e7288285e8de428e857631066c05f SHA512 4062ce0572a597f336009fd11104f7f6aaac43aef17b41ab77978089aacdb780245bf96d5aa2125a68cab41b13753593257462eb4fbd6ba078eb3f1f0cdc9d70
-EBUILD sntpd-3.0-r1.ebuild 822 BLAKE2B c8728852e71e6954c47439d1c612c647cbba7cdf2820b6caafeff07c9e8f33fd576a26e5fcd2923728e1919f204a26b2e91005b3c534078cb20742c47d42076b SHA512 dbb4ca43a72dd3e4e5d099d5723e5ef34c1a9450c7b5942714feb4dc258c86a0bb114fea7c2d889be6604874bc7ed620e13799117fc24f37bd038cbc33ca818b
-MISC metadata.xml 1215 BLAKE2B ea6284bde03ea2157cd105851ad90a1a2cf379bc6b5f0742866d25fdb2997e0875dcb350984daa79b63625b525d1b53cde28b3fa47220591540a165955273fc4 SHA512 eba1d1787f52e8101cb64df313df7eb3ddc2e6b593d9acbc8b5a8accacdd6d7b0fd02c4b73e65ffd73fce1bbbd10f3d206989e5b2d5280ad84aac97506568659
+EBUILD sntpd-3.0-r1.ebuild 821 BLAKE2B b570f1fafb14542109ca188078b5921f1dbe386d842625ce7292424a0f27fcefc3e476d8030d63062b4f6c6d8d06688bf64215b9af2740de87d42237f9c304e0 SHA512 6f7f2996d5f7101025dfd2be61fe89048cc69afa1e7e63a6006479374f1c295cd3d8d824aa4d4399096987b27d391a660ab56dde60661a300f254c1580480eb7
+MISC metadata.xml 863 BLAKE2B 91a39d6197e120dee085cb419b126f01635aac9a4a0cd03c6431d6ba33b11b55b8017daba6d2235ce1d7a5abd54c4c4c6fb7691a0ba271a2e9435b519debbb2c SHA512 cef3ed6698c5827937d672c11723ee3a5bbcd073143decff45cd2a63bf1035677cb41b01b79338a69a61927495967c15e25f17c5e3a56f065e765845830e0987
diff --git a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
deleted file mode 100644
index df87cb6ceb22..000000000000
--- a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ntpclient.c	2018-08-27 20:38:12.000000000 +0200
-+++ b/src/ntpclient.c	2019-08-19 20:11:59.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <errno.h>
- #ifdef PRECISION_SIOCGSTAMP
-+#include <linux/sockios.h>
- #include <sys/ioctl.h>
- #endif
- #ifdef USE_OBSOLETE_GETTIMEOFDAY
diff --git a/net-misc/sntpd/metadata.xml b/net-misc/sntpd/metadata.xml
index 0d0a5d1ae349..9bb3f3c88e32 100644
--- a/net-misc/sntpd/metadata.xml
+++ b/net-misc/sntpd/metadata.xml
@@ -19,9 +19,5 @@
 	</upstream>
 	<use>
 		<flag name="adjtimex">Install adjtimex for the clock adjustment algorithm.</flag>
-		<flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag>
-		<flag name="embedded">Build a very small ntpclient, from OpenWRT project.</flag>
-		<flag name="obsolete">Enable obsolete features, to use with kernel versions older than 3.0</flag>
-		<flag name="syslog">Enable logging to syslog instead of logging to stderr.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild b/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
deleted file mode 100644
index f6b938200cc1..000000000000
--- a/net-misc/sntpd/sntpd-2.2018.244-r1.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
-
-MY_PN="ntpclient"
-MY_PV="${PV/2./}"
-MY_P="${MY_PN}-${MY_PV/./_}"
-
-DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
-HOMEPAGE="https://github.com/troglobit/sntpd"
-SRC_URI="https://github.com/troglobit/sntpd/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug embedded obsolete +syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_PN}-${MY_PV}-linux-headers-5.2.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug replay)
-		$(use_enable embedded mini)
-		$(use_enable obsolete)
-		$(use_enable !obsolete siocgstamp)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-misc/sntpd/sntpd-3.0-r1.ebuild b/net-misc/sntpd/sntpd-3.0-r1.ebuild
index d1af599b9339..7736ca2eb8bf 100644
--- a/net-misc/sntpd/sntpd-3.0-r1.ebuild
+++ b/net-misc/sntpd/sntpd-3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 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="adjtimex systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index e0cc3b913841..763401aaab11 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,4 @@
 AUX wol-0.7.1-musl.patch 347 BLAKE2B 4ebedc009fb77556004f8bdda8679ca2f0eaca22145aa395a69ce6e78319a6c3fb430bc4ea30c4887dd4e870ad1ff36d7369ec3dc50a419bc5e8ebcdd29ebd7e SHA512 b7568aa53f20a0402aeb9ed579fab2846245df134c000cc4483ce63f01ec64943708595fff9f78c73e6c6156ddd06781314dee46a06c216c9abcd0f1ec696208
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r2.ebuild 580 BLAKE2B d1f96ecb22d0ae3e8ed3baca024dcfd1ddd529c5e0e15abbffa11de33c45e9b2c7bed2540e91e9ee39f3a89bccb70434a64dc114f3b90eaada9e9bb492351499 SHA512 859fb5df28af1a8c11e23f3eff2f07d9e6c74ac78e15f3709cdfc9db8ca146e8c07351b55e02214104706c7bf83356dfa9d941b821dc851b49b6ae878ab7c78c
+EBUILD wol-0.7.1-r2.ebuild 587 BLAKE2B 1b6e054225eacfba846c97bce54abf85269e9e8af7196e2441c7e48d49a0b661ad1feab4517edd724e726bfde26730985c77d126fb02b886f022b99790c4734f SHA512 38af73d55c8f9b0af0350a9be2f42d3315ff75b7368cff35adee0a53189f86747cf041ac3cdf3b2d7c6279449688083525dbc95d2b7ce1471cdab5554747b2d5
 MISC metadata.xml 616 BLAKE2B 5beea9884b74086c02e1cf37e08157dee574c98c56f06371e96132a31747be644761601429ff79211eec98004dd468b5e51e7a71c480b0d6e3e43d3e5941dfa3 SHA512 ba5865dcd92e68b01a21d126aadb530d936639bb391b959c683e83daefcc671201b772a713fc0a6397eb892558c8e9691700ee97955b3992fd64ecf1cdc9c240
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index 67f55caf695e..9bced4b712bb 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="nls"
 
 PATCHES=( "${FILESDIR}/${P}-musl.patch" )
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index b79e391f085a..6f65841cd80f 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 18138c1b1201..6067a3fae2c1 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -24,6 +24,6 @@ AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d05
 DIST openldap-2.4.50.tgz 5712635 BLAKE2B 6a7d864a44c411b82cf703585c4a81954a02497e8510c84e29070dd120da0181e8425fd2b8bb7616e42e6e26d0f06db5ffdf50fb1cd97943d23f9914eb4f1260 SHA512 f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae
 DIST openldap-2.4.53.tgz 5883013 BLAKE2B 09d17d2a5438b09a4aa7f4a815e858d8b17ae7873580e5b3bc81d9569e97174703600472b9ecf79a28b7df561ba8214dfb6d08b467c823feeeae7d0cbdd37c6b SHA512 32dcbf18ffa53b3c2c5399f726c7a8970154d40fb88de85896d18ea2abd79c55ebe28fcf5fbfd52771f95561d70ab364db5f667fe2ec0e67b21e281f5112ec99
 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
+EBUILD openldap-2.4.50.ebuild 29250 BLAKE2B 195ea8b5442e336fe57c9b4f91a4b8a7ec453d9710c3c41d4ff671979c44a8c64c5a43925c74c18f3e491c2340e729b3a9b1b404b56a7fab4e3d527cb37e03e3 SHA512 22c4de2d4b45ab8e6eded7a0678cc49470a058fad7b4132bb8ba1e7e98b3509363d6ac51b0569beac1ed3f98a43a3c5c7cc25e743c757d9091f53900f57fce8c
+EBUILD openldap-2.4.53.ebuild 29259 BLAKE2B 747ecc69c8d8018fd1039921791a548c2aef5750fd088c5698e852ddf37e5bdaf35a776da922b775bd1ce8e87a45455726d55f3043b30f4cdce9582cf54e4d41 SHA512 025b32d434164729bd91e8e65dde3c2d7ba2943e6bd822bf4cf9bd9d67eb1d8d8102aaf3d1ff3b059d37ee995f087520bc78b30fa9c21aa98558d4b995b2ee6d
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.50.ebuild b/net-nds/openldap/openldap-2.4.50.ebuild
index 71320172f0b0..2c5a8f5c18c4 100644
--- a/net-nds/openldap/openldap-2.4.50.ebuild
+++ b/net-nds/openldap/openldap-2.4.50.ebuild
@@ -514,7 +514,7 @@ multilib_src_configure() {
 	done
 
 	tc-export AR CC CXX
-	CONFIG_SHELL="/bin/bash" \
+	CONFIG_SHELL="/bin/sh" \
 	ECONF_SOURCE="${S}" \
 	STRIP=/bin/true \
 	econf \
@@ -548,7 +548,7 @@ src_configure_cxx() {
 
 multilib_src_compile() {
 	tc-export AR CC CXX
-	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
 	local lt="${BUILD_DIR}/libtool"
 	export echo="echo"
 
@@ -730,7 +730,7 @@ multilib_src_test() {
 
 multilib_src_install() {
 	local lt="${BUILD_DIR}/libtool"
-	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
 
 	if ! use minimal && multilib_is_native_abi; then
 		# openldap modules go here
diff --git a/net-nds/openldap/openldap-2.4.53.ebuild b/net-nds/openldap/openldap-2.4.53.ebuild
index 89a4da0e8209..759f15457765 100644
--- a/net-nds/openldap/openldap-2.4.53.ebuild
+++ b/net-nds/openldap/openldap-2.4.53.ebuild
@@ -514,7 +514,7 @@ multilib_src_configure() {
 	done
 
 	tc-export AR CC CXX
-	CONFIG_SHELL="/bin/bash" \
+	CONFIG_SHELL="/bin/sh" \
 	ECONF_SOURCE="${S}" \
 	STRIP=/bin/true \
 	econf \
@@ -548,7 +548,7 @@ src_configure_cxx() {
 
 multilib_src_compile() {
 	tc-export AR CC CXX
-	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
 	local lt="${BUILD_DIR}/libtool"
 	export echo="echo"
 
@@ -730,7 +730,7 @@ multilib_src_test() {
 
 multilib_src_install() {
 	local lt="${BUILD_DIR}/libtool"
-	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
 
 	if ! use minimal && multilib_is_native_abi; then
 		# openldap modules go here
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 7829d6e9dbba..fe681bdc5509 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index 51e5238097c4..2227f80d988a 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -2,19 +2,14 @@ AUX ipfs-at.service 354 BLAKE2B 77bf7a265a0b29945e6661d03f9deec5884076f24afffc9e
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
 AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
 AUX ipfs.service 364 BLAKE2B c3d87df9588d6faed1710c592a5f3b2b1baad5442ee9fd63435d8ffff0f4e441afdded35f703c3bc56b505f99b61ac7c1ff3859e0251b87195cf4ed24abc1502 SHA512 dd0943c2b76cf73b686af3d69aac7321036f548b19c662c107ce51a34f8786fd80075e1369f4ed8d2b67280db93bf9772a3ca85e41f126d88e45604473e0d5c9
-DIST go-ipfs-bin-0.4.19.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
-DIST go-ipfs-bin-0.4.20.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs-bin-0.4.22.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
-DIST go-ipfs_v0.4.19_linux-386.tar.gz 11313754 BLAKE2B ac45961d7af003b28668c208be8e5d4457f28284a9b2ce21d9958a52204212fa08c4a8077382913027b0e79cfd8a230227494ca7897d25ee4900f9747039d6af SHA512 9fc7b467098613786788d41c04257b119d124a03279439c16c6a541d5057ce769b295eae16a42b10561f42f5eb982221dc2beacec42d56e517566115e72124da
-DIST go-ipfs_v0.4.19_linux-amd64.tar.gz 14068171 BLAKE2B e108fcbeeca0823a90df049c870501406ec68d5750d300d5e50fb8f8b2e8c3a1cbdceecc76687cfa9ca0185e7661ad5fb91bf0f33cdef1e1e7c4fc5e0c25dd6c SHA512 66d930bef0196c70f25cb207c00da6e36f6c2c17ff0e785f45d360e710502c233aeeeaaa5ee0bfc984919d42225c74c6474e5e5ce5c8cd6993580903fa8ec0c4
-DIST go-ipfs_v0.4.19_linux-arm.tar.gz 11118746 BLAKE2B 08ea24e8367d22577798636faec3ecdacb2dad9dd635f727a129b875ab02d1b37712b20ce6a387046a7be753032b437aa1feb8fab79aff99140c543652f3d7c6 SHA512 00084c0ecdf2d78e792519dbfcc7f62897283d5d81e7df90745ac41091dabaf44674a62c0ebc6a63bfea9bed97f98ed1dde260d8eb05f4bef2f4d35d3ebe9f5b
-DIST go-ipfs_v0.4.20_linux-386.tar.gz 18312554 BLAKE2B 0da4c23635f4451f4a4156f492fb380a538108b1dd834bbfb35ae1d77543e3d2fb9823431228c5cf6fe6aa6318062dcc4c22e4e3c8775c16ac2b5e876ecfafe3 SHA512 675ab88affa3871ea6ca9cf14150f6ad262ca1c7120ab2dbf15259693754f5372de3958ae9265ac800b21e53f495356dc45f1a67fb01548468dabb6e5d8befd4
-DIST go-ipfs_v0.4.20_linux-amd64.tar.gz 20120151 BLAKE2B 3e363fbf244d4d848dbf5e0e13a78804401ea1b3b205683e8ea6d8b2409557b0575bb23149013ebac231523bb7f6278220715f8e20032d0bbb7a420f94e664b5 SHA512 a8a2ec9c04a7aec576f8b86997d5310b77eca2b78df9c269ac9ef478d786277550f09e410e392ede333eb652e8ed136bb58a22f2b3198c94a61649c7a5525b68
-DIST go-ipfs_v0.4.20_linux-arm.tar.gz 17668228 BLAKE2B f900ecdbc580e86a476d1d5d64fa54be7856429a33b9fc98d8d8141431be0df2776726c64d81218903c51f648f1ab5256d23daf82e260f4e714c7e4bb169380f SHA512 feb608db7fc9750ca155d008992a93bb5e9e1f53504d224aeb474465c5811ada182770c4a5465331f9d6b2c3472201bb53a1243c0de844f94db4751569db3021
+DIST go-ipfs-bin-0.7.0.bash 21018 BLAKE2B 81150944c71fe86b07db8bc2240899cb95637e74e05dd898c2aabd26e47b7222d6e79d4270c4a681450d8d148cf5dcf96d4376de110e6221943e0214ebf1bf61 SHA512 3a5259147652beda38b32e8fa13165775dfd7116ffdc839e350bb8009197c18dc03a69bd3a62233de0ace5fd52e76b6b1d9e88df888ec268e98519b5a35fe89c
 DIST go-ipfs_v0.4.22_linux-386.tar.gz 18865892 BLAKE2B 4ff67301ce6eec8cb38015f6dba16e10ee1fa3efffb47b2c3a9fe76fba875907ccd53ec011abe5b496de4dd2dff0a30f4e526e232f47c174b83004efdcc30764 SHA512 a6d16217412d1be0cdc0a2df604740054758b767994bbcb7ffc745abd90c64c28031b543bcb5589c715fa7115effc9a3b898ada8ad96c604507b428ed2538378
 DIST go-ipfs_v0.4.22_linux-amd64.tar.gz 20900056 BLAKE2B f068c367fb454a62c76f9828927aae0870f54853d0aeddfe6ca774490107c26df88ce41efa016732dffaf269d3dc2d16e1744f9cc35d4f86e355744eb3172a10 SHA512 49b99fec741d67f7bad8fb6fbbd984967f06dfc3de846d10dca34b166f621a182d12f13cf5ccf4e4f33747b67cede6f4205b4cd9b57ce5244128d1385ec82c85
 DIST go-ipfs_v0.4.22_linux-arm.tar.gz 18199193 BLAKE2B 25316649add6256c4f12efb9bb43848e2049cc7bcbe89dbe77309e1cf793e2ebd28559a05d0974af53488c414a26c28499d80f2f13f80454d4217019c58edc65 SHA512 c803964828ccbac40797e58dc82d10bdf899db26ef71ddd2443882bd4f84ff4a5aee4995a04135cb31b8f991381ce8004c51b06501aaef4d58dbcac239519822
-EBUILD go-ipfs-bin-0.4.19.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
-EBUILD go-ipfs-bin-0.4.20.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
+DIST go-ipfs_v0.7.0_linux-386.tar.gz 22038249 BLAKE2B 85c85948d69dcec0c73ac38bad4eb4cd65ef7148199a6afcdf7f419981a12db3d37f4923746feaa608bbcf455065570e264039020c5517f8b0a5ffa163bf4177 SHA512 f2e8db09918aed702f4c952ff014612e06ee59a24f1b796a7d0c56300b82caf388c0201506a174de34aa0e9f0a646e2792a521ceab947d65d82386aefd54799b
+DIST go-ipfs_v0.7.0_linux-amd64.tar.gz 25954590 BLAKE2B 0bd139f77272ac9d5e4e1f3caa8a4967d17ba8fa9caa4eb4859933423c882844eca5403ca90a2cbeae95f080eb21bd64c7f46a391eac3d5717a5e2dcbf2d8aac SHA512 1d5910f27e8d7ea333145f15c6edcbacc1e8db3a99365f0847467bdfa7c73f4d7a05562e46be8e932056c8324ed0769ca1b6758dfb0ac4c2e1b6066b57c4a086
+DIST go-ipfs_v0.7.0_linux-arm.tar.gz 21087228 BLAKE2B ec3122077a487726fe227816f97462bf9caf40d30c44ff6bf67e6266eda7cfff456855cdf8f91c1bc01dcca58b0e76cc931c05179326414e39adb6bf4d7fae18 SHA512 a1a9b6e2833da94d9059f1d03e30e7349ab4f00fc0e8580909f35dbb28f0fdf6cea712a96928f72aa2fadf3efc1328187f4fc863e5ce74e4be699542e262a904
 EBUILD go-ipfs-bin-0.4.22.ebuild 1325 BLAKE2B 347eff8b98a137099b9b4d36ba64ce773da594dda87073099c36c3a337912f61ab67da7c8a179ee229fefb5d600bed892f24dd470b872c5982d94675ab3da4d9 SHA512 bf0eb3b77f96471fb63a13caf1e87dc19dbd2748882a0b3c9c72ac67fd3f6c350f07ffb22d0f80146f88b30bb3b5d152cff442e499c0bff41fb0cca2fbd64c94
+EBUILD go-ipfs-bin-0.7.0.ebuild 1300 BLAKE2B 189949433e69e43b7f8164824b31a4138e2e78fac07d9d82b4618fc0cec1ba3378082ed16af2d6f00169d6def2c3938ae877bf1cade90f6881a2087201fb1938 SHA512 08e4c322aa2fbfe49a2221077d8954029dc6459f5a91d8b723b4c773176fdccce6a83f18fd30311d5be242760c13804344f5d3d0c3f5de1bf1a00bd84bf72e21
 MISC metadata.xml 477 BLAKE2B 16a170ae9f93261fef63c634d97680c504258e0d418ae4fb041c44c305478d1762f7a8eddec42bbd4603f37c9789093a8ba802b0e9f4089800136350e8605341 SHA512 d947a52ccaee61cb739f95e1e2eab3eb71af66d55272e40ce62388bb00550747105861328b458bfb4172b0b5737c54c5d572f9bc6c868503b494f0bc5a5d6f5b
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.19.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.19.ebuild
deleted file mode 100644
index d19ef9ab7104..000000000000
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 systemd user
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
-	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
-
-	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-
-RDEPEND="sys-fs/fuse"
-S="${WORKDIR}/go-ipfs"
-
-QA_PREBUILT="/usr/bin/ipfs"
-
-src_install() {
-	dobin ipfs
-
-	systemd_dounit "${FILESDIR}/ipfs.service"
-	newinitd "${FILESDIR}/ipfs.init" ipfs
-	newconfd "${FILESDIR}/ipfs.confd" ipfs
-
-	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
-	keepdir /var/log/ipfs
-}
-
-pkg_preinst() {
-	enewgroup ipfs
-	enewuser ipfs "" "" /var/lib/ipfs ipfs
-
-	fowners -R ipfs:ipfs /var/log/ipfs
-}
-
-pkg_postinst() {
-	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
-	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
-	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
-}
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild
deleted file mode 100644
index d19ef9ab7104..000000000000
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 systemd user
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
-	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
-
-	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-
-RDEPEND="sys-fs/fuse"
-S="${WORKDIR}/go-ipfs"
-
-QA_PREBUILT="/usr/bin/ipfs"
-
-src_install() {
-	dobin ipfs
-
-	systemd_dounit "${FILESDIR}/ipfs.service"
-	newinitd "${FILESDIR}/ipfs.init" ipfs
-	newconfd "${FILESDIR}/ipfs.confd" ipfs
-
-	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
-	keepdir /var/log/ipfs
-}
-
-pkg_preinst() {
-	enewgroup ipfs
-	enewuser ipfs "" "" /var/lib/ipfs ipfs
-
-	fowners -R ipfs:ipfs /var/log/ipfs
-}
-
-pkg_postinst() {
-	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
-	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
-	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
-}
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.7.0.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.7.0.ebuild
new file mode 100644
index 000000000000..7a4b01b10bb2
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 systemd
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.io/"
+SRC_URI="
+	amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
+	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
+	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
+
+	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+
+BDEPEND="
+	acct-group/ipfs
+	acct-user/ipfs
+"
+RDEPEND="
+	${BDEPEND}
+	!net-p2p/go-ipfs
+	sys-fs/fuse:0
+"
+S="${WORKDIR}/go-ipfs"
+
+QA_PREBUILT="/usr/bin/ipfs"
+
+src_install() {
+	dobin ipfs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
+	keepdir /var/log/ipfs
+}
+
+pkg_preinst() {
+	fowners -R ipfs:ipfs /var/log/ipfs
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index e3eb3806a0ea..970d3cf9475a 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 08ccb71bc2d2..a34fcf2fae33 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,5 +1,5 @@
 DIST mitmproxy-5.1.1.tar.gz 27223155 BLAKE2B 38369eb07c41bde9f8e8c246ab5cc4fc6edfcd222f353624f4d2ae193f176228471aafdadd1b65238ccd808d778a69e1d140035be9116b87a75c286493747fe8 SHA512 ac5cd82d4d89590b57625661c493aca6a702605c612ea1acd9e0d0806067d47f60085ee68260bba2a10dc343410ae6a76ea1575287a0e312e4467a4e8485c6e1
 DIST mitmproxy-5.2.tar.gz 27251381 BLAKE2B d6bc5de8a3840a880664f52e011736cb640d324c6aa3846d4f2b3c2fc0d49467ab8ad3e8268a591cbe19d9f6dda5acc37fa2de705b4de1c1920b5003e10ea457 SHA512 6073c73b24618d6f64c4e99f199ebb6bc4157a3f83bfa7aff10a113f8dde823715e95bdf4202a1526dc0856d120858d32842b814327c3b98452b629fccb1790d
 EBUILD mitmproxy-5.1.1.ebuild 2884 BLAKE2B a066a3006656839fb2e04efe8b17ae2db0b0db899958f359e5718341c3988d9870911c817eedd91680ee250ee2d2bd32c3b0706897c58ac8db73339a6d5ca5b7 SHA512 045fb1f56dcaf446d6d5396db7ee78c0dd9f10e15688b29a29fffde0efa1e1a2c5ee37795c2def434536da60cd8c0ae55142847cc2b7013e0a4a4406e46f046f
-EBUILD mitmproxy-5.2.ebuild 2382 BLAKE2B 899639d6769bd25192518d94f4352274c4bebaf4022d9309cdb8c6af81cd77f04c00d8605906b72d8dde7cc422bd45f4c965968d6ad1e324e6a51e40421c21c1 SHA512 46b95ce796156df2b5bf2b706a5cc8e06385db044a4337d3f624736d6ea7f2c2e5c711eef8cef0d724bcb2ac586a65fd20b97a18f3013ff1b93f7765ad3f338a
+EBUILD mitmproxy-5.2-r1.ebuild 3029 BLAKE2B 2d7de2fddfd8b9d939b33a66352fe830466135d32fe097588ede71d345fad0abd4881b3ddc89ad05a2e1e713f926fb7e133b94f0f5bfd7b6f82eec6a1f4fa140 SHA512 e803ead1473693b6a580db34eb958bf28b93866f37da5778e9586623eeb5e231957e53de2edc063e0d17807da28930085511b04bc1a51c4eabe7d80fdec54202
 MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
diff --git a/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild b/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
new file mode 100644
index 000000000000..67c9373c73f7
--- /dev/null
+++ b/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
@@ -0,0 +1,92 @@
+# 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_{7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
+HOMEPAGE="https://mitmproxy.org/"
+SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
+	>=dev-python/click-6.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/hyperframe-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
+	>=dev-python/ldap3-2.5[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/wsproto-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.50.8[${PYTHON_USEDEP}]
+		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+		>=dev-python/zstandard-0.8.1[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# loosen dependencies
+	sed -i \
+		-e '/>/s/>.*/",/g' \
+		-e '/urwid/s/==2\.0\.1,!=2\.1\.0//' \
+		setup.py || die
+
+	# remove failing test
+	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
+
+	# https://github.com/mitmproxy/mitmproxy/issues/4136
+	# https://bugs.gentoo.org/740336
+	rm test/mitmproxy/addons/test_termlog.py || die
+
+	# requires asynctest
+	rm test/mitmproxy/addons/test_readfile.py || die
+
+	# Passes with OpenSSL 1.1.1g, fails with OpenSSL 1.1.1h
+	# https://github.com/gentoo/gentoo/pull/17411#discussion_r497270699
+	sed \
+		-e 's/test_mode_none_should_pass_without_sni/_&/g' \
+		-e 's/test_mode_strict_w_pemfile_should_pass/_&/g' \
+		-e 's/test_mode_strict_w_confdir_should_pass/_&/g' \
+		-i test/mitmproxy/net/test_tcp.py || die
+	sed \
+		-e 's/test_verification_w_confdir/_&/g' \
+		-e 's/test_verification_w_pemfile/_&/g' \
+		-i test/mitmproxy/proxy/test_server.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-proxy/mitmproxy/mitmproxy-5.2.ebuild b/net-proxy/mitmproxy/mitmproxy-5.2.ebuild
deleted file mode 100644
index d5ba12b4c7c2..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-5.2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-6.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.5[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.50.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-		>=dev-python/zstandard-0.8.1[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/urwid/s/==2\.0\.1,!=2\.1\.0//' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	# requires asynctest
-	rm test/mitmproxy/addons/test_readfile.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-vpn/6tunnel/6tunnel-0.13.ebuild b/net-vpn/6tunnel/6tunnel-0.13.ebuild
index 0719d63523d7..7b1c7485ecae 100644
--- a/net-vpn/6tunnel/6tunnel-0.13.ebuild
+++ b/net-vpn/6tunnel/6tunnel-0.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/wojtekka/6tunnel/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86"
+KEYWORDS="amd64 ~s390 x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-test.patch"
diff --git a/net-vpn/6tunnel/Manifest b/net-vpn/6tunnel/Manifest
index 764ffd5e1969..d8ca40f37372 100644
--- a/net-vpn/6tunnel/Manifest
+++ b/net-vpn/6tunnel/Manifest
@@ -2,5 +2,5 @@ AUX 6tunnel-0.13-test.patch 3041 BLAKE2B c942ef9d53874a4e5048e8e3bc3366d08a164af
 DIST 6tunnel-0.12.tar.gz 96364 BLAKE2B 3c36cc4fc632bcb0136981dace4ae46d2823901eb92d0f82b58b801ad139879b0e2ca129099a651bc51dc8f29aa3db89a0be62d7dabda87d66361474558b66a1 SHA512 56c5b8b285c730e25a1bd57a37fc6d169c4c54a842e7763a1580231158858a098b8eb5549dd8adf0c5ae4516cce9c70b00ae82f27b6e152ca10eba7681b8808b
 DIST 6tunnel-0.13.tar.gz 103054 BLAKE2B 4aa10cd798ff3e3ab1e78bf3497c007e63a3e0cef094f507976fa495e6b544601cd9a231b828fc21db35a45e67a9dc4f13b1339e82d4f198c842c9b1177b95ad SHA512 e495b561e2fe4483417cf44291d729377fe02123f21b7d58b9aed294c676392d860de7474b6bcb4e3e4ffdcd87752ee1af070dfbab028b5de5adb778b0241f72
 EBUILD 6tunnel-0.12.ebuild 364 BLAKE2B 780fd8c0fce16a2ed6d05e49228bb5f1b67b0b7450895801522161d62823e30e2429e1faafa63ad514f2220f08b5fd0f45a37c4debfea4502346d92853732f47 SHA512 dea90ebbbd893ab828af9359c02489bca73c2e4736242a402ef6a0ce26b96e0fb79b0f81c14fed3b2b1d7b4f0ab314f7485d7ce33f08d185c7c9d41f8bd5f630
-EBUILD 6tunnel-0.13.ebuild 404 BLAKE2B 1910df616f4e659b2792a3da3983e6c9545d74061e6fa21db75bbdaa8d2b96cfb4b2b5f556427e44361763389da8295d5426dc06b4b0c2e75dbb11a5a412e3ab SHA512 2f4d0672a96d81545d7a1353618002023b9c1e86efe84725ddb5f6630a313709e921ae490ed97b8eb2c75f548aebd30d8f106df775e29917ccc2011f71dd0362
+EBUILD 6tunnel-0.13.ebuild 402 BLAKE2B d0a3bc2570d4977864db9cd66bf24153e54deea2700bb3cbae1dc121bdf10d23e051b6a1288fb57974a73cf18b545310495fa6bd047f1d5b1f372c4f1d75f1e9 SHA512 13d0a4f8d4e71f687a76af41300a5c966920eef289dd67dc8855372a3ab74a5ba385581ce954461133e0d701889b289e299d721533c5e5a860fe83b8b48e9954
 MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 9c9c910985cb..36672c66f6a9 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index 703ec38b3ec5..83b01d4f164d 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,3 +1,3 @@
 DIST wireguard-linux-compat-1.0.20200908.tar.xz 262708 BLAKE2B e1621237c6a76a6b8111eb26d2547c7335d87f8e11110db29fd6d7b8c56993d0998383a2beab682c75caa0de183f17e345b0f96794a7c9e5b2cd04281d558ce0 SHA512 e13f243a7a72a4d4bd326af40439b7760b6ea8b452e67ddff1c844dc62bc53e2dc2c1738f98c7a45b6b24566d0ed9dc0dc3e9006fcb668f0314aac2ab9eaeb87
-EBUILD wireguard-modules-1.0.20200908.ebuild 3486 BLAKE2B 2a201c656281cd4a83df1129776c0ec17800683c0f844373cbd05fe2153fff4f9d91e4464d532951294ff7ef1ef52cd6de3802a74aa0fe6c34ffe6a585913e5f SHA512 aafd74e5c34c5f92dea25f45d8a5220cf8a620c5b30b1360e622f3c1e3e4dd9de793a1413a868a4cc4547f68eade0a373a6e47f15636f37237097125c69eddb2
+EBUILD wireguard-modules-1.0.20200908.ebuild 3490 BLAKE2B 8596bd28f1597a5a00af96fce29d0b2363e1426c046dae5dc03e51153ced4a6c7cfef5d455864baafdcd15ef870c9515c9f18950ca560d16796e5de7e89962b7 SHA512 d6bdd26af3b99c89d3b34ee34a16ed0f9d2da0ea459aac113f3453012a8c2fcaeb7a1fd93bdee1268366747966448d1b72728d0cbb13093536dd4a3ccac5f83d
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
index 198636c9d9a4..86de5edd4d3d 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://www.wireguard.com/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-linux-compat"
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
 	SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
 	S="${WORKDIR}/wireguard-linux-compat-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index ef024633576d..789e107d30e1 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index e43502a5b3bf..b5852f0a338d 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -2,7 +2,7 @@ DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046
 DIST aircrack-ng-1.6.tar.gz 7933308 BLAKE2B c4cacdc9b767789a7b2426857831c1f8166d3f2e11a71cffc1466f2d4006552dfe420a50e0085f3c74fbdc23770309bb81d49e0c5372b0e4a8fa5e294c16d942 SHA512 df65ec3032ff20dc4aae4921e6a9c330a51b5df89af02d4c6fbf691fcfade21658b1a2d5de286a7e729dc6fb740f6fd4e6b6f53649486ef64bc3d00d81a95bd5
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
 EBUILD aircrack-ng-1.5.2.ebuild 2893 BLAKE2B a93ce214ad665bbf50e7d08bb1250731e2993437592fa6db39b1a207090ec4264e6f8b8b51d6a4f6f97b972250d0abb2afd5b23394899ae3075464939ef4a5ce SHA512 7797d00f2128120e5755a023903f6677c83face85d31053b71e9a11f73fcb2f64069464727aae58c6a234ad1fe673a987afe49c9271a191dd5cf0420b6f43572
-EBUILD aircrack-ng-1.6-r1.ebuild 2951 BLAKE2B f0b11c45136f229eca31b045ad8344f39be7aa15ee0af9d02f86a65c1332822f53f1b585e294be6ac143e4cf8fc77d56dafd2b086c2fd8fe048074ae734bb529 SHA512 d97a7690c8ee73e044f9f69f6a3500be1c913bd70b9b7c352dba75e294875866b8174baffff78966a032cc4fa593d6338bc62e98432cba13dbd860cff0c5897e
+EBUILD aircrack-ng-1.6-r1.ebuild 2950 BLAKE2B b9f178f2b79a5530cc2d674cab55cb867b896f7831e1291bb195dff7bd1ce65cbabc3fea5181aee68e4318c7072604dd73ca8f7ba374e64f103b346ac6e3bd58 SHA512 37766208fd9e5d49f4b178b3efca06a71397903550031bbb4a77d6abb49e9efc8a45163fb01b60080953d686b137826de62b806d821a261f948e11cacc5c7860
 EBUILD aircrack-ng-1.6_p20200722.ebuild 3113 BLAKE2B fd379315b4a038fcfaf46b0d179c506fca602b83476eb3c16a2fe42a672a0ba63cae9555fc4c5ecdfaa1654d8c00cab10a142d6412a78d887280e6000cdcaa3f SHA512 5266db58d5dad326a7007382319ac83dd9c4bbae731bbee23216a763c3d7470916e7d424f5bcd2be2d02b432fb6d34edcabf6a70c63d1290df91c54e4dfe793e
 EBUILD aircrack-ng-9999.ebuild 2952 BLAKE2B fc5540b4faa82f0b88f279c32650d7eabc506e150960028d59786afcc2b9a0dda5198f12d9858bb029e6850f9a9e45f813269eb810d660dcf416ddce244b7496 SHA512 1554f875c73f68a25352437bbd11021c713e9174572cf8c6f88d3959cbbfeccf91920644054b6f207acd7903a0d06c37456273eca23de4114ae1ac7da2b26c56
 MISC metadata.xml 1024 BLAKE2B c7f31132d721d72f926098b5a85d4cab21ac4fdbd63e75c15485eb4dd62264061ab4173628e05ddde74523a0557fd905a6dc008305f26c7f65416f92b70a4f4b SHA512 e51a08063ed89d55ba02aef49d249fc18adb03026726230faddf661f55f709a37520c68e632ae2996955f837651309a6d83bdcbad775a540d0a2f1aeddbfee72
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
index baba1e8a9fe6..e71b20d39d6f 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 953eb1d6bb81..624337452cad 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -5,15 +5,10 @@ AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9
 AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST 0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2 6933 BLAKE2B 021574de46f582f668788d35bb0f2fb7a47a03ae9d8009adaf3d53946bdf7fc61301a985a7eb0c6cde37fef36dceae86d71d287a8beb61d793b6309064e4e09d SHA512 f42f997a92592d3caf7e29e50bfb5733ab94988743eb3231c78b31272c5cde840f5abd984e1c6b1f928828a6be84eb5d17c3455207509f48652ed160a4f6c7ae
-DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
-DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
-DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
 DIST gnuradio-3.8.2.0.tar.xz 2438736 BLAKE2B 93eabff578cd6b3b6587a6aa083095c787323ebf87a447d61999813e7e5e48b414d080a4fc02d01dabaa9378d42e3a210451a9109fc202991ebda8d1c9669676 SHA512 33930f62762cd9e3d1038b4a903f01e7ab33129732d207c126a89c1f1e719e9d656a94cdcbf3f6010f8476fedacee639c8a12444c41cdd56ad9fbace7863a170
-EBUILD gnuradio-3.7.13.5-r3.ebuild 7963 BLAKE2B aec02ac499a1b2cc11c40a133314fa40ba293f309e0bdbb2bfdad56d1b3c16a09b6226177d658d17ccdb9ad9aaf4c8b33dac92577dc55fb82070eaf86582ae92 SHA512 81f1b3d77d1122724d665a0b57c33b6e102689a8b9a3d90f50f45a1327b0c9ee4b5748f9dcf980ef4edebaca4617b49b91682619ab705c3003b154df17a8d369
-EBUILD gnuradio-3.7.13.5-r4.ebuild 8136 BLAKE2B 3f5148845dd0147c008abb5ea740c11f28022b9d73782c04d255438d457bb08a7719e06aeb7a5b16ac6d420962cdbe2415121bf86d30f0ebe48a6bc26b413c9b SHA512 9a7591d241466705b882e0ac14cebacd1717621c253d6b68f529b03603e58a9dd78f2e1664fd27c7b4e03848bf0224a2cd4012b2b1b299475d8ba11395dda30b
 EBUILD gnuradio-3.8.1.0-r1.ebuild 6001 BLAKE2B 169303b741b964fe99d9e118cb009a6fff1e64266f591345683a7bc9cb8d814eadb63097da103e7026922e2f4d32384b24e56298b1db6137dba20bb5110a9e83 SHA512 980f3b69d0c5c73f57e03484907960073689be75a473fa2e2f3893fefeb5e24c4c7d9abd06fcb0032ea30de8f1a73b0c21c4986cd5fbcd96f922450faf6b81cc
 EBUILD gnuradio-3.8.1.0-r2.ebuild 6180 BLAKE2B 5b43706289ce84c725fd6a370c75a2d70794b9db19baaf6121bb5ffd053b367781149d9c6d377da262dfb43b783ac22211cd2d1a82ad2d2233e77cd5a4697910 SHA512 4dbe95781189edcd088685d6cc1e3dafd21fda36d469de5919c1189f788f692e8ce597452e85887445d17f59adb3ad42a29d8eb7fe6156141c7c87acccd81b97
 EBUILD gnuradio-3.8.2.0.ebuild 6214 BLAKE2B b647cbfe1eaf25a98152775c7b1c56d9d9d13cfecb7dded0cbff3a913087889646abf3d2378fc465c4a067623e06b0eb294e3f127b9ecd7abeb81f83be47ea14 SHA512 5fd64b198e7c19dbb69df406aa8c72431a9a3fae31c3069b75a964225f36fe2f8e48c5157cd150818a46e68dd88b3667173c67b64cdca000887fb078b586d711
 EBUILD gnuradio-9999.ebuild 5976 BLAKE2B 23ce3f7fd6dba404271bc2a6fe4f5d50ca7e5851a47cb2f3e72c34dcba796c4835eacc8840a0b52e106869bfc63fe6a43d4f392adc0bd42e3fa42bb34b6d463e SHA512 88519e9721890754e5efc572d9d9f9b5b7745a78499b69e91f1be907a53901273e9eddfae32f9af950d9b19fc12efbbe1a8f247073653e13fa611db13ee7c964
-MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
+MISC metadata.xml 1532 BLAKE2B 0e5d971ca6a16064f0c250b3577bed7196c01089279821adb4d30523a850dc84a9f88936a8ff3471e468b36cf42942c34098e59351e9b97fcd97c6be110213b9 SHA512 636c94dab0303842c19cdb3aaccc354cdb5f14d758ee601e921e3d0bbcd6c7b2080abc16ba04ae9882129711312acfb58edfbd44b2619723cd01a989cafcd204
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
deleted file mode 100644
index e5e6b1a24c2d..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
-		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint-3.7"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt5? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		qt5? (
-			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			x11-libs/qwt:6[qt5(+)]
-			dev-qt/qtwidgets:5
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		wxwidgets? (
-			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-		doc? (
-			>=app-doc/doxygen-1.5.7.1
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${WORKDIR}"/qt5-maint-00*.patch
-	epatch "${WORKDIR}"/codec2-next-00*.patch
-	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	#zeromq missing deps isn't fatal
-	python_export PYTHON_SITEDIR
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DDESIRED_QT_VERSION="$(usex qt5 5)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
deleted file mode 100644
index 4bd0848dbf45..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
-		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz
-		https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint-3.7"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt5? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		virtual/jack
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		qt5? (
-			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			x11-libs/qwt:6[qt5(+)]
-			dev-qt/qtwidgets:5
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		wxwidgets? (
-			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-		doc? (
-			>=app-doc/doxygen-1.5.7.1
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${WORKDIR}"/qt5-maint-00*.patch
-	epatch "${WORKDIR}"/codec2-next-00*.patch
-	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
-	epatch "${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch"
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	#zeromq missing deps isn't fatal
-	python_export PYTHON_SITEDIR
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DDESIRED_QT_VERSION="$(usex qt5 5)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index 5d03b8a37dbf..f3386a84a9e2 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -7,19 +7,14 @@
 	</maintainer>
 	<use>
 		<flag name="analog">enable analog signal processing blocks</flag>
-		<flag name="atsc">enable ATSC (HDTV) transmitter and receiver blocks</flag>
 		<flag name="audio">enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag>
 		<flag name="channels">enable channel mode blocks</flag>
 		<flag name="digital">enable digital signal processing blocks</flag>
 		<flag name="dtv">enable digital tv signal processing blocks</flag>
-		<flag name="fcd">enable Funcube Dongle source block</flag>
 		<flag name="fec">enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
 		<flag name="filter">enable filter signal processing blocks</flag>
 		<flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
-		<flag name="log">enable logging to console and files</flag>
 		<flag name="modtool">enable modtool for editing GNU Radio modules and components</flag>
-		<flag name="noaa">enable NOAA POES HRPT receiver blocks</flag>
-		<flag name="pager">enable pager signal processing blocks</flag>
 		<flag name="performance-counters">enable block performance counters</flag>
 		<flag name="trellis">enable trellis blocks for FSM</flag>
 		<flag name="uhd">install UHD source and sink blocks</flag>
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index be91a7f66642..891bddd9d72c 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,6 +1,4 @@
-DIST gr-ieee802154-0.0_p20190606.tar.gz 195541 BLAKE2B f565808788c463816633774362be0bf6e6900db52051ef4f8e2eed5b110c7b9edcf05458f8a4a8e3afef59c4a76101a5606ea9c9023ad922162ee9466cc7e343 SHA512 b430ee6c16356307566619cd50258c3fd05ca198a67f0b47eea6b8d1038de6cc070823dd7392a56c4308cd74495802b4b52a4a425ce43ce4afb56386ec5fa39a
 DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86
-EBUILD gr-ieee802154-0.0_p20190606.ebuild 1351 BLAKE2B 268f659fe1b7219fa2e515613fcbe0052637b847996193e436e87d7866783c54ae30d85a43657c030fe73b0f1f7d87558b936044e3abe85b3706ae4e85da1ec1 SHA512 68fa564c2187038c01221086ca7a7a86413c5bb6199a276d289722eb81fbe1a3f2e3803577aaeb1253ec6afbc6d5d5fdb3d22b6f9bfa75c3e384b69afad75183
 EBUILD gr-ieee802154-0.0_p20191006.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 EBUILD gr-ieee802154-9999.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
deleted file mode 100644
index 89e8afbf67b3..000000000000
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
+++ /dev/null
@@ -1,51 +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 cmake-utils python-single-r1
-
-DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
-HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
-	KEYWORDS=""
-else
-	COMMIT="d3d94023c71af9e6d7721f7412fba88ff5325234"
-	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
-	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index 69cebe5eca97..d32a4894e1eb 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,6 +1,4 @@
-DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
 DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
-EBUILD gr-iio-0.3-r3.ebuild 787 BLAKE2B 09d0be1cc71419bd6860607576addfde2c65eff09cc7f60182467dcee686d6a044fe033a653b1db27971d68eee94a6ba7c4f6f7827ecc08191798a0f50a89938 SHA512 688f3b54237474f15eaa535b37025c0173cfd5034d78ef30524634700182a464f35f6c3805bf03cbc2de693a3dc0a902e475b61cc3c3894685fd4af7fb1d24ef
 EBUILD gr-iio-0.3_p20191219-r1.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 EBUILD gr-iio-9999.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 MISC metadata.xml 434 BLAKE2B 565c3b42597436890ea7bc2d5b13d16720480e8932878c73bc3efe0708ca6ad2e900b7595248dfc0e25fbca17ad3f216bdfc02c0f29519013db5ac8137a09a7c SHA512 1e970d2cfc935f25ad3cde099739a9574c8bcae6a4e8c59d7aba6bd01319155d9bfc80124d2dad649f24aa7a937bdad7cc843525282f72b10e5e999eca7a4f49
diff --git a/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
deleted file mode 100644
index cc5dd36528ff..000000000000
--- a/net-wireless/gr-iio/gr-iio-0.3-r3.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=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNU Radio IIO Blocks"
-HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-3.7*:=
-	dev-libs/boost:=
-	net-libs/libiio:=
-	net-libs/libad9361-iio:="
-
-DEPEND="${RDEPEND}
-	sys-devel/flex:=
-	sys-devel/bison:=
-	dev-util/cppunit:=
-	dev-lang/swig:0"
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index e5d04e97efa2..7b76f89f19d1 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,6 +1,4 @@
-DIST gr-iqbal-0.37.3.tar.gz 105924 BLAKE2B 25eddc718e2b6d5c679a0d6f199d9d49ff69b535502bf9449d7561ae8c172014a5058cee7ef692a36ec518408747d63d01a23c963f45a5d4b5f58175c49f5bbc SHA512 04ac24e2cc8ebf458088e4d8b005818d3f2496fdc801779dc276c21ee751520039078d5157022a886494f8d62b586d69c703e83fb0539e775ce95e3ca34cf374
 DIST gr-iqbal-0.38.1.tar.gz 106392 BLAKE2B 009f36dcf34127e80d8afa91196906a2b2dc8696dd16f9e7d6d9011d9baf2e4c2dfac78eb1acabcbe52dd88ce08b15f8da407b141585f2c60fd63549218576e0 SHA512 b2f74bba560478b746ad1b11d70202fa2d396462f4806918379543fc69a915346745b34f9ffb2914091ec677295f6f378a5b22641c26aa37c5e23092623b5cee
-EBUILD gr-iqbal-0.37.3.ebuild 708 BLAKE2B b02d0481770d6b05038a0eec9b5f69bcb02866e6436229f523cc204faace02ba17f0350e3ecff4d3827d3a10e6d3ada25a7fb16523f81ef268ec29df5002f2fe SHA512 d93be823cf734ce2a96aa0fe7ea4a25dc590c1fd90f5320caf340b9dfda90c2da1108d5b0195dd6ea3a949ca1d38b194ab32f60d6fb65147ef158d9dbf6cf1e1
 EBUILD gr-iqbal-0.38.1.ebuild 864 BLAKE2B 922265ce7d23112dd60ea4f9642a235bad372c495b9a21f6d7f20f6524e81409d70d8b4f0d130aa2d229835d4e92144cf14ab72abc28e60e35e50b3c10c3e50a SHA512 1732456dff3d84ddca603b54ab12bcdbc6775fd4df103cef6d1d96132464ee6d3ee19e8672e51c5b23f2ab034871350a044a5967eb57ecf31b7130c5ca0f9835
 EBUILD gr-iqbal-9999.ebuild 864 BLAKE2B 922265ce7d23112dd60ea4f9642a235bad372c495b9a21f6d7f20f6524e81409d70d8b4f0d130aa2d229835d4e92144cf14ab72abc28e60e35e50b3c10c3e50a SHA512 1732456dff3d84ddca603b54ab12bcdbc6775fd4df103cef6d1d96132464ee6d3ee19e8672e51c5b23f2ab034871350a044a5967eb57ecf31b7130c5ca0f9835
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
deleted file mode 100644
index c1920c8ed5ed..000000000000
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.3.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=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="gnuradio I/Q balancing"
-HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
-else
-	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
-	net-libs/libosmo-dsp:=
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index beabb1a299ef..1fae5e2d41fd 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,8 +1,6 @@
-DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
 DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
 DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
-EBUILD gr-osmosdr-0.1.5-r1.ebuild 1926 BLAKE2B a61337ac088431d18e5e2bd04b0bcf8c60b1519e07c0b86a61dbb23e74346796fdf1ff6a16258365f88f2bab3628934fafd8774d728c5f50befb2d68e3f9a5ce SHA512 3ebb20e9c58fd195b6c59d885cd0f4f6cc88af32dabd0cc2da2567eb0aa997cdbf72b616ad375350faa43c87bc3c4baae7dc3160d8e80c468bd47985c7c4383c
 EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
 EBUILD gr-osmosdr-0.2.2.ebuild 2199 BLAKE2B 90a673c1a90268b367a93f593a22e905d1a83ad4e43597564b8b10142cd8898996621851c1ca45a50bd2d892234b0467e6bf145ae08aba8d31fb309f02ee6a8a SHA512 141a81ca92922bbdf69f2731e1e20200a61372abb8b32d0be26ccb8679627b8b8b64d53a2e17147635df3a804700cf64118d39b48c69026efd911ddbcf73b28e
 EBUILD gr-osmosdr-9999.ebuild 1948 BLAKE2B a3f613241993c7efebdece14548cfe61c75cc5beb8efd0a463e2e83643658b0b921692908edb17fe401773b17ea8317f87be1491190449078bef9d1095a5ac55 SHA512 c4ff4d8d9fc20284b846886a1bc2a3ad6dc7c6ebc4a18af44616500cce0833fabec96d1c29ef44518073ef9729655f4cf0fdcad4a8482a761ce06e667a4cbf08
-MISC metadata.xml 965 BLAKE2B 6dbc466abe93e1ffef58f8f07ac4326ced3e9399c86fcb3135c16293065d0c9dfca6584e527b1d60f4fbaee6322ff6ed7a5c5a8ae20c8f985d0488a94352e8ea SHA512 2c744ddfec67ffd438ea76afc037e6ff7480d5349b63e00ac74dff191f33f3f9ecde08ee167b568b64a7dea33d3efbf67be582f1613bd8f8a5e0d29275a8da77
+MISC metadata.xml 906 BLAKE2B 7c95ce3b8aa4159311da0d1b52be2bbe8f455035a4b35a7e93b45beb0cd064c57520dcf1fb9e28578ee631d9f18fd76e6f88885adc4fd8518cf413eb39e0cce0 SHA512 4774699e05eb13ac4a006a68f8d5f173ddb5528561b71cee5e2e2e3a84b7ae843f0be621df245933e3ac250b6bc7b03494f6435b1d940c9e78844a563f449ef3
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
deleted file mode 100644
index 53e6a3392760..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,69 +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 cmake-utils python-single-r1
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
-else
-	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	=net-wireless/gnuradio-3.7*:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
-	airspy? ( net-wireless/airspy )
-	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
-	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_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_MIRI="$(usex mirisdr)"
-		-DENABLE_PYTHON="$(usex python)"
-		-DENABLE_RTL="$(usex rtlsdr)"
-		-DENABLE_RTL_TCP="$(usex rtlsdr)"
-		-DENABLE_SOAPY="$(usex soapy)"
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		python_fix_shebang "${ED}"/usr/bin
-	fi
-}
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 68a1bf0f0a5c..39125bb505e6 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="airspy">Build with Airspy support</flag>
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
-	<flag name="fcd">Build with Funcube Dongle support</flag>
 	<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index 35b24c2c72ff..a635ef0ad95b 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,6 +1,4 @@
-DIST gr-paint-0.0_p20200418.tar.gz 2129751 BLAKE2B 8767ff1ec791352dc701d0f7f68bbbd4088073379b4116ff2dbf2120b5e6e9b1a87ba0b0554a8489dc9b93cdb2ea5e3a8596b09482512fd1b10ea25d5b5c0fe9 SHA512 5f52e2baa090ed80d8a5b75846821b47163dcc055b94201fb59788bd85769a4e3f8c18654de45e68cb4088681b2db8b2327b5d14f176872bfe8bb2e01d7b6bfb
 DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
-EBUILD gr-paint-0.0_p20200418.ebuild 1098 BLAKE2B 1578dfee76801a9d4c8896794771cd913d25e6e700e89b3adfe4acfa72f4c16ea56827e61bb94949f1b50da968ffbe6df544a142d99c1b62b21e4a404ce1d90a SHA512 7fbd7d8090c1bf535702245e15eaaf0192dd9098657e4f918250d5f6957ddda066ea62a028a70df1e184161929802392fb3ea3a0913a3d99e7fcebac2e93287f
 EBUILD gr-paint-0.0_p20200517.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
 EBUILD gr-paint-9999.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
deleted file mode 100644
index d8339979c4e2..000000000000
--- a/net-wireless/gr-paint/gr-paint-0.0_p20200418.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
-
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
-else
-	COMMIT="e36b2c638061d14f1b3c3bf3e889a8c99c273930"
-	SRC_URI="https://github.com/drmpeg/gr-paint/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64"
-fi
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
-HOMEPAGE="https://github.com/drmpeg/gr-paint"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
-	')
-	=net-wireless/gnuradio-3.7*:=[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick
-"
-BDEPEND="
-	dev-lang/swig
-	dev-util/cppunit
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOXYGEN=$(usex doc)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 7662558b5ae2..0d10f253989f 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -5,6 +5,6 @@ AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 B
 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 8651030448176873599cf48122c958fbd48130506be543f674a5811cbf1fbca224e6b70610d737aba40d4880f9db976771df314e917b93f84edb1ef3a2bf2379 SHA512 c25fff3e0767cdaadb8f8c181916422b127f0851f66150333a2c1cda89493f1b162f63975f3eca6eb2d181121201a8b74a55436a4b540005bb9918f8c2180253
-EBUILD hostapd-2.9-r3.ebuild 7438 BLAKE2B 83bd493bcb46f325bbd4acf63a2ac307011aafde320cd41c3b4ce3c961cbe7f4a142d6c9bda90ab1f8d6a070ef7589da784ac07e678f8742c6d6b52eebbd6830 SHA512 95381ded174f4f933878506e3f00af346b269aedcb9f54a5e9576065aac29322942b802b883c1f8b65674322e4ae99c3b32d42deed296ef9e3adff3b1f3e411c
+EBUILD hostapd-2.9-r3.ebuild 7437 BLAKE2B a5f58c2e465cec4b95d945c078c3695fa86c1b5372458bf32465daadfc7ef912489db1ba148c842deaf94db9ef655ed7943ad0bb06414427ed43c932116abb8a SHA512 956b2344bb31ced7059cb16a22b0f653497c5c502bcbd66c2ca76483f025beaca9257b5824c7925edc9b54fd05deae8424ca6f0de0a43909d27ab9f2b920eec8
 EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
 MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 1a7b79b5b57c..b93c40f9893c 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="amd64 arm arm64 ~mips ppc ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 3b59fc8c78a4..3c5bb43947aa 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,4 +5,4 @@ DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f9
 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
 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
+MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index f9a1efd46a10..c596280be249 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name="client">Build the ncurses-based user interface</flag>
 		<flag name="libusb">Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble)</flag>
 		<flag name="suid">
 			Install a setuid root helper binary with limited functionality;
@@ -14,15 +13,7 @@
 			reducing security risks
 		</flag>
 		<flag name="pcre">Build with pcre support</flag>
-		<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
-		<flag name="plugin-autowep">Build the autowep plugin</flag>
-		<flag name="plugin-btscan">Build the btscan plugin</flag>
-		<flag name="plugin-dot15d4">Build the dot15d4 plugin</flag>
-		<flag name="plugin-ptw">Build the ptw plugin</flag>
-		<flag name="plugin-spectools">Build the spectools plugin. This uses <pkg>net-wireless/spectools</pkg></flag>
-		<flag name="plugin-syslog">Build the syslog plugin.</flag>
 		<flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag>
-		<flag name="ruby">Build extras which are written in ruby, example plugins and the like.</flag>
 		<flag name="ubertooth">Enable capture source for ubertooth to sniff bluetooth low energy</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 6f06f0dad1f8..214946983d0d 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -3,6 +3,6 @@ DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25f
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 EBUILD lorcon-0.0_p20150109.ebuild 1323 BLAKE2B b6339a31e80485e9169453e69c2311f964eb2995e613001ffb033cac40581868124d1635f56d627291224dcc2346778c269d0c5e4f65682c7e4b99cfc01e02d2 SHA512 1933c94718b830c9c5a24a78dec8835f82b5c30c43bd6fde38bfa994c8916c19eba7b3b49912ef9f7f5e7b5313fcdd55a127b81f88126c6c31ad7ada4d0b5927
 EBUILD lorcon-0.0_p20180409-r1.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
-EBUILD lorcon-0.0_p20200214.ebuild 1506 BLAKE2B dceab58b9442d2270a005b349a69d3172df911bccdf1a696a8ec6a9e06403eb5f314a8ddad96ee4700abe62e155c9ebbd28e116ec45f89e5f5c43e1a0a4e5939 SHA512 d7365f97d2ca2d993aeded7ac41bc36e2204c037b39fecd9a2e548044fb04619d4b7edb7001aaaf3676ef17835106bab2bc61cef647f637cdc9d1900f19e76ab
+EBUILD lorcon-0.0_p20200214.ebuild 1505 BLAKE2B af81e59b07763843219a60794c1773541f720278bcc15eb14a09c251c60d0ef840a7737a31f8e22286be80796ae1b0a53ee7986c34042214ce618b027d8d3966 SHA512 466a6b127d93bf32ca6009307b021579dc241d5999365734095d60df8f4c6846105c8f3f7da6ef2f7ed8ff066b343750716bcb7253aee2901612bbe1d0554f54
 EBUILD lorcon-9999.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
index 6562ec9862bf..5b0c385c4d6d 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -20,7 +20,7 @@ else
 	GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-	KEYWORDS="~amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/mousejack/Manifest b/net-wireless/mousejack/Manifest
deleted file mode 100644
index 9d0973cb2515..000000000000
--- a/net-wireless/mousejack/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mousejack 858 BLAKE2B 5989e4f8c6645bc2feb8fe2ebbb9d2a2b5beba328016aa3c0c53ff20720b8e62cd08f83dc08dc608eb1b8ff27f3a92ea0a547547074bf9cca56276b0e63caad3 SHA512 31c89a7d85ab36a978439ecaaa03dbae1b1e8511d3aa02b1acb521854d81b4e8c012c202792abbf28f25283ec718ad4abd4d14a16ba4c8ead073c054490e9c84
-DIST mousejack-0.0_p20160726.tar.gz 34252 BLAKE2B 7511d29aa94f2fb5590b34d52eaa64150f3931933f043c9028e2d9cae61342a314a369e80e51e1150294afaadca06e58ec71ba4df4150a7a58d9a82d28919a58 SHA512 01fc87a347aea9ccad7611ef494da0521da278b7664e511409f0f822327b02f6fb555c5b5da86aae998b8fd34b7a55260d03594fbd9bb61c3ceca77e7d54958c
-EBUILD mousejack-0.0_p20160726-r2.ebuild 1290 BLAKE2B 033a8ce1143e0762ffea92f11bca5243e27795baa346c340021c3ca508d27c071ecd845e83731ffe693c63dda158487b5c40aa1ecbcbacc7a806966d3cb5680c SHA512 99be115e435f1fb455e267c1576577c55f90071dba74e25ac91b3f6055a456d1c10d727a75d7e227650ee8456e63596d652bb686e773dea95516f6666ab413c9
-MISC metadata.xml 360 BLAKE2B ca2e678d3f96cece827270a7c5ee404a5e926c0a231979c4cc4442085fde9af1ce8d28f2a07b5bcf7f475eccb3b772d843ef36c03ae405205e710f5a3a240195 SHA512 ed42ea84e9b7f97be6aafb2cea3495e63abab197759a31795ebab8900f29caf500040b0deaf7997c6f598a8a8db3b2a64925d6df05f9b5b851037bd4e25b0b3a
diff --git a/net-wireless/mousejack/files/mousejack b/net-wireless/mousejack/files/mousejack
deleted file mode 100644
index 666ea47d9c9e..000000000000
--- a/net-wireless/mousejack/files/mousejack
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-usage() {
-  printf "The following firmware's are supported:\n"
-  printf "Nordic Semiconductor Bootloader\n"
-  printf "CrazyRadio Firmware\n"
-  printf "RFStorm Research Firmware\n"
-  printf "run \"mousejack install\"\n\n"
-  printf "To flash Logitech Unifying Dongle C-U0007\n"
-  printf "run \"mousejack logitech_install\"\n\n"
-}
-
-if [ -z "${1}" ]; then
-  usage
-  exit 1
-fi
-
-#parse args
-while true; do
-  case $1 in
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    install)
-      /usr/share/mousejack/prog/usb-flash.py /usr/share/mousejack/dongle.bin
-      exit $?
-      ;;
-    logitech_install)
-      /usr/share/mousejack/prog/logitech-usb-flash.py /usr/share/mousejack/dongle.formatted.bin /usr/share/mousejack/dongle.formatted.ihx
-      exit $?
-      ;;
-    --)
-      shift
-      break
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
diff --git a/net-wireless/mousejack/metadata.xml b/net-wireless/mousejack/metadata.xml
deleted file mode 100644
index c5c7cc912abc..000000000000
--- a/net-wireless/mousejack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">BastilleResearch/nrf-research-firmware</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild b/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
deleted file mode 100644
index f5149a462303..000000000000
--- a/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
+++ /dev/null
@@ -1,47 +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="Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards"
-HOMEPAGE="https://www.mousejack.com/"
-COMMIT="02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93"
-SRC_URI="https://github.com/BastilleResearch/nrf-research-firmware/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/nrf-research-firmware-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="dev-embedded/sdcc[device-lib,mcs51,sdbinutils]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pyusb[${PYTHON_MULTI_USEDEP}]
-	')"
-
-src_prepare() {
-	mv tools/lib tools/nrf24 || die
-	for file in tools/nrf24-*; do
-		sed -i 's#from lib#from nrf24#' ${file} || die
-	done
-	default
-}
-src_install() {
-	insinto /usr/share/${PN}
-	doins bin/dongle.{bin,formatted.bin,formatted.ihx}
-
-	python_domodule tools/nrf24
-	python_doscript tools/nrf24-*
-
-	python_scriptinto /usr/share/${PN}/prog
-	python_doscript prog/usb-flasher/usb-flash.py
-	python_doscript prog/usb-flasher/logitech-usb-flash.py
-	python_doscript prog/usb-flasher/unifying.py
-
-	dosbin "${FILESDIR}/mousejack"
-}
diff --git a/net-wireless/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
deleted file mode 100644
index 59130fac5d29..000000000000
--- a/net-wireless/python-wifi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-wifi-0.5.0.tar.bz2 69113 BLAKE2B fe2a6693ca22a963c5149991693ea72e58542ea0c9622573f0f6ad7194d50daa09fe52e8f349224a2131bf2a8fbe0ee9538e17d5413fefe574e60ee9416aa345 SHA512 cbbb337b20f60bb28597dc6e3c90b8d20ddee9512cf000ca0107eb01d2bfde1b3047458d1a3f4dc4b9836ae283cbc24792ffb95c4747027896cd6e50a72151d8
-EBUILD python-wifi-0.5.0-r3.ebuild 842 BLAKE2B 8882fc4fc795597352752180527554165e93c36321479b6c2d12030d1726078243d832387c881a7fc8c4cde7a59400c97ac58ff0836a95bb4239c2c04036bfba SHA512 ae8aaacead6a43a32057814d7d498b70414deb3f4d8ef46b48f160ac9a8f270bde296ef4d0066bdbefd8500858d7191a4a14d2c670737e26235465daac6a463f
-MISC metadata.xml 329 BLAKE2B 9bb66e4d52b4b290c05ef91d15cdef7ae45d46da08311d825b9c33f8fded2106be79edd68e32a44d6399dae763204220dc60c6348f440fd8dd30fc9163c91e4f SHA512 254d847c410e8ab8f3822a03f7689245ca47e5682c73f60ca40a2e2a81ca661421c0db040332dcc6800d942d4904d2e2ca7e234b5eda1b257a358f2236258978
diff --git a/net-wireless/python-wifi/metadata.xml b/net-wireless/python-wifi/metadata.xml
deleted file mode 100644
index b447a239cea6..000000000000
--- a/net-wireless/python-wifi/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">python-wifi.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
deleted file mode 100644
index 16cb7625f40f..000000000000
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r3.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides r/w access to a wireless network card's capabilities"
-HOMEPAGE="https://pypi.org/project/python-wifi/"
-SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-LICENSE="LGPL-2.1 examples? ( GPL-2 )"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/AUTHORS docs/BUGS docs/DEVEL.txt docs/TODO )
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc -r examples
-	rm -rv "${ED}"/usr/{docs,examples,INSTALL,README} || die
-	if use examples; then
-		mv -v "${ED}"/usr{,/share}/man || die
-	else
-		rm -rv "${ED}"/usr/man || die
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 1b645f5550b9..f661f9b3017c 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 8102c07d8c08..5daea90dd3cc 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -407,8 +407,6 @@ sys-apps/smartmontools caps
 
 # Raúl Porcel <armin76@gentoo.org> (2010-06-26)
 # custom-optimization doesn't work on alpha
-mail-client/thunderbird custom-optimization
-www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization
 
 # Kacper Kowalik <xarthisius@gentoo.org> (2010-05-30)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 342d8e5fc66d..281979cb105b 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -42,10 +42,8 @@ app-emulation/lxd apparmor
 net-misc/curl quiche
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-08-18)
-# media-video/pipewire is not stable yet
-dev-libs/weston pipewire
-<kde-apps/krfb-20.07.80 wayland
-<kde-plasma/xdg-desktop-portal-kde-5.19.4 screencast
+# media-video/pipewire-0.2 will never be stable, to be dropped.
+<dev-libs/weston-9 pipewire
 <sys-apps/xdg-desktop-portal-1.7.2 screencast
 x11-wm/mutter screencast
 
@@ -55,7 +53,9 @@ dev-qt/qtsql oci8
 
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
-media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d gflags glog tesseract
+# (except what's needed by digikam, dilfridge)
+media-libs/opencv contribcvv contribhdf contribsfm contribxfeatures2d gflags glog tesseract
+<media-libs/opencv-4.4.0 contrib contribdnn
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index f181a8eea1ae..49a55042c93a 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -25,7 +25,6 @@ dev-util/geany-plugins markdown
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
 <kde-apps/krfb-20.07.80 wayland
-<kde-plasma/xdg-desktop-portal-kde-5.19.4 screencast
 <sys-apps/xdg-desktop-portal-1.7.2 screencast
 x11-wm/mutter screencast
 
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index ae2176ed150c..5942c3bbcb31 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -55,10 +55,8 @@ net-misc/curl quiche
 sys-firmware/seabios debug
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-09-14)
-# media-video/pipewire is not stable yet
-dev-libs/weston pipewire
-<kde-apps/krfb-20.07.80 wayland
-<kde-plasma/xdg-desktop-portal-kde-5.19.4 screencast
+# media-video/pipewire-0.2 will never be stable, to be dropped.
+<dev-libs/weston-9 pipewire
 <sys-apps/xdg-desktop-portal-1.7.2 screencast
 x11-wm/mutter screencast
 
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 6fbce4a6d581..86a2ecc0c554 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -407,7 +407,6 @@ www-client/elinks javascript
 
 # Raúl Porcel <armin76@gentoo.org> (2010-06-26)
 # custom-optimization doesn't work on ia64
-mail-client/thunderbird custom-optimization
 www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization
 
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index eaa31aa330b5..364ba06c12a6 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -35,10 +35,8 @@ app-metrics/collectd collectd_plugins_slurm
 kde-apps/kget bittorrent
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-09-13)
-# media-video/pipewire is not stable yet
-dev-libs/weston pipewire
-<kde-apps/krfb-20.07.80 wayland
-<kde-plasma/xdg-desktop-portal-kde-5.19.4 screencast
+# media-video/pipewire-0.2 will never be stable, to be dropped.
+<dev-libs/weston-9 pipewire
 <sys-apps/xdg-desktop-portal-1.7.2 screencast
 x11-wm/mutter screencast
 
@@ -48,7 +46,9 @@ dev-qt/qtsql oci8
 
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
-media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d gflags glog tesseract
+# (except what's needed by digikam, dilfridge)
+media-libs/opencv contribcvv contribhdf contribsfm contribxfeatures2d gflags glog tesseract
+<media-libs/opencv-4.4.0 contrib contribdnn
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 94de6f1fa71b..7aafae049752 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-08)
+# Broken
+# error: unresolved link to `crate::os::unix::ffi::OsStrExt`
+>=dev-lang/rust-1.47.0 doc
+
 # 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
@@ -19,10 +24,6 @@ net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
 ~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)
 # Highly experimental, may cause breakages when updating. Use with 
 # caution!
@@ -39,9 +40,7 @@ app-office/lyx docbook
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
 media-plugins/mythplugins mythnetvision
-sci-physics/thepeg rivet
 sys-cluster/drbd-utils heartbeat
-sys-cluster/pacemaker heartbeat
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
@@ -50,7 +49,6 @@ app-metrics/collectd collectd_plugins_onewire
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
 # These flags depend on dev-python/pygtk that is masked for removal.
-app-mobilephone/sobexsrv gtk
 <media-gfx/gimp-3 python
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
@@ -152,7 +150,6 @@ net-analyzer/hydra ncp
 # Michał Górny <mgorny@gentoo.org> (2020-03-28)
 # Requires masked dev-vcs/bzr.  Remove the mask if breezy is packaged
 # and the package is confirmed to work with it.
-dev-vcs/cvs2svn bazaar
 <=dev-util/rosinstall-0.7.8 test
 <=dev-util/wstool-0.1.18 test
 <=dev-python/vcstools-0.1.42 test
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 3a3b7af9c7e8..13efd694dc42 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sam James <sam@gentoo.org> (2020-10-09)
+# Depends on dev-libs/boost[python,numpy], not fully working atm
+# bug #733830, bug #746740
+media-gfx/openvdb python numpy
+
 # Joonas Niilola <juippis@gentoo.org> (2020-10-08)
 # Experimental feature not yet stabilized. Use with caution.
 dev-libs/efl avif
@@ -46,10 +51,6 @@ dev-libs/boost numpy
 # for stable systems
 dev-lang/rust miri nightly parallel-compiler system-bootstrap
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-12-18)
-# Neither sys-apps/bolt nor kde-plasma/plasma-thunderbolt are stable
-<kde-plasma/plasma-meta-5.19 thunderbolt
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-09)
 # Declared experimental, and dev-cpp/websocketpp not stable yet
 sci-libs/indilib websocket
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 6611f107da34..e22135e4f5ed 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
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
-# consolekit is masked for removal
-consolekit
-
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
diff --git a/profiles/default/linux/hppa/package.use.mask b/profiles/default/linux/hppa/package.use.mask
index 129881bf303d..60580e813822 100644
--- a/profiles/default/linux/hppa/package.use.mask
+++ b/profiles/default/linux/hppa/package.use.mask
@@ -7,8 +7,4 @@
 # No hardware support for NUMA (bug #381313)
 sys-apps/hwloc numa
 
-# Jeroen Roovers <jer@gentoo.org> (2008-08-15)
-# HPPA still isn't supported with anything but -O0.
-www-client/firefox custom-optimization
-
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index 88e1fc59584b..487326b67d7a 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -20,6 +20,7 @@ ddusbt - Add support for DD usb touch screen
 directgfx - Add support for output via SDL
 displaylink - Add support for displaylink based LCDs
 dpf - Add support for DPF display modulees
+dpfax - Add support for AX206 photo frames
 ea232graphic - Add support for the Electronic Assembly RS232 graphic driver
 ea65 - Add support for the VFD in the AOpen XC Cube-AV EA65 media barebone
 efn - Add support for the English Font display Network based displays
@@ -121,6 +122,7 @@ usbhub - Add support for USBHUB displays
 usblcd - Add support for USBLCD displays
 vlsys_m428 - Add support for MonCaso 320 LCD displays
 vnc - Add support for output on a vnc connection
+vssdcp - Add support for network-based vssdcp protocol LCD displays
 wincornixdorf - Add support for the WincorNixdorf serial cashier displays BA63 and BA66
 x11 - Add support for X11 displaying
 xosd - Add support for xosdlib
diff --git a/profiles/license_groups b/profiles/license_groups
index b35e620317ff..bb2ff8e153fb 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source shrimp SMAIL Snd SSLeay Subversion SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay Subversion SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
diff --git a/profiles/package.mask b/profiles/package.mask
index f055c888571b..aa9fcd38865d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,44 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Savchenko <bircoph@gentoo.org> (2020-10-11)
+# Mask old openafs version and corresponding openafs-kernel with
+# multiple CVEs.
+# All kernel module functionality is merged back in the single
+# net-fs/openafs package using USE="modules" starting from 1.8 branch.
+# No reverse dependencies, bug #719136. Removal in 30 days.
+net-fs/openafs-kernel
+<net-fs/openafs-1.8
+
+# Sam James <sam@gentoo.org> (2020-10-11)
+# Current Wireshark in ~arch is vulnerable.
+# Not updated yet due to maintainer inactivity.
+# This forces a downgrade to the fixed, stable
+# version of Wireshark.
+# bug #744592
+=net-analyzer/wireshark-3.3.0
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-10-11)
+# Mask new version until calendar apps are sorted out:
+# bug #747538.
+>=sys-libs/timezone-data-2020b
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-10-09)
+# pam module separated from
+# the sys-auth/passwdqc package
+# (now merged back).
+# Removal in 30 days
+sys-auth/pam_passwdqc
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-10-09)
+# Mask older erlang releases for removal.
+# Bug #740894.
+<dev-lang/erlang-23
+
+# Azamat H. Hackimov <azamat.hackimov@gmail.com> (2020-10-06)
+# 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782.
+>=dev-lua/luaexpat-1.3.3
+
 # Sam James <sam@gentoo.org> (2020-10-05)
 # Masked for testing. New major versions of Guile
 # often break reverse dependencies.
@@ -458,34 +496,6 @@ net-vpn/peervpn
 dev-db/mariadb:5.5
 dev-db/mariadb:10.1
 
-# Louis Sautier <sbraz@gentoo.org> (2020-09-10)
-# Masked for removal in 30 days, no revdeps.
-# All former consumers now use os.sendfile available in Python >= 3.3.
-dev-python/pysendfile
-
-# Mikle Kolyada <zlogene@gentoo.org> (2020-09-10)
-# Merged into the app-text/texlive-core package.
-# Removal in 30 days
-dev-tex/dvi2tty
-
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# Last release in <2003.  Fails to build (bug #691690).
-# Removal in 30 days.  Bug #731008.
-media-sound/freebirth
-
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# These packages still require Python 3.6.  They are either dead
-# upstream or their maintainers are simply unresponsive.
-# Please do not remove any packages from this list unless you actually
-# port them to Python 3.7 *and* 3.8 (3.9 would also be nice).
-# Removal in 30 days.  Please find relevant bugs on tracker bug #695996.
-app-crypt/acmebot
-app-vim/conque
-dev-python/redlock-py
-dev-python/root_numpy
-dev-python/rootpy
-dev-util/setconf
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # These packages (or package versions) still require Python 2.7.
 # They are either dead upstream, their Python 3 porting efforts are
@@ -493,56 +503,8 @@ dev-util/setconf
 # 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-misc/mswinurl_launcher
-app-misc/mtail
-app-text/silvercity
-dev-libs/qrosspython
-dev-python/SchemaObject
-dev-python/oauth
-dev-ruby/pygments_rb
-dev-util/doxy-coverage
-dev-util/mpatch
-dev-vcs/cvs2svn
 dev-vcs/gitstats
 games-strategy/0ad
-media-sound/codecgraph
-net-misc/pssh
-net-misc/ris-linux
-net-wireless/mousejack
-net-wireless/python-wifi
-sci-biology/amos
-sci-biology/embassy-meme
-sci-biology/meme
-sci-biology/shrimp
-sci-misc/gato
-sci-physics/rivet
-sys-cluster/heartbeat
-x11-misc/dsx
-
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# These packages are stuck on Python 2.7.  While the Python dependency
-# is optional, I can't test removing it because the packages fail
-# to build anyway.
-#
-# net-analyzer/mk-livestatus: py3 bug #735394, build failure bug #705430
-# sci-biology/vienna-rna: py3 bug #735438, build failure bug #707158
-# sys-fs/owfs: py3 bug #735502, build failure bug #707438
-net-analyzer/mk-livestatus
-sci-biology/vienna-rna
-sys-fs/owfs
-
-# Louis Sautier <sbraz@gentoo.org> (2020-09-09)
-# Masked for removal in 30 days, no revdeps.
-# Backport of a module included in Python >= 3.3.
-dev-python/backports-unittest-mock
-
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# Multiple unresolved vulnerabilities.  Last release in 2013 (but has
-# some activity in git).  Not touched by maintainer since 2015.  Stuck
-# on Python 2 (bug #735522) with incorrect eclass usage (bug #710258).
-# Apparently broken with openssl-1.1 (bug #674246).
-# Removal in 30 days.  Bug #715204.
-www-servers/cherokee
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-09-01)
 # Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
@@ -649,19 +611,6 @@ net-libs/nDPI
 ~virtual/perl-Time-Piece-1.340.100
 ~virtual/perl-Unicode-Normalize-1.270.0
 
-# Michał Górny <mgorny@gentoo.org> (2020-07-13)
-# Python 2 dev-python/pillow revdeps with extended removal time.
-# Also the only revdeps of dev-python/matplotlib-python2.
-# Removal in 90 days.  Bug #729672.
-<net-wireless/gnuradio-3.8
-<net-wireless/gr-iio-0.3_p20191219-r1
-<net-wireless/gr-paint-0.0_p20200517
-<net-analyzer/gr-fosphor-0.0_p20200131
-<net-wireless/gr-ieee802154-0.0_p20191006
-<net-wireless/gr-iqbal-0.38.1
-<net-wireless/gr-osmosdr-0.2.0
-dev-python/matplotlib-python2
-
 # Stephan Hartmann <sultan@gentoo.org> (2020-09-06)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
@@ -671,7 +620,7 @@ dev-python/matplotlib-python2
 # Mart Raudsepp <leio@gentoo.org> (2020-06-06)
 # Meson port does not handle multilib yet and has issues
 # regarding runstatedir (not using /run).
-=net-misc/networkmanager-1.22.10-r11
+=net-misc/networkmanager-1.22*
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-27)
 # Vulnerable old version of icedtea-web #711392
@@ -753,42 +702,6 @@ app-office/texmacs
 # Requires >=dev-lang/lua-5.3 which is masked
 sys-apps/likwid
 
-# Matt Turner <mattst88@gentoo.org> (2019-03-16)
-# Previously packaged drivers, now removed from Gentoo.
-# Keep this mask in place so users are aware, but can also easily unmask them
-# in an overlay if so desired.
-x11-drivers/xf86-input-citron
-x11-drivers/xf86-video-apm
-x11-drivers/xf86-video-ark
-x11-drivers/xf86-video-chips
-x11-drivers/xf86-video-cirrus
-x11-drivers/xf86-video-cyrix
-x11-drivers/xf86-video-i128
-x11-drivers/xf86-video-i740
-x11-drivers/xf86-video-impact
-x11-drivers/xf86-video-mach64
-x11-drivers/xf86-video-neomagic
-x11-drivers/xf86-video-newport
-x11-drivers/xf86-video-nsc
-x11-drivers/xf86-video-rendition
-x11-drivers/xf86-video-s3
-x11-drivers/xf86-video-s3virge
-x11-drivers/xf86-video-savage
-x11-drivers/xf86-video-sis
-x11-drivers/xf86-video-sisusb
-x11-drivers/xf86-video-sunbw2
-x11-drivers/xf86-video-suncg14
-x11-drivers/xf86-video-suncg3
-x11-drivers/xf86-video-suncg6
-x11-drivers/xf86-video-sunffb
-x11-drivers/xf86-video-sunleo
-x11-drivers/xf86-video-suntcx
-x11-drivers/xf86-video-tdfx
-x11-drivers/xf86-video-tga
-x11-drivers/xf86-video-trident
-x11-drivers/xf86-video-tseng
-x11-drivers/xf86-video-voodoo
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2019-01-23)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 dev-java/ant-eclipse-ecj:4.10
@@ -856,7 +769,6 @@ sys-devel/automake:1.10
 # If you still use one of these old toolchain packages, please upgrade (and
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
-<sys-devel/gcc-5.4
 <sys-libs/glibc-2.30-r8
 <sys-devel/binutils-2.33.1-r1
 <sys-devel/binutils-hppa64-2.33.1
diff --git a/profiles/targets/developer/make.defaults b/profiles/targets/developer/make.defaults
index 94e10bef0180..51d04d55ffbf 100644
--- a/profiles/targets/developer/make.defaults
+++ b/profiles/targets/developer/make.defaults
@@ -18,4 +18,4 @@ PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"
 # USE="-perl -python snmp truetype xml"
 # perl and python are now disabled by default anyway, truetype and xml are enabled
 # by the also inherited desktop profile
-USE="snmp"
+USE="${USE} snmp"
diff --git a/profiles/updates/4Q-2019 b/profiles/updates/4Q-2019
index 55d4ca511320..8bf87c318998 100644
--- a/profiles/updates/4Q-2019
+++ b/profiles/updates/4Q-2019
@@ -5,3 +5,4 @@ move app-admin/graylog2 app-admin/graylog
 move media-libs/libclthreads dev-libs/libclthreads
 move media-libs/libclxclient x11-libs/libclxclient
 slotmove net-misc/teamviewer 15 0
+move sci-libs/Rtree sci-libs/rtree
diff --git a/profiles/use.desc b/profiles/use.desc
index a0104c8a2f76..ef9f4da57215 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -334,6 +334,7 @@ vala - Enable bindings for dev-lang/vala
 vanilla - Do not add extra patches which change default behaviour; DO NOT USE THIS ON A GLOBAL SCALE as the severity of the meaning changes drastically
 vcd - Video CD support
 vdpau - Enable the Video Decode and Presentation API for Unix acceleration interface
+verify-sig - Verify upstream signatures on distfiles
 vhosts - Add support for installing web-based applications into a virtual-hosting environment
 videos - Install optional video files (used in some games)
 vim-syntax - Pulls in related vim syntax scripts
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f76c8566f976..81732ea96cc4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2514,8 +2514,6 @@ dev-python/kombu:sqs - Enables Amazon SQS transport module for Kombu
 dev-python/kombu:yaml - Enables yaml backend
 dev-python/matplotlib:excel - Pull dev-python/xlwt for the exceltools toolkit
 dev-python/matplotlib:gtk3 - Enable x11-libs/gtk+:3 support
-dev-python/matplotlib-python2:excel - Pull dev-python/xlwt for the exceltools toolkit
-dev-python/matplotlib-python2:gtk3 - Enable x11-libs/gtk+:3 support
 dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
 dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
@@ -2975,7 +2973,6 @@ dev-util/uftrace:capstone - Use capstone to provide dynamic tracing without reco
 dev-util/vulkan-tools:cube - Build the cube/cubepp demos
 dev-vcs/cssc:valgrind - Enable usage of dev-util/valgrind in tests
 dev-vcs/cvs:server - Enable server support
-dev-vcs/cvs2svn:bazaar - Support for dev-vcs/bzr
 dev-vcs/cvsync:gcrypt - Use dev-libs/libgcrypt for hash functions.
 dev-vcs/cvsync:mhash - Use app-crypt/mhash for hash functions.
 dev-vcs/cvsync:openssl - Use dev-libs/openssl for hash functions.
@@ -3587,6 +3584,7 @@ kde-apps/okular:markdown - Enable Markdown support via app-text/discount
 kde-apps/okular:mobi - Enable mobipocket support
 kde-apps/okular:mobile - Enable Plasma mobile support
 kde-apps/okular:plucker - Enable Plucker E-Book for Palm OS devices support
+kde-apps/okular:qml - Install Okular Qml components
 kde-apps/okular:share - Enable support for a share menu using kde-frameworks/purpose
 kde-apps/okular:speech - Enable text-to-speech support
 kde-apps/pimcommon:designer - Build plugins for dev-qt/designer
@@ -3776,12 +3774,8 @@ mail-client/s-nail:kerberos - If network is enabled, this adds support for GSSAP
 mail-client/s-nail:net - Enable support for network protocols (POP, IMAP and SMTP). If you only need to send mail with the local Transport Agent, disabling this will get you support for only /usr/sbin/sendmail call.
 mail-client/s-nail:ssl - If network is enabled, this adds support for S/MIME and SSL/TLS-powered protocols through dev-libs/openssl.
 mail-client/sylpheed:oniguruma - Use dev-libs/oniguruma for regular expression
-mail-client/thunderbird:bindist - Disable official Firefox/Thunderbird branding (icons, name) which are not binary-redistributable according to upstream.
 mail-client/thunderbird:clang - Use Clang compiler instead of GCC
-mail-client/thunderbird:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 mail-client/thunderbird:eme-free - Disable EME (DRM plugin) cabability at build time
-mail-client/thunderbird:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
-mail-client/thunderbird:lightning - Enable app-global calendar support (note 38.0 and above bundles calendar support when this flag is off)
 mail-client/thunderbird:lto - Enable Link Time Optimization (LTO). Requires Gold linker when using GCC or LDD linker when using Clang
 mail-client/thunderbird:openh264 - Use media-libs/openh264 for H.264 support instead of downloading binary blob from Mozilla at runtime
 mail-client/thunderbird:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time.
@@ -3791,9 +3785,7 @@ mail-client/thunderbird:system-icu - Use the system-wide dev-libs/icu instead of
 mail-client/thunderbird:system-jpeg - Use the system-wide media-libs/libjpeg-turbo instead of bundled.
 mail-client/thunderbird:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
 mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
-mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 mail-client/thunderbird:system-webp - Use the system-wide media-libs/libwebp instead of bundled.
-mail-client/thunderbird-bin:crashreporter - Enable crash reporter for bugs
 mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
 mail-client/trojita:pim - Enable support for KDE PIM resources integration via kde-apps/akonadi addressbook plugin
 mail-filter/MailScanner:exim - Set mail-mta/exim to used MTA
@@ -3904,7 +3896,6 @@ mate-extra/caja-extensions:wallpaper - Add an extension to support setting an im
 mate-extra/mate-polkit:accountsservice - Support extraction of data from AccountsService
 mate-extra/mate-power-manager:applet - Enable building of the MATE applet.
 mate-extra/mate-power-manager:libsecret - Support locking of keyring via app-crypt/libsecret
-mate-extra/mate-screensaver:consolekit - Enable support for sys-auth/consolekit
 mate-extra/mate-utils:applet - Enable the mate dictionary applet
 media-fonts/corefonts:tahoma - Also install the Tahoma font. Due to the lack of a free bold variant, this may render badly. See bug 184790.
 media-fonts/culmus:ancient - Install ancient semitic scripts
@@ -4346,6 +4337,7 @@ media-libs/openimageio:color-management - Enable color management via media-libs
 media-libs/openimageio:dicom - Enable DICOM medical image file support via sci-libs/dcmtk
 media-libs/openimageio:field3d - Enable f3d file (write) support via media-libs/Field3D
 media-libs/openimageio:opencv - Enable OpenCV support via media-libs/opencv
+media-libs/openimageio:openvdb - Enable OpenVDB support via media-gfx/openvdb
 media-libs/openimageio:ptex - Enable Ptex texture mapping system file support via media-libs/ptex
 media-libs/opensubdiv:cuda - Enable NVIDIA CUDA Toolkit support through dev-util/nvidia-cuda-toolkit
 media-libs/opensubdiv:opencl - Enable OpenCL support through virtual/opencl
@@ -5261,9 +5253,6 @@ net-analyzer/icinga2:nano-syntax - Adds support for syntax used in the nano edit
 net-analyzer/icinga2:plugins - Adds support for nagios plugins
 net-analyzer/ipsumdump:nanotimestamp - Enable timestamps with nano-second resolution
 net-analyzer/linkchecker:sqlite - Mozilla Bookmark parsing
-net-analyzer/mk-livestatus:boost - Use dev-libs/boost for ASIO support
-net-analyzer/mk-livestatus:nagios4 - Generate a net-analyzer/nagios-4 compatible plugin
-net-analyzer/mk-livestatus:re2 - Use dev-libs/re2 for regex support
 net-analyzer/monitoring-plugins:dns - Install net-dns/bind-tools required for monitoring DNS servers. Disabling the flag does not remove any plugins.
 net-analyzer/monitoring-plugins:fping - Install net-analyzer/fping required for fancy ping monitoring. Disabling the flag does not remove any plugins.
 net-analyzer/monitoring-plugins:game - Install games-util/qstat required for monitoring FPS servers. Disabling the flag does not remove any plugins.
@@ -5835,6 +5824,8 @@ net-im/spectrum2:twitter - Enables the Twitter backend.
 net-im/spectrum2:whatsapp - Enables the WhatsApp backend, based on net-im/transwhat.
 net-im/swift:client - Build the full graphical XMPP client.
 net-im/swift:gconf - Enable configuration through gnome-base/gconf.
+net-im/teams:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of bundled.
+net-im/teams:system-mesa - Use the system-wide media-libs/mesa instead of bundled.
 net-im/telegram-desktop:enchant - Enable the app-text/aspell spell-checking backend
 net-im/telegram-desktop:hunspell - Enable the app-text/hunspell spell-checking backend
 net-im/telepathy-connection-managers:gadu - Enable Gadu Gadu protocol support.
@@ -6505,7 +6496,6 @@ net-misc/mulk:metalink - Enable support for media-libs/libmetalink
 net-misc/netkit-bootparamd:libtirpc - Build against net-libs/libtirpc for RPC support
 net-misc/networkmanager:concheck - Enable connectivity checking support
 net-misc/networkmanager:connection-sharing - Use net-dns/dnsmasq and net-firewall/iptables for connection sharing
-net-misc/networkmanager:consolekit - Use sys-auth/consolekit for session tracking
 net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting ip
 net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting ip
 net-misc/networkmanager:elogind - Use sys-auth/elogind for session tracking
@@ -6633,10 +6623,6 @@ net-misc/sitecopy:rsh - This allows the use of rsh (remote shell) and rcp (remot
 net-misc/sitecopy:webdav - Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.
 net-misc/sks:optimize - Enables bytecode optimization
 net-misc/sntpd:adjtimex - Install adjtimex for the clock adjustment algorithm.
-net-misc/sntpd:debug - Enable analysis code path and debugging of NTP protocol.
-net-misc/sntpd:embedded - Build a very small ntpclient, from OpenWRT project.
-net-misc/sntpd:obsolete - Enable obsolete features, to use with kernel versions older than 3.0
-net-misc/sntpd:syslog - Enable logging to syslog instead of logging to stderr.
 net-misc/spice-gtk:gtk3 - Build the spice client (spicy), requires x11-libs/gtk+:3
 net-misc/spice-gtk:mjpeg - Enable builtin mjpeg video decoder
 net-misc/spice-gtk:policykit - Enable sys-auth/polkit support for the usbredir acl helper
@@ -6978,19 +6964,14 @@ net-wireless/crda:gcrypt - Use libgcrypt instead of openssl for key checking
 net-wireless/dump1090:bladerf - Build with Nuand BladeRF support
 net-wireless/dump1090:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
 net-wireless/gnuradio:analog - enable analog signal processing blocks
-net-wireless/gnuradio:atsc - enable ATSC (HDTV) transmitter and receiver blocks
 net-wireless/gnuradio:audio - enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer
 net-wireless/gnuradio:channels - enable channel mode blocks
 net-wireless/gnuradio:digital - enable digital signal processing blocks
 net-wireless/gnuradio:dtv - enable digital tv signal processing blocks
-net-wireless/gnuradio:fcd - enable Funcube Dongle source block
 net-wireless/gnuradio:fec - enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")
 net-wireless/gnuradio:filter - enable filter signal processing blocks
 net-wireless/gnuradio:grc - enable GNU Radio Companion graphical tool to design signal processing flow graphs
-net-wireless/gnuradio:log - enable logging to console and files
 net-wireless/gnuradio:modtool - enable modtool for editing GNU Radio modules and components
-net-wireless/gnuradio:noaa - enable NOAA POES HRPT receiver blocks
-net-wireless/gnuradio:pager - enable pager signal processing blocks
 net-wireless/gnuradio:performance-counters - enable block performance counters
 net-wireless/gnuradio:trellis - enable trellis blocks for FSM
 net-wireless/gnuradio:uhd - install UHD source and sink blocks
@@ -7004,7 +6985,6 @@ net-wireless/gr-baz:rtlsdr - install rtlsdr source block
 net-wireless/gr-baz:uhd - install UHD aware blocks
 net-wireless/gr-osmosdr:airspy - Build with Airspy support
 net-wireless/gr-osmosdr:bladerf - Build with Nuand BladeRF support
-net-wireless/gr-osmosdr:fcd - Build with Funcube Dongle support
 net-wireless/gr-osmosdr:hackrf - Build with Great Scott Gadgets HackRF support
 net-wireless/gr-osmosdr:iqbalance - Enable support for I/Q balancing using gr-iqbal
 net-wireless/gr-osmosdr:mirisdr - Build with Mirics MSi2500 + MSi001 SDR support
@@ -7026,18 +7006,9 @@ net-wireless/iwd:ofono - Enable support for oFono SIM authentication
 net-wireless/iwd:standalone - Enable standalone mode with built-in DHCP client and DNS handling"
 net-wireless/iwd:systemd - Use systemd-resolve rather than resolvconf for DNS handling in standalone mode
 net-wireless/iwd:wired - Enable ethernet authentication daemon
-net-wireless/kismet:client - Build the ncurses-based user interface
 net-wireless/kismet:libusb - Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble)
 net-wireless/kismet:pcre - Build with pcre support
-net-wireless/kismet:plugin-autowep - Build the autowep plugin
-net-wireless/kismet:plugin-btscan - Build the btscan plugin
-net-wireless/kismet:plugin-dot15d4 - Build the dot15d4 plugin
-net-wireless/kismet:plugin-ptw - Build the ptw plugin
-net-wireless/kismet:plugin-spectools - Build the spectools plugin. This uses net-wireless/spectools
-net-wireless/kismet:plugin-syslog - Build the syslog plugin.
 net-wireless/kismet:rtlsdr - Enable rtlsdr based kismet capture sources
-net-wireless/kismet:ruby - Build extras which are written in ruby, example plugins and the like.
-net-wireless/kismet:speech - Audio support using app-accessibility/flite
 net-wireless/kismet:suid - Install a setuid root helper binary with limited functionality; this allows running kismet as a normal user, significantly reducing security risks
 net-wireless/kismet:ubertooth - Enable capture source for ubertooth to sniff bluetooth low energy
 net-wireless/neard:tools - build and install extra helper utilities
@@ -7121,6 +7092,7 @@ sci-astronomy/sextractor:modelfit - Enable profile model fitting, needs sci-libs
 sci-astronomy/stellarium:deep-sky - Install extra deep sky objects catalog (may affect performance)
 sci-astronomy/stellarium:media - Enable sound and video support
 sci-astronomy/stellarium:stars - Install extra star catalogs
+sci-astronomy/stellarium:telescope - Enable telescope control via sci-libs/indilib
 sci-astronomy/wcslib:fits - Enable support for the FITS format through sci-libs/cfitsio
 sci-astronomy/wcslib:pgplot - Builds PGBSOX routines, needs sci-libs/pgplot library
 sci-astronomy/wcslib:tools - Builds and installs extra command line utilities for WCS checking
@@ -7652,7 +7624,6 @@ sci-physics/thepeg:c++11 - Build ThePEG using the C++11 standard. Experimental f
 sci-physics/thepeg:fastjet - Adds support for sci-physics/fastjet
 sci-physics/thepeg:hepmc - Adds support for High Energy Physics Monte Carlo Generators sci-physics/hepmc
 sci-physics/thepeg:lhapdf - Adds support for sci-physics/lhapdf
-sci-physics/thepeg:rivet - Adds support for sci-physics/rivet
 sci-physics/vgm:c++11 - Build using the C++11 standard
 sci-physics/vgm:c++14 - Build using the C++14 standard
 sci-physics/vgm:c++17 - Build using the C++17 standard
@@ -7871,7 +7842,6 @@ sys-apps/portage:native-extensions - Compiles native "C" extensions (speedups, i
 sys-apps/portage:rsync-verify - Enable full-tree cryptographic verification of Gentoo repository rsync checkouts using app-portage/gemato.
 sys-apps/portage:xattr - Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.
 sys-apps/proot:care - Build dynamic CARE binary (more info - https://proot-me.github.io)
-sys-apps/qingy:consolekit - Enable native consolekit support
 sys-apps/qingy:opensslcrypt - Encrypt communications between qingy and its GUI using dev-libs/openssl
 sys-apps/razercfg:gui - Installs GUI configuration utility and status bar applet. Requires dev-python/PyQt5
 sys-apps/razercfg:pm-utils - Installs the pm-utils hooks for suspend/resume and requires sys-power/pm-utils
@@ -7885,6 +7855,7 @@ sys-apps/s390-tools:ncurses - build hyptop monitoring program
 sys-apps/s390-tools:openssl - build the zkey utility
 sys-apps/s390-tools:pfm - build the cpacfstats tool
 sys-apps/s390-tools:zlib - build the zgetdump and dump2tar utilities
+sys-apps/s6:execline - enable support for dev-lang/execline
 sys-apps/s6-linux-init:sysv-utils - Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown
 sys-apps/shadow:bcrypt - build the bcrypt password encryption algorithm
 sys-apps/shadow:su - build the su program
@@ -7952,7 +7923,6 @@ sys-auth/oath-toolkit:pskc - Build tools & library for the Portable Symmetric Ke
 sys-auth/pam_mktemp:prevent-removal - If supported, set EXT2_APPEND_FL on /tmp/.private to prevent temporary directories from being removed
 sys-auth/pam_mysql:openssl - Use OpenSSL for md5 and sha1 support
 sys-auth/pam_u2f:debug - Enable debug messages using the pam logging macros.
-sys-auth/pambase:cracklib - Enable pam_cracklib module on system authentication stack. This produces warnings when changing password to something easily crackable. It requires the same USE flag to be enabled on sys-libs/pam or system login might be impossible.
 sys-auth/pambase:debug - Enable debug information logging on syslog(3) for all the modules supporting this in the system authentication and system login stacks.
 sys-auth/pambase:elogind - Use pam_elogind module to register user sessions with elogind.
 sys-auth/pambase:minimal - Disables the standard PAM modules that provide extra information to users on login; this includes pam_lastlog, pam_motd, pam_mail and other similar modules. This might not be a good idea on a multi-user system but could reduce slightly the overhead on single-user non-networked systems.
@@ -7966,7 +7936,6 @@ sys-auth/pambase:pwquality - Enable pam_pwquality module on system auth stack fo
 sys-auth/pambase:securetty - Enable pam_securetty module in the login stack. Not generally relevant anymore as the login stack only refers to local logins and local terminals imply secure access in the first place.
 sys-auth/pambase:sha512 - Switch Linux-PAM's pam_unix module to use sha512 for passwords hashes rather than MD5. This option requires sys-libs/pam version 1.0.1 built against sys-libs/glibc version 2.7, if it's built against an earlier version, it will silently be ignored, and MD5 hashes will be used. All the passwords changed after this USE flag is enabled will be saved to the shadow file hashed using SHA512 function. The password previously saved will be left untouched. Please note that while SHA512-hashed passwords will still be recognised if the USE flag is removed, the shadow file will not be compatible with systems using an earlier glibc version.
 sys-auth/pambase:systemd - Use pam_systemd module to register user sessions in the systemd control group hierarchy.
-sys-auth/passwdqc:utils - Install pwqcheck and pwqgen helper utilities
 sys-auth/polkit:elogind - Use sys-auth/elogind for session tracking
 sys-auth/polkit:systemd - Use sys-apps/systemd for session tracking
 sys-auth/ssh-ldap-pubkey:schema - Install a copy of the LPK schema, only needed on LDAP servers.
@@ -8164,7 +8133,6 @@ sys-cluster/openstack-meta:neutron - Installs Openstack Neutron
 sys-cluster/openstack-meta:nova - Installs Openstack Nova
 sys-cluster/openstack-meta:placement - Installs Openstack Placement
 sys-cluster/openstack-meta:swift - Installs Openstack Swift
-sys-cluster/pacemaker:heartbeat - Enable sys-cluster/heartbeat support.
 sys-cluster/pacemaker:smtp - Enable SMTP support via net-libs/libesmtp
 sys-cluster/pmix:munge - Enable authentication via munge
 sys-cluster/pmix:pmi - Build PMI1 and PMI2 interface
@@ -8238,8 +8206,6 @@ sys-devel/gcc:jit - Enable libgccjit so other applications can embed gcc for Jus
 sys-devel/gcc:libssp - Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)
 sys-devel/gcc:lto - Build using Link Time Optimizations (LTO)
 sys-devel/gcc:mpx - Enable support for Intel Memory Protection Extensions (MPX)
-sys-devel/gcc:nopie - Disable PIE support (NOT FOR GENERAL USE)
-sys-devel/gcc:nossp - Disable SSP support (NOT FOR GENERAL USE)
 sys-devel/gcc:nptl - Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)
 sys-devel/gcc:objc - Build support for the Objective C code language
 sys-devel/gcc:objc++ - Build support for the Objective C++ language
@@ -8371,12 +8337,6 @@ sys-fs/multipath-tools:rbd - Enable Rados block device support via sys-cluster/c
 sys-fs/ntfs3g:external-fuse - Use external FUSE library instead of internal one. Must be disabled for unprivileged mounting to work.
 sys-fs/ntfs3g:ntfsdecrypt - Build and install the ntfsdecrypt application.
 sys-fs/ntfs3g:ntfsprogs - Include internal version of ntfsprogs.
-sys-fs/owfs:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
-sys-fs/owfs:ftpd - Enable building the OWFS FTP server (owftpd)
-sys-fs/owfs:fuse - Enable building the FUSE-based OWFS client (owfs)
-sys-fs/owfs:httpd - Enable building the OWFS web server (owhttpd)
-sys-fs/owfs:parport - Enable support for the DS1410E parallel port adapter
-sys-fs/owfs:zeroconf - Enables support for zero-configuration networking via net-dns/avahi
 sys-fs/quota:netlink - Compile daemon receiving quota messages via netlink
 sys-fs/quota:rpc - Enable quota interaction via RPC
 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
@@ -8486,7 +8446,6 @@ sys-libs/ncurses:trace - Enable test trace() support in ncurses calls
 sys-libs/ncurses-compat:tinfo - Build curses library (libncurses) sep from the low-level terminfo library (libtinfo) -- usually needed only for binary packages -- but it is binary compatible in either mode
 sys-libs/newlib:nano - Build additional newlib-nano library
 sys-libs/pam:berkdb - Build the pam_userdb module, that allows to authenticate users against a Berkeley DB file. Please note that enabling this USE flag will create a PAM module that links to the Berkeley DB (as provided by sys-libs/db) installed in /usr/lib and will thus not work for boot-critical services authentication.
-sys-libs/pam:cracklib - Build the pam_cracklib module, that allows to verify the chosen passwords' strength through the use of sys-libs/cracklib. Please note that simply enabling the USE flag on this package will not make use of pam_cracklib by default, you should also enable it in sys-auth/pambase as well as update your configuration files.
 sys-libs/readline:utils - Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline
 sys-libs/talloc:compat - Enable extra compatibility stuff
 sys-libs/timezone-data:leaps-timezone - Install the set of "right" timezones; these timezones include leap seconds when counting seconds since the epoch (while POSIX does not) as they are based on the TAI (International Atomic Time) clock
@@ -8665,9 +8624,7 @@ www-client/elinks:gopher - Enable support for the gopher protocol
 www-client/elinks:mouse - Make elinks to grab all mouse events
 www-client/elinks:tre - Enable support for regex searches via dev-libs/tre
 www-client/elinks:xml - Enable support for bookmarks via dev-libs/expat
-www-client/firefox:bindist - Disable official Firefox branding (icons, name) which are not binary-redistributable according to upstream.
 www-client/firefox:clang - Use Clang compiler instead of GCC
-www-client/firefox:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 www-client/firefox:eme-free - Disable EME (DRM plugin) cabability at build time
 www-client/firefox:geckodriver - Enable WebDriver support
 www-client/firefox:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
@@ -8676,14 +8633,12 @@ www-client/firefox:lto - Enable Link Time Optimization (LTO). Requires Gold link
 www-client/firefox:openh264 - Use media-libs/openh264 for H.264 support instead of downloading binary blob from Mozilla at runtime
 www-client/firefox:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time.
 www-client/firefox:screencast - Enable support for remote desktop and screen cast using media-video/pipewire
-www-client/firefox:screenshot - Allow to disable screenshot extension in global profile
 www-client/firefox:system-av1 - Use the system-wide media-libs/dav1d and media-libs/libaom library instead of bundled.
 www-client/firefox:system-harfbuzz - Use the system-wide media-libs/harfbuzz and media-gfx/graphite2 instead of bundled.
 www-client/firefox:system-icu - Use the system-wide dev-libs/icu instead of bundled.
 www-client/firefox:system-jpeg - Use the system-wide media-libs/libjpeg-turbo instead of bundled.
 www-client/firefox:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
 www-client/firefox:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
-www-client/firefox:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 www-client/firefox:system-webp - Use the system-wide media-libs/libwebp instead of bundled.
 www-client/firefox-bin:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
 www-client/jd:migemo - Enable migemo support for Japanese
@@ -8739,8 +8694,6 @@ www-servers/apache:static - Link in apache2 modules statically rather then plugi
 www-servers/apache:suexec - Install suexec with apache
 www-servers/apache:suexec-caps - Install suexec with capabilities instead of SUID
 www-servers/apache:suexec-syslog - Log suexec to syslog instead of to a separate file
-www-servers/cherokee:admin - Install web based cherokee conf tool
-www-servers/cherokee:rrdtool - Enable rrdtool support
 www-servers/civetweb:server - Build standalone server
 www-servers/fnord:auth - Enable HTTP authentication support
 www-servers/gatling:diet - Compile against dev-libs/dietlibc
@@ -8917,7 +8870,6 @@ x11-misc/rofi:windowmode - Enable normal window mode
 x11-misc/rss-glx:quesoglc - Enable support for OpenGL Character Renderer
 x11-misc/sddm:elogind - Use sys-auth/elogind for session tracking.
 x11-misc/sent:savedconfig - Without a saved config.h, this package depends on media-gfx/farbfeld for image conversions
-x11-misc/slim:consolekit - Enable native consolekit support
 x11-misc/spacefm:gtk2 - Support GTK+ 2.x instead of GTK+ 3.x
 x11-misc/spacefm:gtk3 - Support GTK+ 3.x instead of GTK+ 2.x
 x11-misc/spacefm:video-thumbnails - Support video thumbnails with media-video/ffmpegthumbnailer
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 01829b4ff701..b2b1a9d1444d 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 71922a3d8e04..520133c6506b 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,12 +1,17 @@
 AUX stellarium-0.20.2-disable-x86-test.patch 834 BLAKE2B 3b66784a9535be602aabf0b88bf83182bf7e63e67cf746bb0270cb04759b42ad92ed2427bbe024aa09716fbb03ad5621afe4e708f2f3d1e783057f1fadf23691 SHA512 a6e826d81882534b5826ed5847d90cc036ce5b388efa63adc9ba08a61daa91af86066c514b60edeb20cf4d4b2c60cd9c74f641fc02f0954506ba4063ff95e645
+AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294
+AUX stellarium-0.20.3-unbundle-qtcompress.patch 8123 BLAKE2B 314a2f4c191b7d6c0083679878c38bf6f632a1be6d19d68d82a0eda520c9a96e3f4f87d7437b6cf53c0812fc917ec82865796a8088da7afc2d6424d442a20a94 SHA512 fd6121345a5609b8a70a06753b6495b258eae7a1f978d8eeac8e7aa6b73777d9a982bc016d891bbcad48ead1b5c624bb0b07dbac8b40bd1a16baaf347b72b97d
+AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
-DIST stellarium-0.20.1.tar.gz 343991703 BLAKE2B 59580dd2bca885893bfc68faaf966a727e3d7c0774f59726e23cec132cbfca4ae518983db2e52d4d3d3f1ec96c7ce876168bb23959178ebf212ee6bb357299b3 SHA512 685a306391dc681cc21834a226e35c769e11909f625ff7461d7e896ba412ad595871e93c69981b342099f46829f9f3ef3e276be867dc5ea5523fa60a99cc21d1
 DIST stellarium-0.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c
+DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d
 DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
-EBUILD stellarium-0.20.1.ebuild 2233 BLAKE2B 9e5228c4a7ef23f2382ba71d02bac61fbbe995f07f49a26d4621ed0cfad22271289a05811c4662cb1a35e38aa047e9186143396e1c472652031aa4b4720b8564 SHA512 911ad306134ec38383580d9e677faae00cfca79824f98d3db046cee9bd84339d5fed0cebf969e7efd6d00e0c18fd6803db96f233f76621760ac5f01ab2404ba5
+DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3
+DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
 EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763
-MISC metadata.xml 1101 BLAKE2B acb5d8968e42487806e9df0d300c8070f8df139855a0caf0324504cd5e49c9ee5e4446b6e029a88ad3e38320179adac30d414aa96a569e327bf6cb391ed10e6c SHA512 14e3d4b82b5f7c5f4c28078df0b4295fd305813c045c1f6c7262fe30181911fca5fae728d822048ba154fd7ed8f92b9c1965a8d10e75d51da825ff4e2db3cbb9
+EBUILD stellarium-0.20.3.ebuild 3935 BLAKE2B a28b01ddbaf2a227f101d1a82c7d822d0e5b8134dfb2812704de5aadcb49dbea1876333519db4b6874b8521dd4ab4da7ef00fd71a3efb0c896cfe2c95f1ebde6 SHA512 def10d85c26c2f517db20e74595fc0ebb3a4e5cbcbee5e1074d2ffbe6ee07525983cbbf6ac450ad69319ba326123c9acde1fed7eaba3080fd5ec4d579170c2a1
+MISC metadata.xml 1166 BLAKE2B ae9afc6a617426c07b8746859f4e1ed0e7ab61256cb82f754f8fb0f7d9e24709b2f9edf9a4f4fef1f8d0d6b46eaee2ef8af3641b81abacd8391cf41fa0624e79 SHA512 dc95989f85aaaf8c08a86b0dbaa2a57d69226dfae7e4317f8c7cc5a3dd8d4a0303a9e3111d29b6a18242f3a96e17d4e4f01fd85c7e4d7a0587495d775d537781
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
new file mode 100644
index 000000000000..33d355f842f4
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
@@ -0,0 +1,82 @@
+diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+index a250e1bb0f..f14007c392 100644
+--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+@@ -25,7 +25,7 @@ add_library(TelescopeControl_INDI STATIC
+ target_link_libraries(TelescopeControl_INDI
+     Qt5::Core
+     Qt5::Network
+-    indiclient
++    -lindiclient
+     TelescopeControl_common
+     ${CMAKE_THREAD_LIBS_INIT}
+     )
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+index f401dc7049..d890d3aa14 100644
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+@@ -25,9 +25,9 @@
+ #include <limits>
+ #include <cmath>
+ 
+-#include "indibase/baseclient.h"
+-#include "indibase/basedevice.h"
+-#include "indibase/inditelescope.h"
++#include "libindi/baseclient.h"
++#include "libindi/basedevice.h"
++#include "libindi/inditelescope.h"
+ 
+ const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1;
+ 
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+index 111ad2cdba..80ead01137 100644
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+@@ -20,7 +20,7 @@
+ #define INDICONNECTION_HPP
+ 
+ #include <QObject>
+-#include "indibase/baseclient.h"
++#include "libindi/baseclient.h"
+ 
+ #include <mutex>
+ #include <QStringList>
+diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+index 6bd7754ff5..633d4ae7b2 100644
+--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
++++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+@@ -24,7 +24,7 @@
+ 
+ #include "StelCore.hpp"
+ #include "StelUtils.hpp"
+-#include "indibase/inditelescope.h"
++#include "libindi/inditelescope.h"
+ #include "INDIControlWidget.hpp"
+ 
+ TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString &params):
+diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+index 6c1a281ec5..ca7b7e0c40 100644
+--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+@@ -22,7 +22,7 @@
+ #include <cmath>
+ 
+ #include "INDIConnection.hpp"
+-#include "indibase/basedevice.h"
++#include "libindi/basedevice.h"
+ 
+ void TestINDIConnection::deafultCoordinates()
+ {
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 6fcf7678da..a59d8c121c 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
+ 
+ ################################# INDI ################################
+-IF(USE_PLUGIN_TELESCOPECONTROL)
++IF(USE_PLUGIN_TELESCOPECONTROL AND 0)
+     set(INDI_SOVERSION "1")
+     set(CMAKE_INDI_VERSION_MAJOR 1)
+     set(CMAKE_INDI_VERSION_MINOR 6)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
new file mode 100644
index 000000000000..64b19a54c88a
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
@@ -0,0 +1,222 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b72c2c8f6..9436bc66da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -629,5 +629,6 @@ ELSE()
+ ENDIF()
+ 
++find_package(Qt5Compress REQUIRED)
+ 
+ ########### Set some global variables ###########
+ IF(UNIX AND NOT WIN32)
+diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
+index 8e3138adf2..b59049767d 100644
+--- a/plugins/Satellites/src/CMakeLists.txt
++++ b/plugins/Satellites/src/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
+ ENDIF(ENABLE_TESTING)
+ 
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
+ IF(MSVC)
+diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
+index 7432f4316d..f4f4453661 100644
+--- a/plugins/Satellites/src/Satellites.cpp
++++ b/plugins/Satellites/src/Satellites.cpp
+@@ -43,7 +43,7 @@
+ #include "StelUtils.hpp"
+ #include "StelActionMgr.hpp"
+ 
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ 
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+ 					QString archive = zip.fileName();
+ 					QByteArray data;
+ 
+-					Stel::QZipReader reader(archive);
+-					if (reader.status() != Stel::QZipReader::NoError)
++					QZipReader reader(archive);
++					if (reader.status() != QZipReader::NoError)
+ 						qWarning() << "[Satellites] Unable to open as a ZIP archive";
+ 					else
+ 					{
+-						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ 						for (const auto& info : infoList)
+ 						{
+ 							// qWarning() << "[Satellites] Processing:" << info.filePath;
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bdd214729f..81631ce8ec 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+      CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+ ENDIF()
+ 
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+ IF(ENABLE_LIBGPS)
+      SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
+ ENDIF()
+diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
+index 8da2070b26..9949252cee 100644
+--- a/src/core/modules/LandscapeMgr.cpp
++++ b/src/core/modules/LandscapeMgr.cpp
+@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ 	}
+ 	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+ 
+-	Stel::QZipReader reader(sourceFilePath);
+-	if (reader.status() != Stel::QZipReader::NoError)
++	QZipReader reader(sourceFilePath);
++	if (reader.status() != QZipReader::NoError)
+ 	{
+ 		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
+ 		emit errorNotArchive();
+@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ 
+ 	//Detect top directory
+ 	QString topDir, iniPath;
+-	QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++	QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ 	for (const auto& info : infoList)
+ 	{
+ 		QFileInfo fileInfo(info.filePath);
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 1e0e7e2b32..834aff89cb 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+ 
++if(0)
+ set(qtcompress_SRCS
+     qtcompress/qzip.cpp
+     qtcompress/qzipreader.h
+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
+ #turn off automoc, not needed here
+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
++endif()
+ 
+ set(qcustomplot_SRCS
+     qcustomplot/qcustomplot.cpp
+@@ -176,7 +176,7 @@
+     qxlsx/xlsxcelllocation.h
+     )
+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
+ 
+ ################################# INDI ################################
+diff -r 11536448457a xlsxzipreader.cpp
+--- a/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:41:22 2020 +0100
++++ b/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:42:03 2020 +0100
+@@ -28,13 +28,13 @@
+ namespace QXlsx {
+ 
+ ZipReader::ZipReader(const QString &filePath) :
+-    m_reader(new Stel::QZipReader(filePath))
++    m_reader(new QZipReader(filePath))
+ {
+     init();
+ }
+ 
+ ZipReader::ZipReader(QIODevice *device) :
+-    m_reader(new Stel::QZipReader(device))
++    m_reader(new QZipReader(device))
+ {
+     init();
+ }
+@@ -45,8 +45,8 @@
+ 
+ void ZipReader::init()
+ {
+-	QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+-	foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
++	QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++	foreach (const QZipReader::FileInfo &fi, allFiles)
+ 	{
+ 		if (fi.isFile)
+ 			m_filePaths.append(fi.filePath);
+diff -r 2019bb0d2919 xlsxzipreader_p.h
+--- a/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:35:35 2020 +0100
++++ b/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:36:28 2020 +0100
+@@ -38,7 +38,7 @@
+ //
+ 
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ #include <QScopedPointer>
+ #include <QStringList>
+ #include <QVector>
+@@ -60,7 +60,7 @@
+ private:
+     Q_DISABLE_COPY(ZipReader)
+     void init();
+-    QScopedPointer<Stel::QZipReader> m_reader;
++    QScopedPointer<QZipReader> m_reader;
+     QStringList m_filePaths;
+ };
+ 
+diff -r 11536448457a xlsxzipwriter.cpp
+--- a/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:41:22 2020 +0100
++++ b/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:42:03 2020 +0100
+@@ -29,14 +29,14 @@
+ 
+ ZipWriter::ZipWriter(const QString &filePath)
+ {
+-    m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
+-    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++    m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
++    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+ 
+ ZipWriter::ZipWriter(QIODevice *device)
+ {
+-    m_writer = new Stel::QZipWriter(device);
+-    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++    m_writer = new QZipWriter(device);
++    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+ 
+ ZipWriter::~ZipWriter()
+@@ -46,7 +46,7 @@
+ 
+ bool ZipWriter::error() const
+ {
+-    return m_writer->status() != Stel::QZipWriter::NoError;
++    return m_writer->status() != QZipWriter::NoError;
+ }
+ 
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device)
+diff -r 2019bb0d2919 xlsxzipwriter_p.h
+--- a/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:35:35 2020 +0100
++++ b/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:36:28 2020 +0100
+@@ -37,7 +37,7 @@
+ //
+ 
+ #include <QString>
+-#include "external/qtcompress/qzipwriter.h"
++#include "qzipwriter.h"
+ 
+ class QIODevice;
+ class QZipWriter;
+@@ -57,7 +57,7 @@
+     void close();
+ 
+ private:
+-    Stel::QZipWriter *m_writer;
++    QZipWriter *m_writer;
+ };
+ 
+ } // namespace QXlsx
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
new file mode 100644
index 000000000000..6fb7fb4f7859
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
@@ -0,0 +1,23 @@
+This patch is not really needed, because zlib is already used from system, but
+it makes it easier to ensure that nothing else is bundled
+
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 834aff89cb..590579e501 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui)
+ set_target_properties(glues_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external")
+ 
++if(0)
+ SET(zlib_SRCS
+      zlib/adler32.c
+      zlib/compress.c
+@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ #turn off automoc, not needed here
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
++endif()
+ 
+ if(0)
+ set(qtcompress_SRCS
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 53378dcf2286..5edf86197e9f 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>alexey+gentoo@asokolov.org</email>
-    <name>Alexey Sokolov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Stellarium is a free open source planetarium for your computer. It
-  shows a realistic sky in 3D, just like what you see with the naked
-  eye, binoculars or a telescope. It is being used in planetarium
-  projectors.
-</longdescription>
-  <use>
-    <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
-    <flag name="media">Enable sound and video support</flag>
-    <flag name="stars">Install extra star catalogs</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">stellarium</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Stellarium is a free open source planetarium for your computer. It
+		shows a realistic sky in 3D, just like what you see with the naked
+		eye, binoculars or a telescope. It is being used in planetarium
+		projectors.
+	</longdescription>
+	<use>
+		<flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
+		<flag name="media">Enable sound and video support</flag>
+		<flag name="stars">Install extra star catalogs</flag>
+		<flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Stellarium/stellarium</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/stellarium/stellarium-0.20.1.ebuild b/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
deleted file mode 100644
index 616eeba408b1..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.20.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
-
-inherit cmake desktop flag-o-matic xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://www.stellarium.org/"
-SRC_URI="
-	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.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
-	)"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gps media nls stars test"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? ( dev-qt/qtpositioning:5 )
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_MEDIA="$(usex media)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_4_1v0_2.cat
-		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
new file mode 100644
index 000000000000..00d5ddb9e3b2
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
@@ -0,0 +1,135 @@
+# 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 desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.11"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+	deep-sky? (
+		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+	)
+	doc? (
+		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+	)
+	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
+	)"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug deep-sky doc gps media nls stars telescope test"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen[dot] )
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-libs/qtcompress:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtserialport:5
+	dev-qt/qtwidgets:5
+	media-fonts/dejavu
+	sys-libs/zlib
+	virtual/opengl
+	gps? ( dev-qt/qtpositioning:5 )
+	media? ( dev-qt/qtmultimedia:5[widgets] )
+	telescope? ( sci-libs/indilib:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-indi.patch"
+	"${FILESDIR}/${P}-unbundle-qtcompress.patch"
+	"${FILESDIR}/${P}-unbundle-zlib.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+	# Several libraries are bundled, remove them.
+	rm -r src/external/{libindi,qtcompress,zlib}/ || die
+
+	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
+	# while we have qcustomplot 2 in tree which changed API a bit
+	# Also the license of the external qcustomplot is incompatible with stellarium
+
+	# for glues_stel aka libtess I couldn't find an upstream with the same API
+
+	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
+
+	local remaining="$(cd src/external/ && echo */)"
+	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
+		eqawarn "Need to unbundle more deps: ${remaining}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_TESTING="$(usex test)"
+		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build apidoc
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+	fi
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	if use deep-sky ; then
+		insinto /usr/share/${PN}/nebulae/default
+		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 4c7f9b88e8d6..7a9ad19bf3c3 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/amos/Manifest b/sci-biology/amos/Manifest
deleted file mode 100644
index 0749a737c777..000000000000
--- a/sci-biology/amos/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX amos-3.1.0-fix-build-system.patch 3132 BLAKE2B a7758991b5916cec6e9a2a39ee55beef73d14c19b7154ab2ced8e41eca411d1b6cacda5b7388e3ee48f330e489e4012660b3c08383c423a8553d283cd1cc4764 SHA512 b23c168c166f8a1dad89d1b25536a59be3e68a6478cef3db5664dc901cef0547213a8622a72ee1a2e1d5b8930c65d95e309573f903423e8fb80fb7312d89f863
-AUX amos-3.1.0-gcc-4.7.patch 400 BLAKE2B af160452d1bf52df204156dc9039645483c0ee349b96c2562eba4608695ac76b308c9cc2bc82a55401b3d56c33c4d2bae9e07a0a62ed4a3b15becb8f95ecda7f SHA512 3777885d5cd5edcb881abfbe1580092e073311797bd4776cd3ec9d27b634339718238be7f452f1ea1a0aea5fb9f6059d6b6f6a47bc2a0fb6d1811a2ec51a0835
-AUX amos-3.1.0-goBambus2.py-indent-and-cleanup.patch 1057 BLAKE2B fde1011da762750140f8880968c952b275d625f92b43ee8c35aaa23b687cc8d6cda441aa7b7cc883a67efe2a0d4a9cc13ee9f6b3663fef9f8274693350fe8e87 SHA512 5d2a0d4b222a23f30db560937b1c0e447f61dc786e097b259696fa41dca1e57a17a1e684bbd9fa9ddcee1334f7e6e3a91ccb7567d4fe079c3bdb3bb54034d11f
-AUX amos-3.1.0-qa-Wformat.patch 4511 BLAKE2B 64064175db625a098a528f0c8036196968c58dae445edd3c98fc5627e3a84d593abc438958573ef7a28193d0d2fc76db30fe16a180a383dec9bae5084305505d SHA512 de0382f9128b46fef8e87d14de75bbc9f0af3e8bcbb915edab26a883186109ab29ddbb31c5cf70fc8d37700abe36fb73a7bdca46c29672052d01ebebffd52abe
-DIST amos-3.1.0-fix-c++14.patch.bz2 8033 BLAKE2B 942248f64906253205392df71010bf41105d2985fc8112e7443975d776cc484a4e2b6cf34284d4c384145bf32601892c06f156a0b0ccf0f2ce721de242e02e9b SHA512 76e26ca48a009cbf637d9462878223633e9b21cbd12d58a19e9a561f2cf4805791becc0b5f7aaf81975ca1e02b263cdd9d5ff310c4594670922ea65885ad9634
-DIST amos-3.1.0.tar.gz 2094268 BLAKE2B b9fb80d4e7b7e9e7769081c2680a3cba26591f00a4d9fdb17ad602e581dea5e8e2add4b0d9d3821a7f8a4ec1a45dfd867037baf35ecd401584f030c86b2b0f83 SHA512 7a416b9a0438b47425355383b709491a58f38c8d834df29e43c942170e710c6ea7e3bc8c509a58421b1340ad6eece9ea2da357ce5cd1d41ce08375676ee30491
-EBUILD amos-3.1.0-r4.ebuild 1110 BLAKE2B 4730d6a04ba727fd72ea825c6c57d65079ae9ddb29411f0a26aa94653309364ddec742104783044549adc2a60f06a7452f76e392145aa02db472042dde05e1d5 SHA512 7cb40d45dabc4e6cc188d3edf8347f34578d1f955b2d522273f3b551be6974023145e35a443f0e4495d70746aa40b6c451cedf999c102f1f8f7ffbab09748d61
-MISC metadata.xml 345 BLAKE2B 750928cf3e96c24e2af8e84d5889100c1954eb140596368dc00d479f63898c82e3bb0e07a9e970c6c12eb36ed3ae84c6bcc7913cf3ed56e2d71120185d24a4f0 SHA512 a31ba5660e524b70517f2644bb929d4bc0428d1ea682752ca2ddefd3b5a8a5c8aabf7a9877fa61e8fe12599da65e9f0a6c1e7db90d61729e26c33b76303ff497
diff --git a/sci-biology/amos/amos-3.1.0-r4.ebuild b/sci-biology/amos/amos-3.1.0-r4.ebuild
deleted file mode 100644
index 0dbcaffd81da..000000000000
--- a/sci-biology/amos/amos-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A Modular, Open-Source whole genome assembler"
-HOMEPAGE="http://amos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-3.1.0-fix-c++14.patch.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	dev-perl/DBI
-	dev-perl/Statistics-Descriptive
-	sci-biology/mummer"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-	"${FILESDIR}"/${P}-goBambus2.py-indent-and-cleanup.patch
-	"${WORKDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-qa-Wformat.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# prevent GCC 6 log pollution due
-	# to hash_map deprecation in C++11
-	append-cxxflags -Wno-cpp
-}
-
-src_configure() {
-	econf --with-qmake-qt4=no
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/goBambus2
-}
diff --git a/sci-biology/amos/files/amos-3.1.0-fix-build-system.patch b/sci-biology/amos/files/amos-3.1.0-fix-build-system.patch
deleted file mode 100644
index 9c824dd2f122..000000000000
--- a/sci-biology/amos/files/amos-3.1.0-fix-build-system.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-* Use proper AR and not just 'ar'
-* Fix build system to build in parallel
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,6 +34,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_RANLIB
-+AM_PROG_AR
- AC_PROG_CPP
- AC_PATH_PROG(PERL, [perl], [:])
- AC_PATH_PROG(PYTHON, [python], [:])
---- a/src/Align/Makefile.am
-+++ b/src/Align/Makefile.am
-@@ -133,7 +133,7 @@
- 
- ##-- hash-overlap
- hash_overlap_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
-@@ -172,7 +172,7 @@
- 
- ##-- make-consensus
- make_consensus_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
-@@ -182,7 +182,7 @@
- 
- ##-- make-consensus_poly
- make_consensus_poly_LDADD = \
--	$(top_builddir)/src/Align/libAlign_poly.a \
-+	libAlign_poly.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
-@@ -192,7 +192,7 @@
- 
- ##-- maligntest
- maligntest_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
-@@ -202,7 +202,7 @@
- 
- ##-- merge-contigs
- merge_contigs_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
-@@ -235,7 +235,7 @@
- 
- ##-- show-ma-asm
- show_ma_asm_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/Common/libCommon.a \
- 	$(top_builddir)/src/AMOS/libAMOS.a
- show_ma_asm_SOURCES = \
-@@ -261,7 +261,7 @@
- 
- ##-- simple-overlap
- simple_overlap_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
-@@ -272,7 +272,7 @@
- 
- ##-- test-align
- test_align_LDADD = \
--	$(top_builddir)/src/Align/libAlign.a \
-+	libAlign.a \
- 	$(top_builddir)/src/CelMsg/libCelMsg.a \
- 	$(top_builddir)/src/Slice/libSlice.a \
- 	$(top_builddir)/src/Common/libCommon.a \
---- a/src/Bambus/Bundler/Makefile.am
-+++ b/src/Bambus/Bundler/Makefile.am
-@@ -47,7 +47,7 @@
- 	clk.cc
- 
- MarkRepeats_LDADD = \
--	$(top_builddir)/src/Bambus/Bundler/libBundler.a \
-+	libBundler.a \
- 	$(top_builddir)/src/Common/libCommon.a \
- 	$(top_builddir)/src/AMOS/libAMOS.a \
- 	$(top_builddir)/src/GNU/libGNU.a
-@@ -55,7 +55,7 @@
- 	MarkRepeats.cc
- 
- OrientContigs_LDADD = \
--	$(top_builddir)/src/Bambus/Bundler/libBundler.a \
-+	libBundler.a \
- 	$(top_builddir)/src/Common/libCommon.a \
- 	$(top_builddir)/src/AMOS/libAMOS.a \
- 	$(top_builddir)/src/GNU/libGNU.a
-@@ -63,7 +63,7 @@
- 	OrientContigs.cc
- 
- FilterEdgesByCluster_LDADD = \
--	$(top_builddir)/src/Bambus/Bundler/libBundler.a \
-+	libBundler.a \
- 	$(top_builddir)/src/Common/libCommon.a \
- 	$(top_builddir)/src/AMOS/libAMOS.a \
- 	$(top_builddir)/src/GNU/libGNU.a
diff --git a/sci-biology/amos/files/amos-3.1.0-gcc-4.7.patch b/sci-biology/amos/files/amos-3.1.0-gcc-4.7.patch
deleted file mode 100644
index de2a41184c52..000000000000
--- a/sci-biology/amos/files/amos-3.1.0-gcc-4.7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- src/Align/find-tandem.cc |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/Align/find-tandem.cc b/src/Align/find-tandem.cc
-index ddf1cab..a29e21e 100644
---- a/src/Align/find-tandem.cc
-+++ b/src/Align/find-tandem.cc
-@@ -7,6 +7,7 @@
- #include <vector>
- #include <ctime>
- #include <sys/time.h>
-+#include <unistd.h>
- using namespace std;
- 
- const int OFFSET_TABLE_SIZE = 100;
diff --git a/sci-biology/amos/files/amos-3.1.0-goBambus2.py-indent-and-cleanup.patch b/sci-biology/amos/files/amos-3.1.0-goBambus2.py-indent-and-cleanup.patch
deleted file mode 100644
index 97a8f59d0208..000000000000
--- a/sci-biology/amos/files/amos-3.1.0-goBambus2.py-indent-and-cleanup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- amos-3.1.0/src/Pipeline/goBambus2.py.orig	2013-09-11 01:05:29.850090457 +0200
-+++ amos-3.1.0/src/Pipeline/goBambus2.py	2013-09-11 01:07:03.250090701 +0200
-@@ -1,7 +1,7 @@
- #pipeline script for assembly + Bambus 2
- #contributed by Todd J Treangen
- 
--import string, sys, os, subprocess#, spincursor
-+import sys, os, subprocess#, spincursor
- 
- RED =    "\033[0;31m"
- GREEN =  "\033[0;32m"
-@@ -360,7 +360,7 @@
-                 print "\t\t%s...failed%s"%(RED,NONE)
-                 sys.exit(1)
- 
--       p = subprocess.Popen(AMOSDIR+"OutputResults -b %s -prefix %s %s"%(amosbank, prefix+".scaff.linear"), shell=True, stdin=subprocess.PIPE, stdout=vtext, stderr=logfile)
-+        p = subprocess.Popen(AMOSDIR+"OutputResults -b %s -prefix %s %s"%(amosbank, prefix+".scaff.linear"), shell=True, stdin=subprocess.PIPE, stdout=vtext, stderr=logfile)
- 
-         if xopt_dict["verbose"] == 1:
-             print "10) running OutputResults"
-@@ -388,4 +388,3 @@
-             else:
-                 print "\t\t%s...failed%s"%(RED,NONE)
-                 sys.exit(1)
--)
diff --git a/sci-biology/amos/files/amos-3.1.0-qa-Wformat.patch b/sci-biology/amos/files/amos-3.1.0-qa-Wformat.patch
deleted file mode 100644
index 13f4eeb247a1..000000000000
--- a/sci-biology/amos/files/amos-3.1.0-qa-Wformat.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Fix QA warnings, due to using incorrect format specifiers in printf:
-* contig-cmp.cc:237:50: warning: format ‘%u’ expects argument of type ‘unsigned int’,
-* but argument 3 has type ‘std::vector<Contig_t>::size_type {aka long unsigned int}’ [-Wformat=]
-*     fprintf (stderr, "%u b contigs\n", b . size ());
-
---- a/src/Align/align.cc
-+++ b/src/Align/align.cc
-@@ -1936,7 +1936,7 @@
-    n = align . size ();
-    con = consensus . c_str ();
- 
--   fprintf (fp, "\nConsensus len = %d\n", consensus . length ());
-+   fprintf (fp, "\nConsensus len = %zu\n", consensus . length ());
- 
-    for  (i = 0;  i < n;  i ++)
-      {
-@@ -3936,7 +3936,7 @@
-         }
- 
-       // Array of sum of quality scores in the slice for A,C,G,T,- resp.
--      for (j = 0; j < 6; j ++)
-+      for (j = 0; j < 5; j ++)
-         qvsum [j] = 0;
- 
-       int nof_ambiguities = 0;
---- a/src/Align/align_poly.cc
-+++ b/src/Align/align_poly.cc
-@@ -1761,7 +1761,7 @@
-    n = align . size ();
-    con = consensus . c_str ();
- 
--   fprintf (fp, "\nConsensus len = %d\n", consensus . length ());
-+   fprintf (fp, "\nConsensus len = %zu\n", consensus . length ());
-    for  (i = 0;  i < n;  i ++)
-      {
-       fprintf (fp, "\nString #%d:\n", i);
---- a/src/Align/count-qmers.cc
-+++ b/src/Align/count-qmers.cc
-@@ -191,8 +191,8 @@
- 
-     PrintMers(mer_table, min_count);
- 
--    fprintf(stderr, "reporter:counter:asm,reads_total,%ld\n", COUNT);
--    fprintf(stderr, "reporter:counter:asm,reads_bp,%ld\n",    LEN);
-+    fprintf(stderr, "reporter:counter:asm,reads_total,%lld\n", COUNT);
-+    fprintf(stderr, "reporter:counter:asm,reads_bp,%lld\n",    LEN);
-   }
-   catch (Exception_t & e)
-   {
---- a/src/Align/kmer-cov.cc
-+++ b/src/Align/kmer-cov.cc
-@@ -485,7 +485,7 @@
-           Kmer_Len = s . length ();
-       else if  (Kmer_Len != int (s . length ()))
-           {
--           sprintf (Clean_Exit_Msg_Line, "New kmer \"%s\" length is %d instead of %d",
-+           sprintf (Clean_Exit_Msg_Line, "New kmer \"%s\" length is %zu instead of %d",
-                 s . c_str (), s . length (), Kmer_Len);
-            Clean_Exit (Clean_Exit_Msg_Line, __FILE__, __LINE__);
-           }
---- a/src/Align/kmer-cov-plot.cc
-+++ b/src/Align/kmer-cov-plot.cc
-@@ -316,7 +316,7 @@
-     }
-     else if  (Kmer_Len != int (s . length ()))
-     {
--      sprintf (Clean_Exit_Msg_Line, "New kmer \"%s\" length is %d instead of %d",
-+      sprintf (Clean_Exit_Msg_Line, "New kmer \"%s\" length is %zu instead of %d",
-                s . c_str (), s . length (), Kmer_Len);
-       Clean_Exit (Clean_Exit_Msg_Line, __FILE__, __LINE__);
-     }
---- a/src/Align/make-consensus.cc
-+++ b/src/Align/make-consensus.cc
-@@ -303,7 +303,7 @@
-             break;
-         }
- 
--        sprintf (sid, "%ld", ++layout_id);
-+        sprintf (sid, "%u", ++layout_id);
-         cid = string (sid);
-         ID_t lid = layout.getIID ();
-         if (lid == 0)
---- a/src/Align/make-consensus_poly.cc
-+++ b/src/Align/make-consensus_poly.cc
-@@ -279,7 +279,7 @@
- 		   break;
- 	       }
- 		 
--	       sprintf(sid, "%ld", ++layout_id);
-+	       sprintf(sid, "%u", ++layout_id);
- 	       cid = string(sid);
- 	       ID_t lid = layout.getIID();
- 	       if (lid == 0) {
---- a/src/Align/simple-overlap.cc
-+++ b/src/Align/simple-overlap.cc
-@@ -422,7 +422,7 @@
-            "Options:\n"
-            "  -a       Also show alignments of overlaps \n"
-            "  -E <x>   Maximum error rate for overlaps is <x>\n"
--           "           e.g., -E 0.06 for 6% error rate\n"
-+           "           e.g., -E 0.06 for 6%% error rate\n"
-            "  -F       Input is a fasta file\n"
-            "  -h       Print this usage message\n"
-            "  -o <n>   Set minimum overlap length to <n>\n"
---- a/src/Compare/contig-cmp.cc
-+++ b/src/Compare/contig-cmp.cc
-@@ -145,7 +145,7 @@
- 
-    fclose (fp);
- 
--   fprintf (stderr, "%u a contigs\n", a . size ());
-+   fprintf (stderr, "%zu a contigs\n", a . size ());
-    vector <Unitig_t>  a_contig (max_id + 1);
-    n = a . size ();
-    for  (i = 0;  i < n;  i ++)
-@@ -234,7 +234,7 @@
- 
-    fclose (fp);
- 
--   fprintf (stderr, "%u b contigs\n", b . size ());
-+   fprintf (stderr, "%zu b contigs\n", b . size ());
-    vector <Unitig_t>  b_contig (max_id + 1);
-    n = b . size ();
-    for  (i = 0;  i < n;  i ++)
---- a/src/Staden/progs/trace_convert.c
-+++ b/src/Staden/progs/trace_convert.c
-@@ -6,6 +6,9 @@
- #include "traceType.h"
- #include "seqIOABI.h"
- 
-+#include <fcntl.h>
-+#include <unistd.h>
-+
- static char fileIdentifier[] = "$Id$";
- 
- struct opts {
diff --git a/sci-biology/amos/metadata.xml b/sci-biology/amos/metadata.xml
deleted file mode 100644
index 2668bce2ac8a..000000000000
--- a/sci-biology/amos/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>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">amos</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-biology/embassy-meme/Manifest b/sci-biology/embassy-meme/Manifest
deleted file mode 100644
index b52ed7b5f840..000000000000
--- a/sci-biology/embassy-meme/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX embassy-meme-4.7.650_fix-build-system.patch 2860 BLAKE2B 4b6d608d6fde975acd09373b39c64449585cd5f76e323fdd07c9ee9f741cf0f679a143bdd8ef110a0d93b70451425cf021b763860ef376b03c13f8a9456f8e62 SHA512 c44b219c75e67d17fcfd56145ae3709053bda38b8690141d1e9b846e4e4a9cab135f0dc9c5399e4712cf030ad562dd075f45c393e78157a2c1b92d80903b3d1c
-DIST embassy-meme-4.7.660.tar.gz 622448 BLAKE2B 93bbbe3de085aa2cd843349f8397b2d1f547be62afdb7deb30eec90a891f7825c847b92754bd956388b1bfe0250cabcbc7ad68f7d0378748a7949001016d344c SHA512 0536531b198aac09a9fe6c17cf1c60c766789c94a7f83f743a90aaa65061c95534bf398c53611a34549b7ec1a4928fdc45fe0d2553f25f85eeda41f90c2e8c6f
-EBUILD embassy-meme-4.7.660.ebuild 381 BLAKE2B 05a00fd0ca6d8e16bf61fe932f1e9805bac024fbd5bbee7bb4a37e2b3aaa3e394f5d9b8a9d208c127833c25b3de749abf27d849fe2bf0ab22557d565e3ce923f SHA512 b31045a88106d64ddbdd91cb85d06328b99b57eb490aa9f74f9cbf2464e3ed6485ca5e54ebd8146df8aacf0d44ee8f6f1d68cbb7a9e9dd3f2f46d637e2a8404b
-MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-meme/embassy-meme-4.7.660.ebuild b/sci-biology/embassy-meme/embassy-meme-4.7.660.ebuild
deleted file mode 100644
index 8752e78d8fc9..000000000000
--- a/sci-biology/embassy-meme/embassy-meme-4.7.660.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
-
-EBO_DESCRIPTION="MEME - Multiple Em for Motif Elicitation"
-
-EBO_EAUTORECONF=1
-
-inherit emboss-r2
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sci-biology/meme"
-
-S="${WORKDIR}/MEME-4.7.650"
-PATCHES=( "${FILESDIR}"/${PN}-4.7.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch b/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
deleted file mode 100644
index 56f5814e1efa..000000000000
--- a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
+++ /dev/null
@@ -1,100 +0,0 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 391989f..d921f25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
- 
- 
- 
--dnl PCRE library definitions - see the MAJOR and MINOR values
--dnl to see which version's configure.in these lines come from
--
--dnl Provide the current PCRE version information. Do not use numbers
--dnl with leading zeros for the minor version, as they end up in a C
--dnl macro, and may be treated as octal constants. Stick to single
--dnl digits for minor numbers less than 10. There are unlikely to be
--dnl that many releases anyway.
--
--PCRE_MAJOR="7"
--PCRE_MINOR="9"
--PCRE_DATE="11-Apr-2009"
--PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
--
--dnl Default values for miscellaneous macros
--
--POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
--
--dnl Provide versioning information for libtool shared libraries that
--dnl are built by default on Unix systems.
--
--PCRE_LIB_VERSION="0:1:0"
--PCRE_POSIXLIB_VERSION="0:0:0"
--
--
--
--
- dnl FIXME: This does no longer seem required with Autoconf 2.67?
- dnl Intel MacOSX 10.6 puts X11 in a non-standard place
- dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
- 
- 
- 
--dnl "Export" these variables for PCRE
--
--AC_SUBST([HAVE_MEMMOVE])
--AC_SUBST([HAVE_STRERROR])
--AC_SUBST([PCRE_MAJOR])
--AC_SUBST([PCRE_MINOR])
--AC_SUBST([PCRE_DATE])
--AC_SUBST([PCRE_VERSION])
--AC_SUBST([PCRE_LIB_VERSION])
--AC_SUBST([PCRE_POSIXLIB_VERSION])
--AC_SUBST([POSIX_MALLOC_THRESHOLD])
--
--
--
--
- dnl Test if --enable-localforce given
- locallink="no"
- embprefix="/usr/local"
-@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
- AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
- 
- 
-+AS_IF([test "x${enable_systemlibs}" = "xyes"],
-+[
-+dnl using system libraries
-+  PKG_CHECK_MODULES([PLPLOT], [plplotd],
-+  [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
-+  )
-+])
- 
- 
- # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1600399..9f28162 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
- 	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
- 	-I../../../ajax/acd -I../../../plplot
- else
--AM_CPPFLAGS = -I${embprefix}/include -I${embprefix}/include/eplplot \
--	$(NLINCLUDES) \
--	-I${embprefix}/include/epcre
-+AM_CPPFLAGS = -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS)
- endif
- 
- if ISSHARED
-@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
- 	$(XLIB)
- else
- LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
--        -lajax -lepcre $(NLADD) -leplplot $(XLIB)
-+        -lajax $(NLADD) $(XLIB)
- endif
diff --git a/sci-biology/embassy-meme/metadata.xml b/sci-biology/embassy-meme/metadata.xml
deleted file mode 100644
index d1b9a7602ec2..000000000000
--- a/sci-biology/embassy-meme/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>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">emboss</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-biology/meme/Manifest b/sci-biology/meme/Manifest
deleted file mode 100644
index 773a56aca2d6..000000000000
--- a/sci-biology/meme/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX meme-4.11.2_p2-fix-build-system.patch 10447 BLAKE2B 5ca1f4b43247f00b09012f503e0198306db39aa9992e56865d130d40f1530452784bf9edb508ad37d15fe4427fa2d19d4781db35e1f2b1b0257e8214e92734a4 SHA512 85181e114e825081ef52545fef7ab638c91029964eb8be2e1e4042d1d766d5376dbcabc9bd3902f19d162997dd63cb02fea66d231df6bafc0e74981373ea9724
-AUX meme-4.11.2_p2-patch1.patch 13820 BLAKE2B 3d5815bfe966e1d77cdf4491f34f3b3bd8ea674a5510a63d3cec0d0710c29d6d8cb6b1c284f2c8e9259687975644d39afabaf7c3708a3023d3939be4bf3174c1 SHA512 5a5989b5c626dee6aeaa435ce6c444caed6711d62216743d97215abddef95eb92c66544576866fc43c8efb090410aaed425231642dfcd9634b3f3025d5f1981f
-AUX meme-4.11.2_p2-patch2.patch 1684 BLAKE2B 7e5e22f90aa8424d26239a44e56c91ffe6709667a57bd73e058f1b9b012e3873ea6c226bfceefd4ab57989c3059f1fd2bf057bbc253620110fe26bb6370f6e7c SHA512 9c9b01196f76e3b02fa40c7a4d20bc77622cc3ac188584a53774be4ad72a889a72a7a57b38dda81fc7f1bb23db20eec50b0778b71caade4ddf65e49407f3ef8a
-DIST meme_4.11.2.tar.gz 18004930 BLAKE2B accacc7d2422ff6ea3411ff43ea664c94f5d6ba320e1cfec642a88cb6ea5303b2fe8c99a6c35d865c377560118402ab11f869930fd108f02eeaa06321db21655 SHA512 c97c3815e71e2fb5491548152f00688cdfbf4365f6027657e0ffc68e5d96cdd10a4708e0882ab7a5a61d78d93113c925cf5bb300fbe93fa4b2961becef497894
-EBUILD meme-4.11.2_p2.ebuild 2352 BLAKE2B d5946ace6bebec5fe7714b6db3d13185b7fb1cd07e4f24d1a6c7474556c8ed6a16e95f3ae2a3ace62c5e75ad1e8cf5f2832b6dafc2a3276d47e7a1c43c329b5d SHA512 fa4bd73f96f5f0f05dbbd12d316abe49d0414978cbcdc25bb625c288feb346d979c955316298489d951430faf60354f380ead663d04e5e711789e67d6be52e63
-MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/meme/files/meme-4.11.2_p2-fix-build-system.patch b/sci-biology/meme/files/meme-4.11.2_p2-fix-build-system.patch
deleted file mode 100644
index b548de5a39a5..000000000000
--- a/sci-biology/meme/files/meme-4.11.2_p2-fix-build-system.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-Fix and modernise build system
-* Remove all *FLAGS setting, just append to the user-supplied ones
-* Add --enable-doc and --enable-examples configure flags
-* Install documentation and examples in correct directories
-* Discover libxml2 and libxslt dependencies using PKG_CHECK_MODULES
-* Install python and perl modules correctly
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,61 +76,10 @@
- AM_CONDITIONAL(WANT_STRLCPY, test ["$have_strlcpy" = no])
- 
- # Check for compiler-specific settings
--LARGE_FILE_SUPPORT=`getconf LFS_CFLAGS`
--if test "${GCC}" = "yes"; then
--  ac_cc_opt="-O3"
--  ac_cc_debug_opt="-O0"
--  ac_cc_warn="-Wall -Wno-unused"
--  ac_cc_debug="-ggdb"
--  # Check for OS X llvm (clang) compiler
--  if `gcc --version |grep llvm >/dev/null`; then
--    ac_cc_debug="-g"
--  fi
--  CFLAGS="-std="gnu89" $ac_cc_warn -DUNIX -D__USE_FIXED_PROTOTYPES__ $LARGE_FILE_SUPPORT"
--else
--  ac_cc_opt="-O"
--  ac_cc_debug_opt=""
--  ac_cc_warn=""
--  ac_cc_debug="-g"
--  CFLAGS="$ac_cc_warn -DUNIX -D__USE_FIXED_PROTOTYPES__ $LARGE_FILE_SUPPORT"
--fi
--
--# Set up default libxml2 settings
--# check for installed copy of libxml2
--build_libxml2="yes"
--if test -n "$XML2_CONFIG"; then
--  # Require at least version 2.6
--  required_libxml2_version="2006000"
--  LIBXML2_VERSION="`$XML2_CONFIG --version | \
--    awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`"
--  if test -n "$LIBXML2_VERSION" && \
--     test "$LIBXML2_VERSION"  -ge "$required_libxml2_version"; then 
--    build_libxml2="no"
--    LIBXML2_LIBS="`$XML2_CONFIG --libs`"
--    LIBXML2_CFLAGS="`$XML2_CONFIG --cflags`"
--  fi
--fi
--if test -z "$LIBXML2_LIBS"; then
--  AC_MSG_WARN([libxml2 library not found])
--  LIBXML2_LIBS="\${top_builddir}/src/libxml2/libxml2.la"
--  LIBXML2_CFLAGS="-I\${top_srcdir}/src/libxml2/include"
--fi
--
--# Set up default libxslt settings
--# check for installed copy of libxslt
--build_libxslt="yes"
--if test -n "$XSLT_CONFIG"; then
--  build_libxslt="no"
--  LIBXSLT_LIBS="`$XSLT_CONFIG --libs` -lexslt"
--  LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
--fi
--if test -z "$LIBXSLT_LIBS"; then
--  AC_MSG_WARN([libxslt library not found])
--  LIBEXSLT_LIBS="\${top_builddir}/src/libexslt/libexslt.la"
--  LIBXSLT_LIBS="\${top_builddir}/src/libxslt/libxslt.la"
--  LIBEXSLT_CFLAGS="-I\${top_srcdir}/src/libexslt"
--  LIBXSLT_CFLAGS="-I\${top_srcdir}/src/"
--fi
-+AC_PROG_MKDIR_P
-+AC_SYS_LARGEFILE
-+CFLAGS="-std=gnu89 -Wall -Wno-unused ${CFLAGS}"
-+CPPFLAGS="-DUNIX -D__USE_FIXED_PROTOTYPES__ ${CPPFLAGS}"
- 
- # who is installing 
- USER=`whoami`
-@@ -279,6 +227,16 @@
- AM_CONDITIONAL(PARALLEL, test ["$parallel" != no])
- AM_CONDITIONAL(PARALLEL_IS_LAM, test -n ["$lammpi"]) 
- 
-+dnl Documentation
-+AC_ARG_ENABLE([doc],
-+	AS_HELP_STRING([--enable-doc], [Enable installation of documentation]))
-+AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
-+
-+dnl Examples
-+AC_ARG_ENABLE([examples],
-+	AS_HELP_STRING([--enable-examples], [Enable installation of examples]))
-+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
-+
- AC_ARG_ENABLE(
-     webservice,
-     [  --enable-webservice=deploy_dir       Deploy the MEME service on an existing Opal 2.5+ installation],
-@@ -309,24 +267,35 @@
- AM_CONDITIONAL(WEBEITHER, test ["x$OPAL_DEPLOY" != "x" -o "x$OPAL_URL" != "xno"])
- 
- # enable building of included libxml2
--AC_ARG_ENABLE(
--    build_libxml2,
--    [  --enable-build-libxml2     Build included version of libxml2. Default is to use pre-existing locally installed copy.],
--    build_libxml2=$enableval; \
--    LIBXML2_LIBS="\${top_builddir}/src/libxml2/libxml2.la"; \
--    LIBXML2_CFLAGS="-I\${top_srcdir}/src/libxml2/include" , )
--AM_CONDITIONAL(BUILD_LIBXML2, test ["$build_libxml2" = yes])
-+AC_ARG_ENABLE([build-libxml2],
-+	AS_HELP_STRING([--enable-build-libxml2], [Build included version of libxml2. Default is to use pre-existing locally installed copy.]))
-+AS_IF([test "x$enable_build_libxml2" = "xyes"], [
-+	dnl Enable building of bundled libs
-+	LIBXML2_CFLAGS="-I\${top_srcdir}/src/libxml2/include"
-+	LIBXML2_LIBS="\${top_builddir}/src/libxml2/libxml2.la"
-+	],[
-+	dnl Use system libraries
-+	PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
-+])
-+AM_CONDITIONAL([BUILD_LIBXML2], [test "x$enable_build_libxml2" = "xyes"])
-+
- 
- # enable building of included libxslt
--AC_ARG_ENABLE(
--    build_libxslt,
--    [  --enable-build-libxslt     Build included version of libxslt. Default is to use pre-existing locally installed copy.],
--    build_libxslt=$enableval; \
--    LIBEXSLT_LIBS="\${top_builddir}/src/libexslt/libexslt.la"; \
--    LIBXSLT_LIBS="\${top_builddir}/src/libxslt/libxslt.la"; \
--    LIBEXSLT_CFLAGS="-I\${top_srcdir}/src/libexslt"; \
--    LIBXSLT_CFLAGS="-I\${top_srcdir}/src/" , )
--AM_CONDITIONAL(BUILD_LIBXSLT, test ["$build_libxslt" = yes])
-+AC_ARG_ENABLE([build-libxslt],
-+	AS_HELP_STRING([--enable-build-libxslt], [Build included version of libxslt. Default is to use pre-existing locally installed copy.]))
-+AS_IF([test "x$enable_build_libxslt" = "xyes"], [
-+	dnl Enable building of bundled libs
-+	LIBXSLT_CFLAGS="-I\${top_srcdir}/src/"
-+	LIBXSLT_LIBS="\${top_builddir}/src/libxslt/libxslt.la"
-+
-+	LIBEXSLT_CFLAGS="-I\${top_srcdir}/src/libexslt"
-+	LIBEXSLT_LIBS="\${top_builddir}/src/libexslt/libexslt.la"
-+	],[
-+	dnl Use system libraries
-+	PKG_CHECK_MODULES([LIBXSLT], [libxslt])
-+	PKG_CHECK_MODULES([LIBEXSLT], [libexslt])
-+])
-+AM_CONDITIONAL([BUILD_LIBXSLT], [test "x$enable_build_libxslt" = "xyes"])
- 
- # set website url
- AC_ARG_WITH(
-@@ -427,13 +396,13 @@
-     [AC_PATH_PROG(PERL, perl)])
- AC_DEFINE_UNQUOTED(PERL, "$PERL", [Path to Perl] )
- 
-+AC_ARG_WITH([perl-dir],
-+	AS_HELP_STRING([--with-perl-dir], [Perl modules directory]), [perlmoddir="$with_perl_dir"], [perlmoddir="lib/perl"])
-+AC_SUBST([perlmoddir])
-+
-+
- # set path to Python
--AC_ARG_WITH(
--    python,
--    [  --with-python=NAME     Set path to Python. Default is to take from user's PATH.],
--    [PYTHON=$withval],
--    [AC_PATH_PROG(PYTHON, python)])
--AC_DEFINE_UNQUOTED(PYTHON, "$PYTHON", [Path to Python] )
-+AM_PATH_PYTHON
- 
- # set path to convert utility
- AC_ARG_WITH(
-@@ -586,13 +555,15 @@
-         Configuration parameters
-         ========================
- 
--  Install path:               ${prefix}
-+  Install path (prefix):      ${prefix}
-   Install UID:                ${MEME_USER}
-   Version:                    ${VERSION}
--  C compiler:                 ${CC}
--  C compiler flags:           ${CFLAGS}
--  Linker:                     ${LD}
--  Special Libs:               ${LIBS}
-+  C compiler (CC):            ${CC}
-+  C compiler flags (CFLAGS):  ${CFLAGS}
-+  C preproc flags (CPPFLAGS): ${CPPFLAGS}
-+  Linker (LD):                ${LD}
-+  Linker flags (LDFLAGS):     ${LDFLAGS}
-+  Special Libs (LIBS):        ${LIBS}
-   MPICC                       ${MPICC}
-   MPIRUN                      ${MPIRUN}
-   MPI_CMD                     ${MPI_CMD}
---- a/doc/css/Makefile.am
-+++ b/doc/css/Makefile.am
-@@ -5,7 +5,7 @@
- 
- EXTRA_DIST = $(NORMAL_FILES)
- 
--if ! WEBSITE
--doccssdir = $(prefix)/doc/css
-+if ENABLE_DOC
-+doccssdir = $(htmldir)/css
- doccss_DATA =  $(NORMAL_FILES)
- endif
---- a/doc/examples/compute_prior_dist_example_output_files/Makefile.am
-+++ b/doc/examples/compute_prior_dist_example_output_files/Makefile.am
-@@ -7,8 +7,8 @@
- EXAMPLES = \
-   prior.dist.txt
- 
--if ! WEBSITE
--exdir = $(prefix)/doc/examples/compute_prior_dist_example_output_files
-+if ENABLE_EXAMPLES
-+exdir = $(docdir)/examples/compute_prior_dist_example_output_files
- ex_DATA = $(EXAMPLES)
- endif
- 
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -22,8 +22,8 @@
- # load the EXAMPLE_OUTPUT_FILES variable
- include examples.mk
- 
--if ! WEBSITE
--exdir = $(prefix)/doc/examples
-+if ENABLE_EXAMPLES
-+exdir = $(docdir)/examples
- nobase_dist_ex_DATA = $(EXAMPLES) $(EXAMPLE_OUTPUT_FILES)
- endif
- 
---- a/doc/examples/sample_opal_scripts/Makefile.am
-+++ b/doc/examples/sample_opal_scripts/Makefile.am
-@@ -15,8 +15,8 @@
-   MemeClient.pl \
-   MemeClient.py
- 
--if ! WEBSITE
--exdir = $(prefix)/doc/examples/sample_opal_scripts
-+if ENABLE_EXAMPLES
-+exdir = $(docdir)/examples/sample_opal_scripts
- ex_DATA = $(EXAMPLES)
- endif
- 
---- a/doc/images/Makefile.am
-+++ b/doc/images/Makefile.am
-@@ -30,8 +30,8 @@
- 
- MEME_IMAGES = $(PROGRAM_ICONS) $(OTHER_IMAGES)
- 
--if ! WEBSITE
--memeimgdir = $(prefix)/doc/images
-+if ENABLE_DOC
-+memeimgdir = $(htmldir)/images
- memeimg_DATA = $(MEME_IMAGES)
- endif
- 
---- a/doc/js/Makefile.am
-+++ b/doc/js/Makefile.am
-@@ -41,8 +41,8 @@
- 
- BUILT_SOURCES = $(BUILT_FILES)
- 
--if ! WEBSITE
--docjsdir = $(prefix)/doc/js
-+if ENABLE_DOC
-+docjsdir = $(htmldir)/js
- docjs_DATA =  $(NORMAL_FILES) $(BUILT_FILES) $(SYMLINK_FILES)
- endif
- 
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -129,8 +129,8 @@
-   update-sequence-db.html \
-   ismb94.pdf
- 
--if ! WEBSITE
--memedocdir = $(prefix)/doc
-+if ENABLE_DOC
-+memedocdir = $(htmldir)
- memedoc_DATA =  $(NORMAL_FILES)
- endif
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -52,7 +52,7 @@
- endif
- 
- dbdir:
--	mkdir -p $(MEME_DB)
-+	$(MKDIR_P) $(DESTDIR)/$(MEME_DB)
- 
- all-local:
- if WEBSITE
-@@ -64,8 +64,8 @@
- endif
- 
- install-data-local:
--	mkdir -p $(MEME_LOGS)
--	chmod a+w $(MEME_LOGS)
-+	$(MKDIR_P) $(DESTDIR)/$(MEME_LOGS)
-+	chmod a+w $(DESTDIR)/$(MEME_LOGS)
- 
- distdir = $(PACKAGE)_$(VERSION)
- 
---- a/scripts/Makefile.am
-+++ b/scripts/Makefile.am
-@@ -22,8 +22,8 @@
-   -e 's%@WHICHJAVA@%$(JAVA)%' \
-   -e 's%@WHICHCONVERT@%$(CONVERT)%' \
-   -e 's%@WHICHGHOSTSCRIPT@%$(GHOSTSCRIPT)%' \
--  -e 's%@PERLLIBDIR@%$(libdir)/perl%' \
--  -e 's%@PYTHONLIBDIR@%$(libdir)/python%' \
-+  -e 's%@PERLLIBDIR@%$(perlmoddir)%' \
-+  -e 's%@PYTHONLIBDIR@%$(pythondir)%' \
-   -e 's%@JAVALIBDIR@%$(libdir)/java%' \
-   -e 's%@LAM_BIN@%$(LAMBIN)%' \
-   -e 's%@APPCONFIGDIR@%$(sysconfdir)%' \
-@@ -62,7 +62,7 @@
-   DiffXML.pm \
-   HypergeometricDynProg.pm
- 
--perlmoddir=$(libdir)/perl
-+perlmoddir = $(exec_prefix)/@perlmoddir@
- perlmod_SCRIPTS = \
-   $(BUILT_PERL_MOD) \
-   $(NORMAL_PERL_MOD)
-@@ -76,8 +76,7 @@
-   hypergeometric.py \
-   sequence.py
- 
--pythonlibdir=$(libdir)/python
--pythonlib_SCRIPTS = \
-+python_PYTHON = \
-   $(BUILT_PYTHON_LIB) \
-   $(NORMAL_PYTHON_LIB)
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -19,7 +19,13 @@
- ARCHIVE_REVISION = $(shell cat ../ARCHIVE_REVISION)
- ARCHIVE_DATE = $(shell cat ../ARCHIVE_DATE)
- 
--SUBDIRS = filters libxml2 libxslt libexslt . parallel
-+SUBDIRS = filters . parallel
-+if BUILD_LIBXML2
-+SUBDIRS += libxml2
-+endif
-+if BUILD_LIBXSLT
-+SUBDIRS += libxslt libexslt
-+endif
- 
- BUILT_SOURCES = dir.h projrel.h
- 
diff --git a/sci-biology/meme/files/meme-4.11.2_p2-patch1.patch b/sci-biology/meme/files/meme-4.11.2_p2-patch1.patch
deleted file mode 100644
index 30a182f8f43a..000000000000
--- a/sci-biology/meme/files/meme-4.11.2_p2-patch1.patch
+++ /dev/null
@@ -1,383 +0,0 @@
---- a/doc/alphabet-format.html
-+++ b/doc/alphabet-format.html
-@@ -233,7 +233,7 @@
-           providing a reference on the meaning of the symbols used. If present, the
-           symbol name must be the second field.</p>
-           <p>The &quot;<span class="pdat">name</span>&quot; follows the rules of
--          <a href="qstr">quoted text</a>.</p>
-+          <a href="#qstr">quoted text</a>.</p>
-         </div>
-         <h5>color</h5>
-         <div class="indent">
---- a/doc/release-notes.html
-+++ b/doc/release-notes.html
-@@ -14,8 +14,26 @@
-       <h2>Motif-based sequence analysis tools</h2>
-     </div>
-     <h2>MEME Suite Release Notes</h2>
-+    <hr>
-+      <b>MEME version 4.11.2 patch 1 -- June 16, 2016</b>
-+      <ul>
-+        <li>
-+            <b>Bug fixes</b>
-+            <ul>
-+              <li>
-+              Fixed bug in MCAST 4.11.2 that caused it to prematurely truncate
-+              reading the sequence file.
-+              </li>
-+              <li>
-+              Modified MEME to fall back to a simple Dirichlet prior when
-+              using DNA or a custom alphabet with a prior that requires
-+              a prior library, but no prior libray is specified.
-+              </li>
-+            </ul
-+        </li>
-+      </ul>
-+      <p>
-       <hr>
--      <p>
-         <b>MEME version 4.11.2 -- May 5 2016</b>
-       </p>
-       <ul>
---- a/src/fasta-io.c
-+++ b/src/fasta-io.c
-@@ -14,6 +14,7 @@
- #include "alphabet.h"
- #include "fasta-io.h"
- #include "io.h"
-+#include "seq-reader-from-fasta.h"
- #include "prior-reader-from-psp.h"
- #include "seq.h"
- 
-@@ -159,61 +160,6 @@
- }
- 
- /****************************************************************************
-- * Read raw sequence until a new sequence is encountered or too many letters
-- * are read.  The new sequence is appended to the end of the given
-- * sequence.
-- *
-- * Return: Was the sequence read completely?
-- ****************************************************************************/
--static BOOLEAN_T read_raw_sequence_from_reader(
--   DATA_BLOCK_READER_T *fasta_reader, // Sequence source
--   char* name, // Sequence ID (used in error messages).
--   ALPH_T* alph, // Alphabet in use
--   unsigned int offset, // Current position in raw_sequence.
--   unsigned int max_chars, // Maximum chars in raw_sequence.
--   char* raw_sequence // Pre-allocated sequence.
--) {
--  // tlb; change a_char to integer so it will compile on SGI
--  int a_char;
--  int start_update;
--  BOOLEAN_T return_value = TRUE;
--
--  // Start at the end of the given sequence.
--  assert(offset < max_chars);
--
--  DATA_BLOCK_T *seq_block = new_sequence_block(max_chars - offset);
--  return_value = !fasta_reader->get_next_block(fasta_reader, seq_block);
--
--  char *seq_buffer = get_sequence_from_data_block(seq_block);
--  size_t seq_buffer_size = get_num_read_into_data_block(seq_block);
--  int i;
--  for (i = 0; i < seq_buffer_size; ++i) {
--    a_char = seq_buffer[i];
--    // Skip non-alphabetic characters.
--    if (!isalnum(a_char) && a_char != '-' && a_char != '*' && a_char != '.') {
--      if ((a_char != ' ') && (a_char != '\t') && (a_char != '\n') && (a_char != '\r')) {
--        fprintf(stderr, "Warning: Skipping character %c in sequence %s.\n",
--                a_char, name);
--      }
--    } else {
--      // skip check if unknown alph
--      if (alph != NULL && !alph_is_known(alph, a_char)) {
--        fprintf(stderr, "Warning: Converting illegal character %c to %c ",
--                a_char, alph_wildcard(alph));
--        fprintf(stderr, "in sequence %s.\n", name);
--        a_char = alph_wildcard(alph);
--      }
--      raw_sequence[offset] = (char) a_char;
--      ++offset;
--    }
--  }
--
--  raw_sequence[offset] = '\0';
--  free_data_block(seq_block);
--  return(return_value);
--}
--
--/****************************************************************************
-  * Read one sequence from a file in Fasta format.
-  *
-  * Return: Was a sequence successfully read?
-@@ -320,44 +266,6 @@
- }
- 
- /****************************************************************************
-- * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
-- * and copy them in to the raw sequence in the SEQ_T object starting at the
-- * given buffer offset. 
-- ****************************************************************************/
--void read_one_fasta_segment_from_reader(
--   DATA_BLOCK_READER_T *fasta_reader,
--   size_t max_size,
--   size_t buffer_offset,
--   SEQ_T *sequence
--) {
--
--  assert(sequence != NULL);
--  assert(get_seq_length(sequence) <= max_size);
--
--  // Get the raw sequence buffer from the SEQ_T
--  char *raw_sequence = get_raw_sequence(sequence);
--  if (raw_sequence == NULL) {
--    // Allocate space for raw sequence if not done yet.
--    raw_sequence = mm_malloc(sizeof(char) * max_size + 1);
--    raw_sequence[0] = 0;
--  }
--
--  // Read a block of sequence charaters into the
--  // raw sequence buffer for the SEQ_T.
--  char *name = get_seq_name(sequence);
--  BOOLEAN_T is_complete = read_raw_sequence_from_reader(
--    fasta_reader,
--    name,
--    NULL, //FIXME this is dodgy, need a proper way of getting the alphabet. The fasta_reader has it but it is not accessable!
--    buffer_offset,
--    max_size,
--    raw_sequence
--  );
--  set_raw_sequence(raw_sequence, is_complete, sequence);
--
--}
--
--/****************************************************************************
-  * Read all the sequences from a FASTA file at once.
-    Multiple files can be appended by calling this more than once.
-  ****************************************************************************/
---- a/src/fasta-io.h
-+++ b/src/fasta-io.h
-@@ -43,19 +43,6 @@
- );
- 
- /****************************************************************************
-- * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
-- * and copy them in to the raw sequence in the SEQ_T object starting at the
-- * given buffer offset. 
-- ****************************************************************************/
--void read_one_fasta_segment_from_reader(
--  DATA_BLOCK_READER_T *fasta_reader,
--  size_t max_size,
--  size_t buffer_offset,
--  SEQ_T* sequence
--);
--
--
--/****************************************************************************
-  * Read all the sequences from a file in Fasta format.
-  ****************************************************************************/
- void read_many_fastas
---- a/src/init.c
-+++ b/src/init.c
-@@ -767,10 +767,16 @@
-       if (alph_is_builtin_protein(alph)) { // default mixture prior for proteins
-         plib_name = make_path_to_file(get_meme_etc_dir(), PROTEIN_PLIB);
-       } else {
--        fprintf(stderr, "The prior library must be specified for DNA or custom "
--            "alphabets when specifiying a prior type of 'dmix', 'mega' "
--            "or 'megap'.");
--        exit(1);
-+        fprintf(
-+          stderr, 
-+          "WARNING: When using DNA or a custom alphabet, "
-+          "and specifiying a prior type of\n"
-+          "'dmix', 'mega' or 'megap', a prior library must be provided.\n"
-+          "No prior library was provided, so a simple Dirichlet prior will be used.\n"
-+        );
-+        prior = "dirichlet";
-+        ptype = Dirichlet;
-+        if (beta <= 0) beta = 0.01; // default b = 0.01 for simple Dirichlet
-       }
-     }
-   }
---- a/src/seq-reader-from-fasta.c
-+++ b/src/seq-reader-from-fasta.c
-@@ -639,11 +639,140 @@
-   return fasta_reader->current_position;
- }
- 
-+
-+/****************************************************************************
-+ * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
-+ * and copy them in to the raw sequence in the SEQ_T object starting at the
-+ * given buffer offset. 
-+ ****************************************************************************/
-+void read_one_fasta_segment_from_reader(
-+   DATA_BLOCK_READER_T *fasta_reader,
-+   size_t max_size,
-+   size_t offset,
-+   SEQ_T *sequence
-+) {
-+
-+
-+  assert(sequence != NULL);
-+  assert(offset < max_size);
-+
-+  // Get the raw sequence buffer from the SEQ_T
-+  char *raw_sequence = get_raw_sequence(sequence);
-+  if (raw_sequence == NULL) {
-+    // Allocate space for raw sequence if not done yet.
-+    raw_sequence = mm_malloc(sizeof(char) * max_size + 1);
-+    raw_sequence[0] = 0;
-+  }
-+
-+  // Read a block of sequence charaters into the
-+  // raw sequence buffer for the SEQ_T, starting at offset.
-+  BOOLEAN_T is_complete = read_raw_sequence_from_reader(
-+    fasta_reader,
-+    max_size - offset,
-+    raw_sequence + offset
-+  );
-+  set_raw_sequence(raw_sequence, is_complete, sequence);
-+}
-+
-+/****************************************************************************
-+ * Read raw sequence until a new sequence is encountered or too many letters
-+ * are read.
-+ *
-+ * Return: Was the sequence read completely?
-+ ****************************************************************************/
-+BOOLEAN_T read_raw_sequence_from_reader(
-+   DATA_BLOCK_READER_T *reader, // Sequence source
-+   unsigned int max_chars, // Maximum chars in raw_sequence.
-+   char* raw_sequence // Pre-allocated sequence buffer.
-+) {
-+
-+  SEQ_READER_FROM_FASTA_T *fasta_reader 
-+    = (SEQ_READER_FROM_FASTA_T *) get_data_block_reader_data(reader);
-+
-+  // Read sequence into temp. buffer from the sequence file.
-+  char buffer[max_chars];
-+  long start_file_pos = ftell(fasta_reader->fasta_file);
-+  size_t seq_index = 0;
-+  size_t total_read = 0;
-+  while (seq_index < max_chars) {
-+
-+    size_t num_char_read = fread(
-+      buffer,
-+      sizeof(char), 
-+      max_chars - seq_index,
-+      fasta_reader->fasta_file
-+    );
-+    fasta_reader->current_position += num_char_read;
-+    total_read += num_char_read;
-+
-+    if (feof(fasta_reader->fasta_file)) {
-+       fasta_reader->at_end_of_file = TRUE;
-+    }
-+    else if (num_char_read < (max_chars - seq_index)) {
-+      die(
-+        "Error while reading sequence from file:%s.\nError message: %s\n", 
-+        fasta_reader->filename,
-+        strerror(ferror(fasta_reader->fasta_file))
-+      );
-+    }
-+
-+    size_t i;
-+    for(i = 0; i < num_char_read; ++i) {
-+      char c = buffer[i];
-+      assert(c != 0);
-+      if (isspace(c)) {
-+        // Skip over white space
-+        fasta_reader->at_start_of_line = (c == '\n');
-+      }
-+      else if (c == '>' && fasta_reader->at_start_of_line == TRUE) {
-+        // We found the start of a new sequence while trying
-+        // to fill the buffer. Leave the buffer incomplete.
-+        // and wind back the file
-+        fseek(fasta_reader->fasta_file, start_file_pos + i - 1, SEEK_SET);
-+        fasta_reader->current_position = start_file_pos + i - 1;
-+        fasta_reader->at_end_of_seq = TRUE;
-+        fasta_reader->at_start_of_line = FALSE;
-+        fasta_reader->at_end_of_file = FALSE;
-+        break;
-+      }
-+      else {
-+        fasta_reader->at_start_of_line = FALSE;
-+        // Check that character is legal in alphabet. 
-+        // If not, replace with wild card character.
-+        if (alph_is_known(fasta_reader->alphabet, c)) {
-+          raw_sequence[seq_index] = c;
-+        }
-+        else {
-+          raw_sequence[seq_index] = alph_wildcard(fasta_reader->alphabet);
-+          fprintf(
-+            stderr, 
-+            "Warning: %c is not a valid character in %s alphabet.\n"
-+            "         Converting %c to %c.\n",
-+            c,
-+            alph_name(fasta_reader->alphabet),
-+            c,
-+            raw_sequence[i]
-+          );
-+        }
-+        ++seq_index;
-+      }
-+    }
-+    if (fasta_reader->at_end_of_seq | fasta_reader->at_end_of_file) {
-+      break;
-+    }
-+  }
-+
-+  raw_sequence[seq_index] = '\0';
-+  return(fasta_reader->at_end_of_seq | fasta_reader->at_end_of_file);
-+}
-+
- /******************************************************************************
-- * Fills in the next data block for the sequence. 
-- * During the first call for the sequence it fills in the full data block.
-- * On successive calls, shifts the sequence in the block down one position
-- * and reads one more character.
-+ * Populates the data block for the with the next block of sequence. 
-+ *
-+ * During the first call for the sequence it fills in a buffer from a file,
-+ * The sequence pointer in the data block is set to point at the start of the buffer.
-+ * On successive calls, the sequence pointer in the block is shifted down one position
-+ * in the buffer. When the end of the buffer is reached, it is filled again from the file.
-  * 
-  * Returns TRUE if it was able to completely fill the block, FALSE if 
-  * the next sequence or EOF was reached before the block was filled.
---- a/src/seq-reader-from-fasta.h
-+++ b/src/seq-reader-from-fasta.h
-@@ -37,5 +37,30 @@
-   int * end_ptr           // end position of sequence (chr:\d+-(\d+))
- );
- 
-+/****************************************************************************
-+ * Read raw sequence until a new sequence is encountered or too many letters
-+ * are read.
-+ *
-+ * Return: Was the sequence read completely?
-+ ****************************************************************************/
-+BOOLEAN_T read_raw_sequence_from_reader(
-+   DATA_BLOCK_READER_T *fasta_reader, // Sequence source
-+   unsigned int max_chars, // Maximum chars in raw_sequence.
-+   char* raw_sequence // Pre-allocated sequence.
-+);
-+
-+/****************************************************************************
-+ * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
-+ * and copy them in to the raw sequence in the SEQ_T object starting at the
-+ * given buffer offset. 
-+ ****************************************************************************/
-+void read_one_fasta_segment_from_reader(
-+   DATA_BLOCK_READER_T *reader,
-+   size_t max_size,
-+   size_t offset,
-+   SEQ_T *sequence
-+);
-+
-+
- size_t get_current_pos_from_seq_reader_from_fasta(DATA_BLOCK_READER_T *reader);
- #endif
diff --git a/sci-biology/meme/files/meme-4.11.2_p2-patch2.patch b/sci-biology/meme/files/meme-4.11.2_p2-patch2.patch
deleted file mode 100644
index 498d1df7b664..000000000000
--- a/sci-biology/meme/files/meme-4.11.2_p2-patch2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/doc/release-notes.html
-+++ b/doc/release-notes.html
-@@ -15,6 +15,21 @@
-     </div>
-     <h2>MEME Suite Release Notes</h2>
-     <hr>
-+      <b>MEME version 4.11.2 patch 2 -- October 24, 2016</b>
-+      <ul>
-+        <li>
-+            <b>Bug fixes</b>
-+            <ul>
-+              <li>
-+              Fixed bug in handling of RNA-like custom alphabets.
-+              </li>
-+              <li>
-+              Fixed bug in MAST -comp option.
-+              </li>
-+            </ul
-+        </li>
-+      </ul>
-+      <hr>
-       <b>MEME version 4.11.2 patch 1 -- June 16, 2016</b>
-       <ul>
-         <li>
---- a/src/alph-in.c
-+++ b/src/alph-in.c
-@@ -1044,7 +1044,7 @@
-           lookup[0] = sym->complement;
-           comp2 = (ALPH_SYM_T*)rbtree_get(reader->merged, lookup);
-         }
--        if (comp1 != comp2) {
-+        if (comp1 && (comp1 != comp2)) {
-           add_msg(reader, parmsg_create(SEVERITY_ERROR, -1, -1, -1, 
-                 "not like %s alphabet as %c complement rules are incorrect",
-                 ext_name, req_syms[i]));
---- a/src/mast-util.c
-+++ b/src/mast-util.c
-@@ -740,14 +740,14 @@
- 
-   // create the frequency array  
-   alph = xlate ? xlate_dest_alph(xlate) : alph;
--  freq = allocate_array(alph_size_core(alph));
-+  freq = allocate_array(alph_size_full(alph));
-   init_array(0, freq);
- 
-   // count the number of letters of each type 
-   if (xlate) {
-     for (n=0; sequence[n]; n++) {
-       i = xlate_index(xlate, false, sequence+n);
--      if (i > 0 && i < alph_size_core(alph)) incr_array_item(i, 1, freq);
-+      if (i > 0 && i < alph_size_full(alph)) incr_array_item(i, 1, freq);
-     }
-   } else {
-     for (n=0; sequence[n]; n++) {
diff --git a/sci-biology/meme/meme-4.11.2_p2.ebuild b/sci-biology/meme/meme-4.11.2_p2.ebuild
deleted file mode 100644
index 0f7d25b43368..000000000000
--- a/sci-biology/meme/meme-4.11.2_p2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools perl-functions python-single-r1 versionator
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}_${MY_PV}
-
-DESCRIPTION="The MEME/MAST system - Motif discovery and search"
-HOMEPAGE="http://meme-suite.org/tools/meme"
-SRC_URI="http://meme-suite.org/meme-software/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="meme"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples mpi"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-shells/tcsh
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-libs/zlib
-	app-text/ghostscript-gpl
-	media-gfx/imagemagick
-	dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Template
-	dev-perl/Log-Log4perl
-	dev-perl/Math-CDF
-	dev-perl/XML-Compile-SOAP
-	dev-perl/XML-Compile-WSDL11
-	dev-perl/XML-Parser
-	dev-perl/XML-Simple
-	virtual/perl-Data-Dumper
-	virtual/perl-Exporter
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.11.2_p2-patch1.patch
-	"${FILESDIR}"/${PN}-4.11.2_p2-patch2.patch
-	"${FILESDIR}"/${PN}-4.11.2_p2-fix-build-system.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	perl_set_version
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-logs="${EPREFIX}"/var/log/${PN} \
-		--with-perl=perl \
-		--with-convert=convert \
-		--with-gs=gs \
-		--disable-build-libxml2 \
-		--disable-build-libxslt \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable examples) \
-		$(use_enable !mpi serial) \
-		--with-perl-dir="${VENDOR_LIB#${EPREFIX}/usr}" \
-		PYTHON="${EPYTHON}"
-
-	# delete bundled libs, just to be sure. These need
-	# to be removed after econf, else AC_OUTPUT will fail
-	rm -r src/{libxml2,lib{,e}xslt} || die
-}
-
-src_test() {
-	# bug #297070
-	emake -j1 test
-}
-
-src_install() {
-	default
-	docompress -x /usr/share/doc/${PF}/examples
-
-	# prefix all binaries with 'meme-', in order
-	# to prevent collisions, bug 455010
-	cd "${ED%/}"/usr/bin/ || die
-	local i
-	for i in *; do
-		if [[ $i != meme-* ]]; then
-			mv {,meme-}"${i}" || die
-		fi
-	done
-
-	keepdir /var/log/meme
-}
diff --git a/sci-biology/meme/metadata.xml b/sci-biology/meme/metadata.xml
deleted file mode 100644
index 959160fe46b1..000000000000
--- a/sci-biology/meme/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>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/shrimp/Manifest b/sci-biology/shrimp/Manifest
deleted file mode 100644
index 6a5d38227ddb..000000000000
--- a/sci-biology/shrimp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SHRiMP_2_2_3.src.tar.gz 4596867 BLAKE2B 64e485b8e2524062c11c581bbcac426800c9f42f61da467378dbfd3add63f721a9da9c04df61bde3704e654a20395e799e89fc5e47129b1d3f5bc93f960470fa SHA512 029179aeeb317194b998c29aa91d1d2ce5ccbc6f9ad4a1043d1e5fc75d3344c2f39500ab07e8389c09fa179f0c9b59afee22691bc4eb5d396777f4e0fe25f2d5
-EBUILD shrimp-2.2.3.ebuild 1818 BLAKE2B 4878f0ce5782f0bc5fb5d4b14d5d713f21268b612cb18a2f14e19e3cca1c2270940b1f74220da0788fea9e142c803bcc77b9b2c04479a9432f06b9b29f3f7705 SHA512 2bfdb6f1cf7678dc9fafd66c25c07f55671f39600a44c606bac33652806105ff448d231202fb405307a0a49716557aa7cc63d371163821af2d919422ff9e2e6f
-MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/shrimp/metadata.xml b/sci-biology/shrimp/metadata.xml
deleted file mode 100644
index 959160fe46b1..000000000000
--- a/sci-biology/shrimp/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>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/shrimp/shrimp-2.2.3.ebuild b/sci-biology/shrimp/shrimp-2.2.3.ebuild
deleted file mode 100644
index 2b57b032a1b2..000000000000
--- a/sci-biology/shrimp/shrimp-2.2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic python-single-r1 toolchain-funcs
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="SHort Read Mapping Package"
-HOMEPAGE="http://compbio.cs.toronto.edu/shrimp/"
-SRC_URI="http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_${MY_PV}.src.tar.gz"
-
-LICENSE="shrimp"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="custom-cflags +cpu_flags_x86_sse2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# file collision on /usr/bin/utils #453044
-DEPEND="!sci-mathematics/cado-nfs"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/SHRiMP_${MY_PV}
-
-pkg_pretend() {
-	use cpu_flags_x86_sse2 || die "This package needs sse2 support in your CPU"
-}
-
-pkg_setup() {
-	if [[ ${CC} == *gcc* ]] &&	! tc-has-openmp; then
-		elog "Please set CC to an OPENMP capable compiler (e.g. gcc[openmp] or icc"
-		die "C compiler lacks OPENMP support"
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e '1 a #include <stdint.h>' \
-		-i common/dag_glue.cpp || die
-	# respect LDFLAGS wrt 331823
-	sed \
-		-e "s/LDFLAGS/LIBS/" \
-		-e "s/\$(LD)/& \$(LDFLAGS)/" \
-		-e 's/-static//' \
-		-i Makefile || die
-
-	append-flags -fopenmp
-	if ! use custom-cflags; then
-		append-flags -O3
-		replace-flags -O* -O3
-	fi
-	tc-export CXX
-
-	cd utils || die
-	sed -e '/^#!/d' -i *py || die
-	sed -e '1i#!/usr/bin/python' -i *py || die
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local i
-	newdoc bin/README README.bin && rm bin/README
-	dobin bin/* utils/split-contigs utils/temp-sink
-	dodoc HISTORY README TODO SPLITTING_AND_MERGING SCORES_AND_PROBABILITES
-
-	pushd utils > /dev/null
-
-	python_doscript *py
-
-	rm *.py *.o *.c split-contigs temp-sink || die
-	insinto /usr/share/${PN}
-	doins -r *
-}
diff --git a/sci-biology/vienna-rna/Manifest b/sci-biology/vienna-rna/Manifest
deleted file mode 100644
index 0de0a4ebedfe..000000000000
--- a/sci-biology/vienna-rna/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vienna-rna-2.1.1-impl-decl.patch 354 BLAKE2B d9d7a4e749a2c8681dc619961291f5e082681f15729a72ee1423bc4af71e8f745a558506e7147846c84df8fb7e5d316d1bc253f8125487a4ea6aab3c05b19bd8 SHA512 7c288b4889f11b5cc4e6db5b5db6dfcd70843aa135181e8d819ae86c90faed4a43e08f99b47f418caa23643642e68bf5e153f4d279f7566433af1c9093ec6e8b
-AUX vienna-rna-2.1.1-prll.patch 885 BLAKE2B 168d4b1a4c5ff0eb92379fe5762e7f0d6b7676c774c659422923c894bfcdb9efbbe20979ed87129c688b6ced9ad19cc51716164a0056b19fbc80fc27bbd32d57 SHA512 1b80636b43e1ce9ca54431358b45f2503ef3f49b8cd049b5ef501058e1771bda3628c88e63cc1bea9a32aff5a004ccef663b47dae385a5df6071793f292dff94
-AUX vienna-rna-2.1.8-bindir.patch 367 BLAKE2B 9bf3df6c604d5ac0661188d4f662ee12387f8bb30c2e3ecbd4a7bfd0a73ff5419f7a10b2fe70efd53e4b634bfdd3c1039ec000b26e7f5edbbcc4242a4edf5914 SHA512 aee16e7ff546aff38dd4a29d43502f4eb50778e6377a7d57f6a010dacc6a5f02162418fde27df03d1ba27f02361835d63dcefd866b8ac22f17a926c28fa4e9bf
-DIST ViennaRNA-2.1.8.tar.gz 5464683 BLAKE2B ed2086461b37c90de11638852680507c823495abacec1e797c589c22d07dc48b4833d8d6916e5c95083bb9b970c659bbfb14ca45e155486333a915593c4caf01 SHA512 84f9db1247ff7a77aa6550b6285d9bed31fa6ce179aab26eef798c65a07f5cbd89f944630dfa5d29a43401b12a439324b57ee69047a3985e3a4f1e88dffca60e
-EBUILD vienna-rna-2.1.8.ebuild 2588 BLAKE2B 5a1692be0a587cc85dcf0a60c609ff0c4eade92e5da98ce05bf2d90a195e606d9ca9262774c2c6875b1d9d53451b5043d7c4ae8a3446d4ebf3607effe039cd92 SHA512 4474f2bf042a31e02fd7b9882f6b5ec17fef4ba9f23eab29a39e9c09ea29414e836c029e568a905a2c315370c763384f9d84547a56a8806216dc825d51c3d378
-MISC metadata.xml 1324 BLAKE2B ba9d5e1f5893344fd1899e3723e1b86bac75546cde97b311fe7ef9dc2068f1a063cd5a5d2ac65d1195f532441194e8943ad2ec44db9a5c614ed0c8d894a900bb SHA512 8198db695aea5244b62fab23fd0a53a0657f8d37cc741f60869a39374e97c725b564086d852e37216c584083168881eba246f59b840d6a41bfe9246d3bd88d4b
diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-impl-decl.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.1-impl-decl.patch
deleted file mode 100644
index de457f318e8e..000000000000
--- a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-impl-decl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- Readseq/readseq.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Readseq/readseq.c b/Readseq/readseq.c
-index 8af7b39..56a25ae 100644
---- a/Readseq/readseq.c
-+++ b/Readseq/readseq.c
-@@ -171,6 +171,7 @@ link -w -o readseq -t MPST -c 'MPS ' 
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+#include <stdlib.h>
- 
- #include "ureadseq.h"
- 
diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-prll.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.1-prll.patch
deleted file mode 100644
index ee4aef5c3308..000000000000
--- a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-prll.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- Readseq/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Readseq/Makefile b/Readseq/Makefile
-index f073aaa..05f2edd 100644
---- a/Readseq/Makefile
-+++ b/Readseq/Makefile
-@@ -6,11 +6,11 @@
- #
- 
- # pick an ANSI C compiler (the default Sun CC is not ANSI)
--CC=gcc  # Gnu C Compiler
-+CC?=gcc  # Gnu C Compiler
- #CC=cc  # SGI Irix
- #CC=vcc # some DEC Ultrix
- 
--CFLAGS=
-+CFLAGS?=
- #CFLAGS= -DSMALLCHECKSUM  # if you prefer to use a GCG-standard 13 bit checksum
- #    instead of a full 32 bit checksum. This may enhance compatibility w/ GCG software
- 
-@@ -40,7 +40,7 @@ all: build test
- 
- build: $(SOURCES)
- 	@echo "Compiling readseq..."
--	$(CC) $(LDFLAGS) $(CFLAGS) -o readseq readseq.c ureadseq.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o readseq readseq.c ureadseq.c ureadasn.c
- 
- # if using NCBI, uncomment these lines in place of build: above
- #build: $(SOURCES)
diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.8-bindir.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.8-bindir.patch
deleted file mode 100644
index e54dff95b485..000000000000
--- a/sci-biology/vienna-rna/files/vienna-rna-2.1.8-bindir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Utils/Makefile.am b/Utils/Makefile.am
-index f42ebf4..d84a0f1 100644
---- a/Utils/Makefile.am
-+++ b/Utils/Makefile.am
-@@ -1,4 +1,4 @@
--pkgbindir = $(pkgdatadir)/bin
-+pkgbindir = $(prefix)/bin
- pkgbin_PROGRAMS = b2ct popt ct2db
- 
- pscript = b2mt.pl ct2b.pl dpzoom.pl mountain.pl relplot.pl rotate_ss.pl cmount.pl colorrna.pl coloraln.pl refold.pl switch.pl
diff --git a/sci-biology/vienna-rna/metadata.xml b/sci-biology/vienna-rna/metadata.xml
deleted file mode 100644
index bbc3d41fb4a6..000000000000
--- a/sci-biology/vienna-rna/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>sci-biology@gentoo.org</email>
-		<name>Gentoo Biology Project</name>
-	</maintainer>
-	<longdescription>
-		The Vienna RNA Package consists of a C code library and several
-		stand-alone programs for the prediction and comparison of RNA secondary
-		structures. RNA secondary structure prediction through energy
-		minimization is the most used function in the package. We provide three
-		kinds of dynamic programming algorithms for structure prediction: the
-		minimum free energy algorithm of (Zuker and Stiegler 1981) which yields a
-		single optimal structure, the partition function algorithm of
-		(McCaskill 1990) which calculates base pair probabilities in the
-		thermodynamic ensemble, and the suboptimal folding algorithm of
-		(Wuchty et.al 1999) which generates all suboptimal structures within a
-		given energy range of the optimal energy. For secondary structure
-		comparison, the package contains several measures of distance
-		(dissimilarities) using either string alignment or tree-editing
-		(Shapiro and Zhang 1990). Finally, we provide an algorithm to design
-		sequences with a predefined structure (inverse folding).
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild b/sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild
deleted file mode 100644
index 7664f6d3dc6e..000000000000
--- a/sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=true
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils distutils-r1 multilib perl-module toolchain-funcs
-
-DESCRIPTION="RNA secondary structure prediction and comparison"
-HOMEPAGE="http://www.tbi.univie.ac.at/~ivo/RNA/"
-SRC_URI="http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="vienna-rna"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc openmp python static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-lang/perl
-	media-libs/gd
-	doc? ( dev-texlive/texlive-latex )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig:0 )"
-
-S="${WORKDIR}/ViennaRNA-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bindir.patch
-	"${FILESDIR}"/${PN}-2.1.1-prll.patch
-	"${FILESDIR}"/${PN}-2.1.1-impl-decl.patch
-)
-
-src_prepare() {
-	sed -i 's/ getline/ v_getline/' Readseq/ureadseq.c || die
-	sed -i 's/@PerlCmd@ Makefile.PL/& INSTALLDIRS=vendor/' interfaces/Perl/Makefile.am || die
-
-	autotools-utils_src_prepare
-
-	if use python; then
-		cd interfaces/Python || die
-		local PATCHES=()
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-cluster
-		$(use_enable openmp)
-	)
-
-	use doc || \
-		myeconfargs+=(
-			--without-doc-pdf
-			--without-doc-html
-			--without-doc
-			)
-	autotools-utils_src_configure
-	sed \
-		-e "s:CC=gcc:CC=$(tc-getCC):" \
-		-e "s:^CFLAGS=:CFLAGS=${CFLAGS}:" \
-		-i Readseq/Makefile || die
-	if use python; then
-		cd interfaces/Python || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	autotools-utils_src_compile -C Readseq build CC=$(tc-getCC)
-
-	# TODO: Add (optional?) support for the NCBI toolkit.
-	if use python; then
-		cd interfaces/Python || die
-		emake RNA_wrap.c
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	autotools-utils_src_compile -C interfaces/Perl check
-	use python && autotools-utils_src_compile -C interfaces/Python check
-	autotools-utils_src_compile -C Readseq test
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-
-	newbin Readseq/readseq readseq-vienna
-	dodoc Readseq/Readseq.help
-	newdoc Readseq/Readme README.readseq
-	newdoc Readseq/Formats Formats.readseq
-
-	# remove perlocal.pod to avoid file collisions (see #240358)
-	perl_delete_localpod || die "Failed to remove perlocal.pod"
-	if use python; then
-		cd interfaces/Python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 1fecf4e508f9..9aec67e407d0 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 015a4eab9de9..3715f7dde284 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -5,6 +5,7 @@ DIST gromacs-2019.6.tar.gz 33446147 BLAKE2B adc21fb6b841b06d499607f8c0166a673645
 DIST gromacs-2020.1.tar.gz 29153989 BLAKE2B b1c0313da945c57c74040c2bcd50495b238b0e131cc4ebecd74ae0d01465b47d732ea456a52a2f9d998cd37e2bfdb93d52bd15177328c4b7a14e6b1d8bc00117 SHA512 130394ec70e5d75ea451e9fa77c4ea2dd4adb0c51cc7663ac8579972bab7a0b75d9143d0eebb21802fc93305deca8831393a8cb3f51b6d01f9477f3dadece037
 DIST gromacs-2020.2.tar.gz 29144614 BLAKE2B cd20b031dcec32d9a797d66f2679779077910c184702f12f12093d92e8417d42e07bfb17a8fe63e9d29a889d5f57461b5f86e11adfc26635f8d2b5a5df19473a SHA512 348c80fad93b34e6703906fec97c6c2294c0803c326d6145776b732e1c33cd58e0967ddb2ec4799e3583542c09e7a6a015e4d084d60cf97b81b3a92253cca76c
 DIST gromacs-2020.3.tar.gz 29143950 BLAKE2B ea88fcacc3958f1123c1fe4852f7160a04e4daff15dd2eb87c23197bff2e6379f396df0747b078dc86e7bb909ecbb4b6d98530a34234c989a636dbdb2327562d SHA512 8dbd13f8c6dd9ac337e0bea683aeff38010ee9b4ef438de230beb76e5a54884a5c1eda72f20294b7920758978e247900ac3db32b95c7452350fc1f5ef0a4bcc8
+DIST gromacs-2020.4.tar.gz 29149899 BLAKE2B a07c8efd96137d58c1edf4ac9b5aafeb16d9e65234b9459b71471827032654acacb58ed6ae87ec6e0e593a0acd799683cc4461b06cc883b089d740708619345e SHA512 0c56f058741af70660baf0177724ec940dd984c05ea141ede91ee51ce3744f76d00e31bdb5db907e46fa1639de5dca637b3ace26e89f908c2e74c69f0c21ed3a
 DIST manual-2018.8.pdf 10025023 BLAKE2B afb0a6e6a72d78df743fcb57e7c1716848589e571dd35167b957a9b407ca27978ccfb6cb9e0df9c9439b888f352501a00ba32281ed1e0b4193bd606f1d77152e SHA512 b1972f7ce965bfc9377542993c5943ea4868a8ed23a969d4203264746d6bea3a7a65c6379196ece37fd6d68ec7ec80f827bde87d1049284af7082759a124f1d5
 DIST manual-2019.5.pdf 12702361 BLAKE2B cb80429a59019b190115bf2af689c0df23b0fec6e41a9ebc9eba20977d1b06eed79044c906c41228883767f673140e15d3a5ef947a0c1ec4fe84012089f4fa91 SHA512 baf27961b87e6120c49abc9dc58e25d12a15588b4ac787e1a086748d488692d4a1262229ac66e550d3cca3a6042545fb6ec472a2c98d6a8698b7a18b4397f605
 DIST manual-2019.6.pdf 12702376 BLAKE2B c350127bc06a9eb3dee73da39037c84daeb89500e23cb131bd19a150bf60602d4dde7611e0c6f0f344af4093e96a899303dac71b4df56fd0c44c3a48a56606b7 SHA512 dfdff67c2c1c9ce1f1c236b7686c5331b0fe86951da6c98eddd6a3e748815e0be0a9653ae4318469fcdd913c4e7c355d64a997cc80b9d9fbe6282ef6d98e61eb
@@ -14,12 +15,14 @@ DIST regressiontests-2019.6.tar.gz 67643195 BLAKE2B 1e054e24b187946f7ea28090d4f2
 DIST regressiontests-2020.1.tar.gz 48541809 BLAKE2B 0fec2f0fb7fad0ad48bb790d7df6487e2c1931a0a2134795bf7da4a9087f0f2a3743288fc4ec057fa6b22412c2d8f312cfa3af38be8c5bea51d7a06afb5ac9f0 SHA512 664d29ce39629ed218de65179ce4a73e479d73d30bc96f5ae57624d7e4447298c6122dc09e7873b8cad458eaee0530866411fab20e009e46bf39b133e0de47e8
 DIST regressiontests-2020.2.tar.gz 48539492 BLAKE2B 08222ec18e70f551194fc0a060facda394c0d9999e162dace06029aa5f36e7237aeb2468a80d1198257a45fb076f8f633a7279a85976484900bf4154176aa070 SHA512 3066d92a59dafade78807612681d82a7b8a0bd9b74fa7e8784063a908418c55b4427482dc7feb261ff6981fabb2d64a800d3e90ed647ab45e201f4847347bac7
 DIST regressiontests-2020.3.tar.gz 48541439 BLAKE2B c8b3840b76b7974e5efd518d02da2be3c8e685a420462962cf4ffb7b234bd5ffec0fb83adc962e4ce4716098667e1431f7bc46911bf5400f369881c697c1d0cb SHA512 84848210b2c4c0387c3f347237d58a114bd28c2d248f359e40a4a5b3557fca7763c431d1e03f167dcf22296a48dd47413a644238d72edc1414e3f830dd732416
+DIST regressiontests-2020.4.tar.gz 48542144 BLAKE2B 1dcde67525d40ababa74d9e8ba2dd3fdef1de7d1018491e102edd71d3a622925f213b5a0812e5448882b4cb5fb578317e8e5029bdc4bd53008aa8441a3d9dea1 SHA512 7c71f36a1cef22562f14dcd233e90ad2fe370ae1a7d3b5268727259b374e12d4754253735ac8745d3738bdbc1cc2067780fda5e393be2ff264f632fe4e0c1978
 EBUILD gromacs-2018.8.ebuild 6958 BLAKE2B 17452127d480265b57b435d84de5860729860e72a47f89ced75cfa18e9efc1b6dc478785545a86313e9fc6a93647d1ae9f4b78167654acc0a95288215df3d35a SHA512 a2c23b418af81162c22b06d4b5fe2114d09288f314dacb6ca7a5b0fecd50a3bf0069237ec036da8c420b133daaf1eef43d40d1b13c525df8f362f9a0a7b9ec51
 EBUILD gromacs-2019.5-r1.ebuild 7280 BLAKE2B 9d26c304b6e67d00a69d6919daf2bde5b542c9e1c5e1e2f44a2fb1350986a1175737bc9f7325c71cca8479a3e90fca63a0debb01eff5bb94113533a0be364839 SHA512 c991901aed3149fa7872f02647aaff424bd93508157c0f734cc0b14b9f81fe55ff996d8a5a7fb7ba1514cf737047cfbd389a54804d2b5659d728df6f004a847e
 EBUILD gromacs-2019.6.ebuild 7283 BLAKE2B 00055c4ba5cf660237d73232aa7a76857bc141eaa79fdbf81985d337c134123ad7fd92b69d017425ec3f11eb2f367a25e8c4168b948f1092b2a1e538cb991886 SHA512 c307ea57a5b7c468ddd454ee97743643363121757c50cda948398090fa9368dc7b52255e6c3a261565894edd77f91d62c221841c1aca3644691c7fb9a0a8d5ef
 EBUILD gromacs-2020.1-r1.ebuild 9844 BLAKE2B 9568558d0558311ed7a8b8d523ec287dea6682ff5eccb6b780e90739f876d262d20b9f938999bb3283a7c05677aa3a33e7c35071822be05fdd4cf4c74d9ec1d9 SHA512 86e3d58bedb8a87210a81bad1450c11dbfbc99623beac78a498c39dcef2628b2a9a6a7b85c036a79ead38e56ce40d3d15beba6072c4fa8cd62011181eacef97f
 EBUILD gromacs-2020.2.ebuild 9844 BLAKE2B 9568558d0558311ed7a8b8d523ec287dea6682ff5eccb6b780e90739f876d262d20b9f938999bb3283a7c05677aa3a33e7c35071822be05fdd4cf4c74d9ec1d9 SHA512 86e3d58bedb8a87210a81bad1450c11dbfbc99623beac78a498c39dcef2628b2a9a6a7b85c036a79ead38e56ce40d3d15beba6072c4fa8cd62011181eacef97f
 EBUILD gromacs-2020.3.ebuild 9844 BLAKE2B 9568558d0558311ed7a8b8d523ec287dea6682ff5eccb6b780e90739f876d262d20b9f938999bb3283a7c05677aa3a33e7c35071822be05fdd4cf4c74d9ec1d9 SHA512 86e3d58bedb8a87210a81bad1450c11dbfbc99623beac78a498c39dcef2628b2a9a6a7b85c036a79ead38e56ce40d3d15beba6072c4fa8cd62011181eacef97f
+EBUILD gromacs-2020.4.ebuild 9844 BLAKE2B 9568558d0558311ed7a8b8d523ec287dea6682ff5eccb6b780e90739f876d262d20b9f938999bb3283a7c05677aa3a33e7c35071822be05fdd4cf4c74d9ec1d9 SHA512 86e3d58bedb8a87210a81bad1450c11dbfbc99623beac78a498c39dcef2628b2a9a6a7b85c036a79ead38e56ce40d3d15beba6072c4fa8cd62011181eacef97f
 EBUILD gromacs-2020.9999.ebuild 9759 BLAKE2B bf1d5b859c466f05b4909113c90faaed916512809ec9563c474461906d49261baeca9b8f7e5bdf85a3fffd32b1b84b4ec47d4523105bba3ed32ce73491d6e7d1 SHA512 cac942e6effce1c0c7ff99ac56c88d9422a89b1b275d3555c5a15a00640c253bd3a98301b9509daf14b3e4d3f1577a8fe6647aab10bf645645ccf35b57470208
 EBUILD gromacs-9999.ebuild 9755 BLAKE2B ee04718fea528c500f797f0ee1ebfb2307772ff5ab4cfc3293f3bf6f93a25ee6155c0b888a4d25371c6a9c4fb022d9e79da9a9df85d7fc82a97442755314ff28 SHA512 5338d8d45908e0b618c21908162e16fff4fba74d671a756229f1f05bce9fd578e923d6289609344cd4a28a78995e2609908de0598cc5d60d45a029ac97b7bba4
 MISC metadata.xml 1192 BLAKE2B 560c1c792102747fc16c22d475114480b9897263405da05946721dae5b781c599a02e1401adfa4d929bfb41b4d52791376438aa37d33de18beabc9edbeb779fa SHA512 136c49bfaca76e714e811077c7f7d214a5984c7b6c891c79ad4a754c304752e17450c9aee100dafce04d7bf3893a53224ef9b54504a278654d59fae9acdd0f77
diff --git a/sci-chemistry/gromacs/gromacs-2020.4.ebuild b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
new file mode 100644
index 000000000000..ba456196edd8
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
@@ -0,0 +1,341 @@
+# 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,7,8} )
+
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		https://repo.or.cz/r/gromacs.git"
+	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0 )
+	hwloc? ( sys-apps/hwloc )
+	lapack? ( virtual/lapack )
+	lmfit? ( sci-libs/lmfit )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	!sci-chemistry/gmxapi
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+PATCHES=( "${FILESDIR}/${PN}-2020_beta1-pytest.patch" )
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+
+	# try to create policy for imagemagik
+	mkdir -p ${HOME}/.config/ImageMagick
+	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+	<?xml version="1.0" encoding="UTF-8"?>
+	<!DOCTYPE policymap [
+	<!ELEMENT policymap (policy)+>
+	!ATTLIST policymap xmlns CDATA #FIXED ''>
+	<!ELEMENT policy EMPTY>
+	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+	]>
+	<policymap>
+		<policy domain="coder" rights="read | write" pattern="PS" />
+		<policy domain="coder" rights="read | write" pattern="PS2" />
+		<policy domain="coder" rights="read | write" pattern="PS3" />
+		<policy domain="coder" rights="read | write" pattern="EPS" />
+		<policy domain="coder" rights="read | write" pattern="PDF" />
+		<policy domain="coder" rights="read | write" pattern="XPS" />
+	</policymap>
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		local acce="None"
+		use cpu_flags_x86_sse2 && acce="SSE2"
+		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+		use cpu_flags_x86_avx && acce="AVX_256"
+		use cpu_flags_x86_avx2 && acce="AVX2_256"
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	if use lmfit; then
+		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
+	else
+		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex doc)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "https://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 3a298a5f48e3..9b37dbf87722 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index 6999189bf3be..dc886134fd00 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -2,8 +2,10 @@ AUX iverilog-10.3-file-missing.patch 8849 BLAKE2B 2cb72c6d2b769ae0ac601f950b62dd
 AUX iverilog-10.3-fno-common.patch 777 BLAKE2B 99ce15739f0d86dd838e652542152cc7b2301a3dee605b7aff299ef3588576b21ed21ae19468a3dcca200cee4b6cd3271125837d75e83dbed770d07cd2eeb83a SHA512 2e10fbb03649da90e97977b18922fb74527d0256fdd6b819ba69cafe64c3a38f09cf47619448fd34a47a2ebf72af406c18d276885189f2381157ba99c1994319
 AUX iverilog-10.3-gen-bison-header.patch 3125 BLAKE2B 75bd40007237491571e0bbac19cd9d007db5b18b491882f52ca9889ead097189371906a62cebae2176ea822572984f58c97ac6abbef7ee89f2397a06a4580c1f SHA512 ebc835c28456498787a82ff446c606a6713343e4421465a17afeb1266b1dc445c760707059b217ee9efc7e79d00a119fb2173c1adbf3270cdd0ed720e3436d17
 DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d
+DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056
 EBUILD iverilog-10.3-r1.ebuild 1869 BLAKE2B bda326a2afc4ba27c3fb0331033e3f229f323bb0ae7c73f47c9c00363b18c4c16a9ea942d5c7879c8e22f6bd9b86dc7c37370d384ab31d21168d2128cde37caa SHA512 83a96e9ba2ea8cedb81d0cc2f62226afeacfa6c5104213ac040299161500955212b8f6c70f8d991eb478cdfc62779b3bf264704ab68bd26cbc735b7c35e27c13
 EBUILD iverilog-10.3-r2.ebuild 1787 BLAKE2B 1691ece5e455e1dfd053bb40318b8e6582f995e58c8a7b116fd37c6401bd5a0959c4190560b202bca722c89913b460ea1f0690b504646d249488ce2186aa3302 SHA512 970eb1c579e34da062bff435d426973a746ebc2e4e2f5b7ee9b2fb76a9d573d45ba2185f97b54d1ebf35c72b953bd7a7434a1a35af2a58e17dcc238c8445f9bb
 EBUILD iverilog-10.3.ebuild 1865 BLAKE2B f3d3828e9d6d5afd7457dbe620450713e7e8e32ed18ee41f36d07eb474bfd979dd5c27b71fdd3a9847cdcec03229586bfd14c170354905573293137ede1853f8 SHA512 4d6d589df25c6f1139f0f24d3d3074c9b7251972d38828d97989806d6f80784049b0b84eaa93f92f24ba3d60499fd612ba32d6443967a7154a197e4a933f3c2d
-EBUILD iverilog-9999.ebuild 1663 BLAKE2B 639e6e07077819b2f5520f506797c0b43c4bac854221a07b5449869b02a057923d87e6456e6da78059f4c7f76913890ebf5fc69e230dead65fab966686936ac3 SHA512 768983e921a914592b911e034d6c4e4f32a7cab80f00a2ae26041f6eb23a02a177cac4c6e75c75dc3ea1fbee0c9a9d97309afaecb8715ce56f7100a02c09c4f3
+EBUILD iverilog-11.0.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
+EBUILD iverilog-9999.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
 MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f
diff --git a/sci-electronics/iverilog/iverilog-11.0.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild
new file mode 100644
index 000000000000..de6fe18b47c9
--- /dev/null
+++ b/sci-electronics/iverilog/iverilog-11.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+GITHUB_PV=$(ver_rs 1- '_')
+
+DESCRIPTION="A Verilog simulation and synthesis tool"
+HOMEPAGE="
+	http://iverilog.icarus.com
+	https://github.com/steveicarus/iverilog
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
+else
+	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-${GITHUB_PV}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+DEPEND="
+	sys-libs/readline:=
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/gperf
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	default
+
+	# From upstreams autoconf.sh, to make it utilize the autotools eclass
+	# Here translate the autoconf.sh, equivalent to the following code
+	# > sh autoconf.sh
+
+	# Autoconf in root ...
+	eautoconf
+
+	# Precompiling lexor_keyword.gperf
+	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
+	# Precompiling vhdlpp/lexor_keyword.gperf
+	cd vhdlpp || die
+	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
+}
+
+src_install() {
+	local DOCS=( *.txt )
+
+	default
+
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index eb85629d9e8e..de6fe18b47c9 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -24,14 +24,14 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="examples"
 
 DEPEND="
 	sys-libs/readline:=
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"
-BDEPEND="dev-util/gperf
+BDEPEND="
+	dev-util/gperf
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -44,7 +44,8 @@ src_prepare() {
 	# > sh autoconf.sh
 
 	# Autoconf in root ...
-	eautoconf --force
+	eautoconf
+
 	# Precompiling lexor_keyword.gperf
 	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
 	# Precompiling vhdlpp/lexor_keyword.gperf
@@ -54,13 +55,9 @@ src_prepare() {
 
 src_install() {
 	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
+
 	default
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index d3b792cbdfe4..1c16c2a1032b 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,5 +1,5 @@
-DIST kicad-footprints-5.1.5.tar.gz 5757316 BLAKE2B 1ae141bd01e3581314bdd5f5b79cc919f68cfc48427cd2b08d2910bdd915866ab3cdb542be860f5e10f01825f094fb81a0704e018f53d80a50950b8b150a5ab9 SHA512 dbfb482d41d1c109e1fb395d194f700e45f1c268a33645b71cd9d98ada32369fe01dd6bf10c7f767c65b9b4e0efa6fc1bde1e4c91b9f4b751540fe3b511ba5b4
 DIST kicad-footprints-5.1.6.tar.gz 6015680 BLAKE2B f0b5cfed0c6310867ace49c87e8c43340995b0fefca4bd528031743d19e77ce5624e3b14580e586bb529359a96b0c89fa1036c89a53c4ed2d5b88e3d49d423af SHA512 da0fa31b56da1210f9bbdd0719ba7b9fe642170a8093dc3411ee3bed1f24ebcc2a14e7aee314a7dcbb80c453ea72a44f7acb34e44814d0d52aeb78eeb1227ec6
-EBUILD kicad-footprints-5.1.5.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
+DIST kicad-footprints-5.1.7.tar.gz 6035007 BLAKE2B 9a2d72f1dc4eeef267055da091f531b6e45d8b469736551a9576ec5ed2b081068975b543c09955f2704946f26efd5c330c2b3a33fdedb6cae42cac8daddeebd4 SHA512 c21bb6e65b1e5d332d75bf2bcdf34da03a4f5301a1d8458da3780dc52099f536579a99a139925de33b2c57983043305dabbb80be3bef207461dbc42458281252
 EBUILD kicad-footprints-5.1.6.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
+EBUILD kicad-footprints-5.1.7.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.5.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
similarity index 100%
rename from sci-electronics/kicad-footprints/kicad-footprints-5.1.5.ebuild
rename to sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 74a01fd5fca3..ee0e62bde81e 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,5 +1,5 @@
-DIST kicad-i18n-5.1.5.tar.gz 4330450 BLAKE2B c111073e97dd35d7545acbaf055918c21375bb4fef3fc9cbc81470d990e8103f0fbd7daf8117531353171239d6bbcffe195fb5933794c13c3978a9cdcf94bda8 SHA512 68e6602fcc7e73c22a594b45ecf53a956af8a134e28e86242bfaa4087df21c04b24ae4df9928f00c2cee7eb0631a02a4de1cd09547b36a466fb324f983ea5363
 DIST kicad-i18n-5.1.6.tar.bz2 2929902 BLAKE2B 6ede4e7cf7972d054e9f69bf5a35bad5b48a1b6368ac5efd78ba8e54dd82edf1da4c3bca93b0d9aa083bbd1740e8e952eae044f802579d8942301b49ebeeaeb1 SHA512 58b213845de9359124e98df1e6bed4df3184da2fe075a1751fe4c9861084748853fd258ecf2d99849ca07a3c84d99657158d9168caf6ac5eaa9884b10dd9ca91
-EBUILD kicad-i18n-5.1.5.ebuild 458 BLAKE2B c2002925255d7655c9f94fe02211f946f6327fe6e00144b3a4ef6d307a4609c102f2ca33ae13a76b12934215c98c618016460829d5fd793ecdb07e6868b81dc0 SHA512 c355e7a288bfb310cfcf9f6660d02f2956c1d6bdef72e9cd67614d41f05a4be302aabce3203546d8c29e4e883b037280f7151dbee2c112c980177d33edef98ef
+DIST kicad-i18n-5.1.7.tar.bz2 3161083 BLAKE2B be8aca1365b755a2f910ee987c76bb6be8b910b189f9ee53b7cd12dbe4c3139085327eada2833b566f220da2224a1ec9504d83b245e91a0f5589a8161c10abeb SHA512 1877c28bffd0d29a32867fe2aa5eb1e24df4ab4c36c381976d712d2319e4b6049cfb91f26d1158cd2ba08eab63a7da12701532fe6207b8aa9c4470c951788fa0
 EBUILD kicad-i18n-5.1.6.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
+EBUILD kicad-i18n-5.1.7.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
 MISC metadata.xml 448 BLAKE2B ce544749e7aedb4f4643feeaea90298bce866d9750a4d1edaec7f8d9248520266a8534a936ee76da3fb1e4072b08cbcfb487b87defbfc921defe8ae193ca8e57 SHA512 0ea5cc77902187b805ca9894e31efbaaedae623bd4ebdc41944e0e57b399e5f7bc7209067fc126d8b9b65e75a9d6c718d41c8cdfed12775f3bd35c6d8cae6647
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild
deleted file mode 100644
index 9d7d8d1b67a9..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
-HOMEPAGE="https://github.com/KiCad/kicad-i18n"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
new file mode 100644
index 000000000000..4e4b8730b265
--- /dev/null
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
+HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+RDEPEND=">=sci-electronics/kicad-5.1.6"
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 3f5f61530358..3beb1a5b9125 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kicad-meta-5.1.5.ebuild 617 BLAKE2B 496eeb23de7d970765fe14f42c5ce6316d53ae61e9c922496b984a7dbe6e72e37a513bde03ebb72ef5609f31240f413d1def639762a2798f4f3ccb865c7cdbff SHA512 4dbc7a9a33f909e646d35970034f9aa537eeadbb5255be8fb3b23a849bd0367cfce9ea5e52a1072d34e7649939a93a768754b044fdf6a81d1232fa9d914357c1
 EBUILD kicad-meta-5.1.6.ebuild 617 BLAKE2B 7cba176e653fcbfe26ba8af93d7337e0e64280c349b550d819dd188051588deb286f57bd6c66e9260b727c28b984272b78beb13f3afb24f6310c02b2162ccc29 SHA512 6c4ea61cc5374bc246c6ffce97034c52de9082b3cc6e7110da137e68cdfe8585187f88f532eb507c3ed1562d616f1e764f96640fb8c1528c8b94c8780c1698e2
+EBUILD kicad-meta-5.1.7.ebuild 617 BLAKE2B 02f8d6a3c29ca8e7d314ace47f5f312f4313838b6653a999cc2d4316a3cde153f88bb371a73bcd6d91f4269ca4319d187b10cdde2dd2ea2b8f9d25470c4f609c SHA512 79f725a9331088deed841a4a8c47ed8341484f9a998d63dde867a98711324389d88112a642f47cac00a42939555154ec49d12d7f093d569a2542d7cae76586b8
 MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild
deleted file mode 100644
index 63786cac4ca5..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc minimal nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.1.5
-	>=sci-electronics/kicad-symbols-5.1.5
-	>=sci-electronics/kicad-footprints-5.1.5
-	doc? (
-		>=app-doc/kicad-doc-5.1.5
-	)
-	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.5
-		>=sci-electronics/kicad-templates-5.1.5
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.1.5
-	)
-"
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
new file mode 100644
index 000000000000..889616e7ac6b
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad-pcb.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc minimal nls"
+
+RDEPEND="
+	>=sci-electronics/kicad-5.1.7
+	>=sci-electronics/kicad-symbols-5.1.7
+	>=sci-electronics/kicad-footprints-5.1.7
+	doc? (
+		>=app-doc/kicad-doc-5.1.7
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-5.1.7
+		>=sci-electronics/kicad-templates-5.1.7
+	)
+	nls? (
+		>=sci-electronics/kicad-i18n-5.1.7
+	)
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 10283c6204f6..7189bdb15b06 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,5 +1,5 @@
-DIST kicad-packages3d-5.1.5.tar.gz 888817126 BLAKE2B 1b515e3a2f81b0273491ba90d210de1ff43eed625eaff1c774fd969a3255d89c4ccab2ace3087210f5ac2012e0df75bb62f1683c89bcedf60f1c3f03ec2c7abe SHA512 844de269cd9c1c0c4082f09097dc853cd49a2942f621229604b9996c61f8e1c1a0b1008201ad2e13107a07b3f4601601f2d361b60b6e62984165dcdfd1dd378c
 DIST kicad-packages3d-5.1.6.tar.gz 922508706 BLAKE2B 2742791ee23d12ae25dcbab85e3b65f0126f3b3193392d60738b3cbee8ca0585aede1dc43b65e8c39526841ba9f960d6df95e5135af2feccecae403ec0583b3a SHA512 248fb4a759c7824d17b8a955f0636ed266e404a783af9a684ae09b8d2efc8871851c5236caf4092a97ba0485a9c3962bdea1898658aa17d6503832348b1968a9
-EBUILD kicad-packages3d-5.1.5.ebuild 554 BLAKE2B f90d89ffab9127f911cc42233d303ca5569f8a2c200c337a4cda7a94f08e25e323ab9435cceb60387583808247523159141b4ab88e0aee7563a19b08d49149dd SHA512 f2d5cbe81d5fce256049734f7be1aa9ecdc694613a27a76a0d0552578668d121e4ab5e259940d7992fe7eb6b4ea0c2c60ce380bb945a4c709e6bc5b4d3842c1a
+DIST kicad-packages3d-5.1.7.tar.gz 942594575 BLAKE2B abc7c4b31f109968a48f5177d2ce09d216aa4b191d083492cc2c72db4a3bcf2209b91552a4eea4593634af7b901a1adb842517cfd9ad032062d6cb1f2415af07 SHA512 b1189c4d8a82e16334a2d116370c3e50edea0c2efaf91f4856605b1e566e808e86fc076796a7855efe709c7fafc7a0e2f924ce31cb245d6a3e362793a4a8be64
 EBUILD kicad-packages3d-5.1.6.ebuild 554 BLAKE2B f90d89ffab9127f911cc42233d303ca5569f8a2c200c337a4cda7a94f08e25e323ab9435cceb60387583808247523159141b4ab88e0aee7563a19b08d49149dd SHA512 f2d5cbe81d5fce256049734f7be1aa9ecdc694613a27a76a0d0552578668d121e4ab5e259940d7992fe7eb6b4ea0c2c60ce380bb945a4c709e6bc5b4d3842c1a
+EBUILD kicad-packages3d-5.1.7.ebuild 554 BLAKE2B b4cbc50a746aa6c0ddebae52f1eb1ed39c83cead7d512a622e4eb766c41cf1caec493c69de6d91e3f73b0e1b0a7c6793e8bd6fb06e2688a878772f41092d8f81 SHA512 1fbcdf4bb2fccb2a7ddc171bfa07527f97d2a20fda067374b56c777eed87402b676ccd7fd6f4f2d88ae383867fb9bdcf22e634debef4f7e02834f20523ef8abd
 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.ebuild
deleted file mode 100644
index f3d17f7c321b..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.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 check-reqs cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://kicad.github.io/packages3d/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="10G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
new file mode 100644
index 000000000000..4069d0c179ef
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://kicad.github.io/packages3d/"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="occ +oce"
+
+REQUIRED_USE="|| ( occ oce )"
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
+
+CHECKREQS_DISK_BUILD="11G"
+S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index de6381481d4e..148ea8b44a63 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,5 +1,5 @@
-DIST kicad-symbols-5.1.5.tar.gz 2922505 BLAKE2B 98c121139b8847678e6aa6a657c23168a7468c9f2ba342f335ba8ce373d6352b985db8b6549f9bfecc914eed686aa14bcb5b3112772f945e50e0f9c1cdb40a33 SHA512 345c7990ba17f778fa975250fbb067a01472aa6e03cbd08a1e34203af5517981b6a569981e30b4d56e58a3966c364b529b9679a96a46ef538bd5ac6a6b46eac7
 DIST kicad-symbols-5.1.6.tar.gz 2993494 BLAKE2B ba4056e350f049633a3265d2bd4e68af7765858d7d26d282b4dd7913d7a0f9d0011de319c6303c89c94ed4a07eeb93d6e08fca0b966d1e1138bef1b1ed74ad50 SHA512 e090cbafe3cffea86ccfda18d521528bededb573af7a46d5e7af0047a8c70f553e11e56046ec26ea11f742031507ab1ddd99459488f7ee57d8a18d6b9a5249ed
-EBUILD kicad-symbols-5.1.5.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
+DIST kicad-symbols-5.1.7.tar.gz 3033099 BLAKE2B e7e81677c5432c034cfdd6eb8e5ae108129d761e33c3f1969f379c0068de0be64353be42e8ca8394ea4bd3d81753e64bec81fb1a6fd106370e1a5673226fb7ad SHA512 0b6a4451957fcbce9a08706d121bbb853782c1163f8daba35f229b08577001bc1de41148340e59d3865d5b2775537c6ced1bede913845dc531d025559725f393
 EBUILD kicad-symbols-5.1.6.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
+EBUILD kicad-symbols-5.1.7.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.5.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
similarity index 100%
rename from sci-electronics/kicad-symbols/kicad-symbols-5.1.5.ebuild
rename to sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index b55f913beec3..80ccd0c50a76 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,5 +1,5 @@
-DIST kicad-templates-5.1.5.tar.gz 1634911 BLAKE2B 899b692de58660eada32a9f31c01b0b51fa5a6233da2395285b8526df411be6260ed07f4f7dc637229874d849d144597822fbf19be1ef48d09505d5bd7a0b216 SHA512 9836ac57d8f0e394eb5bd9a05fb73dd25dc4c0d3dfe20a1271c59b7247b9af2b38c01dd14706add16ba3eaa26d79a18052669ef6404ed3eea0d6ad6d7767a9fa
 DIST kicad-templates-5.1.6.tar.gz 1634919 BLAKE2B acf7f2bd709d8482fb8de408cf89d568a8130d2ddc619e0d3a19e717b507915681879cc8102993a3b0a99c8c9360e5c787243cf1be5f1f76e3a9518ac5b8623a SHA512 cd0d539322e8c4fe9787d68bf2d7c1e5a287824aacd89edff77e1531052664669ce1193f58f5e992ff28183afadcf14c080c9ff407247f0b3d6c12366b4d4b0d
-EBUILD kicad-templates-5.1.5.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
+DIST kicad-templates-5.1.7.tar.gz 1643946 BLAKE2B fee5a92f0f6d1914a12b03c90cfe76239b84fabc6b1b34e1381a59a140459eb27fd9e347e27564faaeecc9f89c149f246d5171e97a12825d50a4cb89f9e33104 SHA512 1c836ac53ab87e83118d158076f8527c0ec47aa047a385f836536971d9f0adc56c6c0029a1ce14828c31d7d446ac4b0cac7403dddec122633dee42ae6c33e4f6
 EBUILD kicad-templates-5.1.6.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
+EBUILD kicad-templates-5.1.7.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
 MISC metadata.xml 453 BLAKE2B 56db0c51d13c0cc2b65536b09e23714f53951c9f25ee716c6ceaaa65e12b2a6c85bed8dfca279364641e1b346bb70ac25c693ab9a0bd17b06d5dc732a0164a73 SHA512 f15055be34911712c68e6500d5f94a17bb21ec4c82eebdbbeb98053bc3daebd6d33c1626389cac8fab0834235f621d078dc89cf0f37f1126b03f6dbccefcae4b
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.5.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
similarity index 100%
rename from sci-electronics/kicad-templates/kicad-templates-5.1.5.ebuild
rename to sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8be1a2229631..7c2c7474bffe 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,13 +1,11 @@
 AUX kicad-5.1.5-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f
 AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d339f035167c3d0f0801f396ddfbbee22d843be53f81440b199c307604c98f08509fe9ec55efab6c297a7175947 SHA512 704fb0cc60bc18610bd410028c5c6302548bac646b0653ba32355b03fadbe4d8366dbad18469d5fd49d1d86e70497a13cbc2748c9e4b139d3a640c46bce50a36
 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
-AUX kicad-5.1.5-metainfo.patch 582 BLAKE2B 4eeeca5edb27989bfb953e8154dde533cca80cd2afa42e6e3bbd06190ca7371f48cdea2610761092a80e9cf0f25ebb8ea40271d79fef2fb3e7c803accf6fcd02 SHA512 cd3f0366df21609a7deadffb7bb4a2a134c9bc6e5c1aa8ef9b3c685cffc1662ddb8cd8d3769b52c0fe77af832f0b4758584c0b29e8af54a20667f2f522e15585
-AUX kicad-5.1.5-ninja-build.patch 2171 BLAKE2B 1b9c6f07abed53e04f676f9aaea6f4e244ca0293e725a81c4d1037e0453201f00cc1d7267b48793c11f0715154762240fefb48ac3b3efcb905857eef76016c66 SHA512 e0ca5eb4695948934c89f3a19edb8dbb77c34039d65c5c0ffaa42c16c5cab0cc5537c747a2f9c2e154be9861f8171537fec6004208b91f32736f521465c959a4
 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
-DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-EBUILD kicad-5.1.5-r2.ebuild 4309 BLAKE2B 377d2af7c9b84715da93767d3b8cd3c0f247c84d5888f68b7a103418ecad42eba44078929fd22b2f614fee39505717cc288994b33c76ee88e3283262bcece4a9 SHA512 e0ee69147c3e865e814a8c45b66451a076ce08a3581fa31cf15cdd0e6c2084492bcc2cc7a091e88c211aa19a2f6fd578d18087077ca88881e03c6ed12df59925
-EBUILD kicad-5.1.6.ebuild 4342 BLAKE2B 5a89ff32ea1ee6c6d1a1c1fe6e8c63368e6b5bc552b57c5bffb99c8c3515abf9077331cd004eeec722d2afe1e2596dee7bddb6fc2f9f5db74c6ccec444abaab4 SHA512 3455b1e37f0079c25005cce0f160fa541edac8cabdfe5f5c9b4ebf7719f390daa5065e4e5bf54e361d6eeb6ab3c66884f28b1b6b3634d4020c124edcb237acff
+DIST kicad-5.1.7.tar.bz2 18279204 BLAKE2B 9d12cf06282d2b8a5c5c4b0a387774ef90f8035bf0fafd9f5d939819f71edbb248d2b15fb4b3f35a80950fd41d140d93165ece61748076d7e2938cc0c9140e46 SHA512 f853eed50245d875b2443cc9accb3c75e8404d8fee12f129df68b3ab7052c31cda1eb0ad22fc10eb23b35250188973fb51a8c55fcb1560ea65d6e5e22b94a182
+EBUILD kicad-5.1.6.ebuild 4550 BLAKE2B 46dcce61ba15a8ddef59c25914361941203a4a4ee54e314cba0b8f9da8130dd42f4d92a715ee09601c821218c05b0835cb3d85fae5ea648f0132d48e44d2becd SHA512 29b3034d1ab841d97ba3460f4ac995e759e03569edc3fd65283b60eab1cfecae891a6a6af05203f655dcff6aef525f6883fae56440de1919dcb2e22c056f53fc
+EBUILD kicad-5.1.7.ebuild 4514 BLAKE2B 6d96c6205b311d851f8616918ffaf2bdedd015ed6ddde7448515ce4f5be22f7c958945b40d9ad79491220bd347563b6b3e2961b53ec14dcbd07342d079201835 SHA512 320f316d483ac823db6466c6260865288736c619b5bc244a3d6835f57e799d8f3a942d4eca3139af553e5d8be2c70bccebb640fa2bcc99d97ceeb5e5b4b03208
 MISC metadata.xml 1013 BLAKE2B b6469c6095bc87dd09a15b8c29df6901c8c3a9137a85f11bca0198b87de4dba56a363763e577303c046ba0ae5734af20f87aff574470942b222489b2c8081067 SHA512 68b19d35279516a088271a06fa2edae7109f2f79c1bf46add405d11885e221f8166e21448cb1e70d961c185712496410a3f32e34265d18360e779f12dc907611
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
deleted file mode 100644
index 48a5ef5be507..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
---- kicad-5.1.5-orig/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeLists.txt	2020-05-11 23:51:52.122093410 -0700
-@@ -919,7 +919,7 @@
-     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
-     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
-     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
--    set( UNIX_APPDATA_FILES resources/linux/appdata )
-+    set( UNIX_APPDATA_FILES resources/linux/metainfo )
- 
-     # Install Mime directory
-     install( DIRECTORY ${UNIX_ICON_FILES}
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
deleted file mode 100644
index 3b4b6a4d2fef..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur kicad-5.1.5-orig/pcbnew/CMakeLists.txt kicad-5.1.5/pcbnew/CMakeLists.txt
---- kicad-5.1.5-orig/pcbnew/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/pcbnew/CMakeLists.txt	2019-12-15 03:47:03.479894245 -0800
-@@ -808,11 +808,7 @@
-         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy )
-         set( PYMOD_EXT "so" )
-     else()  # only linux remains among supported platforms
--        add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
--        target_link_libraries( pcbnew_python ${PCBNEW_KIFACE_LIBRARIES} )
--        set_target_properties( pcbnew_python PROPERTIES OUTPUT_NAME pcbnew PREFIX "_" SUFFIX ".so" )
--        install( TARGETS pcbnew_python DESTINATION ${PYTHON_DEST} COMPONENT binary )
--
-+        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
-         set( PYMOD_EXT "so" )
-     endif()
-
-@@ -792,18 +788,16 @@ if( KICAD_SCRIPTING_MODULES )
-             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-             )
-     else()
--
--
--    # For phase 1, copy _pcbnew.kiface to the python module.
--    add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
--        DEPENDS pcbnew_kiface
--        COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
--        COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
--        )
--    add_custom_target(
--        pcbnew_python_module ALL
--        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
--        )
-+        # For phase 1, copy _pcbnew.kiface to the python module.
-+        add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-+            DEPENDS pcbnew_kiface
-+            COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
-+            COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
-+            )
-+        add_custom_target(
-+            pcbnew_python_module ALL
-+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-+            )
-     endif()
-
- endif()
diff --git a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
deleted file mode 100644
index 895f44b23fb6..000000000000
--- a/sci-electronics/kicad/kicad-5.1.5-r2.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.61:=[context,nls,threads]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	github? ( net-misc/curl:=[ssl] )
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}/${P}-help.patch"
-	"${FILESDIR}/${P}-ninja-build.patch"
-	"${FILESDIR}/${P}-strict-aliasing.patch"
-	"${FILESDIR}/${P}-algorithm-header.patch"
-	"${FILESDIR}/${P}-metainfo.patch"
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	default_src_unpack
-	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
-	# avoid QA issue.  This is needed because /usr/share/appdata location is
-	# deprecated, it should not be used anymore by new software.
-	# Appdata/Metainfo files should be installed into /usr/share/metainfo
-	# directory. as per
-	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.1.6.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild
index 89c22dcb004e..bd19cc4e2bd7 100644
--- a/sci-electronics/kicad/kicad-5.1.6.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.6.ebuild
@@ -131,6 +131,13 @@ src_install() {
 	fi
 }
 
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
+
+	default
+}
+
 pkg_postinst() {
 	optfeature "Component symbols library" sci-electronics/kicad-symbols
 	optfeature "Component footprints library" sci-electronics/kicad-footprints
diff --git a/sci-electronics/kicad/kicad-5.1.7.ebuild b/sci-electronics/kicad/kicad-5.1.7.ebuild
new file mode 100644
index 000000000000..9b524bb56828
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.1.7.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad-pcb.org"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples github +ngspice occ +oce openmp +python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( occ oce )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.61:=[context,nls,threads]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	github? ( net-misc/curl:=[ssl] )
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	oce? ( sci-libs/oce )
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	python? ( >=dev-lang/swig-3.0:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+CHECKREQS_DISK_BUILD="800M"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.5-help.patch"
+	"${FILESDIR}/${PN}-5.1.6-ninja-build.patch"
+	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
+	"${FILESDIR}/${PN}-5.1.6-metainfo.patch"
+	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use openmp && tc-check-openmp
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	default_src_unpack
+	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
+	# avoid QA issue.  This is needed because /usr/share/appdata location is
+	# deprecated, it should not be used anymore by new software.
+	# Appdata/Metainfo files should be installed into /usr/share/metainfo
+	# directory. as per
+	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
+		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
+		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_USE_OCE="$(usex oce)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile dev-docs doxygen-docs
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
+
+	default
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index b6dccfe24133..60d2cdb696ee 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,7 +1,5 @@
 AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
-DIST qelectrotech-0.61-src.tar.gz 9083192 BLAKE2B 25966e70f7f297ed55b539472970698f0947985c377cd90648d03fce8bf73c1bdede97e1104163147c5e60bb8ad05c55718f182528e6131adef6efeaf76f8e82 SHA512 b07d28520bef5773f5f93595c53a839a160c5927a7534ec30eba451fd33ab090909fc1971f28aea53538ff8e20ca45eff0b6597f3ab103b00b89eaa65067f918
 DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd
-EBUILD qelectrotech-0.61.ebuild 1155 BLAKE2B aa15c747e85a3419d77d576e2dbc9b060f3ac1970427dd743b969a216093eb5a550d6fbf9920eb1358e5330e1dfdab41ae7648f1deb04e5a8360593aaed2334f SHA512 620c5a75269d85fa56fb2bc573041853e722c65d709331b3642edd9683067bea30011eff09402b4045a2a5ba110527b48143a7c07f14bc899d1203b45f9c4daa
-EBUILD qelectrotech-0.70.ebuild 1149 BLAKE2B b82ad917704e61d9ea4998676dbcb42f88790c88992259d7b30317ad97c8ecc62a7028b1e93f496f7838dbbbb34329a4c502b7004e4917a01db36af6a911072b SHA512 36350b35456f0247e5ee620e61a0e8b50e5b324a68e781bd6c24b3d943f289d3be295aadadb354d70566b209e528a8e5dc92cf8ca972381ec5c5c2cf00ca6936
+EBUILD qelectrotech-0.70.ebuild 1148 BLAKE2B f815517770d377e6488137a0e013cc012608a27ede5e7fdd02b2f6d7e624e38c263cbbd38190f9040dc7fd6a84c205d16e1d02daddf383a2cbe7c52494312ee4 SHA512 b96df75832dacb6e02b5affbd75bb6dc3c45c6a4a77fb22722d1d3fc051e20a6229cd988eb0045d56bc408a24e0a2f4d78415f465e5fa704b899f59f3912aeb4
 EBUILD qelectrotech-9999.ebuild 1139 BLAKE2B 827b5184d0117228521a770808c2f00aafeec19e5bfc5623d7ba23bbee6ebb2f81b80be2b4c85ec5599613ba903725dd54f011c1e16de9a9d3b886dd2e6692a6 SHA512 0b8e91434bfec88cf0a0822fc8085a8d9eadc3277a955c06df2a59a37d395d43e6e6ed84ee0cdeba9191271d9569eda6012b01245fea1573fe4453bd8ea7b808
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
deleted file mode 100644
index 38d8540b0f54..000000000000
--- a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-${PV%0}-src
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt5 application to design electric diagrams"
-HOMEPAGE="https://qelectrotech.org/"
-SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui: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
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( CREDIT ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
-
-src_configure() {
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	if use doc; then
-		doxygen Doxyfile || die
-		local HTML_DOCS=( doc/html/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
index 7b5498d7383c..cddb5f1a5ac9 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_P=qet-${PV/%0/.0}
 	SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5dc8c020ca1d..6e492052e721 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index ee72503df9c6..abd7c1f9f265 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-maps-3.34.3.tar.xz 3976776 BLAKE2B e01c18be2b48b90f88159828a046e3c422a56557f198595985ba39053ffdc85d60eebbf21d37ab1e4bb2eae8d1ad93c76b199650b713eba7a937674be38c845f SHA512 63261fb77ea1260aacaf502950f89ba6e5294271526b25302258df4fb40f4e04e3a4697750b2f7238f45a8d4bdbe9e583d45a4de02ce178e8f6716b44a7c8ba0
+DIST gnome-maps-3.36.4.1.tar.xz 4006432 BLAKE2B c5c51faccee3e67be08279748dde270716ddf773266f678d1fa573ad4dbf9af95ea53c5c4e548e1c2eb296030371bd693f301ad3a43d2d88e00ac77121ca7834 SHA512 e63f8fe0b0c9226e8393bba4f4db6bc655a45cc869bb247ae51bdb06d69ca29785c562f98294c079cc3fc5c56276f10152c8c8e0ec8d46399918d9cd155e63d6
 DIST gnome-maps-3.36.4.tar.xz 4006520 BLAKE2B 4fb76e23580556c357c5a4a246a250521472a4b264264ea0e6172b2a61583f63e297fef29060b1b30a8978e509820d22eda2e6d56eda69f97e25e9795dcf38b2 SHA512 530ccc0a25c0a1fee2411ecc4034981210836664acc7adc6aa9cff9304e2499c1205f9c27b6b692fdee152fe1750541a1966d59a60958f3592682a5e110d490f
 EBUILD gnome-maps-3.34.3.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af
+EBUILD gnome-maps-3.36.4.1.ebuild 1395 BLAKE2B 9e3bda52a28a2a22dd9c4bdb1ab74a5fc4711f0e32334fea0857a3e0929d5948e6d79ba495df40f184c01ab89db42b870fb8d1215dd53ce31b7e424ab80503b5 SHA512 24fe4a2e948be7b42a97a7a870d3b0b5727c4d8ca611d564e24c7acf8b0a7f227b0a6560d8d4b4b0316e8320c1d6c2cb6fb47b40e9a81a90f1bd1d58685eacb1
 EBUILD gnome-maps-3.36.4.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild
new file mode 100644
index 000000000000..cb8141452d75
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	x11-libs/pango[introspection]
+	>=dev-libs/gjs-1.50.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 8c5cc813b8c5..a6357d9d602e 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
deleted file mode 100644
index ccdc0a2483b4..000000000000
--- a/sci-libs/Rtree/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Rtree-0.8.3_p20180802.tar.gz 48893 BLAKE2B bd0745e8e5051a772c2d50fe35712dc661737f32f6af382579dbbffc7467c21ef73bbeb794489da9891e50497b6f8775b1a670185453d54881e6dc8496fef539 SHA512 10c35a1d00369b3a30c486830d7cecdae6bd9bbc2ab9ea7f398227bc46b116783b1486cc75759eb27d7b25439400cbc39b55e6f58c686caec45bbc8436c6067c
-DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
-EBUILD Rtree-0.8.3_p20180802.ebuild 677 BLAKE2B 63182b2364e40bfccfd82b80ed5e9f7d552e276d53d002023572d6791b2ceb6d84c50921c6ee1315b9c17d80e694c22c37f407edc4f44e8817f22e768329db72 SHA512 35f3477cb35cb9b37683d51d08d72336d3bd526600acdfd5e28dc07972468f638633c0880b6b9a43a3735087e1a4a806362c33802d9ebe20fdbfdd406d21c088
-EBUILD Rtree-0.9.4.ebuild 495 BLAKE2B b6e693428baa03a3e91ce43ccc413d04d5167fa1f7ba4418f6ddc3e1d24925d96494fb4d6b102af4af28f4a787ea62d4520f4b11d12cd9221c16a7a3a3bfb7bb SHA512 ce8c6940c6f81ef921f5d0e9a599ff24be6c5e65e500375169d5a50f73c21b4e7c3993ab804c11c53b77728b6f900ade6abeb1885870cce326fb63abba127304
-MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
deleted file mode 100644
index 0832cb96d361..000000000000
--- a/sci-libs/Rtree/Rtree-0.8.3_p20180802.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,7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT_HASH="c6437a8ae182cb58aef1d0a4465bfc0c6f75b273"
-
-DESCRIPTION="R-Tree spatial index for Python GIS"
-HOMEPAGE="https://github.com/Toblerity/rtree"
-SRC_URI="https://github.com/Toblerity/rtree/archive/${EGIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/libspatialindex"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/rtree-${EGIT_COMMIT_HASH}"
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/sci-libs/Rtree/Rtree-0.9.4.ebuild b/sci-libs/Rtree/Rtree-0.9.4.ebuild
deleted file mode 100644
index ee3030b4dffd..000000000000
--- a/sci-libs/Rtree/Rtree-0.9.4.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
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="R-Tree spatial index for Python GIS"
-HOMEPAGE="https://rtree.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="sci-libs/libspatialindex"
-
-distutils_enable_sphinx docs/source
-
-distutils_enable_tests pytest
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 51c4f60a2de6..264a01cf4562 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -4,5 +4,5 @@ AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa2123
 AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r4.ebuild 3028 BLAKE2B cacb43b61a63aba2ae8a55393ff8f0ea93c0bbea9266f182d3ac270e822b09a16865da60076e6ea059bc1c684c9a13e7291f3aed037ca2fa79c48d0844fd5051 SHA512 c3f361945f1d4756f8251fc3122a4b8ba36e5f5723c4d71742f8d089a41614669ecaf5462a8e2d5945b09611eda3a98f4d91736ca253202c44d1a6fd6cb22705
-EBUILD cantera-2.4.0-r5.ebuild 3072 BLAKE2B 44b04260688a25de14ad1bd53bc5831f4f3354bc0b9cda0c857f86456b7d64e644284e7748ac0949cc5a5b50e3c297bedfdd6f162621eeb8c5d32f3570e318d7 SHA512 a4f702e5a7f4e8bf7c1147bd6a96d2bc51ef99a7c60691deb1f24fd07a78ca8cfb6427a0758912611793272c58a8bf87d66dcaa47b888dc0a3204729c0bb8ecf
+EBUILD cantera-2.4.0-r5.ebuild 3071 BLAKE2B e4a48b20a7446b1f521d2542c111f40603e708aef5940bee16447070cf00fd20e4f73778d054e33e68b92b0ae028dc8fbd89b0817367dcbeb96bc51305f13488 SHA512 0422fdea1f33a1e50aa6ec771234a87929c0827add0afc7cc2618db0cf275657b33d9f7aa95064eda4f2508d2cf7c5015c92d036058dda1838bd45d3b41cf68e
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
index ac2a89b4ddd4..509fa30f426c 100644
--- a/sci-libs/cantera/cantera-2.4.0-r5.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+cti fortran pch +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index a6ff83ec3c9d..ba178732721e 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
-EBUILD colamd-2.9.6.ebuild 652 BLAKE2B 9f0379eed783a2c0187a67173af2d0767424a76fe09adc9942787b278fae68b2fdbeb6d8113b343ba60815e86226a51eb916f37136e2254ae48df016347f3091 SHA512 ec5836bcb1d59494f119e58b7a78e68ee23b6276fc6fdc52a2ab3a774ad8d6a426df2762912ef1e65975ac420d062e24b114a6332db21c9d41120c49a5023f88
+EBUILD colamd-2.9.6.ebuild 653 BLAKE2B 56c901a42baff4cd6fbf02b1df4603c6a6c8b9122bcc2968e0b7ce59f70d7388ab048551e19d2fca3ba081ace3f0e7bd226df40ac8554df513044f7c0cc65c58 SHA512 84bafcce83a0bad14176b032b863b7c20e9bbc3d4e2be91bcc4386b69a5129cd264193b8a5e7568b493106fe17bb0711d2277c235265ce27f24bcc22ea80aab3
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index a656a74f5732..6a5198706edf 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Column approximate minimum degree ordering algorithm"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 681446030969..461ae730a66e 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 805 BLAKE2B 0b737ac020c2d7ec730f9bf129c41857bd876537223526b961efba8da5433b26323f67d091ba725f9a8fd63aeb6a03e89f9bcab0aee9eabb9172bcab32f59f21 SHA512 101487e1540bb0f8bb5dd53a7b1a640145a382061ba7ff33288fb0bd69c78800ad9908ddfcc9c13c6a6dc342b80b4aaa6633897e6e90407a2618073269fa6199
+EBUILD cxsparse-3.2.0.ebuild 806 BLAKE2B 51644f2e6fae0b45aee821accc1b1ac8546ae0bd557803ea96a6e54ec0d722673a6508c6483a71cd5e000d9ba47128192ef55cc7a120cfc5cf4bb5f855aabbcf SHA512 4f73c5b19139497084c224a479187526379a1acd3b34fce3af179c48763d70b2d111ba0ff39fb1baa497abe1f7fc2250bf9ebf4499be5aef74aafc23ec4d1ca0
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 1f31b3ad40cf..e72298d97b68 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Extended sparse matrix package"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 69a615fb3c80..54445e063586 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -3,6 +3,6 @@ AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a8943
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.10.tar.gz 12246979 BLAKE2B 507aa3f058b841f477720cff98480afda5c3e236b688fb1a12ff45ce20c42c6e84c786d62a5db7e6de6d133d40286e58777fcb51d6542b7030629d55ba12086f SHA512 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
-EBUILD openblas-0.3.10.ebuild 4100 BLAKE2B 4c5ea233e1d6efa39f0095aa346ca4ca4fcfd7456a862bf299ad2e161e3e5a5946ba20e5495168e9452cea26031418ea78b17bf82a09cad6b7aedda775fe4722 SHA512 d6a6096a691890f9e96c53d6dc41bbca5d4e33ff4fb988cb8dfb2b2fa18bdee38f2b4d777ca9c745ff99fc81660536df0b334eae667ac9fd92fda4c1ac47ec08
+EBUILD openblas-0.3.10.ebuild 4099 BLAKE2B e32f210f2f1b372d80771f21ca0a4d60a969cc4e67b01587e940027ea83e460c0cd391232c177df3d6aef16c20a2a50564bd8e317323a5834babb3e130020d10 SHA512 3d102b7136bb299c041345566845d5c705894513132e459b639473322cb4f5d585ece8cc71f1de97572860916e41c09264d22d48c3046f46fa407da99a09d626
 EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
 MISC metadata.xml 1460 BLAKE2B 22d1770bd4a58a0be80b7b1b04a7a6909d6bc7ff166a242c46294a1d39f5adf928c9e6f00835b79ef1c2df1747efa3b04d9b380a964581eeb963ea17e453ec9b SHA512 da3e981cab096d3bc18077ac210ccb1b91350418969549467c22f286196b18fb080eeb8a6183247b47de65cbd0a7fb67a16f2e46911aac6c5e9e9f01c193764f
diff --git a/sci-libs/openblas/openblas-0.3.10.ebuild b/sci-libs/openblas/openblas-0.3.10.ebuild
index 9d96c6fa9fd0..d7d208f1143c 100644
--- a/sci-libs/openblas/openblas-0.3.10.ebuild
+++ b/sci-libs/openblas/openblas-0.3.10.ebuild
@@ -84,7 +84,7 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${ED}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+	emake install DESTDIR="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
 		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
 	dodoc GotoBLAS_*.txt *.md Changelog.txt
 
diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
new file mode 100644
index 000000000000..308e77d93147
--- /dev/null
+++ b/sci-libs/rtree/Manifest
@@ -0,0 +1,3 @@
+DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
+EBUILD rtree-0.9.4.ebuild 574 BLAKE2B c77d5a7dd642e975d4cf744dbf1ef64697462a7d5699f5a96a1609d79be20175931b14b603d88f87905854ae082afc8f0d3459b1cfd48c0a128b4fdcf42b0402 SHA512 5d59036d9955902714e54821425e999dec9f476cea9c9ec15b7e73aeae2f64d5a03da92447120b8f5ae4026a127225a19f1fe6321929b3b0f5102d94e2a16896
+MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
diff --git a/sci-libs/Rtree/metadata.xml b/sci-libs/rtree/metadata.xml
similarity index 100%
rename from sci-libs/Rtree/metadata.xml
rename to sci-libs/rtree/metadata.xml
diff --git a/sci-libs/rtree/rtree-0.9.4.ebuild b/sci-libs/rtree/rtree-0.9.4.ebuild
new file mode 100644
index 000000000000..c539f353b91d
--- /dev/null
+++ b/sci-libs/rtree/rtree-0.9.4.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_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="Rtree"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="R-Tree spatial index for Python GIS"
+HOMEPAGE="https://rtree.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="sci-libs/libspatialindex"
+
+distutils_enable_sphinx docs/source
+
+distutils_enable_tests pytest
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index aa4725544047..92b18ddce7e3 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -15,5 +15,5 @@ EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-5.0.0.ebuild 1990 BLAKE2B 52ab23123248a3bc590ce5dea0bc0583bf3cd0b5587e8cbcda392a5f5b14b6229f88a247d3e2889cf8351e7f41290a09be1186857ebffaa31a3a513534d6994d SHA512 f1788b29f519eb1af18c2e2409e14bbce54e96b69144d9267840b9a9678c4fb6039dd44f03af987fb207498e23d631b4f689de0427bb77e8ef0eae6fdc360bdd
 EBUILD sundials-5.1.0.ebuild 2067 BLAKE2B 9f3324ddf9158af16d2489ac656a660859f80470077afaa59f0758b2f1c936110701d29bf24c482261055fc43c7b8b3e9bf7497137bacc2b3d487d87034418ca SHA512 2c1d0f672ca0c2a3b5da077557665b9f481cc9a3c8b5bc5f96e59c8cfcd05d5f9956afd2f367ffc141467961642b39d8443ffbe166850280fb12a8a0d05a0e41
-EBUILD sundials-5.2.0.ebuild 2067 BLAKE2B 9f3324ddf9158af16d2489ac656a660859f80470077afaa59f0758b2f1c936110701d29bf24c482261055fc43c7b8b3e9bf7497137bacc2b3d487d87034418ca SHA512 2c1d0f672ca0c2a3b5da077557665b9f481cc9a3c8b5bc5f96e59c8cfcd05d5f9956afd2f367ffc141467961642b39d8443ffbe166850280fb12a8a0d05a0e41
+EBUILD sundials-5.2.0.ebuild 2066 BLAKE2B 07034582741d9e807559a0ae33e3476a5d0162d875678cb540198cbea4edd4a95473bd2e311e0033d5be5737f885b0a9ba7f323f0e08e969f83e6f2ac6585f4c SHA512 dd808529c79eddb5a39b01649517f01a3a48806f4672f60be102f39e50e967a31cb4a23456857b45bfdadae4f7669704610c95c4775ea7b85c32ebb4b2b0e739
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
index c6bc6848c819..fb50f916f614 100644
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ b/sci-libs/sundials/sundials-5.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
 REQUIRED_USE="hypre? ( mpi )"
 
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 48fc8141992a..1bf254194382 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -3,7 +3,9 @@ DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLA
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
 DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca932f87428274afe6e1ac20670bf6d2b4c1c6ea8f367b1eb7ee64ff9f6e9b8ecdc2f64113924e7e2286e3f4e3d2c36cb101794 SHA512 4aaa21969299b02443e9396c238ef4c03af3bde1d0142a81c04d9706f18b02bfd125f3aaf8ffb47e0a3ffad949c3d3bca3909375f12a1c1e4c55ca1cc7930d51
 DIST tensorflow-estimator-2.2.0.tar.gz 627362 BLAKE2B 125792fc2167b8af837a99b08a9a26943bc5c1fda8ab3690b01c0d49a6dd39142ff4a063867dfe1bee3b99fb018981d0e4ee45d194caac2cd96a829ad22db0ad SHA512 aaf743835e2c606439fcccb56742997e930ba0e72c01d51633ce86824bbfaacd64607dc1fd7fb9604cc444feb65ebae60c2266be084e1b49ef2a1a9ca5a3d60d
+DIST tensorflow-estimator-2.3.0.tar.gz 642118 BLAKE2B 29ecf5b64da20e8e6981375f1631b9b7e8ad061f71d0a3f1ac567bcd04b02102c5854d24e5106660f6bcd7b4ca683bd3bfbde51f236669d0f17e8f847feb7039 SHA512 0befc9c04650a0cd91ce90bc2e9a5d17ae3f7d8d8e4b8f763f223bbb891c73c7e2cbe91a2779af36342008e16f02d118120d94165c6a8e3c14a723b32ee29cb0
 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
+EBUILD tensorflow-estimator-2.3.0.ebuild 1998 BLAKE2B bec6777c916d8da554c4c363a71d54295b2beb40e544363eb46e28f381a32798403b17bc0602539531be6a3d7ab323291cc2aa9f56954ee49dee42845579cedb SHA512 72f337563437517917bde7e3ad0d7d14ce93886009a1352a8b4d8bfe204059d1d0377c96c5dbbed24ff9aa41258f6a1ec204ea03a8683d4835e4b525bc2c3de2
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
new file mode 100644
index 000000000000..5fa7d1782c3a
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.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,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
+	>=dev-util/bazel-3"
+
+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 d72f93e2668f..5c9675f33c91 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,40 +1,57 @@
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
+DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079
 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4
+DIST abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz 1679879 BLAKE2B ce92197c564ff774db46027c32f97cfd55ff1d77b7cec5424e127d10a3b0a54d9e84537bd643c4eb330ca81959bcc0316b13c013b229df06b7f415864c451e46 SHA512 b429758c37749d3d5c5c220fe0dc00fa0e193b406545484095339b25674c4a3bb7850b76dd1a370ed2006729bcbbbb1b438995b614e149c2290bdb10038c49d1
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb492db172b1d2a849ed5f14f91dbb76606335d369e4b15c4eec41adfe3a23cdc5b4f3b2f1351a5e9c25103c002b96a2 SHA512 4729941cedca8ddb876a621b28221d3c17dbb5dd72af27e55f48274208f21db986c5e7cb8adb742c42124bfa8073eb782b49e2557cb3f3f95ca56833fef925c0
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
+DIST bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.tar.gz 19956 BLAKE2B 73f04a13f8ac3552e6f0770d1ac4edcc1b5ef46e4a3c4f3b83f11eeffa632f764d37aa7a98b35b5be6bd0caef19f84d0dc1b88bc55ff5397012863af4ee6d902 SHA512 732f482338996a62db24bfa6acd2fde6b629ac0a49317ed4e4778a55bbbbb22225f42a6cfa18cdcc51c200e29abe82a1f2a5548df09b7244074ae52e1f62ef66
 DIST bazelbuild-apple_support.0.7.1.tar.gz 20070 BLAKE2B e72098fc5017e3371b6af0f33f392a42da18376052f30db5dd602c5ccc0176c1ac8002cca3f598845c5cb33406b4fd8d30c5ea47c69add6c530b75dc6566a4b0 SHA512 bbab25c229404123d7d424fa261480cf887c749ae729cc1a00bd6c2554d4b4b3fa81e0eaa670542b3a5d3301f3bd5dcd7727d011ba854f13dbbf4f65895e4b08
+DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a
+DIST bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz 1951045 BLAKE2B d8c17f301de729bbf5254acacf89490ab1034b1180d5ea788251ae6ba3e2b704c82d7f66d33a086f52ce3909cd33df7739d7d536c6be070a2d3454e2f280517f SHA512 a23826d8e53d49de6347eca052e980878d50b431bf02c9b8333234c0659d5e290447121bf9519729639891e67d732474a3c3b7a7502752b32f830680bb334bad
 DIST bazelbuild-rules_apple.0.18.0.tar.gz 1333446 BLAKE2B c7667e05c236f4de44573707c795d31c980242a2ea6eb69261403e7b1b7cc852d899c9b76cba347df1b1006542f9d532d78586a3bf5f831d37f8f0c0cd79a8eb SHA512 209b21856642b03dc7d54c0c82826224167df7da4c6dda3d29490e0661cdfe35ad9abe763288e0ff80af4d681a361efb22e0ca45ead6fb96fd38f211bcb4435d
 DIST bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697
 DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
+DIST bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz 7612 BLAKE2B de9edd2e1f49edaec782cf58c4ebd3dc3c6d144499a18ac76a0685e28bb9fa6898980ea769c54186816dc696b2e9186d929e99602d8ea535409e1fd23b87da7b SHA512 dd2aef9011c6006e8adc777c211174c26ab74e3cf186541aba865012669ceebf7d96fa34a202654cdfb2beee4f67904f5b7736be466f2838cf31dfb3970f69cd
 DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5
+DIST bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz 140484 BLAKE2B 2526d808a4763fffa16bb035de78993eefe6371a29139b152370081f548d8147868cc95194c06a54f1c5c0cd8b63ffbc59b00686bfaedede2463a448e38c2810 SHA512 e22a85a5dba52cc3474481798264571f6671aace19eecb058b24ac7d586ea7822ed3ae042b4a812671f81d4f9f8915aa2381fa6ac278da7969b976eaf28db636
 DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489
 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
 DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
+DIST eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz 2628283 BLAKE2B feac186ce8d18026b10be4955267ed65b65b4432f02bcf817da08960c9164bcb22b352c413f59890aac2de87c5e3e9e05ea48dff28635bc8901628af518dc4d2 SHA512 f183bfe235a98dc308c69a1d9e168b538cc92cfbbe35d4e35596b0b2588ecad66212efb3d3ffbba7c8adbd67be24cc4dda5dba8dcdd67245eca2b1a0fb94d380
 DIST eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz 2580537 BLAKE2B 927897c80f3529da40a76ddde26113403926d730fa4539aa9e4121406e8d3852abcfdbc55d178723300e9daa26176f6170db06bb49a59cb190e8c7e6dfdea4dd SHA512 d5461e615044aa94b6ac9ab2815536f4bdf2b9ccfeb578cc7bc62554ba928b4192450f72f1350f3231ed44d2bb90e95218de9a5d0bcee9ec02867499a6dc5db0
 DIST eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.tar.gz 2585583 BLAKE2B a2ce9da5f962f891cba748f46ce43667ae2b7fef54d4cc83411eafbc24b331e586c44fb135a2c3597c77fe62b0c8ff1172ae5ce6876f00ddd6f6ef2eca802d9c SHA512 65a73d26474547db83b9b40a133dd2a021e0f5a459104f63124461b4aac28bf3579dc81475441b3576901f28f704d6d4624939b22ecfbfbec896148c4c38da7c
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
+DIST gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip 936866 BLAKE2B 0977df121a80de979a9996b58a0a8cad157db8d0862b96f95b3be1157cddbc6b40dff4fc7da4ee78f5986cbfff2a67c173155e849e772ae476398c51f3028311 SHA512 4bf036de43f5e0890f66e0b16cd9a0f52911b160f79c9c50cf403454fa9d6040df225d34e02f424da8bb8c5f7f5c002f88f4d232c61503aa825c907ad8742823
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
 DIST llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz 115936989 BLAKE2B 624b4a898321e62002cbf3955f844755b3ba6b1c8acf9a310ddac19cf21f9627902eb0b3684e42bac1fe835be972322a5cc667f78a6e2b0e699f956e0cab81e8 SHA512 09ec39ec7a25703bbb47befb406be3de6d15232c971fa186e33dff80192876a827e35523a9782365e26a90abd42b32b9a2ee1443af71cc23cd825b3ff05df629
+DIST llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz 120301408 BLAKE2B 928117c2bae7bcdd2445e9f65297b45b009dfc62e9c16ed08a8f00aacee2497492b6fb4cbea0047a8aa1425b538e02af9b8e6dd21e52348cc45dfbb71ab3f47f SHA512 a9cfbd00a0530e4f5d001029c33be3723ed009799a42bd730a65319da671020a249ae5ba4496f1347a71a9ee69de4e9fe2b80c60ebd1bc4d6d4120bd3d6fecde
 DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88
 DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e
 DIST nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz 123898 BLAKE2B 9a268e089877fde9ac900b43bbf829f7dedfa701b017568647e3564670d5457dc18c96846a2cc8674b243c0c7d97d322e7466167c322588af3ad4f2d189b175b SHA512 9b090a963213eb088edf247e72b51a6cc79669f507831b88205c75a006a43f3d2257c4e75a34c33987c7d95c421e2273642db4c716b02907e8de1b1ef5d080f0
+DIST nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz 147548 BLAKE2B f3d3dd222ae90ac9ac1457a9695f112a21f5652a5b40e10ac049da910f07707b1c3910f59734fbe5e2c6523c1e83f3801f809efa77d122a57e859828c74ba8c2 SHA512 d9ea83caf7940fb47134293236fcb7478c0d4e40365d3b0a29427758e2e2dbb980c5e8c05fc9fc3956ed5e21a82ec0efaa31d973fe9c73fa3f50465f76756131
 DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16
 DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa
+DIST pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip 3787039 BLAKE2B 3a529648d548b7570fd38783e5a3915bf3ad82ab028ee11f70fddaf09b8d64dc58f4d32ed54557b9f3087a8bb13ff4fd78b3597df6b1b5d3c3ef65c03193251a SHA512 8b34e580f19494f92796176db3f14680fd1b7b64458c0ef8e71ff1b3f1cbe12204e901167a585c1e04e95fbeaad5de104abc5edf3ea81a0da1c480a99f6bb94b
+DIST pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz 3489028 BLAKE2B aa6b7719eb9871b6cc71318cb4a9c2e2397e665662b7978daecd9e8380304691a78b95118eba5cbbb738c4b490352a847f6ce6b5c4ae29de0543b95ecc557cbb SHA512 ecd2115340fa82a67db7889ce286c3070d5ab9c30b02372b08aac893e90ccebc65c6b3e66aa02a9ae9c57892d2d8c3b77cb836e5fc3b88df2c75d33e574d90d2
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
+DIST ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip 312628 BLAKE2B e42c484092f5e93dee11bc7c6a92ade3b63533d3507fa5a805b16e3508b8a20b7cff734197ab9d8e9b0e67e9648987ccedc19a23deea93bb00269d2fc65424a4 SHA512 d1b5a73feb4cced7ee49e9bacb80f437b0bcde204c3bc082a2729efb1989517ac97d764d6fe00bd66f0d5349d19d9e0593868c8d22369dc38732cd2204419b1d
 DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
 DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B 8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220 SHA512 94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d
+DIST tensorflow-2.3.1.tar.gz 46544608 BLAKE2B c3cb0954fcd060b95d63895cbeeca20f6af29ade999dc43db5fe010d6b33b6f650047d529f174a1663c23440a56e057e2f97c503a4a40bcdac9374b549f3220e SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
 DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
 DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850 SHA512 8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533
+DIST tensorflow-patches-2.3.1.tar.bz2 11361 BLAKE2B 22ddd827f616e33fd259ce2b7da5cda539d856701ad108d1d3b52d1dab660bcddc809fd9e9db5e6496552df080493b0205b83a58dc32808dc70c60a5878aa8af SHA512 cdfc3407c775f8529cb8eb939b1046a7094ff999b8225e419e2ab4be19ecba6d853ebd8cd2dda77a7f60425a440f4d60bf3afca4a80688f0cba9967e14f8b8fb
 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
+EBUILD tensorflow-2.3.1.ebuild 15183 BLAKE2B 15f3de2530ffd1ea0c9e0383b0d90a2f0b7912ba62d497d56609ffa9be19df2e0f57304d6459a83b0a5e3bcb9410443656d8554595c3e5a2dd08803893c51467 SHA512 84ccd970c56eccdd9350fd56d4aeeffedbb1ad2e0be2fd58a416856f97b1d9f79ace4dffe41460fe6f2e6ae6d2030d7a3ee8720a99844fc3c97e23211cee50d7
 MISC metadata.xml 500 BLAKE2B 05036ab51828503c91b561bf087bb0a4d0cd6aa2f68dafa51499a5b57c33bf04e4f413aca576b62eb60b233467405a346c08d72b3c771b9f3fb4e099a55bd3c5 SHA512 ca5c67f8ced7d0f5ebb5f261c7adbcf23ea31b099e0aa3e1a3f6fd37df7d3558706af4df8411fc421a3b99c8615df7c5f07c617d7af275eccc728e76ce509458
diff --git a/sci-libs/tensorflow/tensorflow-2.3.1.ebuild b/sci-libs/tensorflow/tensorflow-2.3.1.ebuild
new file mode 100644
index 000000000000..657eb270e10f
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.3.1.ebuild
@@ -0,0 +1,405 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/386d809bde475c65b7940f290efe80e6a05878c4/eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.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/archive/5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz -> bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/apple_support/archive/501b4afb27745c4813a88ffa28acd901408014e4.tar.gz -> bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.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_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	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/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.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/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.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/7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz -> llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/google/ruy/archive/34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip -> ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip
+	cuda? (
+		https://github.com/nvidia/nccl/archive/5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz -> nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.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-${PVR}.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-10.2*[profiler] =dev-libs/cudnn-7* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] =dev-libs/cudnn-7* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* )
+		)
+	)
+	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/pybind11[${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.3.0[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.3.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	dev-lang/swig
+	=dev-util/bazel-3*
+	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-${PVR}.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 || die
+	sed -i "/config_googleapis/d" WORKSPACE || die
+
+	# 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
+			dill_archive
+			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
+			tblib_archive
+			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
+
+		for cflag in $(pkg-config jsoncpp --cflags)
+		do
+			echo "build --copt=\"$cflag\"" >> .bazelrc || die
+			echo "build --host_copt=\"$cflag\"" >> .bazelrc || die
+		done
+	}
+	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-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 2fb57f975206..078ad48b87c1 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/agda-stdlib/Manifest b/sci-mathematics/agda-stdlib/Manifest
index 854bd5c659da..b302dfcd9db8 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,7 +1,5 @@
 AUX 50agda-stdlib-gentoo.el 58 BLAKE2B e9b9bef913e26c63e4b0e19a1e4b5c0e370959689ae18e74ed54e7a8c1415c19fb517af9be59feee3e636042bc22fb68f1fd5457f551a436b920b42685aec1f4 SHA512 f45f0e59a1becd5d2b13b452219cc77b553dad9480a848ea62f276e106ab911ed1594e826fe487b886fe9b6e8aadcfde47de4fb1b0ab144ae98b6ac9eb385cfd
 AUX standard-library.agda-lib 55 BLAKE2B 057e933b07b291fd505f2e64f43b087c2aa4f4828ba2a03b5a53b9cac0f0fd0ab1f523c91efd6090e34e376dcc61d90bc5193063b6f07280c0eb2d688a07dedc SHA512 b1e2cbffe4b99157661fe6f4685580c7524890735db0a20ae1942e076b00d0df13624f587ea7584319e5665484da63beb3e0e5c77226bdbe02a4a80fa33a17b4
-DIST agda-stdlib-2.4.2.5.tar.gz 253379 BLAKE2B c635040892bf940057bacf35f85fa6b7e3b49d1877ca7310933c27312b37566f3df077ad021d34e7855daa1e23b2495df82fe288e8416a11f630beeb313ca027 SHA512 b15ed5838916240c8602fe7a4bccddf43c71ab3a18ecb5a6dc85199b908e261b04cf794a4d93c90af0a9263a36603c392280639ace7fecead0c39269c2623302
 DIST agda-stdlib-2.5.2.0.13.tar.gz 264701 BLAKE2B f35b419aac1b80af86217a86fb8e21a2f3427ef9629c8f2e284036859cd89da16ce1b64ceb87f8a3030b5bdb2a68b4f59f74a717fc1e13378ecb20cc6b28f59c SHA512 340a7b9cb15793cdbe99f558a32eaab3476b94b4d43d45bdc92c6b368197d075c977fd2f6ce0c5b0baf584289a2218b07dd030ad2b83f6d9e4bc7effee91eece
-EBUILD agda-stdlib-2.4.2.5.ebuild 1914 BLAKE2B f76f7e595d75dcf99b1e6968fd2b1c458e951b1e2807f7110261830cad2b1b436964c826764ec59e5093712dd6ca1b999746b1321a00d902f9e9891bd9ef01cd SHA512 40c9829fe63f6041253dc022c072fc1eca9e8fbdb1945c6d2f89e278cc051df05534397919691b52638a46e656bd6455db185f0dccd1899d581c85be0c6708d2
 EBUILD agda-stdlib-2.5.2.0.13.ebuild 2175 BLAKE2B debbd1f201004b20b3e41ad446eac17e2e5ae53175d2c5c56e1a35e94239835d337f5f87bc9b2f03b39a8b7bc1f52476cf02147f5c47fab5ce9e18aac4086e25 SHA512 18c5b73a3dc72a8ee6839381428f27617d299f7c0f61af6c10ce32279e9d50b43b6a36ae02ed675ee1a196914d7f1a2331318976e038c6fc827ec66f95cc9a23
 MISC metadata.xml 584 BLAKE2B 9d0eb0995feecbe10282cabba0b56dfe8278149f16840a477b55e6cf63675c79a642922eca2980f193447b1cdfdb59c4f1524a6cd9ec264175e2a753de6b918f SHA512 5d4446db6dac997893534b330f16a5631ff7472fa9178ced3c7300848a0c1733718985f3f6fa2f39adb905e973f8926371043cc08dac99e795e62850e1f2f2dd
diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
deleted file mode 100644
index be6d6baf3910..000000000000
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Agda standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://github.com/agda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile +ffi"
-
-# filemanip is used in lib.cabal to make the GenerateEverything and
-# AllNonAsciiChars executables, so agda-stdlib does not require a subslot
-# dependency on filemanip.
-
-RDEPEND="~sci-mathematics/agda-${PV}:=[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 )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	cabal-mksetup
-	eapply_user
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-	"${S}"/dist/build/GenerateEverything/GenerateEverything \
-		|| die "GenerateEverything failed"
-	local prof
-	use profile && prof="--ghc-flag=-prof"
-	agda +RTS -K1G -RTS ${prof} \
-		-i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
-	# Although my agda-9999 build has
-	# /var/tmp/portage/sci-mathematics/agda-9999/work/agda-9999/dist/build/autogen/Paths_Agda.hs
-	# containing:
-	# datadir    = "/usr/share/agda-9999/ghc-7.6.1"
-	# it fails without the --css option like:
-	# /usr/share/agda-9999/ghc-7.4.1/Agda.css: copyFile: does not exist
-	local cssdir=$(egrep 'datadir *=' "${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir    = \(.*\)@\1@')
-	agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" "${S}"/README.agda || die
-}
-
-src_test() {
-	agda -i "${S}" -i "${S}"/src README.agda || die
-}
-
-src_install() {
-	insinto usr/share/agda-stdlib
-	insopts --preserve-timestamps
-	doins -r src/*
-	dodoc -r html/*
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 7334f7c783c0..95e6e2a0df88 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,8 +1,4 @@
 AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa3d1ddf4f4076d94115f0168d4ad0c96a876be57ead4db26219e594a9afed3aba2ce3cab30e8cf19060 SHA512 55b7438896cb66b4b32b0ba0d9468bb2496df1f63a78f3f4b4e19cc038018605c9cbd7880d2be1b40d6d1509ac6df20304cdc8c2ccde69e89777acfc65a1ce8e
-AUX agda-2.4.2.5-hashtables.patch 558 BLAKE2B 88532103f488b643ac84ad37fae3776514034121624c43610910c44a67ac0e68cc5d5d8afece38e2fbf95dbaa3e268e2418d1c34ba4a8fbc60637d63765be42d SHA512 0297fc4605db3dc11f08ec068cfdce908d273c6d14f472e4d00b4416a8e5f671b3b77d4e0cb671671bafd07b39ec46e72eab6cab972145199b25b3c4cfb0b3a6
-DIST Agda-2.4.2.5.tar.gz 1031427 BLAKE2B bf64731e0c068c4f609e9651f0cb6ea763f1e02ddd8909269a140f8ebd036dbb5b36d9f1b038a32016447bbfbd4f9dd6a00a1cc34616efd7099a2b4ddcc7d3bc SHA512 c2e090a42f699200854c20dad868b4b67e99107f0cdbba20ed268f4618fcf80068ee31db37e4b6637f73128d9f652ef9276d8f7adea54628da759d79f5e4f4a2
 DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c SHA512 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
-EBUILD agda-2.4.2.5-r2.ebuild 4436 BLAKE2B 95e7429fdf3b03505aa2357e2ff7da7b9246d371cf595a26ef9d05dc23d42f4b1267a4cc3759a89ecd135e77ce390fc9db8ed333591159286dae6f594f8931b7 SHA512 8a0f546dc68745851a8083db3a8dff1e141b727026be86ab207ce848500553964cea1c3ca16ef4ffb3492cc13011ccddd50b03fe7dc63723a6f43730d97c075b
-EBUILD agda-2.5.2-r1.ebuild 5270 BLAKE2B fadb3f989c59b25c576376534c43b16d896f99d6cfb349c9ec59364428eec21651943e5a71daf6951aedda6fe8bc97b031b670652dae66ff954dca20fbcb070d SHA512 9de1a2016cdb763df7e450c80514417f3cff228fe97b3a2f7041722b3a09904c99a24e5c152bba54ea10c28b8c37c2b2ac2a5f1a68ef00d38e8335f93159332d
 EBUILD agda-2.5.2-r2.ebuild 5305 BLAKE2B b5fe5d674d023921cc3a6e3a13d281d3289306f0d7ad08b0f1402fdabff79d8ae7a58ac9a17437fa298d142ee601b02256222bfdbec8994d687ad61522b16e65 SHA512 faa7262d365ebdfb1d3b19e4ee2c1a7b8d4e02d91fb414fba5fedee4da92e6027690fa00e6fc92714e22920f43753d059e79841cebafc6bc2ef8e2f3fa77090c
 MISC metadata.xml 907 BLAKE2B f4890d2c0e7c8d3eeb57ad9472ae3b5ae287fc7880fa853ec5d1a6c9867aa3e11ef71cd5b46ed5e9fd9e3c3307eea1260c4aa0d9f1598de64f48f43e0c2af137 SHA512 d48af119f929e739634165e1ece14ef2bf55eb996fd0852fd34783a18da04a156bf858b3f0a7ad3cd5c85e55c564bfb3e5552786161fd2ad66f86eb5d3d91426
diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
deleted file mode 100644
index 63b99d3e1cba..000000000000
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ /dev/null
@@ -1,130 +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.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A dependently typed functional programming language and proof assistant"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs +stdlib emacs"
-
-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?]
-"
-RDEPEND+="
-		emacs? ( >=app-editors/emacs-23.1:*
-			app-emacs/haskell-mode )
-"
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${PV} )"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.16.0
-	dev-haskell/happy
-	cpphs? ( dev-haskell/cpphs )
-"
-RDEPEND+="!sci-mathematics/agda-executable"
-
-SITEFILE="50${PN}2-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-hashtables.patch
-
-	sed -e '/.*emacs-mode.*$/d' \
-		-i "${S}/${MY_PN}.cabal" \
-		|| die "Could not remove agda-mode from ${MY_PN}.cabal"
-	sed -e '/^executable agda-mode$/a \ \ buildable: False' \
-		-i "${S}/${MY_PN}.cabal" \
-		|| die "Could not remove agda-mode executable from ${MY_PN}.cabal"
-
-	cabal_chdeps \
-		'zlib >= 0.4.0.1 && < 0.6.1' 'zlib >= 0.4.0.1' \
-		'transformers-compat >= 0.3.3.3 && < 0.5' 'transformers-compat >= 0.3.3.3' \
-		'build-tools: cpphs >= 1.19 && < 1.20' 'build-tools: cpphs >= 1.19' \
-		'alex >= 3.1.0 && < 3.2' 'alex >= 3.1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpphs cpphs)
-}
-
-src_compile() {
-	if use emacs; then
-		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
-		elisp-compile src/data/emacs-mode/*.el \
-			|| die "Failed to compile emacs mode"
-	fi
-	haskell-cabal_src_compile
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	dist/build/agda/agda --test +RTS -M1g || die
-}
-
-src_install() {
-	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
-
-	haskell-cabal_src_install
-
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	# generate Primitive.agdai, emulate Setup.hs postinst phase
-	Agda_datadir="${add}" \
-		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
-		|| die "Failed to build 'Primitive.agdai'"
-
-	if use emacs; then
-		elisp-install ${PN} src/data/emacs-mode/*.el \
-			|| die "Failed to install emacs mode"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "Failed to install elisp site file"
-	fi
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/agda-2.5.2-r1.ebuild b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
deleted file mode 100644
index 1c7e55a7ad8d..000000000000
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,148 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-## shared with sci-mathematics/agda-stdlib
-# upstream does not maintain version ordering:
-#  https://github.com/agda/agda-stdlib/releases
-# 0.11 -> 2.5.0.20160213 -> 2.5.0.20160412 -> 0.12
-# As Agda-stdlib is tied to Agda version we encode
-# both versions in gentoo version.
-##
-MY_UPSTREAM_AGDA_STDLIB_V="0.13"
-MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}"
-
-DESCRIPTION="A dependently typed functional programming language and proof assistant"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug uhc +stdlib emacs"
-
-RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
-
-RDEPEND=">=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/edisoncore-1.3.1.1:=[profile?] <dev-haskell/edisoncore-1.3.2:=[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/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?]
-	>=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[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/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?]
-	>=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?]
-	>=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[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.10.1:=
-	>=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?]
-	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
-		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
-		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-		>=dev-haskell/uulib-0.9.20:=[profile?] )
-"
-RDEPEND+="
-		emacs? ( >=app-editors/emacs-23.1:*
-			app-emacs/haskell-mode )
-"
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.22.2.0
-	dev-haskell/happy
-	cpphs? ( dev-haskell/cpphs )
-"
-RDEPEND+="!sci-mathematics/agda-executable"
-
-SITEFILE="50${PN}2-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use emacs; then
-		sed -e '/.*emacs-mode.*$/d' \
-			-i "${S}/${MY_PN}.cabal" \
-			|| die "Could not remove agda-mode from ${MY_PN}.cabal"
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag uhc uhc)
-}
-
-src_compile() {
-	if use emacs; then
-		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
-		elisp-compile src/data/emacs-mode/*.el \
-			|| die "Failed to compile emacs mode"
-	fi
-	haskell-cabal_src_compile
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	dist/build/agda/agda --test +RTS -M1g || die
-}
-
-src_install() {
-	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
-
-	haskell-cabal_src_install
-
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	# compile Agda.Primitive and Agda.Builtin modules, emulate Setup.hs postinst phase
-	Agda_datadir="${add}" \
-		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
-		|| die "Failed to build 'Primitive.agdai'"
-	for file in "${add}"/lib/prim/Agda/Builtin/*.agda; do
-		Agda_datadir="${add}" \
-			"${ED}"/usr/bin/agda "${file}" \
-			|| die "Failed to build '${file}'"
-	done
-
-	if use emacs; then
-		elisp-install ${PN} src/data/emacs-mode/*.el \
-			|| die "Failed to install emacs mode"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "Failed to install elisp site file"
-	fi
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch b/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch
deleted file mode 100644
index 9bba347fa292..000000000000
--- a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/full/Agda/Utils/HashMap.hs b/src/full/Agda/Utils/HashMap.hs
-index 5e1da8b..7c34548 100644
---- a/src/full/Agda/Utils/HashMap.hs
-+++ b/src/full/Agda/Utils/HashMap.hs
-@@ -5,7 +5,7 @@ module Agda.Utils.HashMap
-   ) where
- 
- import Data.Hashable
--import Data.HashMap.Strict as HashMap
-+import Data.HashMap.Strict as HashMap (HashMap, filter, lookup, insert, delete, empty, insertWith, toList, adjust, union, unionWith, elems, fromList, (!), keys, map, unions, foldr)
- import qualified Data.Maybe as Maybe
- 
- -- | Like 'Data.Map.Strict.mapMaybe'.
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 5a7f836256fe..e653de0b8a94 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/gato/Manifest b/sci-misc/gato/Manifest
deleted file mode 100644
index a63d4ed30e71..000000000000
--- a/sci-misc/gato/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Gato-1.2.2.tar.gz 274369 BLAKE2B 472ad17865d0a9140502e9149238a16d1ae2f012ac86e04e62ae176fa73564e1c5f8beab22de4e357355f0f6c28a867fe9baeb68ffae971221ac4d2ab0332026 SHA512 a628827b989f28817bcd427903d09f6571b3c2e571b57242d7c41562e558a00b278e87699565d16bf2584a0c8d33c07bf0a3c5113c9feeff417546a0a712c0c9
-EBUILD gato-1.2.2.ebuild 807 BLAKE2B 490de2dc2c2819cb5d31e6ff05ca272c2c3061b4bdef57ba77e1d1fdb405f082165c20d95fd74291df4f454f6a89b0b6341678a1e561bfe6f3207da473463bf3 SHA512 a1335b105404cb9730470b9429dfa7ebc8a3aab4dce1d48422e74b2c2621ee5f010cda485688a06b1958b1b342802f421df55f6cb0396e49199ea10c6e7ac125
-MISC metadata.xml 499 BLAKE2B bdfd0568307bbed32fcff2cc4d9b0b6e1e2c3335576171a651e77f122dc88815f47c3394ed0581ed4c73e94cf418598f6f17f1654964344fa249e078fef4b9ef SHA512 b4fe8ec095cd7d538295039056bed3cec249ac246edfabd02f994d65353018024850e112d116f16e7ecf160ef9ae7f7653ff93885235810583cc0c5881bf02d8
diff --git a/sci-misc/gato/gato-1.2.2.ebuild b/sci-misc/gato/gato-1.2.2.ebuild
deleted file mode 100644
index e78b0e32d1d0..000000000000
--- a/sci-misc/gato/gato-1.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Graph Animation Toolbox"
-HOMEPAGE="http://gato.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P^}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# change TKinter call to avoid crashing of X
-	sed -i \
-		-e 's:self.overrideredirect(1):self.overrideredirect(0):' \
-		"${S}"/GatoDialogs.py || die "failed to patch GatoDialogs.py"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# install data files
-	insinto /usr/share/${PN}
-	doins BFS.* DFS.* sample.cat
-}
diff --git a/sci-misc/gato/metadata.xml b/sci-misc/gato/metadata.xml
deleted file mode 100644
index 9e180aec6745..000000000000
--- a/sci-misc/gato/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>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Gato - the Graph Animation Toolbox - is a software which visualizes
-		algorithms on mathematical graphs.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gato</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 64e39bd7b2d3..87430cd71653 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 4ed9bc48ee50..bd8f29be6297 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -2,6 +2,8 @@ AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932
 AUX bullet-2.89-no-dangling-pointer.patch 842 BLAKE2B 5d66875b52f696b839daccfbfea4a238ea32c6fc31fc6cd441cf5d053569bced474b6c8b7620a1b3eb67d69b73ced3d0d1a2beb8ec5479e64f581d66f630d5fc SHA512 a463da3288d21b3d6b0dad1bc81fcc3b95ce1bd2e53c107b597d3a6beed0b0fbafffab9d38c2394ed125802e0fb073c74f125bed9fac7898f3a3dd23930a6dfd
 DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
 DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
+DIST bullet-3.05.tar.gz 142858358 BLAKE2B d7ef2e68c0740e5bd2a728c576bcd3f07fff3680d8f604d7fd89bb6d7eb8c38f6205aea3bae300d70c2ec4e362c14e0567e3af3aabc893f8e33d979ffe8b3521 SHA512 4cb67547b466e01f6c2258b1f350fdfac0f2dc73a7962b6e196491e6722e1cd22cdfe80d7b2f4e1e92a90f91e277bff5cabfd0f55ef55010f9a4d7286843cecd
 EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e
 EBUILD bullet-2.89.ebuild 2050 BLAKE2B a9cb3d8cde1385146d1db5b5dfc46734ceb01d56c05e02db3b461d3b7b564ce9dcd34686c67bda7143622ca2fc05c5d6a04a50ddf3d8b74867148350f407ff32 SHA512 f778ac777ec9954c8a2ae56f3ad22d04ceff29e57ad119fed92daf535954e31ab5c7d68d49588dc4ed20f894ccdedd0f5099a366d80ae7bc2fa290b8d40ad620
-MISC metadata.xml 1188 BLAKE2B 9234b2083390248796bc38581d85dedecc7befe06b1b3d15a11c46fe0b468a0e831d20ad411d3386bc0f1ae9fc8cb119d4fe6a0a229276627f6349f373d29993 SHA512 84301ff0c87edee5c6704adb6e3a2a7b7ec1594a178a95a680c27acd2e0244742741ad02c4505da788a0c160253433c72c3daafaca95021ecc4709bd0e8571e3
+EBUILD bullet-3.05.ebuild 1892 BLAKE2B 5cfa6c14ac79388126e64448501f6be39a9b7f2ff5c9854df99539edd67619f21eb5bbec8bd6422d18f7ac9efc7268a0b3793fc2d13be103e7fc3e416d31ea4a SHA512 28b136151c774a165ae7c7d4710fffc81558d11d6374ea50b9308a1fc02c13592b454237ed355f4100130f561f4a949e721981c732352d87456682ba34ad89cf
+MISC metadata.xml 1304 BLAKE2B 63dafd8147fbd42a491f15f9ea4db7cb79581925f438fb45465db642f1f915a88d630a45d2ce1111a98df615610d61b640ebfc389595573b26148c24d266f166 SHA512 4f914ed4e849fc29f506e9fa5359f7e6d470636ff2223b3aadbee88a93a037bc7a36a79d9ce37cbecc682854a4abc20d803e42e44805d5df384392f9d3abb280
diff --git a/sci-physics/bullet/bullet-3.05.ebuild b/sci-physics/bullet/bullet-3.05.ebuild
new file mode 100644
index 000000000000..1361eaaff579
--- /dev/null
+++ b/sci-physics/bullet/bullet-3.05.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Continuous Collision Detection and Physics Library"
+HOMEPAGE="https://www.bulletphysics.com/"
+SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples openmp tbb test threads"
+
+REQUIRED_USE="
+	openmp? ( threads )
+	tbb? ( threads )
+"
+
+RDEPEND="
+	virtual/opengl
+	media-libs/freeglut
+	tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
+
+DOCS=( AUTHORS.txt LICENSE.txt README.md )
+
+# Building / linking of third Party library BussIK does not work out of the box
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# allow to generate docs
+	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CPU_DEMOS=OFF
+		-DBUILD_OPENGL3_DEMOS=OFF
+		-DBUILD_BULLET2_DEMOS=OFF
+		-DUSE_GRAPHICAL_BENCHMARK=OFF
+		-DINSTALL_LIBS=ON
+		-DBUILD_BULLET3=ON
+		-DBUILD_EXTRAS=OFF
+		-DUSE_DOUBLE_PRECISION=ON
+		-DBUILD_UNIT_TESTS=$(usex test)
+		-DBULLET2_MULTITHREADING=$(usex threads)
+		-DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
+		-DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die
+		HTML_DOCS+=( html/. )
+		DOCS+=( docs/*.pdf )
+	fi
+
+	if use examples; then
+		# throws QA warnings
+		rm examples/ThirdPartyLibs/openvr/*/linux*/libopenvr_api.so || die
+		DOCS+=( examples )
+	fi
+}
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 8dc1b6e634b1..3eb822b267c4 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -19,10 +19,10 @@
   for games and animation.
 </longdescription>
   <use>
-    <flag name="bullet3">Build Bullet 3</flag>
-    <flag name="double-precision">Build libraries in double precision</flag>
-    <flag name="extras">Build additional libraries</flag>
-    <flag restrict="&gt;=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+    <flag restrict="&lt;=sci-physics/bullet-2.89" name="bullet3">Build Bullet 3</flag>
+    <flag restrict="&lt;=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag>
+    <flag restrict="&lt;=sci-physics/bullet-2.89" name="extras">Build additional libraries</flag>
+    <flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
   </use>
   <upstream>
     <remote-id type="google-code">bullet</remote-id>
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
deleted file mode 100644
index d8af0654ef90..000000000000
--- a/sci-physics/rivet/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST Rivet-2.6.0.tar.bz2 3527799 BLAKE2B a0ffe7a73ed1120cd3944d3c845ed9387528e7645554c589fda0bfcac694e36f24ee78914e916c51f3a978659933b4e8934e0373f26e4a3ba7597714fc9a939f SHA512 49c381d88075715e23942bb02066b189305077581cd64b708ccaf79436202fe1c9d7989fc1f35dfeffdc643adb39283710fdf33fc87407cfb7ddd3e9d2297feb
-DIST refs.bib 16907 BLAKE2B 70c11f86c8ebf6386615b3e900280d1a2677dc82d99f944ac670f52320e05355352dd4017a48ae2af52dfd6f46a92a0d2d65bde4c271589ba4e66b3e7b68982c SHA512 64755e6aeaa1f0b3fb76a33ffdf226bcd42ee597a78a8d458b728f0e6f576d4dafbb276a0498c3b573d23054ccbf54ada6f6c12faf52dbfbeef2372094d01181
-EBUILD rivet-2.6.0-r2.ebuild 2072 BLAKE2B 000281770d68dd8b8fcf79d183010ac7b792a161035edc65dbea1a6bdd8eb5a01129cc798fa1a1fcb4d65806eaf8ec6c9c92ac9c798594697a2b1a36b1815b8e SHA512 4037d80a27a2eb8111dc08463d9200306a886be79ee3e45af21f43f14fec482e5cd7c33f31d59cfd6801bb454dc607f0551c781adc4b450899576be7b46c9a1d
-MISC metadata.xml 836 BLAKE2B ab971f916f23c3c3d70e54440e8f2303918084d25ba5a5ca7ed50142606f88e25019dac7781f20df717e4a552fc3ca642439bf0c37476aa378969f82abbab1c3 SHA512 21245268e114d41e0fe10cf6d265b3db7a0e220e1f6d545df4782839f6f5f284c9ddd6f89d20c74497e394e23bf93c96013dcde5c3685e4f1c112c73156f8db0
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
deleted file mode 100644
index 78b51d05a6f8..000000000000
--- a/sci-physics/rivet/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-physics@gentoo.org</email>
-		<name>Gentoo Physics Project</name>
-	</maintainer>
-	<longdescription>
-		The Rivet project (Robust Independent Validation of Experiment and
-		Theory) is a toolkit for validation of Monte Carlo event
-		generators. It provides a large (and ever growing) set of
-		experimental analyses useful for MC generator development,
-		validation, and tuning, as well as a convenient infrastructure for
-		adding your own analyses. Rivet is the most widespread way by which
-		analysis code from the LHC and other high-energy collider
-		experiments is preserved for comparison to and development of future
-		theory models.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-physics/rivet/rivet-2.6.0-r2.ebuild b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
deleted file mode 100644
index 3bd00b427282..000000000000
--- a/sci-physics/rivet/rivet-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,91 +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 autotools bash-completion-r1 python-single-r1
-
-DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators"
-HOMEPAGE="http://rivet.hepforge.org/"
-
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P^}.tar.bz2
-	doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-libs/gsl:=
-	sci-physics/fastjet[plugins]
-	sci-physics/hepmc
-	sci-physics/yoda:=[python]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-S="${WORKDIR}/${P^}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack "${P^}.tar.bz2"
-
-	if use doc; then
-		# refs.bib is missing in tarball (reported upstream)
-		cp "${DISTDIR}"/refs.bib "${S}"/doc || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Install rivet-manual.pdf to docdir intead of pkgdatadir
-	sed -i '/pkgdata_DATA = $(DOCS)/s/pkgdata/doc/' doc/Makefile.am || die
-	# Adjust shebangs of Python scripts
-	sed -i "s@^#! /usr/bin/env python@#!${EPREFIX}/usr/bin/python2@" bin/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable python pyext) \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc pdfmanual)
-}
-
-src_compile() {
-	use doc && export VARTEXFONTS="${T}/fonts"
-	default
-
-	if use doc; then
-		doxygen Doxyfile || die
-		HTML_DOCS+=( doxy/html/. )
-	fi
-}
-
-src_install() {
-	default
-	newbashcomp "${ED%/}"/usr/share/Rivet/rivet-completion rivet
-	rm -f "${ED%/}"/usr/share/Rivet/rivet-completion || die
-}
diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index bc6091542f66..08b71bd4391c 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -7,7 +7,7 @@ DIST ThePEG-2.0.0.tar.bz2 1938251 BLAKE2B 8f9403a7f442da6b3bf753f3b45fbddfe339eb
 DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325 SHA512 5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
-EBUILD thepeg-1.9.2.ebuild 2382 BLAKE2B 84b5f2cd6ef51c7b3072027d1cc209af8723ef45be25f63464c24d0add45c9c38e1aada9aafdfca0b13b82abd5adf9da1211e11b1f5c649307918e5a5094ef0c SHA512 4c6cd6830cb66941a605faea7b9d3bce57a43256407835070987270c682e1e17813c9860ef312c127b219d26ef21f9dbb2118dabc765fecaf3a53c749750c166
-EBUILD thepeg-2.0.0.ebuild 2382 BLAKE2B 9ccc67ba13977a9d9e866f22bbaec8e63f7667253a4e86afca248be858d1d30ed8f8926487a18b83a2aa3af885a3e47e7536feec9a1f9e5bf16e4b278378ee11 SHA512 d2f1dd486adcd7841632d1ce7fa66d29e9257a0a08b43849252cbd1fde9f150d2c7382ce28e9fc2680a8dca49879d52e3d01f397e1a043c8a8c6a5e49f513e30
-EBUILD thepeg-2.0.4.ebuild 2303 BLAKE2B 044efd53dce100f361875fec18456644a1989a4ac0499bc18fde3f8e9db85773d47972a1f7c2ab76ff425caaeb7a39b5d042d599b40ee0c04f6b3771a31b238e SHA512 1c679c9030091fa3fa0dd877cc508e41743095552748633f0320360ccb89dcc297e7307c768c408feee6906b0ab2773d25a649cfac6640cb3f4cc66a1f0be3f1
-MISC metadata.xml 1066 BLAKE2B 26afbd997fe3ec808f19c1d0acbb39f4992501ec15a3bb6595f1ff7219016072d6cf3a64636df943f9b5478fb98952f7f998eab7073bb411ebe9d7274ab76686 SHA512 f42af9eb2e0cb212ed9c374b9da6775f4857435c5cb418ebef15f39b061b0a2ddb85269aff102e40cc499a9834cb16d24e44d3b3de9de3a26078edfc7162eac5
+EBUILD thepeg-1.9.2.ebuild 2318 BLAKE2B ff23549389bfbec09217448d6a3d802965291e25a3251d4316049d0b19e8070434dcd5935ec5bb85fca44ffa8ae2dee6b542ffe44700e2ec7ddb7020a18b7edb SHA512 3e82f3c7cac0ba6e84883ae909ab37fc10db688ee842ece8b7a7125b25c43c1234f45710a843e8fd61db92090d0fd2872608a48a6c9e991c47db571de270e53b
+EBUILD thepeg-2.0.0.ebuild 2318 BLAKE2B 6a3c5df9bb82afcd0ee0beb063a5e37aae6f1ab50e923fb4cfc3befc87f2ee71105db578e90d81ad350bc25b3c25407e7536821364c7e71b7dd6a14d8be781cb SHA512 5950b51024e40b4b0a3908792b5fddd2cad4ddfbc7347f38faaeb21a159b63429137f8c4cb8a481addc0ee81df17a161fcaae6832549491bb2de45ba516c992a
+EBUILD thepeg-2.0.4.ebuild 2239 BLAKE2B e52748a673196c5b1415a0fe1d0ea05a89c11e13a867f5ff01004d6e9fd5350e27a8af77a628d8c0ffa4c00605b48053d15e87ad0f75f5e282495b451a6449fe SHA512 a52226c1d7a4c2170048f783470fb9bc1c8107eb21816540a52ec9a581ce3179e209828cf53243c8dd1e4b69f6fa9713ebf5f9d5c8f520498136a90db82dfe48
+MISC metadata.xml 992 BLAKE2B 2c3d61f64d4f24d1cf68d1663ac9ab75fd711de6f851d462226aed95551a6daa4b19287dc4ccef303178a085e756dd9ce5cf2555d965260d8b7b86a4d771ddb5 SHA512 c6412d6cc97da21ba7774d03f4bbc69d53d9bc82fab4d45940f61a318fb67bb58dc4e4668e831b4e2b18efac5d19898229a4e5ce515cd7722372e5aa18685e01
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index b98a9450c6f2..4f8dcee86a89 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -19,6 +19,5 @@
 		<flag name="hepmc">Adds support for High Energy Physics Monte Carlo
 		Generators <pkg>sci-physics/hepmc</pkg></flag>
 		<flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag>
-		<flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index 1f333ed8402a..dfe097cf8ca0 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
 
 SLOT="0/18"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
 	lhapdf? ( sci-physics/lhapdf:0= )
-	rivet? ( sci-physics/rivet:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
 		$(use_with hepmc hepmc "${EPREFIX}"/usr)
 		$(use_with java javagui)
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		$(use_with rivet rivet "${EPREFIX}"/usr)
+		--without-rivet
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 	)
 	autotools-utils_src_configure
diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 6d4e9927f49d..22c553e8f5dd 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
 
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
 	lhapdf? ( sci-physics/lhapdf:0= )
-	rivet? ( sci-physics/rivet:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
 		$(use_with hepmc hepmc "${EPREFIX}"/usr)
 		$(use_with java javagui)
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		$(use_with rivet rivet "${EPREFIX}"/usr)
+		--without-rivet
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 	)
 	autotools-utils_src_configure
diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 93ed41abb780..69fd55af01e8 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -31,7 +31,6 @@ RDEPEND="
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
 	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-	rivet? ( sci-physics/rivet:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
@@ -64,7 +63,7 @@ src_configure() {
 		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
 		$(use_with java javagui) \
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
-		$(use_with rivet rivet "${EPREFIX}"/usr) \
+		--without-rivet \
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 }
 
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index d02889dbe28a..4768ee9f6e5e 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 615b59950697..7ed92156335a 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -5,5 +5,5 @@ AUX gwyddion-2.56-automagic.patch 1522 BLAKE2B c760f952221ee4cd2e36572bef682ca45
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
 EBUILD gwyddion-2.55-r4.ebuild 1593 BLAKE2B c814b8d1298723a73b4d3dc3c07be13a5394029c230d5964412320c7e57ce45173ce6e67ce919ede30c8f760c1315ad515bab550349796c96750439e0e0203d3 SHA512 c89856d8061168bc4800484adefbb48484bcdabe7030621935227885bd5d107ad26c506b867233705bad8b8bc3610d587256c6919e550c857e94f9cea1f9229a
-EBUILD gwyddion-2.56.ebuild 1573 BLAKE2B eb84e3b865d6afd4d96861293cd8a2174c00b85fbae975de9f4814e6c4d5a009745bab7a8524e529a56b97e83fd5d3896962acd3fd757ed8c05642ad24df267e SHA512 d545742eeccddaf671f55cd51cf7fa03031fef5e647f0c49b239461b1bc5014b6269c9c0c6df21e1ca85b6a9935c6a77f26e97355da046975213a9236f916ea4
+EBUILD gwyddion-2.56.ebuild 1648 BLAKE2B 60ecf19f3ec568a6f0d5e7dc41f3e29f4f36fd02190f3d32ef898ddeb283b699d8a864cb67268fe5ab1b9b76f29d1f8e148a63c6b5e57a76fb94a0a3659bb85e SHA512 4557739fb1a01e6b7ffbcc194f422167dc2bb6b792a27b0c827209e313acf0cc61e5b985ff54dc2dcf11235578f8b5c29361266ba7da9ee6af2373713e341edf
 MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1
diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
index de98686272c3..85f881ab3d16 100644
--- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
@@ -47,6 +47,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# hack for bug 741840
+	use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
+
 	econf \
 		--disable-rpath \
 		--without-kde4-thumbnailer \
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 11abb17c0262..024fee041e2f 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,6 +1,8 @@
 DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c
 DIST tensorboard-2.2.1.zip 2950617 BLAKE2B 487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b SHA512 e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa
+DIST tensorboard-2.3.0.zip 6789437 BLAKE2B 34fe0ac903f6b79fc1ddebd2fab3d64e48a4ef9bb6159494e6b3ec5444ab6ad339f5ca7e4e478ec03dc7a788bbce6a4bd3ce253640136079a7a470f01f7b3a48 SHA512 d4cfdc8dbf030c022ecd635249f643d158c92274b142cd3de93cd8877c47cf59b9aca9aab12a971b986b84c7396bed3d7a012837b08d9dee6b0e53dc56e9fcbe
 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
+EBUILD tensorboard-2.3.0.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild
new file mode 100644
index 000000000000..9d1a93563347
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.3.0.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/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index a1274e367cfc..c98ca615efc2 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index ffac90cf4413..e6a40719ab87 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,4 +1,6 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
+DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 EBUILD apparmor-profiles-2.13.4.ebuild 616 BLAKE2B 4edd168013f3e74682680cd9f6545ae831b075a18a4d316cc2e98ae10890977bbaac357bdb1b517ba7420708fbff5be4de184857e56587f669d3ddc7307f315e SHA512 badd1879d23544758ec5ba2085b676a37210fa59d7c1ae6e6d7ee36fdd7357fb94e9e0bac00caab3439cf09370b24d0dec4c0134d7f0ece267c5be505f2df039
+EBUILD apparmor-profiles-3.0.0.ebuild 619 BLAKE2B 4b0d2efaba135e0ab90a6321f1bc4ca1e0d14772f6c4c882be90a99019b6d689dc26b088f99ed0e546120e84a9f3f627669c5f1adff8cf70090300e102abbce6 SHA512 66383f42f0dfc541b21dc6951bc9b238f8bff7dad1353b0b75fdd1fd8afb70f3979cc2f0b9aafbd1c88c649cf532689ebb1ce1b23badf58eba2fb85b49f93048
 EBUILD apparmor-profiles-9999.ebuild 727 BLAKE2B 4e77ef1fb847d6c6d7e9545c0e9ee823f0e308260d3ba75bc3d888702b0f60e620fe897fc81b8e65161092be4bd7965c79aa8afd6401ea987db15d41f7cae9c6 SHA512 8586498145e7b8acf27a4842a8ced8b8a7c804dfdd84cccab81ca1029c4a7ef224580bd2f87758b5b6f4923140e80244bac1fbc238ae854d34a910d392130191
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
new file mode 100644
index 000000000000..46576ffed516
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index cf85b87fb803..4ae5e5ad17c1 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-abrt-2.20190201-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
-EBUILD selinux-abrt-2.20190609-r1.ebuild 277 BLAKE2B 1a2d4ada5533118943b068668e044246952da92e87fa7a7bafb6453f457ced24da7134264673eaefb69075afb75ffce92b819c97c4bacec5848a55fecf12d7ac SHA512 7c54ea55f4b52becbb536c47e4a9fadc9c969d3b9838cf158e8dfb5acd7f6c0d5231b68691a8b6796593082749f630ac969776236e64b3cf7a5751894270856a
+EBUILD selinux-abrt-2.20190609-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
 EBUILD selinux-abrt-9999.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
index 7ce29272597c..b873a89a358e 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for abrt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 832c79756245..38e57cd1da8a 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-accountsd-2.20190201-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
-EBUILD selinux-accountsd-2.20190609-r1.ebuild 380 BLAKE2B 92bff1dfbad7ff1d3232103703f0714d22b3883f7a2c87e615707186b5b0ac0f79ba28bdf0380bcce8d3bab7be625de05fe2781c7f46be4242aaa58779a8bd3b SHA512 4f69c987c6a936cdcb2037e14fe2895bf6b4c2d147583d0f2861b11f9d050d88402891a61aa9fea739a9f8c0e32f2268e3c57736182ad2e16c176d1c72e8641a
+EBUILD selinux-accountsd-2.20190609-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
 EBUILD selinux-accountsd-9999.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
index 7f3f8a5d333b..2de7f0239bce 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 1d62268952a9..8f1a77b36ce7 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-acct-2.20190201-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
-EBUILD selinux-acct-2.20190609-r1.ebuild 277 BLAKE2B b6b1a7d7ed8d4eb273d474f1aef64c6b38c3ceba5a9de02083565de290d50125e7c438f0703548d6fabcbfb706883cad75de303ed065ced5ddd4ef4ec4d6fc05 SHA512 f08d9232d3187b816335058e1638c8e87f3ca9026f4adbe5374c17f4afd1436287123f50e70201242465f1343a2c98cea752f580143edbeb79b95c94aa997c21
+EBUILD selinux-acct-2.20190609-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
 EBUILD selinux-acct-9999.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
index a012c94e8f75..afc94895c459 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index f0a1e895e2d0..ed751766d235 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ada-2.20190201-r1.ebuild 273 BLAKE2B bbc93de888c74a63d210ab9fe84dc0fe230fea0bf9c0894a1cb01ed55f69cb5140ac0c98249daa2d7662a2c4ffd28a8e34ad88d57a84a838b9e866edecc54a47 SHA512 ecab6f318d15919a9208df2a152e64b1123022ccf5d8f9a09758a9855ad4b1c985062a9898168910fad612183ef1696b5dc1326a80fc11f28cfd9503f0940a36
-EBUILD selinux-ada-2.20190609-r1.ebuild 275 BLAKE2B 6407b3e8e5d33700f174530f43dd36c7427432914b768934e8678fc242e6686b7641a57aa55bc9616e37d6594fb3c764512231d4186386d845f609a58f195779 SHA512 14ddffe454e224ae0102b12e24623e5f1160834cb6a1d5b27add33052c434fdcd1d8bf4f512b4c8e194ee7712cf5aa27ee7f1cf0287ea03eb0a07294e3d559be
+EBUILD selinux-ada-2.20190609-r1.ebuild 273 BLAKE2B bbc93de888c74a63d210ab9fe84dc0fe230fea0bf9c0894a1cb01ed55f69cb5140ac0c98249daa2d7662a2c4ffd28a8e34ad88d57a84a838b9e866edecc54a47 SHA512 ecab6f318d15919a9208df2a152e64b1123022ccf5d8f9a09758a9855ad4b1c985062a9898168910fad612183ef1696b5dc1326a80fc11f28cfd9503f0940a36
 EBUILD selinux-ada-9999.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
index 9008a2bf117f..06eec0838701 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ada"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 9ffec450b7c0..ac26499a26b0 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-afs-2.20190201-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
-EBUILD selinux-afs-2.20190609-r1.ebuild 275 BLAKE2B 5b9b945530583af71323e24dfaf70c997c750f45c4906d048f82b8eb68a264bf0579727d260f4749288be1502e183b9a92fada1b3550211333fdcf4e8e8c51d7 SHA512 4b76a1c601cc79bdc017d99c90f0c875dcae461de60ee862d3c2188c1c20cd9b1c3b86be5f3a30eda4c609642d73b8cfefd138aaf496f5f4490c915e66b4f48f
+EBUILD selinux-afs-2.20190609-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
 EBUILD selinux-afs-9999.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
index 483eb036cbea..1d6c1c4bc440 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 95b1c3723589..78f492a9f3ff 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-aide-2.20190201-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
-EBUILD selinux-aide-2.20190609-r1.ebuild 277 BLAKE2B ccc168bb2427749bd419cf7ea29add0f72f13ac28c3fd4050d8583aa2c859d8316667804e3c395a09e70393fd2373071d4e23137ecc2836815b0f91349b22500 SHA512 84a3d894d69afd49f551e8c75bc84236a0285e6a3d08c88bfd63c8ea60ddf4385866b0724e878eb75f10c82ba8533c69a2339eae816352438a74637dba30408d
+EBUILD selinux-aide-2.20190609-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
 EBUILD selinux-aide-9999.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
index 8f4334a0f8b1..fdbe2ad8fe19 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 45f21e6b1f27..5e6d2e354bcf 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-alsa-2.20190201-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
-EBUILD selinux-alsa-2.20190609-r1.ebuild 277 BLAKE2B 4f1309baa35fdfa53160b37238da3560f8a748f0fd8baa9c2b72ee54fb36ec49b2774388ff2b450d29724a88b05ef79f83b3f24031a911a439d764979e9a3230 SHA512 d7a878e241163b6d478b6a50430479662382730814c8b51898809ddacd84b7761214403d106eab9fb6c1f16c43c0849dbd532ef66ca1a378434739d84e9a98a1
+EBUILD selinux-alsa-2.20190609-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
 EBUILD selinux-alsa-9999.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
index 9cf83ba211ab..b81a533192d4 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index c9eabef60e83..841cef9248de 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-amanda-2.20190201-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
-EBUILD selinux-amanda-2.20190609-r1.ebuild 375 BLAKE2B 5e8d232c92be185dcf5c6626dedb52ba087bf5befcf98fd523cce2d6edab4e8c80b4c7e64448c58ade50bf1c803281f9e75dcbae22a4d8aae81efe228b0a76fb SHA512 70b53c5de35c693fd7ea28e57239676d7b5b9f6f7d9b8ec4806df6fcf865010f89ea3fcf0cef1eb4f78b0ee4d8f36397d6a0b8d0727dfd30b76a0dfcb59e7e68
+EBUILD selinux-amanda-2.20190609-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
 EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
index f31158bebca3..4e0a659ca088 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index a6ed6c34fb0d..c78977c8f299 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-amavis-2.20190201-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
-EBUILD selinux-amavis-2.20190609-r1.ebuild 281 BLAKE2B ac8d1b34e968c0fbbee8739f5ce248cc6cac74ffcb73ab696f1be971fe0524009d83edf7d6eb33825b700de02fe9c93b0f6a7c7d9874b2fa19f1f2400d43126b SHA512 d54e2ccfa9c89a60716e5cc983c133de734db74a7dc786f8b63f4aeca6c7f42589c5eeaacda2e12e19382b36ad88a049f9daa0877de1bddcf9c613d3b12149b5
+EBUILD selinux-amavis-2.20190609-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
 EBUILD selinux-amavis-9999.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
index 1bb9ac36180a..6630bc37efb3 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index b076b2ff845f..281eb6ced004 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-android-2.20190201-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
-EBUILD selinux-android-2.20190609-r1.ebuild 432 BLAKE2B efdc02a739dd8dc2a7ae232709e4b816a1858ce74ad00630049f6eec6c94e2d64939f1f1f83f51b338e44defdaa766e0dadd6b9ec01c0b4a013a815299905789 SHA512 7518408c5591ced1e373795062897d27e1dbc514216cf8ef342b6d29e91418966b9f9ddbc6afe08aad4f2369d588f0e7df62fca27c5a85be7faf75a8e587b458
+EBUILD selinux-android-2.20190609-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
 EBUILD selinux-android-9999.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
index 8096d1741803..031c3d821d9c 100644
--- a/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 3079299ba8ef..7c2aa222815d 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-apache-2.20190201-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
-EBUILD selinux-apache-2.20190609-r1.ebuild 381 BLAKE2B f183cfb7d7edc44c9e8f08acea7a03b40c2bb838bf9013893f98cc86daba955fae6b0feb460c7aecdf011cec2e7bab852538d20b42bf8c241edfe383eccd1f76 SHA512 134f153c2d30c23e4a03c2e74cf314f10d8041e9cb8a2dbf43d3a9cffcda7671a866a944a092a464617f4f22f5b9f80c7b34269a3798ab9799f68a66ab04f927
+EBUILD selinux-apache-2.20190609-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
 EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
index 757a65498659..a181b10df320 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 5f229220d52e..f248f7743de4 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-apcupsd-2.20190201-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
-EBUILD selinux-apcupsd-2.20190609-r1.ebuild 379 BLAKE2B a65f3a50738e296932dda5faf14cc4d4d5ab08f1a1d5dbf3df479a9a0d711c8d6def04a8de59fbfd859f901bb3cab9277fef9d76c1879270b8f0075f816c3584 SHA512 129b0d912e2db5050b138fe60c60b8d1331ba8ea6c06717f6ee0aa365a2332d5dc2ac6fb87372098c4dcfa975aad38ffa47397841df6141c019116b171be0d6c
+EBUILD selinux-apcupsd-2.20190609-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
 EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
index d8703e580df6..70059826e9b7 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 047d66df2e31..a4f3a7b3e57a 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-apm-2.20190201-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
-EBUILD selinux-apm-2.20190609-r1.ebuild 810 BLAKE2B 513b44fba06a110537e6637be7d8f629978c5b582690fb3dd558c78e42035ca52bb6ed7a81eecff4953695277c35ca68250e50363311f92087ec63d0033b9f0f SHA512 7c3fc20ad544e4eb4429c1bc8617499d6c641added7b5855fcc747bdb89172d54ecafe54669f9db8baf4f1ae3fcc2f35fd4a53442bf20eadcef82d9f25516cb4
+EBUILD selinux-apm-2.20190609-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
 EBUILD selinux-apm-9999.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
index aa9a5b46b1c6..ae55fff8b58d 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index f66fbea9741d..76bd9805ac65 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-arpwatch-2.20190201-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
-EBUILD selinux-arpwatch-2.20190609-r1.ebuild 285 BLAKE2B 5a436d2367e816acac8f1f9759354e6f8714b35d6684b17bc78568a89a7076c33aea14aaf7282d90da85e2f8ff89ff903f717a65e9890b8dd597a564fdd5d61c SHA512 8ef8a511399f9613471768f7c9143954e012f949dd977a1e2a0863ac02e94e98b007c7ad97fc0e90b334d5596fad8dd7ed024328a72f074ede4706da10640d31
+EBUILD selinux-arpwatch-2.20190609-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
 EBUILD selinux-arpwatch-9999.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
index f1f7ea5c32cc..9bb3a3a5c47d 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index e5da7f5ea14c..c3048d0a7565 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-asterisk-2.20190201-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
-EBUILD selinux-asterisk-2.20190609-r1.ebuild 285 BLAKE2B 11e4887af431c55b4d50378eba5fb3e1655483c317b5bb83839b985f7040cfc8d729db5b06db223518327e47dd3cea745b1dc52866ed57c8def03813db41f1e5 SHA512 1a8913b206060f0e01d128d9d697f93ee27aed8756a026c58c61784702d3e59c8e0b8edde82d5ba3e16a145a05e44308c9924aac23f4c770ff4cef63d11ae693
+EBUILD selinux-asterisk-2.20190609-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
 EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
index 21768ddff004..cf9c32649ff8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 03733abc6ff8..dccd9679b705 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-at-2.20190201-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
-EBUILD selinux-at-2.20190609-r1.ebuild 273 BLAKE2B 199981d2d3e468c06c9a29c00871ce22bc8208842688966640bdec7d4f1fde113cbdbaf4d4300b23182bdf8f78ef38ed3cff6afb46941c0ce0640addc96d8f00 SHA512 3005ab546f0ed220323274302ee1d13be79f38e0d926bf4265e40517279669a96bc104345653c17ebb83927fd85d5a190a4d3357116f2281025be4a0eb98338c
+EBUILD selinux-at-2.20190609-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
 EBUILD selinux-at-9999.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
index 596fa923eeca..c049f8c29d02 100644
--- a/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 68aeeb5a7019..bfd5243a1839 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-automount-2.20190201-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
-EBUILD selinux-automount-2.20190609-r1.ebuild 287 BLAKE2B 55c1a4bfcff3009adc170b000b38dcf32bc0c300b419495134bf7ebc0ebf2f7388d59eaa18f208a1cd4117fa9844be78cec1e7f53d12f60852c66851d9a2f811 SHA512 19a3c301506685196794930314ce7cd5bb3fd148079fe938f3797105e87adf1328d69464ec3a332536a4c112503c8ec38cd8e6c1cdc264479b7ccd31082263d5
+EBUILD selinux-automount-2.20190609-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
 EBUILD selinux-automount-9999.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
index 567a4b107d17..d7aaf7012db4 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 41be952bd381..c550f3acb8f6 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-avahi-2.20190201-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
-EBUILD selinux-avahi-2.20190609-r1.ebuild 279 BLAKE2B e9bfbb8642a5d051af7cf64d66fc027e9e1cfbb84212f2fb1cf2d4e65ee47285c5b4b983c81bd1fb1273cde2f4df3af62c47c8d1c5609d06a6a0b83c0f1438a5 SHA512 986b5846239b1ed30f35e1c30a01ff8be2b0a5fa35d837be2f6275aa931e5edc98d76f3f0e390ba8a156f79c59f82eeebd7241eff5754d01df1e199dd88f529d
+EBUILD selinux-avahi-2.20190609-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
 EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
index e4ef6f2e6953..603ed81d8360 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 43c1852ee6dc..bf510e1d1041 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-awstats-2.20190201-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
-EBUILD selinux-awstats-2.20190609-r1.ebuild 379 BLAKE2B 3caef8ead01db411c45171f0c864ae53805dd0380d4485b3b9467e54e4453b840726182873248663f2a27d944e2c55b73a863e9606231a459d3c54e18714fbd6 SHA512 1d33c442e16cdd30a03d1ca7622725b316c95f59e5000415385197e7932c481b6db9f176456870682bb7f162d3d5d6dc523889a06bcaa64f0f8f6187cb0bb14b
+EBUILD selinux-awstats-2.20190609-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
 EBUILD selinux-awstats-9999.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
index e0d395e69c01..04f221885692 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 62a0573ad466..0d976d172f97 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-backup-2.20190201-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
-EBUILD selinux-backup-2.20190609-r1.ebuild 294 BLAKE2B 4e02c0c82bfc9062eb486c9c61e2374911734d8d4b796dd49e98e46f0f53bdcfed5d03468ec2ef3aec4090f27b6582eeaf85c3578ea7311976daa2abfce541ac SHA512 a70ee8947bddf4296fc88f2b71b0239b1fbd67c1a1c4b32dec613ea3e6140712f7f4b1c877cd17efd18f685554da7ef5c05df234ae0dbf093ed1608974b5c041
+EBUILD selinux-backup-2.20190609-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
 EBUILD selinux-backup-9999.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
index a6a25303d7fe..296374891d75 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index b2e98503728c..f2b3aeebfbdf 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-bacula-2.20190201-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
-EBUILD selinux-bacula-2.20190609-r1.ebuild 281 BLAKE2B d68f56a2e3865c99f2c2f4eda0efc0ae9161efa33a50305a56a9bfae0cbbbeb02356a227b38c0b204b6f09d46984701dfaa99be11cd8de36828dabb0ea41d695 SHA512 13f56ef4725b7bb5b3548e4866e70e47578457badb388c4f373cb30baa804211256ff104559ebe5a3272a715831d8ac7e0f5765f9249de43e79be6e805e170a2
+EBUILD selinux-bacula-2.20190609-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
 EBUILD selinux-bacula-9999.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
index b841a4f7fea6..a5a4b9617c7a 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index bb934ada255f..19d2e91edf5e 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-base-policy-2.20190201-r1.ebuild 3876 BLAKE2B 3fdf86914afa4ea4851b7a61011589e4f1fb2c20775ee260bdce26c3197ab9b1ad97c871a58c1ff7704f9ca23609def48f802167f1238773f9a2c4daab0e2b07 SHA512 03f531f3ce9d7646b9101a159cb96a091011a5a9215491ecc7fcadf7412814e30abb285de3939c7f0584232b540f61b9a1e3ebefbf228f5713da5de9ed9a553f
-EBUILD selinux-base-policy-2.20190609-r1.ebuild 3818 BLAKE2B 78071157fd3f922bbd200d84027dfaefa39b66a0b294753027694183fec9adb45fa5faab31784432255cf12d767a01e2217a2e04950105e7a60d0a01d200f75f SHA512 a76925a23a78c805f3b21263dd80d3569deb10b82d8d86a67a617d83090984300447249bbf313999657bea180c58d833474b20b3e57c650abb4fd8365d9fde5a
+EBUILD selinux-base-policy-2.20190609-r1.ebuild 3816 BLAKE2B a52fb08dc3d36042f251afe98c7894b955c3160890eb4eb84f0b69428a90b05d764b7b1ef12315cea44d5b00617b5747303872e906f67e68c28945cf48197d48 SHA512 cf062f6526826c9b7225ef3c8fe0a3b74da3905b35ba0a174328de422cfc383fbb6831dcbded65f876a956d66523bab39c89f5e23c7a5f80eebc5067ce72a550
 EBUILD selinux-base-policy-9999.ebuild 3818 BLAKE2B e5c0dbf7326cfb52fb95951c7ec7ad29a09c0604f2106198c63d182923157933590c97f70b993b77810e83d67dc667d8cf12d46450f3548629abfd3fe0a88d6b SHA512 ed99b8042b5b16247d4cd2bc02d8f3a6ee13a3fd1ca16d5500b6ba3df56d9d20d1cbd82add3e280c4cd4c27216ec794690af645e14ed6e0af0cf9a70aa983a95
 MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
index 2cf75e0c5f40..3bfca9781cb9 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index ebf25d4753a8..ffd756a22504 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -5,6 +5,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-base-2.20190201-r1.ebuild 4129 BLAKE2B 6a757ed06800b462aac3fdd0343732ee2fd88e45b6c0557187686bb18fb9f296e4159de52e77d440c1f2278e8945de456800918315a492e8d0679189c24877ad SHA512 eb9b30d65d98828c751c16c42f756a7f946a8b2b73e7cfdc0272409d59121a135678a593ad181756747b58db67a5096ac72c79bbe212a2a6c2ee587ae00998ac
-EBUILD selinux-base-2.20190609-r1.ebuild 4164 BLAKE2B 18880e11e2deb3ac150ffc09aa273ac2cc51da775c45f25ec8820a5439dbdd0e2b0c2e3acbed5c21c6d3b6246ebeaf56d78f0e1b8390e9e6f86b63afccc7a844 SHA512 1d3b09ab0b7ae019772d781ec632bb54fb67b691256a8d15eaa95eab21afe55f427b5897d2bdd6951bb84c1826f8d71a08d3567783fd800e15794f72eea782c3
+EBUILD selinux-base-2.20190609-r1.ebuild 4162 BLAKE2B 6e16d72a4b0a46bca0af369f2659e01fe5c5724803695906215f3957f3c549a3a76d397985d88481e13a16aa031e56826ce90a62315b35143f965170b4070170 SHA512 9249f3e354f2535f9d384f59aa3dc8a9cd7902349f64be11b3219cb724d7bdce633c75a41f03b327b5e1d3ecf00d31685dbe631f775731ce354c2cabbd5996e9
 EBUILD selinux-base-9999.ebuild 4164 BLAKE2B e778e6f3924e97996d0dbfd1ff3ce4ce1ad006e6e82ca52562092f83349f1d8dee29b477c10e5256fcb1233ddebe10b19e4eca2e583f47d904caf63585e77e6e SHA512 28d2d7f5baf51c833ec008e92626a65fb3fa5e9b27f43875423497090859ee9e5afe45ac0ec9df6debbcc347aaf45097c1d368eff0f2e2325a8d6345d69345f7
 MISC metadata.xml 967 BLAKE2B 1d3313048964e8b84c6386c24682735ba255897021b5d9df9739a4852864e092c6c8a42c86b91962274c22764661ff5f4f8c0c34edfbf52abe6ae8583f15fcdd SHA512 fc513a530a30b8114a5b9c02862939a4cdd2e123f370292bdc0399b161afdf4843f53c2a15b4bd505d2111496fc6354a54c408c9022137086a33385e5fa99541
diff --git a/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
index bb95a29ae659..fcc6faca334d 100644
--- a/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
@@ -13,7 +13,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 66b25110f514..1034aad6954d 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-bind-2.20190201-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
-EBUILD selinux-bind-2.20190609-r1.ebuild 277 BLAKE2B af7405592f7afb739e095c5c5e3b184e7b70f367b0c56a08181724b4e44cc555b34d8abb5e5d180690f8f2170acf3d36637fccb0f878bae099eeb7c2a0e72bae SHA512 0c59d837e18f87ad3fbe406322116826f32e10c5bacf78b218431ca96091189701241a5090b645d51e28ad9c05b3ca052be7f548bdd8a95626a44b1bc01db91a
+EBUILD selinux-bind-2.20190609-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
 EBUILD selinux-bind-9999.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
index 1be1516f89c6..316b5a0c1ce2 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index e872ff00a27a..41a4a22fec59 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-bitcoin-2.20190201-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
-EBUILD selinux-bitcoin-2.20190609-r1.ebuild 283 BLAKE2B 2a06bffa3ac5df4715d60dba0c061c2d77d0cbc6f415099c328c22ed30bac26695357b0d1245e25735171ae7823f18f12ed0d64ffcd8e2f18c38bb42cabd663a SHA512 c950ec7cb91e070797600734a6234ae4342cea43dc80191945bdb30e1736078885d4faa0bfa5851609cf05b68691f838bd215a0160e329958f0d3b61d5879705
+EBUILD selinux-bitcoin-2.20190609-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
 EBUILD selinux-bitcoin-9999.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
index 0fed7c9ab0e3..975370171f42 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index deca06ff49c0..09f6b311afc7 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-bitlbee-2.20190201-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
-EBUILD selinux-bitlbee-2.20190609-r1.ebuild 378 BLAKE2B 4093a2fd18be05891d96f624bc072958e4d1de87c26e0a7ed9e9fa423559631c0deae70f7a942f8c9e0e43aa509ed5a4c0ef5ca86a97e7586e881cbf765f6b34 SHA512 605fa89d0b2691277f33d8612042e2eee9a150f73d5c914782d44393e1444f304fd606e4c1e69044e017ff8636c198f654bb7cc02a7129cbb56b17519b311427
+EBUILD selinux-bitlbee-2.20190609-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
 EBUILD selinux-bitlbee-9999.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
index 902995934dc0..0216388f2893 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index c0d3af6c6555..a17880fc1035 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-bluetooth-2.20190201-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
-EBUILD selinux-bluetooth-2.20190609-r1.ebuild 287 BLAKE2B 4c187950d7d8f4aa55c092d34a90d078dff3de66d24b4f1a8b45589dda71f3a409780e5c470fe7078b8a0fb063467ad6623df1b2cdf907c1aca6fcfeb22eb0ef SHA512 423a75eaaf5a74f0878f76464110b433cdd3cb1e3d312d0b02f919588f090fdf25b6659f3ecc131de83f1be917b21a71b830df81015f51920ddcd29695e8fbd1
+EBUILD selinux-bluetooth-2.20190609-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
 EBUILD selinux-bluetooth-9999.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
index 3421eba43ffe..29c4304ad9f4 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 7584ed16cfc2..4d117f82e5ad 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-brctl-2.20190201-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
-EBUILD selinux-brctl-2.20190609-r1.ebuild 279 BLAKE2B 18f0cdb4122ce10ae1bd676dfedf7395d9e8b7ab7fc239f2386e6d4b6a5555ccf2fa71a84d82945ce8aafde845e65095a9977d2304dd231bdd593376287a08f9 SHA512 36c3385c5455fd9677bdc0a7e839d49ad86240c563a646feaeb53bd7eebce4a729ef0281cc31c04bb8b7954a48818e2b044310a44a12b7ea093ad61dd47a7f25
+EBUILD selinux-brctl-2.20190609-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
 EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
index dfcfa6c208f5..9e7406bdc317 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 207a6951fd04..b8cea96713f9 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cachefilesd-2.20190201-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
-EBUILD selinux-cachefilesd-2.20190609-r1.ebuild 291 BLAKE2B 66141d1187d4e917de6a4ff0b90640325f7034cb5ee1917c5ddfade77af5c056f6535fbd955d19a3720208055b3e0cd94d563df1712820fd95a6f8eeae30a03d SHA512 f2799708f332be2fcf380523c8b3e9a5f13428a64160311bb370f8d92e6cb82409358f75430cc6331f1ff4067b43f7917879473d8877b3c496896f2b38b36e5a
+EBUILD selinux-cachefilesd-2.20190609-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
 EBUILD selinux-cachefilesd-9999.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
index a8cbd4b1bfff..8de1241a8c0f 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 8e5668e5f156..e0b9289a40d1 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-calamaris-2.20190201-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
-EBUILD selinux-calamaris-2.20190609-r1.ebuild 287 BLAKE2B 66748c9e73924f7c60c4047d341d351ec098aa5b33cfb4bf8a96174115c57726ca6156abe954caa2bbd5d0823b592f7cab8449c02ef9d5fe6b4f60f060b2822c SHA512 b5e44527b6ebfc65f63187a4653f7f6735a75f3571280f12826b08c3a489d8a9d5a993059bd4f4cfc8e9326f7a830ef3316ba4a9fa1780b9faf70d2ea8b57b6d
+EBUILD selinux-calamaris-2.20190609-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
 EBUILD selinux-calamaris-9999.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
index be1eb5e5e59f..b32bc6a90c1a 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 8b947a11bd28..2c672845645a 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-canna-2.20190201-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
-EBUILD selinux-canna-2.20190609-r1.ebuild 279 BLAKE2B ab9709d1b40b37490866e5944cb4c2cea7854d2176268ef6f2376546a8c98159f33492879badf5cc1f6e3630ba6ac0c4791f7041f78011bad6c439ab0d5f2224 SHA512 de3e4dcb62ea8f81862e2333a9f9c7af8e2a43051e813d459969818c9390a5e2c87e133d881ee2f139a265f927166893988994f725b2a30d253dadcc0bfb5928
+EBUILD selinux-canna-2.20190609-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
 EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
index ccadae58f655..52fa0b1fa258 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 660e60ee15e2..5a9fc9ff1c12 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ccs-2.20190201-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
-EBUILD selinux-ccs-2.20190609-r1.ebuild 275 BLAKE2B d7d7d7ff57bd3ed82e5590459a2c344d03ccea24b94588975a1ef859b70ad750c6aa22132a9b7ec64a871f6867e39f3827a17de04fc27e87ca1a121344339438 SHA512 8c90e170580bc97f9a1a4076f545596051937babeb129e149c757cd53f36ee1312010e6234f5438949d014da5ac78b5699ce11d00903033c471e2c9ee5cd88fa
+EBUILD selinux-ccs-2.20190609-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
 EBUILD selinux-ccs-9999.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
index 33dcd9512037..bbfa217c0599 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ccs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 9c7ecc13700f..17752b231a31 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cdrecord-2.20190201-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
-EBUILD selinux-cdrecord-2.20190609-r1.ebuild 285 BLAKE2B b260002a0f858eb8c33b2e650015c1eacb7aba7a40a83501d36b151ae1837ba288d456cdb7b60d212406d611fb36c79b08305df57babf05c8e4f87145237c1a5 SHA512 b6c517242a4a3ea65af5c3e004ec855f094aaacf5a41fa391ee750da89418043983814f771a02beb33e074de8677db67fcbf2560a7db385a86aed015b6eb04ae
+EBUILD selinux-cdrecord-2.20190609-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
 EBUILD selinux-cdrecord-9999.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
index 08a483e4c1de..9b1d26dd820d 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 9f28ba62380f..b41be7e03743 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ceph-2.20190201-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
-EBUILD selinux-ceph-2.20190609-r1.ebuild 277 BLAKE2B 85f6e9181852648879f05f80ecd28c8e4496ed9f4babf77714dbeee5d5c446656fe3e46dffe8ee65333340d2f929e42c5e9b4d147fd9c9214f0f62915e884d54 SHA512 6fe45acfbf22cf06a5648831b1bc30e73905f20fb3e5c177ab5c96169e569b88e39bd3ff9871597fa3924b95796b49a883e3fbf3f9667606639c30a00ca21dbf
+EBUILD selinux-ceph-2.20190609-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
 EBUILD selinux-ceph-9999.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
index e087d4efabec..5661fc772eff 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index babc11a3976f..062d69d52aeb 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cgmanager-2.20190201-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
-EBUILD selinux-cgmanager-2.20190609-r1.ebuild 287 BLAKE2B 1d848aa9b6032dae9e84d8e17368b7c5a6015bff355b115c705f59f937b8414a0225a7c2a02fe6b790aca9b7ec6a759fa98542fa15201cb7d4b16aa20f83dd9d SHA512 48d9fb60ead5266af1ffd8f2568eac81f756adc0657a8361cc018045bc90fda7855f55344302fe26acc00fd9e1781a7b3ac8f3c59da8c4d7198c6f02c6af0389
+EBUILD selinux-cgmanager-2.20190609-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
 EBUILD selinux-cgmanager-9999.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
index 0579da862034..256856515232 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 7bb6f7c77378..25321c0f3559 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cgroup-2.20190201-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
-EBUILD selinux-cgroup-2.20190609-r1.ebuild 281 BLAKE2B 3280567cd4d2e616489f66c588ed7e1847dd163701359e5642cb16126e40738b1b70aca5630f69103356358c0306b9223af34437476f6bf51adea760078fdc7e SHA512 095f07271dde77ecd0c06c194fe431f1db37256d3802104d9c96fa9698cafb58521c85496699e756749540a7c6f97c9713c7a579e51bdab9dd7d5424227c1b15
+EBUILD selinux-cgroup-2.20190609-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
 EBUILD selinux-cgroup-9999.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
index ae3cc604d872..8f2a15a1e49d 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 39fd1b88ab8d..f7906ce5f5bf 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-chromium-2.20190201-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
-EBUILD selinux-chromium-2.20190609-r1.ebuild 388 BLAKE2B cd1912e64231ccb223b76daa02e91d9d0ddd62554f25d0129536d1efdf3a4236820eb98ab325f34fa003bdae976a9a82ffb1c8e3a4e432c099b7c8352222a193 SHA512 7fd15a1ba1709cdf93a709ca2f1018042f270cdee39f82005fa03933f965a78471509a406c3a6b1094ca231c236955f7671b213aeb39d28817bebac9cb0e37c0
+EBUILD selinux-chromium-2.20190609-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
 EBUILD selinux-chromium-9999.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
index 49a72a62bbdd..d6caff85c30c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 2728c1f0ba1f..6ba75f5015ff 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-chronyd-2.20190201-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
-EBUILD selinux-chronyd-2.20190609-r1.ebuild 283 BLAKE2B f6ad4c84163b4b409aa7b7cba776be42f95389a2f81933b79512439c8eb578927391876c04f32af685c7d488280f9e468d29c0f2c104029bd7a608915091871d SHA512 50c79774064ed8cce63a47b96d45c60d65672444b93cbed58e9fa9ecd686dbc46e29fa155889392f39062764b284a126e03d035141f2cb2c1078b9b6e3c3fef6
+EBUILD selinux-chronyd-2.20190609-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
 EBUILD selinux-chronyd-9999.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
index f84c68043472..fdea543bc6a6 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 7160b503463b..b58ab6ea73a7 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-clamav-2.20190201-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
-EBUILD selinux-clamav-2.20190609-r1.ebuild 281 BLAKE2B 5bdd3dd93efaf626935b279937ae417e67070ac6dbf9a6ecd2a608754448a72001a900156b32878408f65dcb499150d8d3d9719c27f075bc212d4108bd7dc105 SHA512 661764612b196192143ce54820e819e5eab3636d5ea8901aa743f258c0d753cb06ac98b077560b85e6213fdbd6d9e3653e2b10d917628d1350af601180eb5e20
+EBUILD selinux-clamav-2.20190609-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
 EBUILD selinux-clamav-9999.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
index df5ef0290e76..ca2993f85ce7 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index be254e1cd8c6..7989604c7a67 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-clockspeed-2.20190201-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
-EBUILD selinux-clockspeed-2.20190609-r1.ebuild 289 BLAKE2B 2de40f79c1e5877c222d6ab922512fb8532aaaab5db3c229ec1b196b5c81ae16f82e40b1d351eeea05bde17a5bd49283d1a5884a3c275cf69ed9260c799fd035 SHA512 d8ad69ef8f90ea693e9587790dfbc07e2fd5c97bb466b42b896acce1ac99206a75d7d10709b0f037d98278f868c6a4f10c4f2d59d7edd7809839aed7a9b55d0a
+EBUILD selinux-clockspeed-2.20190609-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
 EBUILD selinux-clockspeed-9999.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
index 991ea6ad6313..3ecd87cd4b1d 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clockspeed"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 4232223a66ce..aca710b2df94 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-collectd-2.20190201-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
-EBUILD selinux-collectd-2.20190609-r1.ebuild 383 BLAKE2B cd94dc9ec044608768fb740cff2583d0232a6ca167719aab9caa374b9b503d9f86e33a72292f94509bcfaa3ef56fac0b453a9b8073336197685fed0e3b8a523e SHA512 6a79b8ccca6badafb7ea278f82fe5985d2290ae28e42b1aea4ae6ebdcb6d6fb0d19ec649794349ec0fc794320e311af5a7f2f2b4fefbff7e53aef9d9382b7fb6
+EBUILD selinux-collectd-2.20190609-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
 EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
index 82578a806621..2eb2d32bcbb6 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-colord/Manifest b/sec-policy/selinux-colord/Manifest
index daafb6336cca..361044df25bd 100644
--- a/sec-policy/selinux-colord/Manifest
+++ b/sec-policy/selinux-colord/Manifest
@@ -1,5 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
-EBUILD selinux-colord-2.20190609-r1.ebuild 281 BLAKE2B 2c79abc44e75d49233d2084ee6a0af4d942bfddf0c510c5acb397148e89e4a82fd70a5d1a6dff743c58268ceb2c7c1a36a4ccd7cd117102e3da50cb22455cab0 SHA512 e8a0b181fb4bc3884379ed93b4bcd49c5f2c523eb75b12b05956ba715056a08b725417e905188e8d1905545a3a35edfef7d45c5f00e122b4b3402248b01b1ffd
+EBUILD selinux-colord-2.20190609-r1.ebuild 279 BLAKE2B 7533377ec675c3836471a1082a6cb8aa30612eba93f36bea096333d3f1f278f3709334a8e20ec3230a930adaa0484b843f4d18fe169d781acaf2608b6604f181 SHA512 337bb2a2c3cbf549c948bab5335046b550821614dd637cd3f7edb99b6efde16d4a1b4fdaa67e709108233695efc6fcea725b30095799ea9903ce3422a6bf23a6
 EBUILD selinux-colord-9999.ebuild 281 BLAKE2B 2c79abc44e75d49233d2084ee6a0af4d942bfddf0c510c5acb397148e89e4a82fd70a5d1a6dff743c58268ceb2c7c1a36a4ccd7cd117102e3da50cb22455cab0 SHA512 e8a0b181fb4bc3884379ed93b4bcd49c5f2c523eb75b12b05956ba715056a08b725417e905188e8d1905545a3a35edfef7d45c5f00e122b4b3402248b01b1ffd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
index ab98b57ae44e..5227c7770b88 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index f7ca77cc906f..176017918ddb 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-corosync-2.20190201-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
-EBUILD selinux-corosync-2.20190609-r1.ebuild 285 BLAKE2B d9d892f294b0326a63ed38599e4d497063ff0a89038911c6b0621acf44051c464798536333b11277785ecd2bc8d98f52a628707f10635020c0a4af1287c96629 SHA512 c469ec40bc04d4ea0e4bc542821bad0744e84134088aa65ea23b5c5eca7bc44e3cf04c6e3a9cb9106cb049197074cbe429493d1b91aa156998c7994ee310189c
+EBUILD selinux-corosync-2.20190609-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
 EBUILD selinux-corosync-9999.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
index 492a3aff0e78..bddc292c3cc9 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index f781e88a58ce..3d088cfda7e1 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-couchdb-2.20190201-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
-EBUILD selinux-couchdb-2.20190609-r1.ebuild 283 BLAKE2B f37dfb9039e9ca48ce9c02429ffd26e5ce4af6256363b8d12d6caa3fcb20bdbf8e006586bb8fc69e50d6f9f8d5e50ecc0dff46ad7efebc015f3633cc5d42d68d SHA512 df1942c430e90e5d523d2c273e5439080bbf1cc9f5d8b5e42155bb7717f54f966384d766ad7d0bdb7c9a8c77679d4116903970dd9a3dd1afe9aced15add75f68
+EBUILD selinux-couchdb-2.20190609-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
 EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
index 1eea9a03560d..a0c751186b13 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 70255d102dbc..7f6ae281b6a8 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-courier-2.20190201-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
-EBUILD selinux-courier-2.20190609-r1.ebuild 283 BLAKE2B 578e5cac584f4519bba456aa412db2be023c1c11fb81a8aec72f9a70af2bbf46e0b0363b6bdd8a739fbf143482e3a1f07892664948298c799d923a3d2725ff9d SHA512 795133130f9a9eb0b01d2394e2e59871cd2839588b71d848bc17787f957b57f29fa79b6baa96ef6a807dd3a1b635b44773b33ba954946a542d43e4124adf6192
+EBUILD selinux-courier-2.20190609-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
 EBUILD selinux-courier-9999.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
index 6997e079b95a..e386d720af7c 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index b0dca30f0f77..1b82fd295a0f 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cpucontrol-2.20190201-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
-EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 289 BLAKE2B fbd731b00268b790bc980e24fda334ce4fe147ecc235af9ed105d3ae4bbcc26171bb957c97f98c3d045637c8e28bf7945c6e968b06bcdbf5896176d5fe611d40 SHA512 0307bcec416da26b2e82e069405cdfb76ccad9eca9e5cc29c191d1637e019629c80d90565816201ca607a82e91ece8e00689fa1a31c7562c4389e2b404e34501
+EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
 EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
index 87539bb0578d..e052c5e46053 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 7d32fa07d5e1..d0c28da75df8 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cpufreqselector-2.20190201-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
-EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 299 BLAKE2B e3ab8851a8d0ab7e24d81328e6821936ff6e1ca9ec71c8f58d5182d3c5387e22b3904f58d24a3591ac8ff687c42d5049cecdcb2b4332b86e6a8dc850399d1bbc SHA512 9228ffc15c708ee3eb34b4ade9c2deac281cf0c9c5ab5ca5de6c553cc121829f136101902427676ca0a524d5558ca90571815f08e3363a6ac3dc32679a2c30d8
+EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
 EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
index 40d818f6fdff..4406aa586813 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 7e52e8a4b2e8..ad4d9886cc43 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cups-2.20190201-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
-EBUILD selinux-cups-2.20190609-r1.ebuild 367 BLAKE2B 1a809a243e9af7132a53388d58480299fbc3e4b7484726867e74aa3d9470f25b823c944e61538f2f7851e49d755b2f0fbb47df06a2a24c0d6e0b987408eada4d SHA512 9abbe9c488f09c657a3fe9b28c9c678992e77ea829fe621a44f2fc9b18aee44f49f54b4d5915eab6e71bdfa496fcb529e3d06e3a79829e45aeacbfc9e69de801
+EBUILD selinux-cups-2.20190609-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
 EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
index ef76549f7e20..7df0fe175dde 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 42ebbce1745d..0ac37cc3c2e4 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cvs-2.20190201-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
-EBUILD selinux-cvs-2.20190609-r1.ebuild 423 BLAKE2B cb8d7d9e35dab2656a932fc98eda248d0ee09623053a8813d7fc25d8414085f77256baa76d63974d0d089ecad11bbdc7e8bed600bcdb590134e9027d0eb19b3c SHA512 b0a8cebfa2209b098b68b81588468ea237bf5fb40dcfa004ee32dc1ad913b2b1982cbd854e6f97da481ab494408a46b6a271cd8f6da8e4b116afa1a3e1c46d4e
+EBUILD selinux-cvs-2.20190609-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
 EBUILD selinux-cvs-9999.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
index b44fe8dcab44..4eb8346ea7b6 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 951a1327b72a..307600515ea8 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-cyphesis-2.20190201-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
-EBUILD selinux-cyphesis-2.20190609-r1.ebuild 285 BLAKE2B 2baba8f35087be47a337145d10d4159b5d448fac503f732952bd6ff9221c296db92a10f0835e979a2e17a1c3359b427fe9b02a2448c0440b4b77b3c69d71fc2d SHA512 22caaa32cc1579b9e63dcb2808511a8022b841827d47ad754899799503218e52da1b0939fabdfc4d130690970d66ab59db02f298efaa8f5901180a27bb63ee80
+EBUILD selinux-cyphesis-2.20190609-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
 EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
index e14b4aacd141..aace0ba91fa1 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 2ab425a89e82..72a96bf2b74a 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-daemontools-2.20190201-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
-EBUILD selinux-daemontools-2.20190609-r1.ebuild 291 BLAKE2B 5e9313a463fa23b8214ddbc98b43fbda39f674438c199902668a981bc4ce6f0ae7b92e2b7bf0ef2e5b7d6dd0c7e1b44a18303e1077fe4a7c76f578bd63b7a89d SHA512 0f5d66788ae64a780244a060ba63d68b22c7ff3cc572889153d942243ae45b3741ac806eb3014fdd79f8592cae88f0b639a5ca4a43fd2e7a9b52d5b19ca1d785
+EBUILD selinux-daemontools-2.20190609-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
 EBUILD selinux-daemontools-9999.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
index 1b4ee6d4ecd1..bb6c6bd46e73 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 69e80345d872..6031f16d8669 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dante-2.20190201-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
-EBUILD selinux-dante-2.20190609-r1.ebuild 279 BLAKE2B e800aeca3aa5708886d53df2532f6f866637d03777a9df287be3a9dfbb6314b9a9f04e4edfef9249fecb83f76d7e809c6ec4e54f303f654720f04d3a2b7e93e2 SHA512 adef5115da5434286905ee759d05e20819237f8f0b9adf6683b7a661b4e36f664a7d5abbac8d00be5aad6b78653307b71c4a2c86358951fb788257a94abce9be
+EBUILD selinux-dante-2.20190609-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
 EBUILD selinux-dante-9999.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
index 197352fe2e3a..7f5e5c8dacfd 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 80ab5613514b..2373d3783fa8 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dbadm-2.20190201-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
-EBUILD selinux-dbadm-2.20190609-r1.ebuild 279 BLAKE2B 4f3dc879bad0836bbb5e8322722c19969b987109b68da4d611b51004f4c21cb6df913218808a5209e30b6bd44fd40782dcb7c8ef7675f00ad15f6f65d73e290f SHA512 3a81e4d391d4e44ae80d27963719fb194966c8e164b3c2edc7c2fc41c7a667bba3c31082aa0c44b1e2536bfa7117e2ec76abd2e19b6c32c882b781bafde277c6
+EBUILD selinux-dbadm-2.20190609-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
 EBUILD selinux-dbadm-9999.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
index eb7bdd38545f..1debebca55dc 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 50ead16d651e..716da6508237 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dbskk-2.20190201-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
-EBUILD selinux-dbskk-2.20190609-r1.ebuild 373 BLAKE2B 899eae84aec5c514484159e7995b11b87c9bdd73b08f95a439950b9012190746eec508faa2189c0bfe5a6c64478ab28d87003e6b734b87d7ee12db9809034561 SHA512 c83a8ea4c6f06f91148f803966b4c47404c8e6dc79c46e814ac16a6ef1da375390ed05132da84832bfd22383afaf7e3392ee179219d1e7fb347005bf0008d167
+EBUILD selinux-dbskk-2.20190609-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
 EBUILD selinux-dbskk-9999.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
index cdb06e002202..08be811020b4 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index bed33d76919a..a83c13f7319a 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dbus-2.20190201-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
-EBUILD selinux-dbus-2.20190609-r1.ebuild 277 BLAKE2B 0702f90738fbcd435da37793a22e09211089a236be27c24bc36361caf5f5756a41b528c22c4dc325065fed3ff835f34577c6ebbbcb4fc518fb2225757825bec1 SHA512 7225fe881ad5a2b8443be6a06cf81b4006d3d37a84bf465d9497d9ad1372afe27960fb9f4c8e0a40355f0335d0173f2fbda54f512821294fa355628721d58f6a
+EBUILD selinux-dbus-2.20190609-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
 EBUILD selinux-dbus-9999.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
index 08368fca8786..30e4ce38da9e 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index d9a9a59bb13b..6de339e70a81 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dcc-2.20190201-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
-EBUILD selinux-dcc-2.20190609-r1.ebuild 275 BLAKE2B a475d80371d0fce04fe6ec143a224c330e1aa6a93da1e8ce5bbfbb21aa81dfc3761f0f1fc94b5de83190805c55718acf9c9306a1c151287de8c455fb297cd8f7 SHA512 ac60072844dde0d2020864a0d752702d3fc6b0b489302d2b0c2db0a3ca24f303513964944616511582d8af5bab6a55042bf818e79287c1f3188bf53bceb080f6
+EBUILD selinux-dcc-2.20190609-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
 EBUILD selinux-dcc-9999.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
index 87ba80ff8144..3daeb35f2884 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index a8d2c564ff6b..e716da19aae1 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ddclient-2.20190201-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
-EBUILD selinux-ddclient-2.20190609-r1.ebuild 285 BLAKE2B 4c55d7e4d536804e9b9aa37fb03429ee08f02953297551677ae5df04585db00d566d033eca4b476658704c3ac9c1e49ac3cc32085c6af90bb62deb79e7f77754 SHA512 3d808c0805f35da19365b54aeb810778002e19f5427700858b668fdb6883e99f4ba25302081221cc285293f1e8e92e53ada2340184dd25d50619bf8197265b5a
+EBUILD selinux-ddclient-2.20190609-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
 EBUILD selinux-ddclient-9999.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
index da014bed7169..1048608aedc2 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 625cf762c7e5..9de1cfbbcbda 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ddcprobe-2.20190201-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
-EBUILD selinux-ddcprobe-2.20190609-r1.ebuild 285 BLAKE2B 715f996133f6669c63f804ed64111f6972415023d5946e5a659f12267b68711142b61c8fe886199e12a8326173f73d15fbfd5b131c2362e2057246781682dcfe SHA512 dfa85085b10cbca3726971810eb94bd306a9cbc7ac3a16a6b41d4a18beb9b893a6ab512bfb512f8c75ce1146beda4e604c7c3151fc3640a516e7695bc6777e5e
+EBUILD selinux-ddcprobe-2.20190609-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
 EBUILD selinux-ddcprobe-9999.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
index 2c62fb102269..5373462a1fad 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddcprobe"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 14d09c6792ad..3f531929e94b 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-denyhosts-2.20190201-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
-EBUILD selinux-denyhosts-2.20190609-r1.ebuild 287 BLAKE2B 123bcc73e0f2618d348175665874932b607cd75e4bd9a8ec52fcb4a4cefa15c22f8e3e4aede1aa522ecdb2e84add2e9c9af497703464a1b6c44d52e3a01cb1f9 SHA512 3453cbf14fc80ae36e56f40bbc65b97c56bcd6c0fbace909378910b8ea1587d3a3fe33be6471752a2776d7237f15fd9076d79616a0a32f919204cde0e34a70bb
+EBUILD selinux-denyhosts-2.20190609-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
 EBUILD selinux-denyhosts-9999.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
index 607f0dc94550..c5821f7c1996 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for denyhosts"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index ee5823d14767..77f8c3e4fa0a 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-devicekit-2.20190201-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
-EBUILD selinux-devicekit-2.20190609-r1.ebuild 380 BLAKE2B fafa0f31b7638e0d05b5151bf26c4802eaf430a4a299d473e4f89c8dbfd4f0c9b02039616a315a295039535cfa2f137842a5bc2add545e7af9b3c4ac3ef38d3b SHA512 5dcbaaf4bc24894cd3514ed4ef7fd9a14a854de656572d468650f57578888c6db038fb1e3514718d8bb25b45d00e68cf0ef2fe9be5fbcdb0efddba257c4ee010
+EBUILD selinux-devicekit-2.20190609-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
 EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
index abbb06ff13da..ac130b34a23d 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 5384acc191bd..d4f7d1b94a0f 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dhcp-2.20190201-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
-EBUILD selinux-dhcp-2.20190609-r1.ebuild 277 BLAKE2B e1efa6ce25d0bd4d85389b265b28202b6f4232aad484573be5cbc2c47b55dbbe3f313ac5c310f2db36bf91240bb903fcbeca245da4e6120b7b767ae00ceb38ce SHA512 068de50017ab132aef5968407a5fe23a2850374e4c0bee8a18b32e1288b6f64994686eadf1b3ee35366ffd97712ffdeb7b1921e0f7364a5cd219cb1c284451ed
+EBUILD selinux-dhcp-2.20190609-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
 EBUILD selinux-dhcp-9999.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
index 3016ba58eb36..d735edb05ccb 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 0b0e8e1f89a2..46f90aaafb63 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dictd-2.20190201-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
-EBUILD selinux-dictd-2.20190609-r1.ebuild 279 BLAKE2B 543629e668bbb2bb7456b45a0de28c6c79cf4a299e7df36084974be385e475afbc29fb6f8d5f71c10635c7ac51c4bffb23c30f648ede1f5a90b0919454d9226b SHA512 cf9464b64fb80d0da64f109793f0dda08cd0f13872d68a27dc7bd8910cf1fc596ead753771af0d579797f79e3aca0c9de574012e05289f930e4dfb51f0ae5d85
+EBUILD selinux-dictd-2.20190609-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
 EBUILD selinux-dictd-9999.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
index db2c604276f2..10ba9a6a2e99 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index 2fad4b549e20..fecb065d82fa 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dirmngr-2.20190201-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
-EBUILD selinux-dirmngr-2.20190609-r1.ebuild 283 BLAKE2B e5db1ada7f7798252c1fd1268cb1eb46ee6257d8a2094b91f6fef99e1326c48f43f599a8c905e515e526042e3f2c4ec4f6033d918369572ba77be8ebd85dece1 SHA512 b45d40e8df694e910448f3a8ae3cf6bb2ef94498b8a2dd6858f6a2727c051236406ad03ff2fbc16e9696e265c0f96c60cdd7628ef05bdca99dd91ba1e453d76b
+EBUILD selinux-dirmngr-2.20190609-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
 EBUILD selinux-dirmngr-9999.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
index 5f08d1cb4057..08cd2e747812 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 0690b1cb39a9..c90b5978569f 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dirsrv-2.20190201-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
-EBUILD selinux-dirsrv-2.20190609-r1.ebuild 281 BLAKE2B 134c83e69b87b07ad967227f5e167f5b822aabc0789c9879bee69c566fcabce99223ee94131b81c22bd06193358b5cd21606eb7aa7580314860089ca49318a2a SHA512 17756e428274177749d19e21558349c4d8b4b4f523b01e807445946262cf23a93cffa8b16cb7e9a44a62baa753514692275bf24ddda6d257fb4e4084f217a914
+EBUILD selinux-dirsrv-2.20190609-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
 EBUILD selinux-dirsrv-9999.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
index be7bcd71917d..6b25630e88f8 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index e369e1118d81..c52354c893f3 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-distcc-2.20190201-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
-EBUILD selinux-distcc-2.20190609-r1.ebuild 281 BLAKE2B 2e440408363ef7e6dbf7911eee497baebb3d8594633b157eaa7cee504992131eea86253cbea844e59ed03ae513c201de130c229b341e570c5e49bf72c24614e0 SHA512 b8107d5d448bf08509747810c1358a85d31d19b1cd1d1c9c5395fbbcb56a948ed2ba5dfb55c721e8a436a2ef7eb28f40c08423818260212fc36bfab54f0e2620
+EBUILD selinux-distcc-2.20190609-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
 EBUILD selinux-distcc-9999.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
index 07fc45e1faf3..1fb57712c541 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 0e3c96215ac9..c469987d8b8d 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-djbdns-2.20190201-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
-EBUILD selinux-djbdns-2.20190609-r1.ebuild 445 BLAKE2B 4cb1611aaede38b7634dbb1e8f87df264eb570dc30db3b7ce230b0326ee9116ec20703788748bcc59d18a548aab0fd21ffdc6cb6214e719ebabe57c123ea3d36 SHA512 ad73f4171327e794aed1887fc41deabf89cdbd53eda5dcd65e518f243ba957ab59bdb8b9b19a12d5353e8a2e6d544506c39ddb8fcac7498dd5a33612548875db
+EBUILD selinux-djbdns-2.20190609-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
 EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
index 4fd14768c9de..99eb073c70e1 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index 502d384b2b7e..c31a8cc9dfe8 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dkim-2.20190201-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
-EBUILD selinux-dkim-2.20190609-r1.ebuild 374 BLAKE2B 26512997ca8763a050f262801d79f59a0f9f99b21e22eb048850e785fab4cf4c52b661b525e96558683e855109a60b3f8f579794c735e3bf96b07a66467739c5 SHA512 1d0920dc3a3718288b8ebc5b035faa82a78e7420e1d31f9d4d043d33e8fbfc7a999976f1d6e216efc4e0397a62d7a37c9c38d26256cbc8772d9ca3aecab9547a
+EBUILD selinux-dkim-2.20190609-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
 EBUILD selinux-dkim-9999.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
index a6ab770ee838..7becae43bfe7 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index e48ebffc65cc..570b6804f9f3 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dmidecode-2.20190201-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
-EBUILD selinux-dmidecode-2.20190609-r1.ebuild 287 BLAKE2B ae8bbd78975d43697124182829c374faefd2426df022bd8519c5916c32b0c87e2d992414be46366804bd6caf124b34c03ca8be410dae4d2b7fb4603f4380ee50 SHA512 d7f4f1600c67c4a99a6ce34355d38148729fb4fc7cc15e86ec56370c7dd7fe4c99b2d2208c48c0a9ca34622713a289a639f79b4d988e22d45882b8a60f789452
+EBUILD selinux-dmidecode-2.20190609-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
 EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
index 6737d466d6d8..50fd2aa6b619 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 2a3e83c13a69..9214ace2f3b3 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dnsmasq-2.20190201-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
-EBUILD selinux-dnsmasq-2.20190609-r1.ebuild 283 BLAKE2B fd19da6cb147d0d8157b70eeb3f437fd95c8beaa5bd66323eb705ba93f60a3e3ea3ffbb911c4c61be653924016761dabb27a96a28fce884f4cc36c373306106e SHA512 aea442bb958ac44322e471d2af1097ddec8e3616d15fa393e83f219c37c25fa9a957e44c92b796a030faf84bbdb7aabbc4410cefbe7e655f6a43bf45e28f59d3
+EBUILD selinux-dnsmasq-2.20190609-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
 EBUILD selinux-dnsmasq-9999.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
index 92ddc660b994..6bfbbf392abe 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index ee10318590cf..20469a80f642 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dovecot-2.20190201-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
-EBUILD selinux-dovecot-2.20190609-r1.ebuild 283 BLAKE2B 3cb429c403f9d0e66e9753547de834fe092f7c241d9174fcdcfbef430f9f7b9132419cb7f7b6637799892e28211a407d60e20fca164a994ad31c3ddeda4463fc SHA512 37a8e20feda7427bd98c42d901e520f5b610398ac664916d3597b05c14e068ed8ebf9e40937059c20cc7d5784031fb546f0f9466ad57eb0345bb7f5b79e7a25c
+EBUILD selinux-dovecot-2.20190609-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
 EBUILD selinux-dovecot-9999.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
index a0565000cb9c..1e1f33ba3fbe 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index e0e4a7152b3c..06efd806d937 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dpkg-2.20190201-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
-EBUILD selinux-dpkg-2.20190609-r1.ebuild 277 BLAKE2B 263b606cbd53cfc2fcfa3fbe1bcb2b37bbaa71496c1af475905ae4471a64b997b07e522c60457b301b1b56d5a10aec438c83dfbc6dc4e80c724bb6869e499c41 SHA512 9020799f26851ec094dd33daaab15ca77c05f6ffcc4c4e7462cd2cd08839c5da82b11c2fc148fb46ef4e0ac2660a42a050fcb8655cfe31dbf438e85b75d17a99
+EBUILD selinux-dpkg-2.20190609-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
 EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
index e6383a01db5d..89cab8ca4b66 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 94526c7b701b..e56db2196fba 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dracut-2.20190201-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
-EBUILD selinux-dracut-2.20190609-r1.ebuild 281 BLAKE2B 00caf5e7b61265d8633e3298c5e90ab02a1629915dc1dcd88db0f9039ab6c1a462afdb0b2acbbf13318bacb98d1db449241e59c3c3594e61edec1c0218d57216 SHA512 e3d448804819238ac29c3b7b4f81c3d141d8bd6d4f0a483f91877bda69915808d7c246ddfe852c3b8605b2f79b29271e85c52f089c764052e61ad60a4c860f02
+EBUILD selinux-dracut-2.20190609-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
 EBUILD selinux-dracut-9999.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
index 2054bae3ef3f..4666893b2dfb 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index daa7625df074..beb73c1c119e 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-dropbox-2.20190201-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
-EBUILD selinux-dropbox-2.20190609-r1.ebuild 431 BLAKE2B 858c0e3d771c589dd056e287759dd58170751e9af8d2df4b8abf2d1198ba8fbc41bd5b5af678101e77d32fae28cb0ca857f17c502769bb53ae32c82e079f4581 SHA512 aba919083e2524ce70bdafd139e3a24c2e86ebc4190ef942b3a173dc2faaf9eb1633caf1dc41cd88eb4fba063b90aff20baa50e6a2871588d8f7ba9c8d6ef29f
+EBUILD selinux-dropbox-2.20190609-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
 EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
index a1ff5fb57a42..62d5dc077a97 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index d2c0573d7303..1959be0902c4 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-entropyd-2.20190201-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
-EBUILD selinux-entropyd-2.20190609-r1.ebuild 285 BLAKE2B e580a645c4b19a136da6021f8fddc6b9b58957ed3fb9753f85897fa3b3bad6989434baa02ce6dd0a6cdffaf45cb8fab8f4c9c03f606052a8d584b2af2001e1dd SHA512 91c136cbd6bf39a1b4b8f580df811349d38a1a1124b30a759e8c455ccf3f630ba17f3cd5ddd4882878d291d99b04633384b6eeabe080ea2ab4f9cb9b69d75706
+EBUILD selinux-entropyd-2.20190609-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
 EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
index 12207da05f25..bd0339fd2955 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index b34db5992816..2f19695bf9fe 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-evolution-2.20190201-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
-EBUILD selinux-evolution-2.20190609-r1.ebuild 385 BLAKE2B 8d137075737b95a34fbf31a0a387d31f252ae64a1540677dcf475a319e0b0bf2fb405d908efccc25bb6ca2ec41cb9389a645b422fd2ca992f8d8030651393848 SHA512 c36400d09f530b0aad8786ac41a6c126a37b02c5aec44e5d806c7606e16ab5ac9ccfad0744a82a0dd37f9de24f1ea30bf3c55f4cf5661cc9f1ae487af21ac1ae
+EBUILD selinux-evolution-2.20190609-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
 EBUILD selinux-evolution-9999.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
index d175f463b9ea..091f6ae1dd82 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 9f4d7cd7bade..b3fbaa8ebee9 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-exim-2.20190201-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
-EBUILD selinux-exim-2.20190609-r1.ebuild 277 BLAKE2B d3e00ee4abfe2b082b7038aa4099209979a6133cb19d832ddcf3051b9f6accb7922cfb94a5c5cd94d14e5626b2f0b5c50b424b8d15c5d1e14f99d92c360facbc SHA512 27cbc12b0e0dd8451c0d6635db490a68852a65b9d2a76fd1cf2c4e70ca1190e99c510c7b88efde3925165d4732fd72bcb4da79fc0b4abeb84404a6b464bd225b
+EBUILD selinux-exim-2.20190609-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
 EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
index 0ff65864f52f..724df83e9453 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 216f75b00d48..b05d2bbce8c4 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-fail2ban-2.20190201-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
-EBUILD selinux-fail2ban-2.20190609-r1.ebuild 285 BLAKE2B 3601e0a1139039e9cc89e49033c8cde93106649412f7b585e5a60378608b62d99913ccaa9821ffdb67e7a9299a43ef7c89fed6026da6019ca089b06a0c3e44ea SHA512 c113d4fd157b94926a1640b48b9812a07768ef328eca5e1ccb9f2fe63d8e9873ba18486a81cdc3c4e5b82bb92aa5c10b77bc3a15446a1523fa27c9fc89b0bd66
+EBUILD selinux-fail2ban-2.20190609-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
 EBUILD selinux-fail2ban-9999.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
index a1cded44bfc2..b2b0b8ee1ac9 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 46746357f4bf..2aad6cea3a6b 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-fetchmail-2.20190201-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
-EBUILD selinux-fetchmail-2.20190609-r1.ebuild 287 BLAKE2B e2fb3b93b8a2fa0b0334f77d2df63a5c6cde00fcdb2850619bc171f66146942b8694746c90acfaa59d3b18d8e305df473a8696869487a15d510ab8d42696fd81 SHA512 ea869094b99945cfa9b32bf46f45a676a7dc5125dd8dc64bb84ae3043b462d86313da767d32c19aaac0ca9a9636c026459291031271b0273a4090cb5c0332fe7
+EBUILD selinux-fetchmail-2.20190609-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
 EBUILD selinux-fetchmail-9999.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
index e4b9f4758613..ebec93eb3d47 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 8a0550f3b601..02cf67a2a72a 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-finger-2.20190201-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
-EBUILD selinux-finger-2.20190609-r1.ebuild 376 BLAKE2B 1556c8bb077f0b483d9d0c53a02eb073a1f3d4760d6c2e585995f730d73c8345e4906d13e69174113a4c90b3c350d82a79c58e20c15c0c5024e81e28d57ed199 SHA512 3974481f38f7b9aeb7c6ecc3d196579cfe7f2445e773917439a445dc20e96bb7580add8395a3702ea969b2654c44f7e9162fa6fe85135a97cd4b836a0fc193fe
+EBUILD selinux-finger-2.20190609-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
 EBUILD selinux-finger-9999.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
index a4821f707c58..79c29efb8b8f 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index b49646c04e1a..4c6400bd7036 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-flash-2.20190201-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
-EBUILD selinux-flash-2.20190609-r1.ebuild 279 BLAKE2B 21924c513eaabe4206bed0bfec29afeb36a2192f52db1b8d9c7487bee958fc3933b96a7f452045d27ec98550ca184aebe9f7a4ee9db4d7fa1f59f0366ea1f547 SHA512 213379f976e9e4a1d865ec0fd8f21d9e42b975960d653e3aad405e31a27c9461e861d4aa7d5cff32be7ea74a03f0ce921d4b6fa9e05f1414b9ad3cb3fc875256
+EBUILD selinux-flash-2.20190609-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
 EBUILD selinux-flash-9999.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
index c78504df8f10..ff8ae6d5c295 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index a77b8766e7b7..1d8b41642380 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-fprintd-2.20190201-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
-EBUILD selinux-fprintd-2.20190609-r1.ebuild 375 BLAKE2B 945698bc3936da3ee9ce067dbb8e3eaf04dcefd62ba9df72d20e59e27dbeb23a168ed6c748b058838f4f14b85c2b5528ac8800c063e01c6b06a9f689d287fe1b SHA512 d7c8bb1794ebe14c0424d2806ddb81e4c3d257345fd720768d982ad07b96c553a0fc0a833fbda9d11c9ccf04e0bfd5971ec86bb95f68d1bfbd79b065890d0eca
+EBUILD selinux-fprintd-2.20190609-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
 EBUILD selinux-fprintd-9999.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
index 439886384f89..546d0e1ba794 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 56bee91e02f2..337785893b0b 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ftp-2.20190201-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
-EBUILD selinux-ftp-2.20190609-r1.ebuild 275 BLAKE2B 5e4b3e37d98aa40ecbbd50eab8e1754350a95bda0da1ec30af2cd21e5b91954ebebdae2c482bfc03ff0e1cea04bc66cebfe91ae522a2030a55a78d88db7746f5 SHA512 907a169884ea875123666ef65e9e00417dd5e44b5256c734653045312b1b8b5622062633f09fb2cfc9b1fdc7390cd1ef0a73b2fa3b81f6e2e3f15b973a03a237
+EBUILD selinux-ftp-2.20190609-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
 EBUILD selinux-ftp-9999.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
index 5a96505f57f1..60b89d957ce5 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 2950d1406fe5..1362697f1719 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-games-2.20190201-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
-EBUILD selinux-games-2.20190609-r1.ebuild 279 BLAKE2B 68d38a2f649d463915c31d2e30a9804d7c62c4ab7a81c5071cabdac2fccd41d063a171529e877511933b0530efa695f05d3296e5333c04166260aa4207dd2234 SHA512 fa4bc673dd291063da4de9c028c5e7a1367e3e9f39b1d64939cabe01198f5326e5c38d01fdd9aeb0d383b417d62ba204aa1277e7718bd5f8d513d7a5c2d2295d
+EBUILD selinux-games-2.20190609-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
 EBUILD selinux-games-9999.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
index 892674828bae..5b88b7d06130 100644
--- a/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 6d3781cf044a..b26312b666b7 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gatekeeper-2.20190201-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
-EBUILD selinux-gatekeeper-2.20190609-r1.ebuild 289 BLAKE2B 43c4baed0f5c4a1e25c0351010634c7e01c438d55c727ff58778392f5e818e265c55aefbd405afb20694c4518b8645e6019eba8ccd44882e6841825a43d014c3 SHA512 0454cb030222291bf701a7edf4d0eefa4fa79c0c1a5b21d2259042a7b366c2db1b3acff51189de7d16778fae26abc9bfc0a698abc738a1a35b90b928c29820c6
+EBUILD selinux-gatekeeper-2.20190609-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
 EBUILD selinux-gatekeeper-9999.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
index bce180d3afd2..8b5d1f279ad7 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index 52fd25a254f9..2285110d7915 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-git-2.20190201-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
-EBUILD selinux-git-2.20190609-r1.ebuild 371 BLAKE2B 8c6822d747fbf85b4333c3992d17f9ce8474b8d36186c68721931ec69b6d4425ed3885b60bf3be4aebef5b621764c0a02b0c384fc9e7059c0a9aae2e3dbfacb4 SHA512 406da45f6753926e6397dba4e5a7a71d8efc3b78695aabf464db833be687be821d100a5d8292880439d69e7f6351a0358a8bc3ffc428680e5df4d93ea1ba8e94
+EBUILD selinux-git-2.20190609-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
 EBUILD selinux-git-9999.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
index 0dcb24ed68a1..49a24f6621c0 100644
--- a/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 35d5ceaddda2..23213775f79b 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gitosis-2.20190201-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
-EBUILD selinux-gitosis-2.20190609-r1.ebuild 283 BLAKE2B 2ebffb45292df78772d900333a7d8c0f8447878e58ae2f7917ee16715c1f80d397c9ef8a40f96df3d52f91e55a989e9b09f06ed4f9f15ad81e3e93b11fac624d SHA512 83c12fcbceefa831c96c59fa5260e4b63018314488f877acc6938b818435b23d01cc95fe1663d76b506a2c09e8f49fe366322d242f0861e4b86caa95781866ab
+EBUILD selinux-gitosis-2.20190609-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
 EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
index 55bdf28d1f45..d4f730fe9c1e 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index ef7c152d5879..de9831ccdc3b 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gnome-2.20190201-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
-EBUILD selinux-gnome-2.20190609-r1.ebuild 279 BLAKE2B 0a6948dc46db1727182f7eb88467e136447da3be1980660817bd0bc0732d9ba19918d18d18b258d6ca2ea6c945701c77ad23b182bda8cb5e69a0c54563eb88bd SHA512 6dbdae9cef60b628d58afae6645d51dc1b40f803f2561919266ca6194aaee3bf51b7a14327705af843e7ed62a5d124a32cf324f8db6f9672565bf8ec333ffd00
+EBUILD selinux-gnome-2.20190609-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
 EBUILD selinux-gnome-9999.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
index ffb8a5bb7380..d454a15f284b 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 6f9540ff6196..78c3fc0f5f30 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-googletalk-2.20190201-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
-EBUILD selinux-googletalk-2.20190609-r1.ebuild 293 BLAKE2B c8a3910b677e6121ed02b7788cccd3ab4038e01b08aaf8d9d95273e691ad081016cfd4633122985d0ab91ef7b19233c92e2a260c2e99316d6f8588678b574119 SHA512 a5342a9510964647f3858cd58261f25c9b48c06e6b1f7421f3c67ba53a9d47a3b15fcf110c7bef825fc6f2fd56c2deddadf18df8bda6d1a2ff030d5a1ad0c776
+EBUILD selinux-googletalk-2.20190609-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
 EBUILD selinux-googletalk-9999.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
index 9528cb6d240f..c8ed29c56195 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index f77d340be014..7e34389f837b 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gorg-2.20190201-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
-EBUILD selinux-gorg-2.20190609-r1.ebuild 277 BLAKE2B 06863a8f96ad85534166a0b006ed5dd355bec08db6760ad55c3eb6ea8da8def49135e292f4b98a714b6f9f76a6b4fdaafa328931c021b34e1fd1654578a4bfa8 SHA512 ba57dcdf6d0511757740df8d5df8f99b5689ecb1463ea6dc562a4092e45b3e713444e6979420b0e9766b46ce67e1ca72cfbfa165dc7c8cad187f3c6760bd2ef8
+EBUILD selinux-gorg-2.20190609-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
 EBUILD selinux-gorg-9999.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
index a0db7bf363d4..981390bfef56 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 2c246e49d017..0035a4eb7757 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gpg-2.20190201-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
-EBUILD selinux-gpg-2.20190609-r1.ebuild 374 BLAKE2B cd6319f3a4fab473fe1a34443e16d7d6b39dafe11f518ceb71985ac2f12f138c1fc144358ef0ad2d25d8a5dadbb514c1dbb2c35ccf79d3ed4f603dd8c20f31f3 SHA512 512a4431a59699884e91ec9fb2f6fdd453770d1009c50f29a2bce7a66e8f370be93c85e6f115dc686248aefbce5f36367a15d2d7aeca5193326b85cbf11f19b3
+EBUILD selinux-gpg-2.20190609-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
 EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
index 60cf29e2355f..5cf174af34fd 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index f863f86c5d52..7a1e56c09d85 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gpm-2.20190201-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
-EBUILD selinux-gpm-2.20190609-r1.ebuild 275 BLAKE2B 80b53a1cd1a80e5358be33d2239b345b215517002fbf53ade3c6795c1a1a4988d73bb48a9fe7167d0b39be132c388499b30dc436e5408cab8ae30748097b2394 SHA512 9c30bc070e456cc7e08677fc4a51488bc56cd87e79815089112f5cabb5b23897c71a890df6752a35355dba3871390fad25289d7f5351a6be8a91dc7d0f912074
+EBUILD selinux-gpm-2.20190609-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
 EBUILD selinux-gpm-9999.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
index d6917ef04317..c31facbd46fc 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 88468d541f7d..0704bd75a4f4 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gpsd-2.20190201-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
-EBUILD selinux-gpsd-2.20190609-r1.ebuild 277 BLAKE2B 33d1922c06d9016414ecc73ceeebeaef4d5a80d897c68d74186ea379bce3b5fd390e2b7e2f11d61c22af135b0d4074fc771462403fff249a67643c2a72dc26b1 SHA512 acd8e795f9851e93945d49ba9b62eec229ffe3c5d9cd68224ddc013a5e862006b4f4d8771e8837fb92fb079d70ebe8fb9c2efc3fd691c288f01422bf6e3236d0
+EBUILD selinux-gpsd-2.20190609-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
 EBUILD selinux-gpsd-9999.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
index 3fa180185a28..c35a34440ef7 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index 4b80e467c3c5..a69e133f25d3 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-gssproxy-2.20190201-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
-EBUILD selinux-gssproxy-2.20190609-r1.ebuild 285 BLAKE2B b90a82a601d042c2794d8a3bcc7b8d06c6d38564458fdd17ba71acfb0c04bbc30374be4bb0fea6778f1797b23a9636853ecc9b97b1fa6e602d9ae19f218f64c1 SHA512 08d91fa344d892d3064f4399613ba0c1dd2a88df9f3ffd92639b6b06f6986ece8970acb13b945ccdc93d5d6aee719c86dd3ae8bc58aa856aba3e447ec2075608
+EBUILD selinux-gssproxy-2.20190609-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
 EBUILD selinux-gssproxy-9999.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
index a0b74e25a2eb..5e04a763492d 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 5821ce2a5712..a212961c01fa 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-hddtemp-2.20190201-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
-EBUILD selinux-hddtemp-2.20190609-r1.ebuild 283 BLAKE2B 8e432f21cf62aec8989cbd32128e51ab54651915e994a807e6b5b7f4fc045ad875807ebe3166473d313a9dc4d8c457172a1f33a19f962a05ce27b1b0895f7f7b SHA512 dcc44f2090f01b38188e54e34f519bafb961499efb2771255113cdde931f202c1a9c651b8d628af7490be159a65331110927ef4ef5fdc70d0c0e4f6f2a02d93f
+EBUILD selinux-hddtemp-2.20190609-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
 EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
index 5be1701c8c9d..b677c4b786b0 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index d1e94a0ac030..477fa2257090 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-howl-2.20190201-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
-EBUILD selinux-howl-2.20190609-r1.ebuild 277 BLAKE2B 46526b35b8527f2235a2336af40e7a747afb15b9688011423995dff614db1071a7e1a7e4bacc7c81e4bf518c3a8385ddd69d39b5795626465f13631cae66c6c6 SHA512 585281918188bc6b475ce7d3a1b5fcd6bfe57ff8f95a60dc3f0c46a4eb9470952c64abc2dcb0d4ce271c46b65177b50229b71fed5d86f9d30288917441edfc62
+EBUILD selinux-howl-2.20190609-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
 EBUILD selinux-howl-9999.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
index c85d764c5afe..ac0fe42b2cca 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for howl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index dcdd61854fbe..a0e33c16a2dd 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-icecast-2.20190201-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
-EBUILD selinux-icecast-2.20190609-r1.ebuild 283 BLAKE2B 9dc6a232516c0d8d028fe8ffceed56c5f62c2d463450add7cfeebed5189fd1afa09aaadc35d652a1188c6f7df55c8dc2b580bc854f64ced92372259c5188d109 SHA512 ab379577efc81439303a6defe5659728212142695d7c559bf07dfbb46b81a819c6054c96b9a74a4fe2f74934a1c31bb1aff282db8e91df6c234a3170b632b2eb
+EBUILD selinux-icecast-2.20190609-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
 EBUILD selinux-icecast-9999.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
index 95a5fefebd98..e1c6d82781bc 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index e7f33b87a36e..77fbadef02fc 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ifplugd-2.20190201-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
-EBUILD selinux-ifplugd-2.20190609-r1.ebuild 283 BLAKE2B e4f9f5e3a350ce6d7306371c2e94eba89527675042b7c9808fb884f1de524eadacf3efffa6966dca6dbe613cdd72ee80b77e492129fcaee01ca020cf82c631b1 SHA512 4df03d07705995d4fb5a0ac7df007bde7879b8cf4f0f71ace253c838f4734f2f80393b6cfb3c8d707fbc08ca0a4d536bf5b7d79993af4c845bd65739adacd411
+EBUILD selinux-ifplugd-2.20190609-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
 EBUILD selinux-ifplugd-9999.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
index db5375b26ab1..3190e65561e0 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 2e64f241cca4..b1d8f755030c 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-imaze-2.20190201-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
-EBUILD selinux-imaze-2.20190609-r1.ebuild 279 BLAKE2B e1f868acc088670d6893d39eb3b1a4f1e93ab83acb59ec1ba7face0059e60b798e3b407f42c8bb59341296063224d35ffc34d0302325850125a0206bfb8b2fdc SHA512 2c1a9570034daf4c4e287984d3299ac5b744057cfd1fde21b7a9cd4db3e3a799a51a2d154e49244433b3438ca2531d7e699a87219c836fd701245bc7b61d4c6a
+EBUILD selinux-imaze-2.20190609-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
 EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
index 8433c4916828..489648ba6142 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for imaze"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 607f2985e420..d933f85cb952 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-inetd-2.20190201-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
-EBUILD selinux-inetd-2.20190609-r1.ebuild 279 BLAKE2B da49bfcee3136f48f2cd58f80d9f3f23fa9b47e2a9b57207ec5fe1b82cdf623711e1d0d5806c18922e4d5550bbba73b0a232ca97cca1fd61981a5fb5b454561e SHA512 65e170bdaf9f9f9fe68f4455bf96cd8e0508bbc165b9848e0a77b44c58978fc3be4465582cfdab013481604b26d16c54afcfe42e67d98c10dcf556a10781db49
+EBUILD selinux-inetd-2.20190609-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
 EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
index ec96842d35b6..fede958e81a4 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index cd978a900c86..5fb62f9c051b 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-inn-2.20190201-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
-EBUILD selinux-inn-2.20190609-r1.ebuild 275 BLAKE2B 6c4227a3d65291576f85ebe38d88fc7e4f64aadf22e3158bd96ce41832a35361deee80bb266d7a904f104099103b2ab03a73e15f17ae77c1ad12d2acb0c3022b SHA512 4171fb3242f09e4fe964d0181f81b75f4c935fe3d3d6716c847f5d27e8a29f078e5c13068d85fdda8e089306efd3448c0320d93a396c6047db3be53bd79a8ed6
+EBUILD selinux-inn-2.20190609-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
 EBUILD selinux-inn-9999.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
index b03b8bfebb50..c6c4d8b76174 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 35aac1e5e330..863b11141657 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ipsec-2.20190201-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
-EBUILD selinux-ipsec-2.20190609-r1.ebuild 279 BLAKE2B 69f69d5321e5db91a1745ef5ca51a26a6be44a206fd5031455c98514174339376a8caaca0db96144bb971f3324387f983b10a53f7d9d04f738308dc0ae846d34 SHA512 1dbd8f4f0df77b9eb0e585fcfa613976de32bdc8329e00339107b188acad9f6678b6b11ff0bf608b3757539ddc656b8dc542ed16ce98e3f5baf0b74478c04524
+EBUILD selinux-ipsec-2.20190609-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
 EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
index 16183a95d5ab..5c90d6ed4a0c 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 27a39cdfb842..c734c442614d 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-irc-2.20190201-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
-EBUILD selinux-irc-2.20190609-r1.ebuild 275 BLAKE2B fb0c2011ee0cdb56ccadb076d616576d60d0eb6c426905116e313660c6429b6db6286eb9f1de66e90d2da5ca06813bd27c42abf07939d13de331af10de848efc SHA512 4d4564ef95e9eea344e64f91bea4c63a4355739591f0219b343aa1207c9cbf00c480e8a03f7477d2c559b94bec62e5746feae61a2ed0b4a57cbf993beba932d9
+EBUILD selinux-irc-2.20190609-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
 EBUILD selinux-irc-9999.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
index 5fcd93148cb2..b5c726276812 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 883b97ad96ac..f16980adfd8e 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ircd-2.20190201-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
-EBUILD selinux-ircd-2.20190609-r1.ebuild 277 BLAKE2B 1d9465b1cc1c59a9070d47938467e409e78bd6b5db45090195eabd9c538471b5a473b8994ab76cc1eefb99f753a1986c24a07f01ffdbd671049d12d1ce13d2bd SHA512 7fdc775e664cecb066d4434962b55a1e646596830d7f4525c3104e3dcbfbb3bb0355413b3ea5dfd52721b10f8030f6e0d750e06257ed74984e83fa68b310aa3a
+EBUILD selinux-ircd-2.20190609-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
 EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
index 385bb8893073..99d5126c869e 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index f879ce2d0362..785f27e5d2d4 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-irqbalance-2.20190201-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
-EBUILD selinux-irqbalance-2.20190609-r1.ebuild 289 BLAKE2B 5f4b2b1e2f2354a490cf6517019f8d377c9d521f0a0d2d914fcf188f28f03f9d71e0c6793866505b48db4cfde07a0ca23264720e6f268997b0ea240db904a562 SHA512 f1d9927f9455953acf8d7bdc5914d64257063d63258386b1dcbbc9cc4bd70252941e80ff8a40f0fd0a4a96ecd98c153251d9fdac0ac57b50baf4f0e5de493411
+EBUILD selinux-irqbalance-2.20190609-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
 EBUILD selinux-irqbalance-9999.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
index b06580074edf..aea0de17ee95 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index c4090a80f2c2..e8588611c04b 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-jabber-2.20190201-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
-EBUILD selinux-jabber-2.20190609-r1.ebuild 281 BLAKE2B bf4aac75067e65caa8439c52ff79917c5b1df55abe00e7490c2b02dd9369100232866dee94a6db58c20a338f9a644543921d238e4d7144cfa175e1c0f673bc75 SHA512 0fbef72ec09bdcd45678dd005d9abdfc7bd4f4d5c1a2561a80fa210ffed74e24c11fc2101c7f359715d2f4f88b46424ba8c5b57f4d99f69c0ee77b4b4bb3cfea
+EBUILD selinux-jabber-2.20190609-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
 EBUILD selinux-jabber-9999.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
index 2a9d7dd3db87..9c20766a44a8 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 90a76e31f047..07e6117e6fc2 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-java-2.20190201-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
-EBUILD selinux-java-2.20190609-r1.ebuild 281 BLAKE2B b384ca32c7ab2ad85f5ac683e23a09d1306551880f440b0767e94d9dad61822f7c72c2fede2ebac6aa67b445bfb872bd33a7137201dcde0ef2445aa8bf339901 SHA512 5b91c5b50812b06e7a96dedacf0958967a7680f5a5a6c214d2d525a1fe8c166930de7d6573c0ab9778b51679ee016ae0cbf3ea080d0957c9aebbff5e271aadad
+EBUILD selinux-java-2.20190609-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
 EBUILD selinux-java-9999.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
index 189192e72a4c..8da3069cde43 100644
--- a/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 997b7c8c4d78..40ea796414a9 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-kdeconnect-2.20190201-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
-EBUILD selinux-kdeconnect-2.20190609-r1.ebuild 289 BLAKE2B 813c2bfc890198b7e07075997363b7876c67f232941368e4406b9682be11cb5cdd1d21cde0a06cc272ca03dd54211ca01e0373055b07ebd2c625ea7af9269b81 SHA512 8ea6b02be985b002d7ea532f0164994468083b5bcb6a2c53b3f351626bd330b14a002cbf1cb8928fc193e4b172197e3a178ec5e79d6a139564c522d800e5846d
+EBUILD selinux-kdeconnect-2.20190609-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
 EBUILD selinux-kdeconnect-9999.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
index e9688b31fdcd..c084accb0899 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index ed42127a4d3d..4b47816eac44 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-kdump-2.20190201-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
-EBUILD selinux-kdump-2.20190609-r1.ebuild 279 BLAKE2B c23ff26dd7f4d2ade239269450aed3bdf83348087464836254159505851ce4c8c6ecccb3d753dea582b07b0ba3f84ec40375721ed3ab9a7f1197c17334d44d30 SHA512 90d9575912802fae216b558ae4dd60cf5d6fc52c98eaa3af4c33b78bb088a552bf206ea8852c742ffbc8ba1f9fae3c5b8d8ed10beb70e0d8877807e3bae92219
+EBUILD selinux-kdump-2.20190609-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
 EBUILD selinux-kdump-9999.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
index f44fd51b583d..3cd1801830b8 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 090791339c12..0b655ae860dc 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-kerberos-2.20190201-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
-EBUILD selinux-kerberos-2.20190609-r1.ebuild 285 BLAKE2B 9a3b2f7760bfd7591e54c401b3f0590662f93d53eb2594c48a090fb4d897ce75a3634182c4f46fa60db626605a3b0816ad6678c25f930be47f86e91ccaba795e SHA512 ab840d0561effe71c818718457efd11aaf752ec7a1561cb94945b8d67a6a4afcdb8a2149a923dc124398487c4613b8bc8f2efdababc7c96f1c428628ffcec04c
+EBUILD selinux-kerberos-2.20190609-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
 EBUILD selinux-kerberos-9999.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
index e06bddfcf8be..0c1e835f8632 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 413fd18bc220..88b2b4caa2b3 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-kerneloops-2.20190201-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
-EBUILD selinux-kerneloops-2.20190609-r1.ebuild 289 BLAKE2B d141aa650f4e5a75a59543a3d898da5831656a53f9560bbaad1e0a3a1340eba32ae144da574d534a8f41e19bcd3c606ddf5559a7897149879d653aeb3282f4dc SHA512 d66f3a98f7181321c42a123d7f32088542c22c98c24191a34360002e12c83cffc2d85ee3f48978dabb53527bdba28ac2bd0a107f29ddac06e483ecccffcf9091
+EBUILD selinux-kerneloops-2.20190609-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
 EBUILD selinux-kerneloops-9999.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
index a4517b06e042..065d662724f3 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 60056729925c..a1a68f102d57 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-kismet-2.20190201-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
-EBUILD selinux-kismet-2.20190609-r1.ebuild 281 BLAKE2B 84affa8b38d41d0112d1b4f1424d4ad88eed0f359a2b75ca131c2deea23b05990be3f51f84f6e4f59d9e849a5be55d207b6bd44f34591f11ec6ff28e83b4426e SHA512 69bdcacf9e72d741bd64edbd7682604f4b6a01cfa1ecbcd098ccf5d74fa80b49b1e68fac7bcb4f43e541a778fc110dd9804f43a08a1a05c55f36043a53c48aa9
+EBUILD selinux-kismet-2.20190609-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
 EBUILD selinux-kismet-9999.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
index 9747c721084a..c301d6ecc7da 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 39591bef3fb1..d6cda61074d5 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ksmtuned-2.20190201-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
-EBUILD selinux-ksmtuned-2.20190609-r1.ebuild 285 BLAKE2B dfe7290e559be5fd05d85a01241212146a27bf5b6c6481f85b2e048ea99621925936b1125286b7cee8a3b9fc10fe5942ece6f52cfa4ce84ae72856436ca17571 SHA512 746101ad721af0bbb9d6cde73848090f1714ba77c9e120b25dc231e269ecec6100c22b6b14b16d1fa622e19579b4449468190ef684d950608b6e26ec341fe2d1
+EBUILD selinux-ksmtuned-2.20190609-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
 EBUILD selinux-ksmtuned-9999.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
index 6b501238bd32..16daac0e0a3a 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 684a431c8835..4bd554c8f31c 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-kudzu-2.20190201-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
-EBUILD selinux-kudzu-2.20190609-r1.ebuild 279 BLAKE2B 2a269a2212e59896751f2c63ec200bdd508e87107e2c0456edb3d18979f2c31dcdebe1902f2f48bda83d3e0536ba8a0c22db7717f37a4e2cb35e1d26ce5ca813 SHA512 6045d4c16224269ef5e4ba647452560e2f0630da5815a9afc88c46d59ed3b3586d088cb4e953679cee2cef4c873c6fdec1e9a196fa69e3b4b0be3c04fde7f0a1
+EBUILD selinux-kudzu-2.20190609-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
 EBUILD selinux-kudzu-9999.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
index 16738b92d139..4e89d9490b68 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kudzu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 213e6e1d28e2..c15c66fd52a6 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ldap-2.20190201-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
-EBUILD selinux-ldap-2.20190609-r1.ebuild 277 BLAKE2B e375cffb76d3b2920a2d7367dc9786078b9091149fc02b740826b9a02dd057b1a2f1178a6a3394c942a2707ef4ae4c699ede2f239d893093dba6ac51f5fd55a7 SHA512 2fbacd9b0be1f6edc337f5334635ad935738f9bcc57ac4b55a3c2f6d1ce575739f01ba44f99658c8c887a99e0df446b5bd96e63d5b4d31de40a470335c63b780
+EBUILD selinux-ldap-2.20190609-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
 EBUILD selinux-ldap-9999.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
index 1aafa4b5a73b..aaa85782ca29 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index e7223b0fd785..e36a738b85e8 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-links-2.20190201-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
-EBUILD selinux-links-2.20190609-r1.ebuild 279 BLAKE2B d6f60a7674f1416d10e701223cea16c74c3eaf8d08a37ff9e1ef4d691be6dd8afa189ffa0df7607081992f6723fb197fb71e6902237a5f54f80fcc422844cebf SHA512 fdfc05698e31939458200a7913a15c3589df6943b17391d08037f7b4e30d3def0cede3968d0c95947c4da89a460162a871ba249ba8aa914f8506b9d894eb1bf5
+EBUILD selinux-links-2.20190609-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
 EBUILD selinux-links-9999.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
index 809a9b1adb4d..0e7a13b9a2e2 100644
--- a/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 14eaf0268132..f533ed44533d 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-lircd-2.20190201-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
-EBUILD selinux-lircd-2.20190609-r1.ebuild 279 BLAKE2B a8cc6f8e0a86e33d407e7aed8e407d85be8bcf41a0a3b4d78f48bbc9aef6fc0865afa8fdf97bdc577844bdc4f26d1f0a4ba5064950abd095e5d3b5a87396f5e9 SHA512 1f0279b656ee66ee79eab21c6145e21d8a19a3d449f1a5c3e268f61630c3fefa198c3afd926ed45aaf86dd44fc8e7a3dc61d8b9a026f7b8676a8c811c61370ff
+EBUILD selinux-lircd-2.20190609-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
 EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
index 7f812628b7ce..18448d3ac07f 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 7aa8cec95d62..866727fdac93 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-loadkeys-2.20190201-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
-EBUILD selinux-loadkeys-2.20190609-r1.ebuild 285 BLAKE2B 1c227d184468750d717e51ef0402064c6bc4acd71fb0317cbdfb3ded745c8868f6f531df8ed3921a9d0e58c142e07230d222a43042757a928a177e553a4f0f0d SHA512 15c6933a4f26cf12651fe2e499d2d30a9e3c957a1183f6bdfdd99cba89a332c7b86f0187fa563050c8794b2eae0cc7d3bbb552cc9c790079cd6e5827156d3737
+EBUILD selinux-loadkeys-2.20190609-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
 EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
index 9a77439097ba..4560a75336fa 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index e8e6cbd5b0e0..db703ca70af2 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-lockdev-2.20190201-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
-EBUILD selinux-lockdev-2.20190609-r1.ebuild 283 BLAKE2B 88ec909be199c57e8afe03beca6432dbaafa7c5881cbcab65f02099627b800c9bebaffcc1617ae36f3c434fc61cd7e7ebcd35604bb7ebeb97c73bbf55b75e123 SHA512 1bdf90460f8fc673ef8ffc5f7e96881e74aad129a3a2e269ba0d05bc98edfc6e39970f15568f8bf0537c20014f84f85c936891a7962f6377c8c4e3cd38821e50
+EBUILD selinux-lockdev-2.20190609-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
 EBUILD selinux-lockdev-9999.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
index 147d05a97961..77de449548ba 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lockdev"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 8e6eb1d86a6e..0333b6e73407 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-logrotate-2.20190201-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
-EBUILD selinux-logrotate-2.20190609-r1.ebuild 287 BLAKE2B 2153e6bf5f5177a6990fa34849a5a739104e8ee7ab0b10f80b9afdc67b2a56a0b7685eb883ac0a2a2103b13c3204283861f076332b5fc6896f8cd84981ad9cb4 SHA512 a525fa1e017d52f8ac1e3cff848ce21e4fadc4d0e8629a650b699bb33c8a4221c39ff34ba21aed63a3d5ed7ff872cc3b0a229d461c831b396585416340725f1b
+EBUILD selinux-logrotate-2.20190609-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
 EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
index 43ce10056850..49f652b1d083 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index e9cc795a33d9..f156a81f6a64 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-logsentry-2.20190201-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
-EBUILD selinux-logsentry-2.20190609-r1.ebuild 287 BLAKE2B c178002c65c79a63f413c7653159a688d6efce08eae2b5abc427e028b10af80c6393bce2a965b57effc3e87a8d93c742af2d19f4b50161acf14b2340685d3b96 SHA512 fbb8e79a4e5cb12e3951270d6592f862c24db02d5fa95dca754c86a8affcf5f966a4a71f9a67bdc9225da2cac164ec3c02d1ab1a39398bc20c429f6d1668b940
+EBUILD selinux-logsentry-2.20190609-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
 EBUILD selinux-logsentry-9999.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
index d1594d9d426d..7f91dd895116 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 6f5af3e2e0a4..d66568eeed5e 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-logwatch-2.20190201-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
-EBUILD selinux-logwatch-2.20190609-r1.ebuild 285 BLAKE2B 4ba2af5acd5abf9627b4e7317d2e7d39dd755d037a88503eb56e2f935ecac72199924e292f39ccfbad7d15307e193e8240356c855067c01c30596ab11db2a7df SHA512 ac03b980263951465ac3417ea7a8c0158bf3d02992b9e8f47720e48237f522937d6f80d036d1bcde21437720b6ccee5f64fa71d32e06904bfc1986f43f960e50
+EBUILD selinux-logwatch-2.20190609-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
 EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
index f9b53c2ebbab..3a234e51c806 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 6fa91e9e75d1..8dbd722f4c09 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-lpd-2.20190201-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
-EBUILD selinux-lpd-2.20190609-r1.ebuild 275 BLAKE2B 0bc29c0a49e9ea3ac21dfb00c601fc25cb45a159f7f803140f5ebe89371d357637995fe6bb769bea3b7dd1f438bc73b3abf9e5bd72a482987acbe78afaa520a5 SHA512 23b8e103e7ee24383574dc25630b465df1d185f79e65803d104769825b4c7f4a6a18dcd16f766da9ce57bc6bec41071cea95ddd1da8d1969edab8a3a6532a68d
+EBUILD selinux-lpd-2.20190609-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
 EBUILD selinux-lpd-9999.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
index a851a7217945..b2c7d271bd5e 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index b98cb817e936..9d067604db6c 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mailman-2.20190201-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
-EBUILD selinux-mailman-2.20190609-r1.ebuild 283 BLAKE2B 1e3f4c956b6c9ca71eb40deb3962846b97c74350846065c1ffc0b5652eccbe75e59b74fb158666309bfa5790d0e1859d52e0f176da782778e396437be3e88422 SHA512 dd913bfe0c3c6a21a69a4cd68f0ea95ac3bb0629134c040b1d05b009fede10de793adeb1b8b85b1e20eef31ae90e0111ad127f592c1dec2bfcdf82ebf727f4fb
+EBUILD selinux-mailman-2.20190609-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
 EBUILD selinux-mailman-9999.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
index 4f0188cc4741..b42f37fc64b6 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mailman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 63f8812dea25..29e8661140ab 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-makewhatis-2.20190201-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
-EBUILD selinux-makewhatis-2.20190609-r1.ebuild 289 BLAKE2B 74e61ddafccac6bb68b93406211beb28096a44e671d1440c5bac45f095911d40c053ff269c5063a573bfb47f79d354c57651a0e3ee295447a7dd6b55783c2052 SHA512 7ca049c6c311f148f9084f3e440594df128b7f108078c8158df641893ce44c16a8e146ba102df3bfbe3e3d9be9b7f7fe3f20999460e661d9458eee10a0515341
+EBUILD selinux-makewhatis-2.20190609-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
 EBUILD selinux-makewhatis-9999.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
index 60ade6355dce..268267e945b3 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 07bae972f728..d3563ac089e7 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mandb-2.20190201-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
-EBUILD selinux-mandb-2.20190609-r1.ebuild 279 BLAKE2B 7968cd95f9ff8a85b15fd57ea3682d29a469c2c129d13755fad493e504a22d9c67464f57c90e84ec780f603cabd2024c75307adb2b96d4da9bbb9b8b95542066 SHA512 1e4751b4d08eb582dfc3e153960336386b3c70cda4c236dec03ffba3efbc506e45842849479e793ba7ce84824cf7c04daeb520df25c867b10940fa88210cda91
+EBUILD selinux-mandb-2.20190609-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
 EBUILD selinux-mandb-9999.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
index 24cbc9ad3470..e643eb2f28df 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index be91c54ce756..010e955d7209 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mcelog-2.20190201-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
-EBUILD selinux-mcelog-2.20190609-r1.ebuild 281 BLAKE2B fd7942a06738211e7ba92f809cc119a982e3e61574be0383faa55bd77dfc1f14be55429ac79f0d6217c5f92cfcee7f4ef5236de67eed37d6a90338b5a9ea56e7 SHA512 61b9aaca7f19b5dc25fae2790fc48b70b7eb7bfc1abd2fd76291451204d188813ff6afb3817a48454e9add28d08f464c4a05b73da600850188c39e1b6630b511
+EBUILD selinux-mcelog-2.20190609-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
 EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
index 6e326645dc79..ae3029b3bb01 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 9fad72a29111..800c660e1843 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-memcached-2.20190201-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
-EBUILD selinux-memcached-2.20190609-r1.ebuild 287 BLAKE2B aaa0805fb0f3dcbb43adbc279c17f2f73ff0f4b74bea8b50d1d13d74387374b558b30f9fdf27d9e0449baa4e4ceb3ad8e0776d015b9e04665c75031d3ef21708 SHA512 2355845c2ae7fd5a9a0e80739191b64d33fdeb05414a2033ff767d0be708b2d8c4e627bc67d051d6c9b12cee4699854aa62282b2f610e28cca14873a2e0cf103
+EBUILD selinux-memcached-2.20190609-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
 EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
index 80f5971b8908..d24673999f84 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 089fcc57f9ed..90292bfdab91 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-milter-2.20190201-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
-EBUILD selinux-milter-2.20190609-r1.ebuild 281 BLAKE2B 5e32147c790ccfd44744440d7947102ec5b48de02f395d01adaf33b2cda8f3a941d4fb2cb340c668052cbedd9282bfbd5b3b1536cce70852b1c00d8395d34d75 SHA512 db8f03c41f1e28f1bf5972891322086315a865a905fea8ff850ebe13bc2a2b3bb29fa9da84f53d59abb468ac66eec0f1bb770772eb799be857256aee5f0c43fe
+EBUILD selinux-milter-2.20190609-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
 EBUILD selinux-milter-9999.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
index 2994d36053f5..fd47440b3a18 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 83d3e2edbc4b..a9c81a504336 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-modemmanager-2.20190201-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
-EBUILD selinux-modemmanager-2.20190609-r1.ebuild 385 BLAKE2B 44a236f09deea33b8285bd8feac7a12f93d5943436aa7dff90c526f7131ebbb271bfbdca89d6f32230b7d035a03494b81bc2b990344ee01c8a672308125444e4 SHA512 80148cb0e970570fac4cb9c64fa31a941482335a739c0d1b00e91407f4acab97f1f940eab2df32d335c0f3ad349034db8a80c73387ba0b2ce916ac0fd4ce8fe8
+EBUILD selinux-modemmanager-2.20190609-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
 EBUILD selinux-modemmanager-9999.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
index 050cd0163794..c778c4505d57 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 29a807e6ec83..2b9aae7d1816 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mono-2.20190201-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
-EBUILD selinux-mono-2.20190609-r1.ebuild 277 BLAKE2B ca8de0cec769bd91a5f8450aafcc1cf45b89079e5739db159c0c3a84610583a8eea7223bfe98bc7227eb15f0a3398173d317b04a8ff231d2507ff0a12fb9b63e SHA512 3dea98cbc4065b02d6f54c7195de15cc779d00589171651fd13f95c138d3f93d2f42a1d3422353db525a6f7adb2a76acb574a6574b52d625fa7aacfd1c8cc16a
+EBUILD selinux-mono-2.20190609-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
 EBUILD selinux-mono-9999.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
index d4a9dd9f8c8e..bc8639aa0f9c 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index bb9e6222b799..ef09bdb9184d 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mozilla-2.20190201-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
-EBUILD selinux-mozilla-2.20190609-r1.ebuild 385 BLAKE2B 24beefe1957c420d241166ebbb9b0dd6f5c64f24c902e29629e35af5599c0e7f8d36dd9f18408f8e88a68a734dcf88f550f1cd4524a0ebb404c725415dd0cc16 SHA512 645f62b20ccfe9ba0c05e91e84d58a2203282acb674bcd49a97d4379395580f030eb77a41b61c7db4d8c0c263f4919fb22fb669a11a1f074dade7b3991109998
+EBUILD selinux-mozilla-2.20190609-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
 EBUILD selinux-mozilla-9999.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
index b0d826dd03cc..070f4568b4eb 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 995db58ff5ba..331e5150359f 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mpd-2.20190201-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
-EBUILD selinux-mpd-2.20190609-r1.ebuild 275 BLAKE2B cd14db03ecf41975fc3197e5f32a2417b91e07f8ec14aba9219a77b45ed6554f1ef66ce252fee479b7c0c46f4eea68014b2d17e7b140d02e6fb0b6201199edfc SHA512 cfd2c84365b4fab2688e7b07e914309d850a8d4c201859098370868a15aa41a744c6009dda4eb50151240c5f6bccb9482567bb8de2cb4b7897eb7250bc2ffcbb
+EBUILD selinux-mpd-2.20190609-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
 EBUILD selinux-mpd-9999.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
index 28d1755e470e..2a3affc8a356 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 03c009029b6b..23c578cdc01c 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mplayer-2.20190201-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
-EBUILD selinux-mplayer-2.20190609-r1.ebuild 287 BLAKE2B cc2701c29b5ec8cd7f277b93ef5de4a69576c07b88ef6c1e8b0b03c157ff82a6d9beb246c899961da093125563bc9e8e7e38a7f6b986f8b0df4deb93198c20f6 SHA512 cf80287ce9ad31db8388822f5703755d08a8b560b932ba1546f309986c15a6d1f03db5d7ae8c61951d8412b74f7b599f1b3c308ecca53de1cd11913626f54318
+EBUILD selinux-mplayer-2.20190609-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
 EBUILD selinux-mplayer-9999.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
index ba26555b93b2..8dc0b1acce2c 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 1501205d1b64..71353b28f822 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mrtg-2.20190201-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
-EBUILD selinux-mrtg-2.20190609-r1.ebuild 277 BLAKE2B 140b1974e28d9c1ed03eff49c8ed7ce42d4034f1606b08ce18faa46071f04c0e167ff9faa62abbfe88a332f8589ad93644e71a7b7547ae5525de280cee2294fc SHA512 299eaeb05d048207e4c00097e068d448368c42df4324fa7918a08f3182ece9cbd48b7ff1d72132e08faa861f2a6d6e8296a3ea026897d7490c9dea4c989f5ad5
+EBUILD selinux-mrtg-2.20190609-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
 EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
index 0135a93614be..fc9606ff5b50 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 986c5d13b658..2bbdc2bc8e25 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-munin-2.20190201-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
-EBUILD selinux-munin-2.20190609-r1.ebuild 375 BLAKE2B 0d06726d0b39ad69f7b8145b5215dd790cdb3becfc810a5f5bf62a368e06db2c4e14642d87e650f6ed1b1ac1b853bf843572068838d94caa4fd965b986246c08 SHA512 a2009d2ac4162ee773ab08a577908952542b83714f744229c3edc747b82999d6fb33ed2ceb22c6ff1f64c5904d3931581fd05d2262b7570e5b713e14607d1b17
+EBUILD selinux-munin-2.20190609-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
 EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
index aa0755e10cbd..ca842c4104b2 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 0c3e5d60f8ea..3ad3f9c419cf 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mutt-2.20190201-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
-EBUILD selinux-mutt-2.20190609-r1.ebuild 277 BLAKE2B 284100e50cd9683a949d64c4c7805d7b04ffc9e33aad75265109bc769e6a3b2397333e00ca19a3d94a50a6c398105bbb21fca783a770351c56b378a4f3e4ce84 SHA512 0f0878bf8c9410baf499a6f3e73a6d5328d7bbbc3d6eba790de0c3a5104d51a6f25fbbb2a447024c22c1b37f78774d9d0f8b387677845ab629d218d9fdaa954b
+EBUILD selinux-mutt-2.20190609-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
 EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
index aa0b0e159f40..dc3b502a8751 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index bc21c4b36336..f786ad6cb06b 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-mysql-2.20190201-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
-EBUILD selinux-mysql-2.20190609-r1.ebuild 279 BLAKE2B a9de57df3aea1aac1c61ffb2896658d1d8abf08883b56a6f05d8d137b3431b844c8975a3f36f916208831d18afb5d529a411d4ae8569788ac1b5a244d17ca8df SHA512 b338b3995c6c7ccb7e51b170fcff803899e758f66648e8c9fd05e9462bb3d9777fc7619eac56c69aed594ddf0aabd14f5154c9c2c74313be0643de8ad89a9539
+EBUILD selinux-mysql-2.20190609-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
 EBUILD selinux-mysql-9999.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
index f5a96dd5d01e..33ccf44eae23 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index e600a897a278..4c825c84b687 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-nagios-2.20190201-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
-EBUILD selinux-nagios-2.20190609-r1.ebuild 377 BLAKE2B 9e29c8c1c46c276489afb89243d3faa105513fcca272eae5c8d043fb0a8f73da082a3a2eca957788e95673bcaf65ea7751be0d0b506d85c9cb71647e9bfc3e15 SHA512 1175271c167a97675506393413597c0044dc8980d926fd03f9edf9a666e0da984597714efb422552b4ce681bcd1fb11d4e863f4252f8ff634353aa65f27a8036
+EBUILD selinux-nagios-2.20190609-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
 EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
index 81cda8601135..f4bf6669fef0 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index bfcd95baf0ea..ae2920fca94c 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ncftool-2.20190201-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
-EBUILD selinux-ncftool-2.20190609-r1.ebuild 283 BLAKE2B ab59d548155b8edc8fd5983f3e0feed770d36bf41faeb96674e611e4f4b434610d7bdc4b8ba983ba2791a340b3c150ce1a99145b7b6e045e5f82547b5f091b5f SHA512 8e865421c7d7549aa3f27e948d355fcfbf6f1c1a78a07086b81475c727978644a59698c723c0938fcd0a1bf461b1802dd9a5126870b740cc7bbdc032e65dd9a4
+EBUILD selinux-ncftool-2.20190609-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
 EBUILD selinux-ncftool-9999.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
index 8ed25adee78b..6dca146d3481 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index a98b9bb13877..e20f65494e67 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-networkmanager-2.20190201-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
-EBUILD selinux-networkmanager-2.20190609-r1.ebuild 297 BLAKE2B fa6626a2f87226191eee39c08fd91c587ed385da893cdc6b9f15c8da6e0b5de3ab0d3a926a88b0a29c7543a7e925e1f8cce17fbb1912faeb66b8c506fe42f2fa SHA512 a98fc972b04c90734c62763998b4c9891f6db290834ec6e588ee5a3381ccd3aeb400d8b170b5dc7a97c796417b1e1889538f040d61b6291f8f96d47568d8edc6
+EBUILD selinux-networkmanager-2.20190609-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
 EBUILD selinux-networkmanager-9999.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
index 47183f972429..e45cea85c0e8 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 5701173e3747..aa1bd61c8678 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-nginx-2.20190201-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
-EBUILD selinux-nginx-2.20190609-r1.ebuild 374 BLAKE2B ccffae3a3257fbabc8eecc582a0552d7cb872fd68f15a9937e3d6fba0b25c80db70f2ed9002cb6fc2dfba16199385fe62011e9f049818d3f105745e6f94d6126 SHA512 fab838e453a653bcaf5f82cc91c452830c9c817dc44ac8f5f6efbc3d9fdce729a0e315f7a653b10507d9a3eeb51b262446bf584f4217933d3683059a66e48235
+EBUILD selinux-nginx-2.20190609-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
 EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
index 68ebca1fd39f..2d6fbf714ba6 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 20c3ae36be3c..6ce6c47f8882 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-nslcd-2.20190201-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
-EBUILD selinux-nslcd-2.20190609-r1.ebuild 279 BLAKE2B a54484c40bd208ebb33e2b4072e7f3f706818c2ff1004d346c046ab9fbe2adf93f16c3ec1ba24bb45ec2553333612189c59a15f66a33964ad2a0ea9763804eb8 SHA512 53539a1d6cf28e33489bdbe578a2ac9e8be9a16759e9ea1ceefca43b1fb25fbe735dc105bda89d175bc3ec24e31180b85d4f33e1ac597c9ab655e3cc634f2bbe
+EBUILD selinux-nslcd-2.20190609-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
 EBUILD selinux-nslcd-9999.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
index bca1499ca9db..0b5f03ae48ec 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 54f28ff105d2..63bd2ba03f10 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ntop-2.20190201-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
-EBUILD selinux-ntop-2.20190609-r1.ebuild 277 BLAKE2B 7def9e673ba0537f1c70542e91e2989e72bb7be7bb873d2709cd398996b0249854463114c8a7efbc9718166653f45d3f87e5e4baa48d19944b509d7a455e092e SHA512 2b2a61b9f8a645c51719bf406110395369a6bef19c6972d677e459ff1039a933c78a58660855bb5c25f4c93318698e440be98112b691db94acf6fca62e5c874e
+EBUILD selinux-ntop-2.20190609-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
 EBUILD selinux-ntop-9999.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
index fbdc78861eee..62cf12119e3b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index d2c7e53413d7..4ce132f76395 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ntp-2.20190201-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
-EBUILD selinux-ntp-2.20190609-r1.ebuild 275 BLAKE2B 0e23f8186205e8cc7aeddc07c39f9779d89bfcd5e011516cb802ea6da72321ed0f659f44e0f3325f67a99e54b7e8c306ec726161a2c678d5ccec2556a00a74c9 SHA512 5c4534d9fd91e339f39f66fd17cb6b1de69098d4198fc4568508ba533fc74a66c383b374394426ff05250a85d929cdfec53e4435e261366e83b9740c2f62d1bf
+EBUILD selinux-ntp-2.20190609-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
 EBUILD selinux-ntp-9999.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
index 62633ec04d11..b40a9d17b4f5 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index ea6ee3139f3b..684363fd57fa 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-nut-2.20190201-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
-EBUILD selinux-nut-2.20190609-r1.ebuild 371 BLAKE2B b24f869f29bf9c56f12e55858ba6a9dde12ec5358d84d7e6177e426ae00499a53a3a54451f8a74c94fb704bd56ba1a276ccd4b2ef0d448b0e11736b4370ad715 SHA512 b6f15f7f037408ce4373a71011cf9434210ad0723071ac83a61c94934dd099bce30363402c8ed0f1153a873a46af13dbc4f29a4855f841cac0422da640c7253f
+EBUILD selinux-nut-2.20190609-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
 EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
index 1c39e6a4afa8..83b6df01523b 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 37cb118e4574..cbbd0d3fbc17 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-nx-2.20190201-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
-EBUILD selinux-nx-2.20190609-r1.ebuild 273 BLAKE2B 7df9a80399d68c9c014b744000f336c2bfffb5f3c18062e70d3f2c354d60b3ed8fe2fb327622b389b2d84984e3d72828331804ecf73e49205d56904d6ad6913e SHA512 ef8868769c63a1d1fddb15e57551ffbb32bdee7ff3a0b11b4fdb53e6ddde5c7e9140d17525407ffaf20921ac4db9a156c39b52a09ac794e8eabf71e0444384b3
+EBUILD selinux-nx-2.20190609-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
 EBUILD selinux-nx-9999.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
index 59795ad5fd60..c4778537359d 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 3265b4899411..f69c5c66b229 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-oddjob-2.20190201-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
-EBUILD selinux-oddjob-2.20190609-r1.ebuild 281 BLAKE2B f71e57ac79b2d5c967da8f8fb8db23f1cce3815132530ff69e75704451facfa7edce68196f102d7de8b1988e585a450c155830fa95485fccd799638f6deb616a SHA512 f0e328f4338b9481c2d984c0a5f5e51872acd22edbad19c84e5b980705f2fdb90a71b6ca8e4bcf21ee4f94cf2a03617ad7d66a12457c47fc817f917fa12c0079
+EBUILD selinux-oddjob-2.20190609-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
 EBUILD selinux-oddjob-9999.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
index 58df45b08d61..504ae44fe9a2 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index c4bd93d5bb46..3877e146c7ef 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-oident-2.20190201-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
-EBUILD selinux-oident-2.20190609-r1.ebuild 281 BLAKE2B 727502457342c051bc476f233fcaec61ecb3a5310d267e0f1ada56a8c06fdb96723458211afe68939a244a55aa90ee52c0c4a8440f5d0c28c90da3bf24aa2845 SHA512 594b8dbb17725dec1b5111729687823f7c3995534a3a34356b7aa4dc46d976797289afaa1b98faf693fa8a37be576d846078b550101477ed627ef61fbcdfc9c8
+EBUILD selinux-oident-2.20190609-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
 EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
index b90e9ee9776f..863e0f5420bf 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index a07bc2fffab3..7e60618b638b 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-openct-2.20190201-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
-EBUILD selinux-openct-2.20190609-r1.ebuild 281 BLAKE2B 7261b80232bc7404245cc7578360d71559de0a2a93a51322cfaf205e3348c5acf7008d36d82fcabeb46df26833e43fdde8f868767e7d8eca73b73b996cfd177c SHA512 f86381531ca33ee479aeb392244c7febcb47cb4943d6178a52f48a32f14af55e040fd6a93284bcd20126e56bd7f37043eed0e41506eec4ff0f7d1c3602530f20
+EBUILD selinux-openct-2.20190609-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
 EBUILD selinux-openct-9999.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
index b4d08894f2a2..fcced3021952 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 93f8e3d5aeb2..68a521b26632 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-openrc-2.20190201-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
-EBUILD selinux-openrc-2.20190609-r1.ebuild 281 BLAKE2B bbe96c869096466ffb73f6a6f1914af16b8855b6c4ca3776bf6a24e98c6f57a06433c06d25afb0d8f41b005ba7037be8eb96eb995f56de0ef94f8820bf170452 SHA512 aad6bef6f133fb0b03f7f1850ef57836933c8066eefbe3bce1cf61f855845399f3cacdb1728cbdfbc7f5d189f6ee0d237d7ddae3fc5e0b3a6731dbc4493afd8d
+EBUILD selinux-openrc-2.20190609-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
 EBUILD selinux-openrc-9999.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
index dea3563f66d0..44f108d670a2 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 9620686e2bc9..90cbde8850f6 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-openvpn-2.20190201-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
-EBUILD selinux-openvpn-2.20190609-r1.ebuild 283 BLAKE2B e24fb6409fe7004584d3076bc79ed70595755950792556c46ef8a6694649e23825b8cdd4a2f40fce41c3473da9f02de9ddbeba30e5a78f888eacd8bfd312ca9c SHA512 507fd6c149240bd099bd50febcde48756e60e53bb50b5b6cf1b3aabec5414e5b6c1913c839acb0ef6b1c1f4d84a1fd65e4ff4f5b142c1ba5e477c514b9686f35
+EBUILD selinux-openvpn-2.20190609-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
 EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
index f7dcbc5e398c..ef1d67bb9881 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index db8d1f3dc670..e90b72e753b2 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-pan-2.20190201-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
-EBUILD selinux-pan-2.20190609-r1.ebuild 373 BLAKE2B 56a7b1bb53f9d4d03aedc8140ab64523ffa34d9664d7d109645f3d2bb6e2d8d369a846270293b6a43356102084d3733855b06343e10b40e1a93e00020df2ed8a SHA512 90abb7eb1008b8ca96acc3d50b53157241c5151a492e316231994f6d538ba29aa5aa29f25547f4732b048723813a708c9ab24985befa819a21a0134623c058d5
+EBUILD selinux-pan-2.20190609-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
 EBUILD selinux-pan-9999.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
index 1503c2593652..80eb12670a63 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 737b189afcfa..8e724211027d 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-pcmcia-2.20190201-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
-EBUILD selinux-pcmcia-2.20190609-r1.ebuild 281 BLAKE2B 08dfa0f85738fd137dbfd9839f5179d24ef022d3848caa65e5fccb6ec43940a0d4ae24313a6b4b54603913159f8c23fed126cc751f94b5b95766d5681164c7a7 SHA512 94e89c183838588d84fce435055007808b3cad7eed2e7bcd1f77ed94eff22d41b94ad8ea2484b97b2dce912a5ed8182f5b1538b99d1e02b13972c4a776505ec9
+EBUILD selinux-pcmcia-2.20190609-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
 EBUILD selinux-pcmcia-9999.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
index 53a2eb2d6d43..d8101a720a87 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcmcia"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index cf516cff50ba..51c905cbd0c3 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-pcscd-2.20190201-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
-EBUILD selinux-pcscd-2.20190609-r1.ebuild 279 BLAKE2B 99874230b286462bd5ecc25c3bfb2a630221dd39e32ac43ecc7c9eee63c9d252ff785db419609b6cbd008f14595848c29246c91e1f808d283963b8c780c92820 SHA512 5c41dacc7644bc9ea2b7fab3c761505b2024fc075c37cde20a108e2e97cc863293271e01bbfa3de73dcbaaf2a175da31ab138a90bcf6f905a0094dbf3cc6c995
+EBUILD selinux-pcscd-2.20190609-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
 EBUILD selinux-pcscd-9999.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
index bd02138a6f8b..4acb66f5c9db 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index bf5a4147e9a8..089aae231ff3 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-phpfpm-2.20190201-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
-EBUILD selinux-phpfpm-2.20190609-r1.ebuild 377 BLAKE2B 0b1174701d156d7dde63a3773990c2098cc0e3e790721e85711ec9fbb88b46951cd01922b74bcea83035d502c4b456e4960d0fd2884e7a0c5289f39de29fc809 SHA512 05c54e083b8d2d161baee23b74bdb13486c64937d5f9c6a6f652d201a299ea963a31408fd3c7e399df5f529586ea95d155a4ec5828adfa757a6817f285ba9b55
+EBUILD selinux-phpfpm-2.20190609-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
 EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
index 3a745cef6455..495a799ebde2 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 73ae74ec006a..aad356bec8dd 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-plymouthd-2.20190201-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
-EBUILD selinux-plymouthd-2.20190609-r1.ebuild 287 BLAKE2B 34eae1fa3e449c554a4411e5df4e3efb6fc64d344b60930f46d7d7ffa17764c55def0312dc15acb8d7f5aa03ef67d338b7a732fa0e31ea90a21a45cc43ab7830 SHA512 893cef17e3703eb9c6aa89735eaff0facf6fbbbcb2a7bda2a972ca354a8c3a471b38215fb751bc5be3239996527c745e1312db88138bebb503276fe291563eb3
+EBUILD selinux-plymouthd-2.20190609-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
 EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
index aeb8a9ab00a4..4d55cda939ad 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index c3adced7acb6..ed493c2f6016 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-podsleuth-2.20190201-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
-EBUILD selinux-podsleuth-2.20190609-r1.ebuild 287 BLAKE2B 097d4d451300b484407b2b3f74ac4f56ac1870da6a8c66e76ccf93580feef9dab92216fe1e2896bbdef707fdcb34b712e316ae798367ed87bdf8704f69d38286 SHA512 23ab0841e758216041fd65da184d524147079228d3c15017b035faff029f8717de2e8de35f096621852b7eed1710435e80cceedf3df48532f5fb9523a31c5945
+EBUILD selinux-podsleuth-2.20190609-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
 EBUILD selinux-podsleuth-9999.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
index ed5f848b5282..d1579186954e 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podsleuth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index ac852e65f831..178f0bc3ed42 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-policykit-2.20190201-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
-EBUILD selinux-policykit-2.20190609-r1.ebuild 287 BLAKE2B 2f44323e96d97d826145bbe1e8ce3023f98fe46802df9fb3156ac6acfc6e88de990a1a1821f510270e3bf68a1c0fdb60229f6787d97544c5c01b46c0b5f862eb SHA512 13dfc29dad051e775ae7624691a53870563a649454a0b672c3c33e4a424f6983dc859a6ad29e900c519d2932aceef7d25623c9d8e33e5b2337bbfec3b22fe772
+EBUILD selinux-policykit-2.20190609-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
 EBUILD selinux-policykit-9999.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
index b74309de53c1..7a87b59f78d8 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index f9a195929961..de03fa74602d 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-portmap-2.20190201-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
-EBUILD selinux-portmap-2.20190609-r1.ebuild 283 BLAKE2B ab9850ce86f327669e905e386c8c6625232a09dc0bf6e4056180198335419074d8fb1900ecf23c3ccfb7b81ef35a2edda14207d190e414e41f0486759c4a3c15 SHA512 03a73a13745c9fa37d96dd625deeb7940dcb3322254648f63d4d6e81f96574595d5848fe70abdc31800022da1af771bd6f3540967414beda7addca94be18499b
+EBUILD selinux-portmap-2.20190609-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
 EBUILD selinux-portmap-9999.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
index 582bb25a891e..f115867a52e9 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index c29620ed81fa..7d6d0a3fcd2e 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-postfix-2.20190201-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
-EBUILD selinux-postfix-2.20190609-r1.ebuild 283 BLAKE2B c272a75a594e3800a78cd0d86e8192a6093d06a76436a0437d161809dd4a56d235b61b84aa506cc2f04edbb797e250cdebe9c9a32f83dc751ca00274fb5f4a58 SHA512 9c16c22d9935b7ac9d4377c18f50fc6c9b18fd60dc5376f2536299bd1abe9175ffafd03478c2eac18574f3fb5e8d3c5fd6fe888ca9b0f2f6e75e5a33f127306f
+EBUILD selinux-postfix-2.20190609-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
 EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
index 1810a1f46fe0..7fece8996395 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index d491d288de82..07f3e04c2718 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-postgresql-2.20190201-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
-EBUILD selinux-postgresql-2.20190609-r1.ebuild 289 BLAKE2B 25b6eb5b3112729c94270adbee9c93be06bff109b093edf188207931ae1c753972fe52a09c35b5a28593754d09b4098ea66d267d3543b85872e262c69fe0d2fa SHA512 bc3222ca19fc3500767677ee87ef5238330809f0747eb75e653d0d4e462ebb5bc72bc51f13bde36303714423f705b0eb4e779d57a4410b6232d1a70c600a5bc7
+EBUILD selinux-postgresql-2.20190609-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
 EBUILD selinux-postgresql-9999.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
index 7e67688965b5..ed2063ef6962 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index 4db511f59f92..549bc40d22a6 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-postgrey-2.20190201-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
-EBUILD selinux-postgrey-2.20190609-r1.ebuild 285 BLAKE2B 09ec7807fb2405b19b69e3a95777478bc7f679f162697f0148f12c0be557c4f64b49aa053572b1ea3fe1509a2d8d37fd78bcde46b083479b1fc25cadd555accb SHA512 7a9dbfb1f58286488ca130c35c4596c12ee57adade2b230afeffc5d2eabbfe72cfa25f908fb7dc9d90528596e8590514a6aea5e0079dd4e4da73e08829501fa0
+EBUILD selinux-postgrey-2.20190609-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
 EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
index a3f0489332c7..26bbd1343017 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index c7a64a833abc..2fdf1a07f8b8 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ppp-2.20190201-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
-EBUILD selinux-ppp-2.20190609-r1.ebuild 275 BLAKE2B 9bd282b03cbb655f7f0512bb4476e48bf254dbdcd95771ecd0ee04e5aa88465aa8cd6b4c07a2027cb739c54585142d5d821593656347c851f733a5bbf45f7fea SHA512 46f589de28149a8d48b3f96d519e90a9978382606f895487d20f2810dd9c9af6f19804b7668e1fe9852ef3223bb92b32045c562c091f9f10abe84e63100cbb50
+EBUILD selinux-ppp-2.20190609-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
 EBUILD selinux-ppp-9999.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
index f244bcc0de19..b56d8145fe51 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index feaa1b4ec311..13661bb62759 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-prelink-2.20190201-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
-EBUILD selinux-prelink-2.20190609-r1.ebuild 283 BLAKE2B 7bc3ffe8630f0b9e66511702be222d066252fb6a92ab8b547c51bb931528828bd18c12e7000d591574a0fa2623d9b56a9dd9298690e09271a8a9adbdc9d63acb SHA512 f320c55acf21429d6dd65cb4c9f0085e2833bf1454b6a9b2e2777704295c208a41410ae62f6996a24be250e776efe51b95ea0e50d258b686b86e9f8927b1d202
+EBUILD selinux-prelink-2.20190609-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
 EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
index e9fb700490b2..8172bbf9071d 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelink"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 40106f33aa6a..31cc76137d61 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-prelude-2.20190201-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
-EBUILD selinux-prelude-2.20190609-r1.ebuild 379 BLAKE2B 1e6fc0250258e1461edd36be4148b0bb215ae2ce22cf40dad57b7f2525790310227ff1fac1fb19f4b476a08a97bd6c6ba6d8210a5d375a77a43655a710b2514a SHA512 0bba79b655d3236225aecc62a179ada1378e930cee7809954ffa1a6a75173fe03365c7ae807544d573eadb06f7f22b9c4dd1d063bfeaedbea2d5bfa3d5bcbabc
+EBUILD selinux-prelude-2.20190609-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
 EBUILD selinux-prelude-9999.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
index 81d376b156fb..afa5a0e304ac 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelude"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 5ad07f5a6b4e..53b6d60f7812 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-privoxy-2.20190201-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
-EBUILD selinux-privoxy-2.20190609-r1.ebuild 283 BLAKE2B b357514452afe6c0405a68965ba5fa6dc3605222926f22741a13c1c56491c96ed15f462d403a84180028003a0334aea576fe0b28f97f5fb7cab57df25e9131e3 SHA512 ebde1e10d5c471b476e9dc03ba0408be116fd977fdb597c5b4e099aeb67ea5960ef90e50d70398bc02dc5dd2fd276abd4538dffec79d5d62748f67529bf01337
+EBUILD selinux-privoxy-2.20190609-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
 EBUILD selinux-privoxy-9999.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
index 1be8c83fa670..66b3bd046a89 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index ed11299218a2..022bb571a1ed 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-procmail-2.20190201-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
-EBUILD selinux-procmail-2.20190609-r1.ebuild 285 BLAKE2B 69aee55525fe54dd2fc47117db418cdeac0fe2eb30f20ebbc1107bf42917ab5d7cd483263f827a45642da4c4069f430940197e5dbb0babd386d6f0f2dec59d23 SHA512 f16d65714726ddc3111cc13758ddd481369e5cc8dbe3a49fae3ad514c97d3af1bd0a34049fbf42e5e7feabf2bd90344c4c3fef9d2b589adad3cadbc1b9e37238
+EBUILD selinux-procmail-2.20190609-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
 EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
index 194e7ef28eab..2cd5310e4d4c 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index bf41d2e77a21..76fc68530c41 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-psad-2.20190201-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
-EBUILD selinux-psad-2.20190609-r1.ebuild 277 BLAKE2B 2fe861b036683a761b09fc3ad4c53d98f1293c229806d38dca28a6ca6b500115b0546087bdfb0fd7b196a56d67d78a219b976eccb0513721cd3b9a870bf0901e SHA512 ab17ee91d60c56281645ec2b6a52a918ae92855e8df4d41852c07dddfca35973d90007a0a43e2ad0c9c1e76459d1b3eed9d2a189b69e674c2b2c03b6a2696f41
+EBUILD selinux-psad-2.20190609-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
 EBUILD selinux-psad-9999.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
index 4c2b513a93ff..de2b7acdb2ab 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index e71d1d9e4b0c..e06eec3fa248 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-publicfile-2.20190201-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
-EBUILD selinux-publicfile-2.20190609-r1.ebuild 289 BLAKE2B 32816713f4a336c67e7529944372f1d3b7f5ef3548a646b28618609d0726f9efb367b67a7ee41881f70a6bf7afae7d2c3e3ad9029d6baa3b547455631d0cd656 SHA512 a4b4777cd18b211a5f862684ad0d82d8bd982d70afde65aff4c8beaedbc91925137c83f894d360385be98d6530caf7a535563c84b5c1fb52b8d157d5603f126d
+EBUILD selinux-publicfile-2.20190609-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
 EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
index d50fe7ef35f9..fd7141671496 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 1c2441ae6f9a..3cd26226caba 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-pulseaudio-2.20190201-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
-EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 289 BLAKE2B c6a330d93461d2d242ca22ce89695dc2ef4c96ec1fa9d6fe0f560884d972d6a5083fff55de44a29a16ee853772418033b3d1fd55a1027fd19b9265f7c18d95bc SHA512 0f35c69b3b1ecc4c3d5ac93e86ac6240c1d1b469d3425942e7f5b91cd26a0ef55bcae47ccf91f0ba042a432f8955a03fbeb23609cb08caca94a6a3c38dc7f160
+EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
 EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
index 77825e6794ee..c9a025aac615 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index c9c8a3cdb022..b82e4b7b1f8b 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-puppet-2.20190201-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
-EBUILD selinux-puppet-2.20190609-r1.ebuild 281 BLAKE2B 4593c183d285e67a9acb698549c79274482a6be17eab5d4d73d6cebcee8984e8ca38375d221a68f3ed766efc7120e74d4b3ec62091ce34861812d4428d27640a SHA512 f236a2ab1823550451e52dfaa481b212520347d1731ca021b380cd740e86cf0cf30e953b3cf2e3e266b734df92f3f55ad69ba9a15979e7b8a4197808d3eb38c5
+EBUILD selinux-puppet-2.20190609-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
 EBUILD selinux-puppet-9999.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
index df1aafed8a2d..fde8a4a757d7 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 1eb9bd485ecc..0a98616bcef6 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-pyicqt-2.20190201-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
-EBUILD selinux-pyicqt-2.20190609-r1.ebuild 281 BLAKE2B 0ea2137a4cc93801b3e4936cd73ef3adbfd4374783245d589adf5fd622b575907174ce47538d358e4b12834fe3f7328b68b3e863b9a55723788740c15bfd3a86 SHA512 a7f53e83466870911144a66dff3460d5832de9d685fc14ee39b996c69928f31a3a8d7dae0e301ea3d6ff84b763d897104ec24e01984ad37c779c0bc6d5bfcaf3
+EBUILD selinux-pyicqt-2.20190609-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
 EBUILD selinux-pyicqt-9999.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
index 60fd3e2dd6de..88b384de99ec 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyicqt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 816284d6f5b1..932a213dfe6a 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-pyzor-2.20190201-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
-EBUILD selinux-pyzor-2.20190609-r1.ebuild 279 BLAKE2B 931ee3a9f03d126b94daa51fcfb6e0951038e5bf3ec8f58be830af7424ef5088bdb189dedc0fe3f95679c4fbef3ba5d11f8885a4791aec6dadf7485d97ebfb80 SHA512 9f519ec3b9f783045586256895d6970a4eff43df97484758397b6a7b5c655e5cc5e7c33dc1994575c47dede026b67c64463cc54f2d3071ea43cde3349f33b6db
+EBUILD selinux-pyzor-2.20190609-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
 EBUILD selinux-pyzor-9999.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
index 9444ea11ac8c..ec57667a57d1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 2107bea17d39..dd67f3b0b6d0 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-qemu-2.20190201-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
-EBUILD selinux-qemu-2.20190609-r1.ebuild 369 BLAKE2B 2efcfd91667d809b7927cabc60c022a7436dfe968c5d422411f6ea9b150c09c6fcf3fb8e180ea1bb2011c6649bdc1ac3bc65f9faa7949cfe79af8b29c9bb067d SHA512 a602e25c165647dc97b7f0b77f4c678f6392dd5886d3481f67d1a28d0e8b65423305dd6bf807f26d24fb3ae09ba83e54858b57ed2eec83ea90e23cf1c5c9fccb
+EBUILD selinux-qemu-2.20190609-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
 EBUILD selinux-qemu-9999.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
index 73ccfccaf4f2..340db38be4a5 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 7605148cab15..efdd8af3aae9 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-qmail-2.20190201-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
-EBUILD selinux-qmail-2.20190609-r1.ebuild 279 BLAKE2B 602a476c140452db26705d8d43842e1dc73b2de7d53ca196100820aab5f2a0d054697a022e5f3908a49a31c8b9e855f0af84e60f2bb9cd9f25348d67890d30b5 SHA512 a0eb1cd2cd0e7f349f13f6fbc58ae96a6c87370892ccb89815b0317f3ecb460352f4c79ba0b32290622f25d2ffbb246720012ab8cb6c1c76b296854795418aaa
+EBUILD selinux-qmail-2.20190609-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
 EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
index a59316fe4e81..0cdd4b610587 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index f0cf2cde956b..4afcc14ecbc8 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-quota-2.20190201-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
-EBUILD selinux-quota-2.20190609-r1.ebuild 279 BLAKE2B ff61f3aadb01380221699faa59f9107d0148bbea11eba06381eb201ec97734d02b670724b00ef56772fc4da8f6725c6c9d7506f4fd4da5368087813446610cb4 SHA512 a5594a4f893c7725002540de7751221064de4330549a49fd351bfcd0924cb0baca8badc4de87bf610bc61262c75e4d345993d6630f1fa006d8a4bba4791cd490
+EBUILD selinux-quota-2.20190609-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
 EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
index 56a5c61ab164..3e205072b165 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 20774d648774..77f8de75b77b 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-radius-2.20190201-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
-EBUILD selinux-radius-2.20190609-r1.ebuild 281 BLAKE2B 471673a6e3653af4b80f5c5a08faed75007a39d174c536f4e001a3ef4e01e05ab889f960a8a400ef30c29221f48280d53462239c085bfb429cbc4e9fe75d83d1 SHA512 46d46324bb59b82e6a051f96fa792aff39023c422357f4ae7241d2e1a1226adafe2741a8c57703fcc11652a8bcf7198f2ddda6e337f4d6d29b891ef8252f5082
+EBUILD selinux-radius-2.20190609-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
 EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
index e13d36641ca7..38c3e54263ce 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index c3a48f8752d8..630c503cbe7d 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-radvd-2.20190201-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
-EBUILD selinux-radvd-2.20190609-r1.ebuild 279 BLAKE2B 22c0bdb9a9455f8abaf313c92e0df44957de0cfb8ad9eedb5a592b9175506d3aaf5b2aaeb230dd54f83f431cd1fb295b049c233d8cf4c6ca0aa2859548fb86a5 SHA512 a52272286b8df9a18472f0a9a6c5153283431cfb6bc72c555ee1a032be7bd98d3f02f639be5e75539adffc4867e1be56817fd4afec6433fc0391a0457e7e9bf5
+EBUILD selinux-radvd-2.20190609-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
 EBUILD selinux-radvd-9999.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
index 43eb989eb155..81b55dfaa03a 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 9fb47b95bb26..b69e222e5636 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-razor-2.20190201-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
-EBUILD selinux-razor-2.20190609-r1.ebuild 279 BLAKE2B 66a13327b6499ff9db45a2efe440628910481557057cc21283cab966bb7945b6fffd7924cd8ca1ddc26836107d63d5fd3f2990a2fff5415296fe3ca84cfaad85 SHA512 f8b8493147d66d7cf9603d5c21d38e5356af478525414e099e747c24a75b582362b1289e3e6e9d22a780823190f5f4bff287d117d4b8a5e68433b0a0aa9b9822
+EBUILD selinux-razor-2.20190609-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
 EBUILD selinux-razor-9999.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
index 531856a3f333..56fdd0c5c393 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index fbb1ad9a3651..9ac19d4b2525 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-redis-2.20190201-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
-EBUILD selinux-redis-2.20190609-r1.ebuild 279 BLAKE2B 845ba1ac90776ec6df901e0c1da1d7da86a3cebd0118bb445c242e7792ae5abea6825d2dac55dd74599eb7fcd7d00c38b262784cfb94eee9126cb37c50507b04 SHA512 c18280de64a7fd9c0f9d21bddd5a893f6e6bd3ae490d0fb669311c588e2fe7d78c8a23a6fe4e44a642ffe0b1603c65e7239546c0367b849b8a837ba2c5f902ed
+EBUILD selinux-redis-2.20190609-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
 EBUILD selinux-redis-9999.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
index c12ad03d58ba..0a5cd1d0cdbf 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index b8cf3bc90a16..f72eb8f2e237 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-remotelogin-2.20190201-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
-EBUILD selinux-remotelogin-2.20190609-r1.ebuild 291 BLAKE2B 30a5ad39aada322b91ba595ef05522d4d7810ae418162de97f42035f5a0e350383245aaa7a82a3456042f55d357ad3265bc92db84fc009d2ee2d402987ca3036 SHA512 9edbcb1b1e899a15e367efa052405139efc1ef0335b76c2cba2bb1205fdf2af5091a1e39370c319d61d3ab573d66722e0e194cfb843e1436000cefb76346a120
+EBUILD selinux-remotelogin-2.20190609-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
 EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
index 4517b0a770b5..241229603230 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 5f0de7ddef9e..5741f8e3b10a 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-resolvconf-2.20190201-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
-EBUILD selinux-resolvconf-2.20190609-r1.ebuild 289 BLAKE2B 6f460f4bb4ec75a74f071e19ca670a11d4a2a36c7f918972b03e3cb375ca6236c5a8345ac63b2820ccf3703d1a865ce127e8416ed944a7f3a330bca64b6e381a SHA512 180da0b1ad85ae93d3a52ca0e6fe846e57f34473b91834b046bb473f4815a5322aff2d0c56e8e3cda980bc1209ba61ca48b54f2f9c2fc8578c944eba416e1b22
+EBUILD selinux-resolvconf-2.20190609-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
 EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
index b730467be8a2..0f62bf940870 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index fbd42f5039b2..0bbb815ee7e9 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rgmanager-2.20190201-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
-EBUILD selinux-rgmanager-2.20190609-r1.ebuild 287 BLAKE2B e1c14b5b21803dcb431488d38a2587ef017a8510b487fa4e97faea69140783f42087955384dbbfab7b555571ec7f512a311c66bae12afe98e3fa82a3f4483c6f SHA512 4ec51162c5c1aab7cc503dbfe8e6754179f9508768c36f92ccf91df2bd768650e6f26e1b021ab696b900c59a62e3405e30e689ce00896ea6ccd3e10e31b32387
+EBUILD selinux-rgmanager-2.20190609-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
 EBUILD selinux-rgmanager-9999.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
index 9822efb832cd..89a8babc012e 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index a8b7adb821bd..83a383006fbd 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rngd-2.20190201-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
-EBUILD selinux-rngd-2.20190609-r1.ebuild 277 BLAKE2B 9d5cf91d1c686bb617ef427e68f1e681b1a13271ae1e862e13f0a9b81d2b4d9f532289dc39a011261e9fa0c894df8751fc7fb7b8bfecd6df5119e70b5290edb8 SHA512 3037623b14a0e7548e97a0cd451308d78f315f77a37def537067ff0c3b0c31ba248f32ab73ff317c762ad8214dd4bd6e8cf373355340bf95dbeb651e74599263
+EBUILD selinux-rngd-2.20190609-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
 EBUILD selinux-rngd-9999.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
index 6034b2ac8250..354288ac5c95 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 4f25a5f3aba4..db475ca9468a 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-roundup-2.20190201-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
-EBUILD selinux-roundup-2.20190609-r1.ebuild 283 BLAKE2B b3e9d2d06a2a70d273710b686ec99c8666016419e9a0dba852d43c9ed32882ed3ba2177dd550ff162d54abdf6c0832f5a900fb7f6b02e8c41074bb8a246ba2c9 SHA512 4bba3a4fe51a68250c06debb2aaada78b04a96ff5d1c1a8a5898e9c49921ec19b16ca19e1694f232d3d5c696c68cae57273d6a3c1cc33a4ac319457fee69c5a9
+EBUILD selinux-roundup-2.20190609-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
 EBUILD selinux-roundup-9999.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
index f96eaca2a939..48dddce680e8 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for roundup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 216e2ff38f2f..22fda47b43e7 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rpc-2.20190201-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
-EBUILD selinux-rpc-2.20190609-r1.ebuild 275 BLAKE2B 1d7fca0a859b357b2115e5374816e183fceea729960eea9ef589ab3f4eb86c03bf988af1ddcbbce510222bbc3a54b33e671b6fa768fdfa6263a83241e692ee44 SHA512 b4a3a224b819129ac724d469c6cf949dae8d2a99aaa7c47027127a5dd48fb0ad1637c036ce847f892d83573a31065e7a7c41d70796468e1577df55d20d1f812f
+EBUILD selinux-rpc-2.20190609-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
 EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
index c86a0f6c5dd3..2aed48d48a79 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index e2d8388e9a0e..1213e4b4b08c 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rpcbind-2.20190201-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
-EBUILD selinux-rpcbind-2.20190609-r1.ebuild 283 BLAKE2B 022c0eebeed710290856d355d92ac26cfbf17d32883a04e33fc9b7bcd355b7a85c740ba63232ddc217dd50de7e993627420a9bcd8135cb76d9aa0ff78e27fdad SHA512 201785267e33d07a98daf789589b5e2536c3026fcfc2bb9d2a2d9b434767e79097ab55a8e56a836f4f3159b1f41ddf633a00948dec6aa46dc40a1e326a4c3f57
+EBUILD selinux-rpcbind-2.20190609-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
 EBUILD selinux-rpcbind-9999.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
index 6a5985799806..20e9cf2815da 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index c0c21313ce9b..03285b159b84 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rpm-2.20190201-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
-EBUILD selinux-rpm-2.20190609-r1.ebuild 275 BLAKE2B 0637d8f6de33033f482a116d405f68f27ceb081bb186f59c16cfa8430671fdc980fe7364aee2653fe4e525d8cbd2fdb0038217f5a5393604c1247a380e1a905b SHA512 d762abbaf80e78aacd28ac1ebd7ecea8cb0fc47b66f227ce0b54f1afc9a099a8cdef554d2bfff663a703d88cabe86cd29d4cd239c7b1394b7ef2f265db68d639
+EBUILD selinux-rpm-2.20190609-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
 EBUILD selinux-rpm-9999.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
index b544f0f441ce..8daca9ef96db 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index d6392cdf80aa..211ccfb2f8d3 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rssh-2.20190201-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
-EBUILD selinux-rssh-2.20190609-r1.ebuild 277 BLAKE2B 3607a46536a9c521fd24e642d76616dfddf215a88665cf4ee23ad283127badf3bc3cac486e12b454f8e2bb56c732337b25b79b26f93ca39041e38790de0470ea SHA512 3c182b9239ea8eb886a03a3ed7c30cb01425ac9d0b07cc0986fb8f1dd8fec6991b1783e0df1505f98857ac2b374c233ba8067cc520c640421d97aa6d3e99ef23
+EBUILD selinux-rssh-2.20190609-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
 EBUILD selinux-rssh-9999.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
index 8f75fa48cbf2..755769e528e2 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index ac31dfc3038a..346191e9cd63 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rtkit-2.20190201-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
-EBUILD selinux-rtkit-2.20190609-r1.ebuild 371 BLAKE2B 305dcbddda624d71d216bc42ad9fe3224c2bd652bbf375fabcdd555a81003ff6638cafcdd40878c0b8a83d2029cb9110bec987fddd973892cab4c149f3d6b923 SHA512 9654ee1d02faab11f0f273ef5255327e86ca6bc2a099dca512969d2d1818063e49ee3a15d3eb13a949994c4f3280684a7f578856a3229092086032a4eb593df7
+EBUILD selinux-rtkit-2.20190609-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
 EBUILD selinux-rtkit-9999.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
index 58fdb82b561e..ebc3d3cf06f6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 035367f7bdec..0e01871ed202 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-rtorrent-2.20190201-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
-EBUILD selinux-rtorrent-2.20190609-r1.ebuild 285 BLAKE2B d2d76052f307ffaee102b3d24ce6d4c1377333690383c81b6f2784acd5c696c916a224b54c76fc9088f735aa3f6ea3227e487646eefb9486b93d4ee2c51f3c88 SHA512 db7426e2f7358026c1e5795fa88bc276c89a44f540b04eeefae1350b6fa073f124e721152cb97414c7ff6a79236ff33f25ec1f35c7e5bc4cc58e3a365e3bf93d
+EBUILD selinux-rtorrent-2.20190609-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
 EBUILD selinux-rtorrent-9999.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
index f787f854b520..901fc63de3c6 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 9e2379efb233..509fceeebeea 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-salt-2.20190201-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
-EBUILD selinux-salt-2.20190609-r1.ebuild 277 BLAKE2B aefdd8a0819ed3651eec753c43c9e1089c375655421a5ab85f48ca67038484f15081b6ae03f1718a7cf78638d18e7c14d38c9c0a28e4abd88760f9560b1b9739 SHA512 4912a580b054f418cc7fc66b13563aa4d643a2c47231c38abe762609df021b492a1efa432db9ab2caf1fab3d0146e5ffda332bb0462facf7ac6322e1701290d3
+EBUILD selinux-salt-2.20190609-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
 EBUILD selinux-salt-9999.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
index 05742efd1e71..bca578fc21d4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 39d215a4e377..45b5572d2e03 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-samba-2.20190201-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
-EBUILD selinux-samba-2.20190609-r1.ebuild 279 BLAKE2B e0b9ef24123c6191a12c3270383bcdeb90e6357c3744db79f58a15a5e70a02e3de3c35ef79268fb10b30dd6c2bf21e1b820065fac6e50bc5f55d30eab451028e SHA512 bfdf6d8a31d0de1037ef8aedb6d68d32e7928bc9006e1d804590bf72d2b941abb477cff9611dc0eab6895205ef569e5d91511687e00c792139a9e6efaebf7806
+EBUILD selinux-samba-2.20190609-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
 EBUILD selinux-samba-9999.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
index 813642665e2c..618fd14b6b47 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 4de0a555e03d..6dec77237550 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sasl-2.20190201-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
-EBUILD selinux-sasl-2.20190609-r1.ebuild 277 BLAKE2B 214a7c392dcc3641a6a9021e357b7e3bcf412db78a6f7c2fb4a1dfb2ee83717dc2ec9d682540b6e7b7505ade463b06cdef55bf674aa53befa10902db8a298bce SHA512 ba4b8481052c981fe7610fe9c4c32b5350bbd937691a41be15bef7d09d4d83199b78b3dd85af76d8de3465511cade7936c7e6544422b499cd9204b64427194cf
+EBUILD selinux-sasl-2.20190609-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
 EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
index 3bf62b5455c0..52cd1ae23351 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 89998b3b1f8a..a5eeb2a8a839 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-screen-2.20190201-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
-EBUILD selinux-screen-2.20190609-r1.ebuild 281 BLAKE2B adc702f2e3634493c7f5a46d22779a451622a12f665c26cb543df9d8a5359b12bab4960be190b321772a369ebd02a4915e93a5b987804eae96517b5b9f2fdddc SHA512 b04302f47650c9c50b6a4ea83027cf9e6c12b00ec899231e556c9edf0d84aa9a1fb8347aba346fd125fba2dcc05149fa3b989679405e58f8cbd14fdd67abe49e
+EBUILD selinux-screen-2.20190609-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
 EBUILD selinux-screen-9999.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
index 92256a1a8fcc..c44e2cb133fd 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 19ea3c60ad1e..6ae015d98d04 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sendmail-2.20190201-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
-EBUILD selinux-sendmail-2.20190609-r1.ebuild 285 BLAKE2B ad520cc33b4744ac665b7554f82882a1b5c65697f91df4bc4ab29b4b3afdc3f6513da46cf2e929b0816d8b74688312bbe19341ff9b8b5455fe552e38fa378fae SHA512 468ddce085e6326dafe8ddd5dc6cd6623815c899c7dc08489b9dd02172aa28e5ed310567f3c3db7d5fdeaeefa4e30494cd7fb8003ef0674ee46b8ec7baa1351e
+EBUILD selinux-sendmail-2.20190609-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
 EBUILD selinux-sendmail-9999.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
index db11f93080c5..c2df25cda294 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 3e09eb305f32..ebf44d5e5eb0 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sensord-2.20190201-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
-EBUILD selinux-sensord-2.20190609-r1.ebuild 283 BLAKE2B d953c7a90b9894c63a9adb8d67817cd8db2e685d000a40f0b7b2dde0392ed44606a8b178d86fb87abe55c1b0ac540bea9e0f9192238bf32fc7e9842f4859ce60 SHA512 e146a6516d3bfe249f4324f247b2a9113c5455aaaff0aaf3b02c498e2715e6ada348f97520a2551d5586dd04ae721ef17c5108f294405cacabfd4b6830a1d73c
+EBUILD selinux-sensord-2.20190609-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
 EBUILD selinux-sensord-9999.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
index 34aa09fdd723..cd5059fc9d7a 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 074554d37173..e181c3bb7586 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-shorewall-2.20190201-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
-EBUILD selinux-shorewall-2.20190609-r1.ebuild 287 BLAKE2B 040cc943e8dd8ffd996d9db6bd4274e2dcb0335dd18ac6acbc88f24211e147b25662cdb7d6dadfc7352bd4c15794a27bc35eb3474542dfc3652874dd8da4716f SHA512 65fc9c8e555504d4d4fae5377ac183ea0ae8e67a83bc1091cbf4f3448430ac626a8f5b5724bcfc2712dbd8879be136da4edbfaa196ff4883dff91c9d6c06c7e8
+EBUILD selinux-shorewall-2.20190609-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
 EBUILD selinux-shorewall-9999.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
index 5b145b254b2c..05281937cc49 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 06b832c6655d..d57b0e0fa5c9 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-shutdown-2.20190201-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
-EBUILD selinux-shutdown-2.20190609-r1.ebuild 285 BLAKE2B 18449a4357bab6b7fa993611dc52a449f6f39b1a49c33f236d8e021ed47c22ea93f67ac3ca3c7012919a2ea7274737cc7d4b7e816dd7abf2a6bbe5887fda3888 SHA512 abe85f94d40441b84e9f4780708ba4310e20644f71e82725aba3cd4a5342c6003d610cdcef62fbd18e507295163454890d01698cdddb2cd4bfee100976b66ce7
+EBUILD selinux-shutdown-2.20190609-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
 EBUILD selinux-shutdown-9999.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
index f3e44d7a6581..e2a1e5b237f7 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 99ec89b579ab..f5b491a85876 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-skype-2.20190201-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
-EBUILD selinux-skype-2.20190609-r1.ebuild 381 BLAKE2B 015136aded86fff16dfe7b35983f38e2b328bb7e77f2a6a1e88a90068f99245cf106bebc36a3b506ee93ea48375b7bf9d7b71a3b6f15a2a792313badd42e33dd SHA512 e509469a0eda97c1cf4623cd5e23f41816f7257b85ef3cc0b33c333aed4a05173226786444e404b0fc5cfac1081ba30b1bf31bfd5193619b639a40d274ac4abd
+EBUILD selinux-skype-2.20190609-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
 EBUILD selinux-skype-9999.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
index 6aa818db38cc..ab8db9c3022a 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 1ed2aec2e10f..0d3d65da530a 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-slocate-2.20190201-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
-EBUILD selinux-slocate-2.20190609-r1.ebuild 283 BLAKE2B c9e39930f4b0d4cae728ef17d6fdeca26b78d64624977da0699f63ac279abb954957020c2442b43debd69571858921b6e68654257ea0123dd179c1b0393fc03a SHA512 6c795d548a23b1b4bed8c57706f2143cf4e57b21dc3439595e519f9c3482d47244631523eaa996da0b1dfc85ec04a60dfd0b5fea258c8e441db8323caf3c07a6
+EBUILD selinux-slocate-2.20190609-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
 EBUILD selinux-slocate-9999.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
index 80f531b45b3f..f528206f4098 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 97e551eb5664..82b8a3cc5440 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-slrnpull-2.20190201-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
-EBUILD selinux-slrnpull-2.20190609-r1.ebuild 285 BLAKE2B 9b998ce9feaa84354154f218f96f7bd3c17a149e0184943997b68d3bf4187439ed0ba763adb7f12ca8fd321a4c3e429abe9a0d63b5b283fa27cb9064bf515f91 SHA512 3974e3f4cb4652685fb218c6376537ed24a90832511d9052770186e5ced170c73932dfe35bd35c373150e78ebec8b92d8870ee90a0faeab0cad0a5ee2002998c
+EBUILD selinux-slrnpull-2.20190609-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
 EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
index 0a98f5586f6f..b35c57cb8e0e 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 30281dc1b8fd..19a4ed07c5bd 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-smartmon-2.20190201-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
-EBUILD selinux-smartmon-2.20190609-r1.ebuild 285 BLAKE2B 8ecd730e0e95aacb14a64fa2f434d5a5553360c765e823b14ede91c38f372199166e862c55f5451be09afd661c45228879177c7c5ee9d9f4645e777cc6a6b190 SHA512 363069e5e6096a7341cb4a56f4c12cc71e5d4d9a8f03c8ef1bd2ace522b76849abdfdcf1b20af15e0cff613fb47cb6eb45f664a6bc19b30f382930fa7c35a56a
+EBUILD selinux-smartmon-2.20190609-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
 EBUILD selinux-smartmon-9999.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
index 35ed08ef1f30..47f287bf40d0 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index daded4213318..84da4c6c602f 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-smokeping-2.20190201-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
-EBUILD selinux-smokeping-2.20190609-r1.ebuild 383 BLAKE2B a996962d6a9873552b68e4e0b0a2ee029170fe0447e9291faa981a5bb72a0085906256de239e55bb07c516a559fd6004162e9f88fc5ad115d4fad5d670874a5b SHA512 752a0616a133f3074c2dfeed8aa3f2c26c5a6279acf31447fc6acd898e87bb759e8ab34ff587d5e25a5214c06cfbab09ad8f23e4f60379073395b6a64a2606cc
+EBUILD selinux-smokeping-2.20190609-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
 EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
index 002a2c336c83..72e224ffccae 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 0d97473a569d..1c62423f5527 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-snmp-2.20190201-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
-EBUILD selinux-snmp-2.20190609-r1.ebuild 277 BLAKE2B 37f5f9d24035f2e7bc78f980ec6711c44502ec3246f4bfa6b53890ba14ce99444628dd4e659a2d6a19e8fe5051c1fd4f9ce52a6ec5f72b894217dfd838051078 SHA512 cbc7e4740c12ddd060fb0c97fc9adc89d6d90987a2ac40197f87c2b53184581dd5e78f320688add06b48aae21c2650c7cd42a84a261105db161231d1a912f8f9
+EBUILD selinux-snmp-2.20190609-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
 EBUILD selinux-snmp-9999.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
index c6c4f4e416fd..ef3fd5c05495 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 2a4afae09fb2..993988266925 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-snort-2.20190201-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
-EBUILD selinux-snort-2.20190609-r1.ebuild 279 BLAKE2B 62f5ab9c9c5fefe1421a9cfed1612cf1e7ba7be597a31188d6bfcc8c74745c77ffbac800625eb9626531a447aabaa2275b840f34b16a7a1dd843907d4278c10d SHA512 5c09ff345f75b5741cbe8762b4049f757c1e534c3d9232f3bf95dba012715ee2a8a9638e0533719aa3d38e3ee6e42adb315105274558b0025d230c1d7d6b4bb8
+EBUILD selinux-snort-2.20190609-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
 EBUILD selinux-snort-9999.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
index c77750a610b3..b438d449d2ae 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index c16e2ed926c4..6b94fb86ab9b 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-soundserver-2.20190201-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
-EBUILD selinux-soundserver-2.20190609-r1.ebuild 291 BLAKE2B f95a79b53ad72a60727d2592936e259e02557fe228afa299eee5170971e0dfbe3e8405bd1bcdb7774ac9669112ba86dfc2fed78da2825ef10455dfa75de69af0 SHA512 a3569de1bd7bd15c3175726a403b9156d112b894e72e6edba5e51b060b51f5315ce85e70fd18479be742ccbe7cad48a4cd34a2e4b94700fc4b186a2745a94e79
+EBUILD selinux-soundserver-2.20190609-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
 EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
index a37829aa1e65..429a4df4015a 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 7f4860bd577c..3da6c93f819f 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-spamassassin-2.20190201-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
-EBUILD selinux-spamassassin-2.20190609-r1.ebuild 293 BLAKE2B 698905fd4396a05f2e8043ab1bd51d64a58f901a8ae5ff3d22fd771941c2127f54678e8c5881df86c38ae5aac1247151aab802fa217c11f3a391f478aa6540e1 SHA512 93fe7f50bcdacd599963d3e0e6772e2c1a6e49a71ef00c963be66b32e263f3b813feda4928d97aa123cd7022cfd807bba4c93247914c4b9055dc98fbd186dc16
+EBUILD selinux-spamassassin-2.20190609-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
 EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
index 68e71ebad35f..70e5162f3498 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 31721a2a1b2f..c8ead0d682e9 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-speedtouch-2.20190201-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
-EBUILD selinux-speedtouch-2.20190609-r1.ebuild 289 BLAKE2B 5c5de5f25a744c21c3cc278b8ee19812fc81fed8d108ff2782fce002856fe651307235d8665dbe0deeb8d426b5c6e6005052d2c56d97df1145bda066ca42416a SHA512 cf9531ffbeb95768eb0d6bb6534de1f974908b8c6f78622e6288c994bd30eae221dd90fdedc2c411bf99b496c4d8a46a24a78630247830134e8b53b914af5424
+EBUILD selinux-speedtouch-2.20190609-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
 EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
index b20a7621ba4b..829da81326bd 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for speedtouch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 1e5933c07427..7889679c9228 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-squid-2.20190201-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
-EBUILD selinux-squid-2.20190609-r1.ebuild 375 BLAKE2B 537febddd608108ba4af2c65d9ef50ffcb714532e105f11b77f1cb8d5abbda97d477c1af85b70edfb3757f89feea0a309f914eaa45fc951a6de45d10b1ca4f51 SHA512 5621d99c90b2ac184b5ea860edfe7e2e7d8e56765619511b7e9e3166ff9d556d7f04e9fb3bf5737618863931fd68c853d4ebf126b38685e1948bfc61a6b17662
+EBUILD selinux-squid-2.20190609-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
 EBUILD selinux-squid-9999.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
index 47d263f7fc0d..8dc370ba476e 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 78f92bb48c95..e422ec422a1c 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sssd-2.20190201-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
-EBUILD selinux-sssd-2.20190609-r1.ebuild 277 BLAKE2B 267b7cd2dea6b8872cbc8524c36345bf99a15862879bbbf2745a13fa4882ff542498d268c291b60b93aa3811357990a977691670373c1dad805da35dabd7c5a6 SHA512 be97c8318562a0ef55b0707bc0783ec58dd1c3499751e2fc3d1cb3b7a4afa8dc1bdbf0a1f451cd39461c12f7064559180f8c6ae15b65fa0248aeeb722a8b3b2a
+EBUILD selinux-sssd-2.20190609-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
 EBUILD selinux-sssd-9999.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
index b1e2f759c581..b31faaf2a60e 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 24eec7b37fff..b013db6a3387 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-stunnel-2.20190201-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
-EBUILD selinux-stunnel-2.20190609-r1.ebuild 283 BLAKE2B 8f5adfe5fdb791f681c829e3f7ae23386463d8c7efca33c5975de27c16739656ba9150ff108ef5b81c8d560dea2f9b0c54ac373a46b6cef7457e8bd2ca6ee134 SHA512 f3cca4a120258b7ad71b069506c14f70b7cfc02719f4a70f630adec1c6f6a4f730b3a03d87edcfba927400523fd45970549b9706b5bf39ce30ded3193ebc046e
+EBUILD selinux-stunnel-2.20190609-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
 EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
index 98fbbc9cd77d..87ed5e6a727f 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index c9dde9c22f1f..9b14eddf27de 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-subsonic-2.20190201-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
-EBUILD selinux-subsonic-2.20190609-r1.ebuild 285 BLAKE2B 5c622e40d2e8e4a4820310e2e33d857fc3ef5edff5b9d3c364610af7cf446d797e154f98d958162c9895862aeaf909a952008c9f2c7a1e9b732026d9ee784351 SHA512 87108b73a03ac2a26e0c9be5d7f4fd21447134549eb6066f76b30f631d3615c0f2071624419ea4c7970c621a810981c6f752b56012bd264c707eada174091aa6
+EBUILD selinux-subsonic-2.20190609-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
 EBUILD selinux-subsonic-9999.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
index 33ec7cd8b187..b2397d0e041d 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index a259fdd602ef..9a635d4fd841 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sudo-2.20190201-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
-EBUILD selinux-sudo-2.20190609-r1.ebuild 277 BLAKE2B e0a33229f702bc5432e0fa42e79fcac9896363be93885184e6b62ff2ccaa579a3d418632036921f5f1ac0ef5fac6e7ba4a7236dbdfa7d7f0243d52bd9987b7b3 SHA512 ebf65314e8e0cd25a0d9eb94665907413a5cdd27ee1af6f3400b2cb2fc8ab5e2a0d05a8606ab4abf9be2fff1f890ee3d26baad8890353542183772bf33fa6807
+EBUILD selinux-sudo-2.20190609-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
 EBUILD selinux-sudo-9999.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
index c1bd4b9058d2..3240f526b439 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 03e46e1ed959..1bc9bd11aacd 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sxid-2.20190201-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
-EBUILD selinux-sxid-2.20190609-r1.ebuild 277 BLAKE2B a896bcb37a4e5f8a90e058c41773541b32882b7192e14f72b11c2fb21894201b6269ffafbce3ddbb8920ceab03c352da9bd8cc060eb477ed9c3665f2adad859a SHA512 f6b2595554cdb3f5a71190342eab3e22e833f6ce4de63cef82061c041684d7303dc01602d005fc348a5815825804e27a91dca56f85dc7a6aa412e627123acb87
+EBUILD selinux-sxid-2.20190609-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
 EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
index c5b9e3a423d2..9a268614e7a5 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 9fc095110ab2..6c8e558d7926 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-syncthing-2.20190201-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
-EBUILD selinux-syncthing-2.20190609-r1.ebuild 287 BLAKE2B 94eb55f5d290047ea1c25958e5a5887314adff2674803464d81c87fb3728dc405a92e6b8c0f601b00790f918a667eaadf4dbc8fa9ac3d603ccadbaa13892af7b SHA512 89e0206923c6d4c1de630ab3298f643eec90232bd4e7ee78e1963a96d5c0123ccb827755b00a7ef32b46c3d588bf62e9277692e50324f2af20eb4a7219fbdda2
+EBUILD selinux-syncthing-2.20190609-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
 EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
index b9d7a0a287bb..7ab1c868aaf4 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 1a9b4e796386..83cf2004d916 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-sysstat-2.20190201-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
-EBUILD selinux-sysstat-2.20190609-r1.ebuild 283 BLAKE2B 8e1a01a2b1e26da8bdc3c90dde92c44a3f6080aa509017750550f97613793eb05b991c3ca1d9872f226bc1d12b82395aa2f288f2be0dbad5d0c5f0609e298c8b SHA512 d04d21f568d0cd1310b4554e4bc3386e91dc99278d5553ca2e7618a7ccb9d55b6a1792a0a28a05d29cb92667c1fdce8d9521f643a9501665c6b369e609949bf9
+EBUILD selinux-sysstat-2.20190609-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
 EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
index a32fcfb19c6b..a13125cf8b01 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index f20e77ddeb9a..72194a69897a 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tboot-2.20190201-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
-EBUILD selinux-tboot-2.20190609-r1.ebuild 279 BLAKE2B bc9605d5eba988790e640a610df49418be85d3008b50851af78fa54694df476c16cb38ec7b96d0b8da00df14ff04f44b60cd46c67df42ab4cdff90eb3431b411 SHA512 e9203768914e138850464f1d7cb38f71b94fb977c3c63612a495e069bc57716e4ab05e34742cd4a1db7d9d29c12ba7d5c8e3962a020f0b78bfb7b39430c43731
+EBUILD selinux-tboot-2.20190609-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
 EBUILD selinux-tboot-9999.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
index 6497d71ce610..775911f750de 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index aaaa5a9b2c2e..c433973f2f32 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tcpd-2.20190201-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
-EBUILD selinux-tcpd-2.20190609-r1.ebuild 371 BLAKE2B 45c75342f53bd64d59db96ecd618016c5a1e329432bb2b2f4043ca9e71623ae96b6470aaccbdaaafb7b48a3c1ea9eba4d18a8df40a1692d476b3772ee6c04333 SHA512 f49219c1f05cac03b56c440e05fb2e350dfc2b7f6995b89f5ec668d948fe34336f231b654c68f93200752e429616bc6269e97dcdcca412ddc4b0b24375049fc0
+EBUILD selinux-tcpd-2.20190609-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
 EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
index 6c5547717f19..2e55abea5766 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 0fd3b489c882..891490a5e192 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tcsd-2.20190201-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
-EBUILD selinux-tcsd-2.20190609-r1.ebuild 277 BLAKE2B acc017be579b247aa26cea4f1cb13830fc12a115f2eb0bcf938e46e29907aae102eda21b8ba383064dc44b87b0d548ccdd45ed8689e49922763146c4a5b90a41 SHA512 7c83226d5dd31fd71a3f05bbe8b893ea34294534eadaa3d199fb0b5c48a455d33b7fe0a06dc8e023705444497a0dd74e17e6263dc7cc23946d376832b6abca70
+EBUILD selinux-tcsd-2.20190609-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
 EBUILD selinux-tcsd-9999.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
index cac6ead34835..f373db8f23fa 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 36f564fe1e65..ccad4d85c70c 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-telnet-2.20190201-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
-EBUILD selinux-telnet-2.20190609-r1.ebuild 387 BLAKE2B 6f52a7e3a1dc9b46058fd4e31d77adb044eb76b383eeeaea3905ef94c80ebdbefc46391881ac5f7695ab16a2e72645f422816a49f2c5f6a0dfbbe4eef5d205fa SHA512 b9ba504f87721f5241dff2ff941bbf96a94aeb9a6a42b3ba1e4e1289cc473810016c89b9fa3e7f079ea38ab6916d57771deaccf363e55dc2aa83319d18098544
+EBUILD selinux-telnet-2.20190609-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
 EBUILD selinux-telnet-9999.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
index c8e8170ce44e..dbcac40d0959 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 4028bcf03093..c9e3f77c5405 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tftp-2.20190201-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
-EBUILD selinux-tftp-2.20190609-r1.ebuild 277 BLAKE2B 8312e41bfc211d081105c6bf16f35b4fac672f4ad143cec04b7070c4335399defdff5c0243a5076d0d8eb9308f903897d9cf4731dfbe4260fe09e2a9155382df SHA512 ea647b7e39380afbe0f4e797d66c0983f0d1a08b5478760484bbb026740defc4a3546e8336c30e420fadf2f784024930c3d2741bd0b3de0159a26d1379be4dd0
+EBUILD selinux-tftp-2.20190609-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
 EBUILD selinux-tftp-9999.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
index 9a569f5a6be3..979844036988 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 89272d26c127..1b93de832364 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tgtd-2.20190201-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
-EBUILD selinux-tgtd-2.20190609-r1.ebuild 277 BLAKE2B 8c351a5b1c804b4c19fd95d8583c52e6a1a4bbecff4479627c6cf0b14c1962efb220968d25a1b057e3bde91ca004c6a57b68cdee00dff6929cf26f2ee65c2755 SHA512 6fd39446213a35b9285765ac399999f46d8bcfbcbf1d9f3d7f50e9db34b4ee787db853daff4e2faf36a66073895dbc9a3b1dbb6ccf2353154b82b4c44edc072b
+EBUILD selinux-tgtd-2.20190609-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
 EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
index 1e67a6ac9115..57e01c6743b4 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index ad9b2cdf891a..705f7c4347e0 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-thunderbird-2.20190201-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
-EBUILD selinux-thunderbird-2.20190609-r1.ebuild 389 BLAKE2B fc2945e2929812873dd1321d625b333a07209f2f2fe09e805cc528f7020305c7a2a32c1f32b6d5055688a922bd061acafefe07bf6dd714b4d71152accb1ce45d SHA512 bc2e50a48f860c97bf23655aad77ca4ec1461949b86f8633ec9010b250e97f631dcbc46a4c066256b727d71c42da81afae16e9095a1932a62d98aa4d92890165
+EBUILD selinux-thunderbird-2.20190609-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
 EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
index b6b8a5d4a3fd..c14772e51c48 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 7a6688dd6e68..1c9a0d7ce7ab 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-timidity-2.20190201-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
-EBUILD selinux-timidity-2.20190609-r1.ebuild 285 BLAKE2B 4b8f9cf32752001090de2bd7328812acf93cab4dc43d2b66457a671426eef0a3a3d221ea9a10a1e33ecc770a797919746b895e2b3d543cd4c84e66aa09a86082 SHA512 312dcc1be0b66d6abc8c5a08a84f8c51b137b3b4265a1a2af431be90086e0ad558d74e9083dac2535ffdf6f5f613039c4fc34e2c031c18932dd17dcde6725dfe
+EBUILD selinux-timidity-2.20190609-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
 EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
index 6373d459afa1..bb061deee85e 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index ae52a8ad6c81..3ac554dededb 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tmpreaper-2.20190201-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
-EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 287 BLAKE2B b08a3b66ff4db3f7f3462ccaaf9734736c5ee55b645098190aaa8a9887431b909822a86d02293287f5e086a267162a8d8936b5e36841ec484ecb7e1fdaa172c6 SHA512 f61fe5b25af0603df4bc822061bfa4a57f8e76b0778945d65dba14a93fd4cf248327b69e49effbd89897d25937353c818abc3b727585328546c1724a59481270
+EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
 EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
index 5d7d6467c65c..e26c0cf53352 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 8f2de3498259..c5bedab003fd 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tor-2.20190201-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
-EBUILD selinux-tor-2.20190609-r1.ebuild 275 BLAKE2B 264c1e1abd3d5df9a6872a1e00f8f649da2f55e3d262df940c40ec1826150508557829e10d986e0e8ea97628dbe5ebd47a5d690d20d9a618b0be62adf7c2ce1e SHA512 5795313f889dc4f2479408b3720623aa3742d700de330c64be3e78cb33b4201e43ffae0ce84cffdd51ca569b7651775e98aaa61b83a2a7168f841cb21b406c82
+EBUILD selinux-tor-2.20190609-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
 EBUILD selinux-tor-9999.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
index 97a035e29a9b..1ed577178c60 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index abbac196385c..8a465229093f 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-tripwire-2.20190201-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
-EBUILD selinux-tripwire-2.20190609-r1.ebuild 285 BLAKE2B e5c8aee4403594ce1b287c26b6cba68b0a5348ca1d094dfb295c16354df4664ecdcfa90aee112368cad2be2c5ea48186dc3cded3adf7b29347f6ec6613a92e57 SHA512 a685a8b3e9cfefdf1844486bbe47f5eacce78be48d069007d18f310f040a9fae7a4e6baa05b3ebcc31b1e5eaea2391b2418ea57a715bde3fd0c9673291da65b3
+EBUILD selinux-tripwire-2.20190609-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
 EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
index 4186fe2f7c8e..87ec997968ea 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index cf3117b4de51..f48eb0a1b549 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ucspitcp-2.20190201-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
-EBUILD selinux-ucspitcp-2.20190609-r1.ebuild 285 BLAKE2B e2c7f64288a5dca21f0432d4dda01b28b783678b5ab96aa4b4312dcbd41e90c35880c06ed9ca561dc43a26dd91c0d9bd37e88275620048669badb900ee26a61a SHA512 0bae871e80d8361dd8054c24175f0013234731ee7ba4b220332e42a05456b8daa754a10128a43d01258db78734a2056fd9a0e867ce341cd3df2a48dc327ce7f7
+EBUILD selinux-ucspitcp-2.20190609-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
 EBUILD selinux-ucspitcp-9999.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
index edac3f67e055..dff5feca0456 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index b9d6a7397acc..c5d3844f83a5 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-ulogd-2.20190201-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
-EBUILD selinux-ulogd-2.20190609-r1.ebuild 279 BLAKE2B 98d825654e618bece1bc0b87cdf7dba90c8b9023280e361d186a62e8252cafae01763a1e68d20ce38727dc3b6b2a60ace9042a09d990c8f70e10ef0052f1cae9 SHA512 056fd0ffa2d0d509957d5a88dfabe4f8a1020eed9e364210896c1952925f36beb50b24255718ca3261056e792b130a98d1a2e74f16792303c2238ebcb199315e
+EBUILD selinux-ulogd-2.20190609-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
 EBUILD selinux-ulogd-9999.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
index e5b99eadd827..04680ac1fd50 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 4cae1a96106b..0b23dde551e1 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-uml-2.20190201-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
-EBUILD selinux-uml-2.20190609-r1.ebuild 275 BLAKE2B 9109088baa57b286de84f78ad2b659ad50264e214d55663593ef2c740e68d2fcaa73cc21060990e21d613f717f36d1cfc328a2d9f616e6978bcdc428384ab762 SHA512 15a339ac5c23a733fb4f42f918c63aa52272789b2a3cc46e0b4ae3a3e63364b95bcdff32d7f61659cf52f4955603bc8e9110d325349ee64e885e9d3cbcd2f443
+EBUILD selinux-uml-2.20190609-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
 EBUILD selinux-uml-9999.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
index 734e3f6cd0e8..584fdcd94e0e 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index c52d7fb0b38d..3b6811061fc5 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-unconfined-2.20190201-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
-EBUILD selinux-unconfined-2.20190609-r1.ebuild 289 BLAKE2B 67df438c56155a53a7b9372c63419bd3713ab939c4df9fc1676f63253cca14596344eae92c6204871f4bb1188b6accc3006ba4dd8f942edca0a483fa41c239b6 SHA512 e08786cd691d12076f101620089013b75963a7c0448de3bd83a211f597f9a7d9579bef66e070cc541a2e53acb82bbebc63f6f9ad7cc1345db5cc824379731801
+EBUILD selinux-unconfined-2.20190609-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
 EBUILD selinux-unconfined-9999.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
index 77cfe2e29acf..b5dfca8c9ae9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 74f181a31b53..9722a5bfaeaa 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-uptime-2.20190201-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
-EBUILD selinux-uptime-2.20190609-r1.ebuild 281 BLAKE2B d4147f87b15c10df44ef21851d2cb64cf558cbbcc509a49f124dcbb9e31365773ac669745f9971bdf3faa5a80168df8cf7396d0fedbd55c731ad54f87f7e8b02 SHA512 9d0d048d289d34bf50663ee068a8c605181d2d1d2b701ef6a709211f927439321825d571009e108b24ec0ad1e867b72967ed8964d894b1be41bada8dafd5f02f
+EBUILD selinux-uptime-2.20190609-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
 EBUILD selinux-uptime-9999.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
index f34f0be1e2eb..f379344cf536 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 3c9d9cece9f9..f912e2612336 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-usbmuxd-2.20190201-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
-EBUILD selinux-usbmuxd-2.20190609-r1.ebuild 283 BLAKE2B c56202cd9cf22bd30c590d785ad102891ca18c514346ec4950d8d1a1e2d0706def335fa5aadfd8a879ff55052fa27a5c848abeaa00e1c5873c22852633790b55 SHA512 624b2b55ad438f15a1686810fc9e5413a2f947856ed159e41b4f280ac9475fa85c47057ca92c440c1ac7eb18ba08398e32debc082f4fdb1b68456cd2aa94b073
+EBUILD selinux-usbmuxd-2.20190609-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
 EBUILD selinux-usbmuxd-9999.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
index 0db867bb0d59..82fa0322f998 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index f672ba679332..1d745607894c 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-uucp-2.20190201-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
-EBUILD selinux-uucp-2.20190609-r1.ebuild 371 BLAKE2B e756a9df1c56f406c6e7774a9397273c22725de74fc39f325edb64757f1e88c04a41ec2a99e68c4a871c7487bc22de5940af06f76ab72d2d61f63958a44fecc8 SHA512 83cefa45e622f47e5e42dc9916bdfb32edad99b9097009e032ee545273b2f4b277606b577827090c3245f0fbf34ae8b5a85b0525102caffcc3e6a782c246df38
+EBUILD selinux-uucp-2.20190609-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
 EBUILD selinux-uucp-9999.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
index 5850b5885730..1cc80be15c6f 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index d581f997490f..790475fbc5b0 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-uwimap-2.20190201-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
-EBUILD selinux-uwimap-2.20190609-r1.ebuild 281 BLAKE2B 688a64d74beaad52a6469829a6798d3dd994764d924cdb47c5ab5e845361422197885605d3630695233e73f65c093e10b1cf3173460b26eb63a3036325ed07fa SHA512 e4e481c9292e858418fce86152cb5a1ae01f42bff51e46b56c612e8cd1df8fb0ad0a614f958e211e437531d069e64fccc59a6625876f760eb02bfcd81023e21a
+EBUILD selinux-uwimap-2.20190609-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
 EBUILD selinux-uwimap-9999.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
index be9fc2a2ec7c..d25d09577eac 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 13cd84c04507..ad8d0a09617e 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-uwsgi-2.20190201-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
-EBUILD selinux-uwsgi-2.20190609-r1.ebuild 279 BLAKE2B a31f95ab70aa27ddd684c94dc3afde95688880e26171d39c258f5031d6f8a3c7be9483104d44c84e39b8770a2de5c0e069066d6504fc86cf9c4bd42f2c1e73de SHA512 a092c69d158f731541e542075f0665f0aa0f2d8d820e929d2b3c6dae7eb711db5bc2bff95d1488a8de430185eecd6178b7e1224ea105812d2f856c9a3b5e92ac
+EBUILD selinux-uwsgi-2.20190609-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
 EBUILD selinux-uwsgi-9999.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
index f66ead1560cc..f0a8fc63e2c6 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 02c0ba6c4439..f785f41beb3e 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-varnishd-2.20190201-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
-EBUILD selinux-varnishd-2.20190609-r1.ebuild 285 BLAKE2B 54b279b27c4c024b6da25c27e1c5fa5323a9797e0e2ff06f639d2eae9fac08d2d9ba0502ea64266d4cb4740d7e444c607c3d6b029d564d8daaf94bc08210fa1f SHA512 b14fac2baaabfd2d77aa78f1b3904ab57d8ebbdd2c8b15694974d16b442663bc8b9fab3fd3e4a7031861a12b51a73bd9a6ecf44ee97f578957aa10407e0047eb
+EBUILD selinux-varnishd-2.20190609-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
 EBUILD selinux-varnishd-9999.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
index 37e630361be4..37c127035c87 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 984fc0d8471d..d8bdc1c981f2 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vbetool-2.20190201-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
-EBUILD selinux-vbetool-2.20190609-r1.ebuild 283 BLAKE2B 18bc0306922cd42ea6af2c496f4d172fdd529498eed53f840da27c46f1dff7e8fe00e9e0684d9d6cc23839cfdff5350f02854c2f91d984aead07f78e14fb3274 SHA512 5552bf3908a73e989cab6882a10dcbf6992e45fa213f6e5022d5c3f5df62da9d86d4f8d9dd17e69452be680e61edf5891d304a3b7203d9e75482d52ed4989017
+EBUILD selinux-vbetool-2.20190609-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
 EBUILD selinux-vbetool-9999.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
index 998a7c3dbbd5..74dc36ca5928 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index de5f57f6f85f..6cfb1ad0ff2f 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vdagent-2.20190201-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
-EBUILD selinux-vdagent-2.20190609-r1.ebuild 283 BLAKE2B 3482d796b85c6017f8c2dacfdee9ec3cf16b8e619858551fedf1ad0122b8a7bede859c5f310065bd4bdab3c6c20bfd96cb28777ed93a0b65cd9a191b87cfe30d SHA512 77d8d26247bb1ee354cfb25ca2ad842c780709e78b8476cee5b1d9ab19d6ee5877536aab2e0d6df8799eaa939a20ad21991224872fb3aff22b78bb04535ee9b6
+EBUILD selinux-vdagent-2.20190609-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
 EBUILD selinux-vdagent-9999.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
index 841867010152..e20f8b4bb5f7 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index a51ea9af13a9..cbb2b11992e3 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vde-2.20190201-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
-EBUILD selinux-vde-2.20190609-r1.ebuild 275 BLAKE2B dfaeca4d2d5d777598acd33ac9304f7c55cdc16361dcc19b0d6d6ec50e402c5105727dc0a4fb26f5782cd70117d2199c07ea3010c2072583cf36d8ce802b77a5 SHA512 714eba8a2ba748e2db579c3503dadc1a6d8dee28ca510ced900b221d7d6476f100d4d2b44bc4ba5588e3b60d436ad75be46c22afdf467f11006ebb4757c8e457
+EBUILD selinux-vde-2.20190609-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
 EBUILD selinux-vde-9999.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
index 7835ae11f9f3..1b2c0e80467e 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 2488c1d603f6..018ee6a66439 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-virt-2.20190201-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
-EBUILD selinux-virt-2.20190609-r1.ebuild 277 BLAKE2B 7233f2565fbe43a1dfe315115a77de01034155d2be8fe29eddc06647a31179f28aa7209d540fc5d9f3213ef0c5a73372392e91dd74df732a1723fb72dd24813c SHA512 9701ac07c5ce36f38d7431704ee8fa1f25b16b5fa38bf998bf5a6add1cac3f7cbddd6d46113e66627d90bbb88563a1d5997c56b7c84557dc8883a89a76a13916
+EBUILD selinux-virt-2.20190609-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
 EBUILD selinux-virt-9999.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
index 06a776e84236..44711e5d751a 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 53387b2bf731..66da1514a473 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vlock-2.20190201-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
-EBUILD selinux-vlock-2.20190609-r1.ebuild 279 BLAKE2B c3f8071b73cea50e296979673e5e9ce913b6b120156787c12c688b8dbd3ad63e979282333fcbdd8c9cf967c3151d6c452ab89dd67ec58f384bf294058112e337 SHA512 7bb30213850a4c889671f583b5bdb2ef7d28cc075e36f480142656c76d72f0420a1b409766ec359f3a8fd17d334184f58afdd553e612bb4d4523322a098a3ac7
+EBUILD selinux-vlock-2.20190609-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
 EBUILD selinux-vlock-9999.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
index 318295df311d..9a10aa663c40 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index d80a5d58a5f7..59fa5826b846 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vmware-2.20190201-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
-EBUILD selinux-vmware-2.20190609-r1.ebuild 379 BLAKE2B 15a55076f17d1bc3194f4db7673c069afa0b3fd99a66f424305148065d863426aef6a3bc27e701ea0bbf1a8f4c3e7d0287dfec6efc0cc959aa58cce1366cb63a SHA512 f2a09a778b0fcf60965578e8e7572e4d6919d30549293ced51969803f5aecf0f4ec05036985f7fa3cc4f5bf88fe5553b83333e83a8ee0fb6aa014c4f061dcd81
+EBUILD selinux-vmware-2.20190609-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
 EBUILD selinux-vmware-9999.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
index 4963cd0a99df..9d6a7e941334 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index a96288c17a2b..7face9dea039 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vnstatd-2.20190201-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
-EBUILD selinux-vnstatd-2.20190609-r1.ebuild 283 BLAKE2B 5227d011c8c9848dce64ac6b32e4e6c2984af1dcefc43068941a16fd29545d880c4b3674bb42707c6ab2c55c9321af0f33d5f97c4f1d96c17a1898dd816c162b SHA512 450f3dec70dc66a01bea2685a1648915e02fc17e32a1094a7830c2d633ae6fb8d5493e80a71d813ecb10789c70f58d2650d3dc69f424deb132e402f54f1a6ba9
+EBUILD selinux-vnstatd-2.20190609-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
 EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
index a5e52bf160e9..8177e6533ae0 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index 32135915b144..52e48d3c688f 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-vpn-2.20190201-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
-EBUILD selinux-vpn-2.20190609-r1.ebuild 275 BLAKE2B cd6cab90183121f48eb13217b717d0d2cfc2e6e2a55e565cde0551b309d717867c7c4dc942f7e29999c6fa6c30c796241984f0361d28a143e54e16512da1c364 SHA512 5250e6f07c454984a3b13928a67515d919c73d5e43866bf48b545e6857869c1d2f3c305a8b2648ce1454b7114279884c0bd8217a0b34f36193a0f3d8ffc4e20e
+EBUILD selinux-vpn-2.20190609-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
 EBUILD selinux-vpn-9999.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
index 6415c53754a5..410ba76e08b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 1331117a7b38..dd92efcf4553 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-watchdog-2.20190201-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
-EBUILD selinux-watchdog-2.20190609-r1.ebuild 285 BLAKE2B e5d8dc68d4f3b87779d0a5ed821c985c027c201de0f864b2293f7226f8fec60e78641cee9a34a7b5bcb727ca666b16f9460c95c650cd1e96cdac94dab72d278a SHA512 40821b8d2042523d109af8cd934d149e728bd0a7f83cd0a443ca4046172463aabdf99a2db73c28a2537882e686608821c3aff3402bc9e98a841e8561a03b1dc1
+EBUILD selinux-watchdog-2.20190609-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
 EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
index faf0a41094b2..c86a01682697 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 3504edf36b51..4b08e23b3fd4 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-webalizer-2.20190201-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
-EBUILD selinux-webalizer-2.20190609-r1.ebuild 384 BLAKE2B f526dfe16148db5e8151c865135fef0b83aa2576aa2d1152565ed65c048a836edfe5da19d4e69127d0badebeb8574c144d3fe4496dbed473a3613d86cf6ea2fc SHA512 703052e00a2ca9de8a4bc35dce91e92e9c3cd608b7b47e9bca52a58e0cba34fa94ab1203457a714705605518ec071d2280b580bab922783cfff5808927fb3ed7
+EBUILD selinux-webalizer-2.20190609-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
 EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
index 25f964560135..6f7462b40d55 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index affb5cf7df93..37996e8c7181 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-wine-2.20190201-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
-EBUILD selinux-wine-2.20190609-r1.ebuild 277 BLAKE2B cef9261846b5407a8fb2ca20ecd7f3280261118a67d9de07c056a40c0d18e5cd5120d47ca2ad74099558c1618c9556ed44d71aca2fdc1dad64d4cb810faca33f SHA512 91ad49f69144114e24261f39f63b28d550cca861d2edc713997c0f4f1b8a2f9237f48f69d2d79ca07564dac48002cddb476e76093b4319042d279079ab75e7bf
+EBUILD selinux-wine-2.20190609-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
 EBUILD selinux-wine-9999.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
index 0bac3e4f6faa..d782e671f3e6 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index de5c767baf0d..b8192069a443 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-wireshark-2.20190201-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
-EBUILD selinux-wireshark-2.20190609-r1.ebuild 287 BLAKE2B c8606c89e55e9ae10d10eb3b7c6e0a2b54257a1accc318398a1554714442acf9eb3020fe0cbe83057beba42cb88c9dc085de489bf8bc42abd046b174f8bb2405 SHA512 1eb840bd4304b7fbb963114d26f4d877d715ba7aad8caaa8bd302bb9ef6de4b90dd5ae17d5e317789f32da55080a5056f2ed0b3c2f1a12d758445054cafcf8c9
+EBUILD selinux-wireshark-2.20190609-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
 EBUILD selinux-wireshark-9999.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
index 71899125dd79..a1fbdb3141ad 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index b60c3f98c93f..a19595b07404 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-wm-2.20190201-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
-EBUILD selinux-wm-2.20190609-r1.ebuild 273 BLAKE2B deddc52a6d4b1b283503a48c8b8bafe21af5b966f097f3d96b856eb4804aa078cc25092e42894f0ef8592bea6fa849eabeea381486fa8019136ff3813b0f2dc5 SHA512 c4f8d05706e8db4b9ca84f39bbcf48957e8050fa27efa3cc07930afcf64640683574fb10ecac2b3b014ea156b93e3b6fc2c86d5ed48ef4c2c6bd2a8fdaa8482f
+EBUILD selinux-wm-2.20190609-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
 EBUILD selinux-wm-9999.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
index 130a3873e558..ec73f98a2807 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 278dc9986f86..f491b3bad1ef 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-xen-2.20190201-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
-EBUILD selinux-xen-2.20190609-r1.ebuild 275 BLAKE2B 77e72be4252031224f00448479c5d6d141d3c9e36e02b61d3dd8ddce986a228537111b9cfa86b8337422b0fa8906706c0d4b076ab7ecd0c2c9a2099c5c85adea SHA512 2c0f89ad9758afeab27f0ca7fe77cbc954ca273966a6ac99e712dee2cd1983fb5d993a42327916849ebbbafead7042d4544a4ab3cb4db4a917950722675044d8
+EBUILD selinux-xen-2.20190609-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
 EBUILD selinux-xen-9999.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
index f272a35e3c1c..98105b7026dd 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 65486edc6ca2..3657ecb3d0db 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-xfs-2.20190201-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
-EBUILD selinux-xfs-2.20190609-r1.ebuild 275 BLAKE2B b8b9a4263c66629b8dee6bd89961ab20706fb41861fd7519cde29190ce42dbc270cc070c30e51603f2476ce9bb8aa3d4e9a35e6fb3815b4652e05b6591961a8b SHA512 0098d1a02bfa96756a35bf1ec09d2ce888bd1fbf1d246e96e1ec62b7aa645b42359300f53380483498b79c5ddc4b5f0e0fad454d47d015ec00d810eeba0d5718
+EBUILD selinux-xfs-2.20190609-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
 EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
index 4321254c44fd..aaf98f5fe9af 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index d60910dac627..b868fa651022 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-xprint-2.20190201-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
-EBUILD selinux-xprint-2.20190609-r1.ebuild 281 BLAKE2B 4128a6f8fd2af563d26a3f615f79e7b0e4a4129e241170ba81c3a3ec38c0ada581ebce7124c28b8a915130632c6064e01da18e1433fc0377fc69e4fd4550e029 SHA512 94cde5173a5b40278d4a7b49988be7a17c24677f50f27ce995a591fbb2453eecdd2136ed06c4ad676ac5e871e3adaaa359191410da7c5f123541000dad771632
+EBUILD selinux-xprint-2.20190609-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
 EBUILD selinux-xprint-9999.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
index f912d471e9de..5fdeeaee49d6 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xprint"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index a7e134b49627..7069e20baa13 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-xscreensaver-2.20190201-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
-EBUILD selinux-xscreensaver-2.20190609-r1.ebuild 391 BLAKE2B c0a3b4d987537cfecec49b36d7558ec3f7c606cd43d94e61e51798034c2023b109e056c20dc616a522f16539d0cfedf1c30752ffbafb8b92b162e18b74971fdc SHA512 4ba9b5c65dbb8e8813832fbd52177762a1956d4ccfe630185ecfc2340896a7e4a907954ffe11aa06816d8c0d758a9c6b14af6b76d048b2723f94611ddf3e17ed
+EBUILD selinux-xscreensaver-2.20190609-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
 EBUILD selinux-xscreensaver-9999.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
index eaa4325c772d..19aa684ca051 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index b12e15abeb54..c0a211703487 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-xserver-2.20190201-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
-EBUILD selinux-xserver-2.20190609-r1.ebuild 283 BLAKE2B 39da47b56979c493e7f724086a741df5ca1a29ea899061680813813a2ecf24b50ca6e5f486de6406333f02a4776110e97de070f7286e20d470570a68594a11e4 SHA512 20fa0c6186d526c13ad4a2663d186ba344e575477d8cc57ac1c98f3d54cb46f3739be3eda7d78fc3bd45a745250a341bc356f4635100a362f4f94a34269fea07
+EBUILD selinux-xserver-2.20190609-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
 EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
index 8521fba28180..aa953c3b87cf 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 986d39f47b6e..f53f6043b3bb 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -3,6 +3,6 @@ DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-zabbix-2.20190201-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
-EBUILD selinux-zabbix-2.20190609-r1.ebuild 281 BLAKE2B 9f15a08fcbfca1721435adf35b60557268aab9d4ba373a57315d778280f02b1d43fc520d8b951da3715a126480369b170c66d7384794b2a4c34d5293da421782 SHA512 0e6c6285603b7962aed402d4b9ca04f8f2321cf906a05148f6eb975f5f13ce6570312e882ac36b06795949ddd217d65485c3344838f6d970992d7a33fe13e190
+EBUILD selinux-zabbix-2.20190609-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
 EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
index 67821ef053af..42c39935e146 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5f0082bfae14..bf347bc86b7e 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 925ba4575c07..328a45d63227 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,5 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
+DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 EBUILD apparmor-utils-2.13.4-r1.ebuild 2231 BLAKE2B e8ae0a0c14c50d533d960931ad070c2b77c8eee6262dfd97139abfdc378983532b5108ec724745b6d932e1807bd2ac95b599af7f189e927c3eebc11f6906bd77 SHA512 c1b24fd63aa32e3719301c8412c2abd11bcb7bad5da72b93b663d517498bcdd5fa0e2e70864a0735cf0f40c395da003f44bd29ad70d474458d7431f509d87df0
+EBUILD apparmor-utils-3.0.0.ebuild 2195 BLAKE2B a677a2bb90f72690c9b2f6c8e898f06ad85891348b9b1b790218ff7bfa5d1842d376bfaae7bf4953ccf4d42615ccffba71e03b59ab384fb8666838255f5b6ae2 SHA512 cab03155c62603c1b45f75c7e0a557876c011f94f3f1b875f5f00786b3eb682d15d0a46d15c42733251d4e884d724ebdabbfef51be7a7ad87111f3ca9111b706
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
new file mode 100644
index 000000000000..fb89112dc695
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
@@ -0,0 +1,86 @@
+# 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} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		local -x PYTHONDONTWRITEBYTECODE=
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --optimize 2
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index a32c7541f927..7f51aaa55470 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,9 +1,13 @@
 AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
 AUX apparmor-2.13.1-makefile.patch 884 BLAKE2B 4400b00ab143c0ea3b1c14f996131fd023b66c01e694dcd9306d6e00f561f72a608df7a26e3692a8e851b0c91a227eb84d96fb5145b19535ee50ac61c37ec811 SHA512 c324d1dc2101e073df2bc6c3696396becb45e5c25e4c1d6797145554e0499c79353d3a2ad2cced18f42bb1cc315f8590ea2c1b7ee9a3882d5c483380f7c86c6d
+AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548
 AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148
+AUX apparmor-init-1 1238 BLAKE2B d41ff2534219e60b1495e53aea251d292d87cadd43a53c3d51ec8b49b5428b0ef183073469b2ae3817c306ae377779c98f250bca09d2c93e640350e78528b532 SHA512 0d8bae7b6f77335a34e2371b08f3fb2a7fb7b4684419a1e269a3b5ea37f71a9d173f4bd56abd37d34a45d1faa879663c828b66ebdcbeb202efd33b652ccb4d08
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
+DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 EBUILD apparmor-2.13.4.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919
+EBUILD apparmor-3.0.0.ebuild 1631 BLAKE2B 554f5fbdcdcde96debac49f3ecd615346c17f3f916f24b21ddec5970978d21e08450084cfd80135f273b153fe61596b96c55fd31b5eeef7f2b288c605d63c221 SHA512 4bd655a6fd9f99cfb1b53cba3a8441bccb864ff826f4e27c0bc91a84e7e35e3bd76a97b00f45c87aabf9d196be26b516a02d24f9ea22cccce43eb9ac77623451
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild b/sys-apps/apparmor/apparmor-3.0.0.ebuild
new file mode 100644
index 000000000000..36c5b717c4b8
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+
+	# bug 634782
+	sed -e "s/cpp/$(tc-getCPP) -/" \
+		-i ../common/list_capabilities.sh \
+		-i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
new file mode 100644
index 000000000000..9c03a4465c36
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
@@ -0,0 +1,18 @@
+* Avoid installing empty /var/lib/apparmor
+* Install rc.apparmor.functions to Gentoo-appropriate location
+
+--- a/Makefile
++++ b/Makefile
+@@ -407,10 +407,10 @@
+ .PHONY: install-indep
+ install-indep: indep
+ 	install -m 755 -d $(INSTALL_CONFDIR)
++	install -m 755 -d ${DESTDIR}/usr/libexec
+ 	install -m 644 parser.conf $(INSTALL_CONFDIR)
+-	install -m 755 -d ${DESTDIR}/var/lib/apparmor
+ 	install -m 755 -d $(APPARMOR_BIN_PREFIX)
+-	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
++	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
+ 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
+ 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
+ 
diff --git a/sys-apps/apparmor/files/apparmor-init-1 b/sys-apps/apparmor/files/apparmor-init-1
new file mode 100644
index 000000000000..4addaee294b3
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-init-1
@@ -0,0 +1,88 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Load all configured profiles for the AppArmor security module."
+description_reload="Reload all profiles"
+
+extra_started_commands="reload"
+
+aa_action() {
+	local arg=$1
+	local return
+
+	shift
+	$*
+	return=$?
+
+	if [ ${return} -eq 0 ]; then
+		aa_log_success_msg $arg
+	else
+		aa_log_failure_msg arg
+	fi
+
+	return $return
+}
+
+aa_log_action_start() {
+	ebegin $1
+}
+
+aa_log_action_end() {
+	eend $1
+}
+
+aa_log_success_msg() {
+	einfo $1
+}
+
+aa_log_warning_msg() {
+	ewarn $1
+}
+
+aa_log_failure_msg() {
+	eerror $1
+}
+
+aa_log_skipped_msg() {
+	einfo $1
+}
+
+aa_log_daemon_msg() {
+	einfo $1
+}
+
+aa_log_end_msg() {
+	eend $1
+}
+
+. /usr/libexec/rc.apparmor.functions
+
+start() {
+	ebegin "Starting AppArmor"
+	eindent
+
+	if ! is_apparmor_loaded ; then
+		eerror "AppArmor kernel support is not present"
+		eend 1
+		return 1
+	fi
+
+	parse_profiles load
+
+	eoutdent
+}
+
+stop() {
+	ebegin "Stopping AppArmor"
+	eindent
+	apparmor_stop
+	eoutdent
+}
+
+reload() {
+	# todo: split out clean_profiles into its own function upstream
+	# so we can do parse_profiles reload && clean_profiles
+	# and do a proper reload instead of restart
+	apparmor_restart
+}
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index a951a581516b..038494980823 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,6 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20200427.src.tar.gz 115896 BLAKE2B 0c325fe140ffb9e9d1591d414156d280ac6e802eb652f876fcb6888ea4d6cefd485bc6501179a4f7f3db33ca0fe9f64b83214f883b86bda0c8014b81916d893c SHA512 8f943ac517680c8744563f35654f5b5201fde16cfe24264d8ad171ab517b65a6f50dc569789228e095e2b485e5a0d4fe58e2a0d7f199df2b225652689e3a2e83
+DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
 EBUILD cpuid-20200427.ebuild 602 BLAKE2B bd80e3581f4e15953ad1cfe1fdfb102729316fd9f085d06e38f82ac4f0aa3d97c7989ab2dc9a6d94269faff3b04b205a02b0f44d466e15b57e75ed95c7749d97 SHA512 c4bd77425b100a9f86b56c1c9f386df7eaab703ee44ea62d34f0ad19baac6f7d5a977ac07621615301a2d5aad2fc6b8ba9c0ea0bfef62e92d23bcff2e0c260c3
+EBUILD cpuid-20201006.ebuild 604 BLAKE2B 8e34b2c78d88273d214fa6df847b6db84d2dc8dcf26514f779e61a9bde540fc3b42946a5bf2b3aa51a238824d2169a08510ce942bdd21e5b0a5b7e112265bf83 SHA512 f68fc7a76850491a58891043465849feb1c71e8f79c0f8ac978dc86289d1e03c964af93cc80d08d2ba4e5ed695f51a3b5d42352a191b48bebad2bf1c93577623
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20201006.ebuild b/sys-apps/cpuid/cpuid-20201006.ebuild
new file mode 100644
index 000000000000..c48d21a156d2
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20201006.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-lang/perl"
+DEPEND="app-arch/gzip"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 96d6a229d180..5c8ab0c32b03 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -5,6 +5,6 @@ DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
 EBUILD dtc-1.5.0-r2.ebuild 1663 BLAKE2B a819481eb057a777ff6f405b06a90c0af5e45f27d644b71835954af2e1f5fcb6a268a1553fba2119058516df17120da7221fc5a85fcc4e1da7dcc8a1bd784555 SHA512 7feab3bfbe64fda933b8034e1aee397244e7937502fea343512f6908709e9ae746aa43cbb8b25ba27ffb94ff90269a3d881cd08fdf9a764c05ed0bd90a2fdd4d
 EBUILD dtc-1.5.0.ebuild 1296 BLAKE2B c233996dc4f35d0ba521de4ede3a3eb37533c8cfd7655dac83602c70cb55093fa631e16785469ad41244dbf61836ef4cabf541ec166694c34e8960b0576f75ad SHA512 7b5dacd6a422da8e2353047f36cf47269a473e4c39809e0b71401e99bc27b7d37a2be743afe033fe444f00ed244e329bc82999d3cfef005504a3024160e918d1
-EBUILD dtc-1.6.0.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
+EBUILD dtc-1.6.0.ebuild 1502 BLAKE2B 329f2df26158b5144eeb1aff5f5164724a8bcf683c1c53ae32a488c0fc71ed69a80d855fe474a19a61e029cbe8d359aa9c5e5a4b235f58079b9eff98da0884f3 SHA512 d7315b1bf632145459c31b117484780d5148eb5e1e8afecc3d9d381f7d4a1583fa08ef6a0dd43035f57daf479598209ba03e115b470f4f32cf0b9c432bcd3e71
 EBUILD dtc-9999.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
 MISC metadata.xml 491 BLAKE2B e57c27c911b37572b2836c634b03b2fb52bae256c22972af19637113f467e3eaa270e8dca070dbb9522495db5bad1f1b4441fcaae9d47e7eff8efd0b4127628a SHA512 9e328b8fd47363cf6caaf40832df015d9055ae746118dd9c501311af24a12d5377781cfb2ad8d42d2c82539709597310c1dbded4e522d0b0272b23859735506a
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index 5d8cb20a5b37..d19788a0a630 100644
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 1494651e3a8a..64675554ca53 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -5,9 +5,11 @@ DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5a
 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
 DIST fakeroot_1.25.2.orig.tar.gz 126876 BLAKE2B 13c4457aed3d6df08fef0f3af6093eea05bcaedff280146a7d09e96a1e73d0615c2527ce32bc4999a0acc0478610241440ec9a70ee27860cd61d799f636c30d3 SHA512 3afc0d6c82bef4968f1eac293174d12f957788f173fa8b69753c422f0f3bb54e012d350eaa8e535501dd62185479c1d4cb1c6e3f605930ae5987a7f622c450c2
+DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e
 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
 EBUILD fakeroot-1.25.2.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
+EBUILD fakeroot-1.25.3.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3.ebuild
new file mode 100644
index 000000000000..eac32e7e9542
--- /dev/null
+++ b/sys-apps/fakeroot/fakeroot-1.25.3.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/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index 88950ca9d405..4f9ae96759d5 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -2,4 +2,4 @@ AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
 EBUILD firejail-lts-0.9.56.2-r1.ebuild 1217 BLAKE2B 1d7dcd7ebfee4c51d441a80dd59c1043b4accd6acdc95c7aaab747f79f4ded5ccd6bd7dbd7a687e09d8920b80f0cb179d56a6e9701d6839425051e3bd2080251 SHA512 d71262d24137f1f7f9f31e5f9a163c95a94b8680958d74e1729a7171197d6459e9e359994591201a469b110dd1da7ad51f9453296cb461534cdb5138bebe491a
 EBUILD firejail-lts-0.9.56.2-r2.ebuild 1405 BLAKE2B 059e7678dfb94f9049d3976f3d5ba2b9bb42b53875627257641627532e86ef4831d6bdda25f62b4557f6a4c596a478a637a70d3866d664d58e59c9fab87628b9 SHA512 6e44b5f8b4517762389320628a5c3b573df23288263eaa1b0cf6f3ad98fff7dd0ed55d6c1d738a9296cbb8ea4fe0e63c77417ca07c90ca928d360fd02bfc9dab
-MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1
+MISC metadata.xml 1316 BLAKE2B c21f6419753cfbd0b00ea3e6fd2239504a42186904eccc27bf7e63a0f3bf8f5267847b53fa33188327963db8ab16813965214e2444d4de1b6da2f2c5488ac367 SHA512 d431f0930cd81ec6ab639ce72ba08c12c4165e44845aa16146d4efe7b8717609949bb53e4756816c269e75b5338857173bd13b88abb30744a7c793c05ac7befb
diff --git a/sys-apps/firejail-lts/metadata.xml b/sys-apps/firejail-lts/metadata.xml
index 74406c739693..b59050f3232d 100644
--- a/sys-apps/firejail-lts/metadata.xml
+++ b/sys-apps/firejail-lts/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>expeditioneer@gentoo.org</email>
-		<name>Dennis Lamm</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of
 		untrusted applications using Linux namespaces and seccomp-bpf. It allows a process and all its descendants to
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 071d8d8b124c..a06b71d1d5c6 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -2,4 +2,4 @@ DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfce
 EBUILD firejail-0.9.62-r1.ebuild 2102 BLAKE2B d30a3fa1db880a665b7f3754b14046d3e82e6a53fe9aa059dbfe6dfe48d97ece348efec04c94bba3f13961663bd39686a863039cd03a1ee2789a16511db3fe9d SHA512 6b6657dedcfea70e330e9240e0ee66c6658635bae9e10f58e07e0aa428803b8c4ece403f6530defca9782c2fe83972c223c9d1b7287445e6e88427e02884c679
 EBUILD firejail-0.9.62.ebuild 2162 BLAKE2B fbeced554b46369107e56846ebb4d8b4accd3c81996f81222a145a4d054ff1426f3514c59c4558c2f517cbc7a1f5035005c10fe778f152fa56a51c752eaaa40d SHA512 449e60bf793afa228f106e3b8913e8d7ba24e31f6e09da141750d0e607b91cd4dcdfa0092c88dcc16e593907182ada3fe20491df850e09cc95895ec1cb75a6c3
 EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
-MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
+MISC metadata.xml 1601 BLAKE2B d9ddec92af77f18e96baa7808f85003d325e328b39fb322893d810ddb2e92d6f21f16e7ecae9c36f3149743e2cadb00140951a138b1cbac3c8a76cf508621f5a SHA512 814eabfe74660854382acaf24ad495ecb04e49614b3f1bdcb744bec894e1b622a1ab57855c52ad713eaafae683bae67515301330291b5e010c3504128344e151
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 07938ac97ea4..f435d71e1994 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>expeditioneer@gentoo.org</email>
-		<name>Dennis Lamm</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of
 		untrusted applications using Linux namespaces and seccomp-bpf. It allows a process and all its descendants to 
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index d522d90fb31c..41e2c0f7bbc4 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,6 +2,6 @@ DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff
 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.4.ebuild 1514 BLAKE2B 124fa485d3431064369ca7b246e535f06c2abdade0c4c9e44a21361f57385b5af120277d603dd210c25ff5da8b8bcd37a5e818c7129632e63c0e1012e7017a42 SHA512 f082b3ec09463cf4f5501bdd24fa84b5b1dff35ba64e2dd7c7f6d93b86c27948c070cee48069333ce7d5caf173fcb98b55b7df568f60a1087bc5b285d9325a3c
 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.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 34e55974da37..9f94192b4198 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 1d67c1e8ea78..b37823cfdea1 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,3 +1,5 @@
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
+DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 EBUILD i2c-tools-4.1-r1.ebuild 1954 BLAKE2B 6dd8ba51d6948c9736c2ddd3e13efc7ef39a9d914a17d5ee7fc325639f6d734e95b4d6e12ed58f54b06cc3e140875b2de55756c77d228ca73c158661b2ac2850 SHA512 5d852e226406e78bb57ce21544b02dfc987cc64abea22cc22eb6f7558db2a79e6ee0134800082ddd549e30ae604d7c12892d9352655c3ba04100c71229248536
+EBUILD i2c-tools-4.2.ebuild 1716 BLAKE2B e143bf1c18b154b26d01601a3719881a2981fd8d8995c12dcec84b34936c2a4e639ede30ab27a3b34eeb4400b0a98cfb3433660c763213778ffbe50e2531c7ef SHA512 e9fc0d7af98f25c0494dee12a8cb20fc461478243cd20b6edc9a4b279b6d7f2fce1af3519c548e6349ab03823d326c920f558f5fdda9f3132b861e3d9559ece8
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
new file mode 100644
index 000000000000..f55d8d32a059
--- /dev/null
+++ b/sys-apps/i2c-tools/i2c-tools-4.2.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=( python{3_7,3_8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
+HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
+SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+RDEPEND+="
+	perl? ( dev-lang/perl )"
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+
+	# Cut out the eeprom/ & stub/ dirs as only perl scripts live there.
+	if ! use perl ; then
+		sed -i '/^SRCDIRS/s: eeprom stub : :g' Makefile || die
+	fi
+}
+
+src_configure() {
+	use python && distutils-r1_src_configure
+
+	export BUILD_DYNAMIC_LIB=1
+	export USE_STATIC_LIB=0
+	export BUILD_STATIC_LIB=0
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" all-lib # parallel make
+	emake CC="$(tc-getCC)"
+	emake -C eepromer CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+	if use python ; then
+		cd py-smbus || die
+		append-cppflags -I../include
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install-lib install
+	dosbin eepromer/eeprom{,er}
+	dodoc CHANGES README
+	local d
+	for d in $(usex perl eeprom '') eepromer ; do
+		docinto "${d}"
+		dodoc "${d}"/README*
+	done
+
+	if use python ; then
+		cd py-smbus || die
+		docinto py-smbus
+		dodoc README*
+		distutils-r1_src_install
+	fi
+}
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index 3bed08581adf..465e121b868d 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
-DIST IPMICFG_1.31.1_build.200623.zip 1755988 BLAKE2B d9f851d9f9aa2edd51427e4b03bc09e62cc848079507995aefc9c115fe72b6727747e1739a71a56f7909c67d66150d32d89d7163130b9e23c9bd8f9f07b24d70 SHA512 b138d05ad8d2441be6ee3aa97975a998c5d0863e4b8d46d7841693aaeddece058940327fe57a6407df22204ee838325a19b90caec247f7fe8231cb0ab4058474
-EBUILD ipmicfg-1.31.1.200623.ebuild 1060 BLAKE2B 57eb760774c9c09a4cc3aa8bf7e147cfbb5d3af67f24e5416a31cdd70e5f7498d114c8705da66e7cd93bd10d138e7d37ce5a398e9c1c9ce97ec387ac51ac3441 SHA512 9b724058ae4dca4bcc80a0b70d84eed416b59f538d2372536468c590052a2c3bc2578a2f847d8dcfc912df97094113da3fff8600bf603927f812e535729528bd
+DIST IPMICFG_1.32.0_build.200820.zip 1821515 BLAKE2B a214d45f0a52ba16e85f4287780da1d7c3b236624139f71e32e0112914864a044a5b1756ee75525bbd9e8c475b39c608e80b3fc679388c3d07b4b2823a36d57d SHA512 c800f8fc3675718a7077cd717d0a810a516f17081c0a1d3a440af4b292f1f908b66e2450a1f8f5efcd34ebcaf9db56a2dc8b4c448d6d920fd36578356f7753dc
+EBUILD ipmicfg-1.32.0.200820.ebuild 885 BLAKE2B 64bf62be524fc2124ca615e0584646ada755629c00a897fe968b34a7581968e0181954b60d23884430837d3239a9d12700d2302408e43064bedb62c5aaecf876 SHA512 3b7c9ddd0a7fd46327eae22a3a741e6fc8f3ba0e312e09d39ff3ea25e1f9fa924261efa84c4c9fb4e44412bc13f993ca5f2a5782a1822a4bbfffcb4edbdd7013
 MISC metadata.xml 331 BLAKE2B 5f6297bfe1e48c20819f052322f825018f8ba39434a23fbb69e5f5630e92fafa43b3bb5e991175f69673baf79d8b4bcdeb95404502593faad8819c5a2c152871 SHA512 379175cdb1d7b9f18f80349817a8a46bcc75c4fd7d7cadd938b9630c341dec359328462072c4f72661af379c054a237a95d0dfb6937d49661cb8203108de0c80
diff --git a/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild b/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild
deleted file mode 100644
index 15d16ef5e366..000000000000
--- a/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.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
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="${PN^^}"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
-HOMEPAGE="https://www.supermicro.com"
-SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="uefi"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist fetch mirror"
-
-S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
-
-QA_PREBUILT="usr/bin/ipmicfg"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg
-
-	if use uefi; then
-		insinto /usr/share/ipmicfg
-		newins UEFI/IPMICFG.efi ipmicfg.efi
-	fi
-
-	# Install docs
-	local DOCS=(
-		"IPMICFG_UserGuide.pdf"
-		"ReleaseNotes.txt"
-	)
-	einstalldocs
-}
diff --git a/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild b/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild
new file mode 100644
index 000000000000..c4778e0cb976
--- /dev/null
+++ b/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN^^}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="https://www.supermicro.com/wftp/utility/{MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="uefi"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
+
+QA_PREBUILT="usr/bin/ipmicfg"
+
+src_install() {
+	newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg
+
+	if use uefi; then
+		insinto /usr/share/ipmicfg
+		newins UEFI/IPMICFG.efi ipmicfg.efi
+	fi
+
+	# Install docs
+	local DOCS=(
+		"IPMICFG_UserGuide.pdf"
+		"ReleaseNotes.txt"
+	)
+	einstalldocs
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 970db73ec183..f573dd496dc8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,6 +6,6 @@ DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9
 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.8.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
+EBUILD portage-3.0.8.ebuild 8380 BLAKE2B 606b98ed8dbd8a33f77ca3f7ad73d6d69975c83b2dc12eae00a4a0db051f01d9631708add45502b4dadcc5da9a3b26c6ae95e4b3f06e1f86fd957609e8001178 SHA512 e46f1ca33494a6cb202f5e7cd40c4345b62d353a522b769d0e93f6f1db43a477b1e4a2b06b5371d0898c844b6580bc459e322353f779d1ba265d11ded3a138a0
 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.8.ebuild b/sys-apps/portage/portage-3.0.8.ebuild
index 28cd3d04cca0..240471a5a151 100644
--- a/sys-apps/portage/portage-3.0.8.ebuild
+++ b/sys-apps/portage/portage-3.0.8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 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"
+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 )"
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index ee7c4d4476b8..db0d204d9dce 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -2,9 +2,8 @@ AUX 50qingy-gentoo.el 241 BLAKE2B 951d9c06cb1b31be819cf687f6bd02fca29fcb35d482cf
 AUX qingy-1.0.0-tinfo.patch 1581 BLAKE2B 4e1dc1328a322b8c2a2b9e7abc05eaad4ba6ba8b208dda28a7648908c6670864fd23f2a7d0472b42ea79521b532e21dc92449ef47c9f7d788342c21ba0fd8001 SHA512 f9ac5d0dba7473de113a360f02f7eeefbb5af70db2c282741697316ddcc81ecc01e2341436e6a6fcb9f43170a4297b2b12aeec352a271ce12b97e6aaf593bac1
 AUX qingy-logrotate 75 BLAKE2B 2c61e97469a1911a3c711321a202b5276a41bf607e4361ef2acf2f2225e6f5752f33d9e8130f5fef682fb0a19f04bb2e2b056904cb24a9daca8f199a921c2850 SHA512 3b22cac09fc7394a4a4aa5a786309378cd769c351eed1e2813b84230c6ec74f7c30bfec9c6a03682b2ad5063a30bbdaac679f9e07bab2cee75ec73dd137aca01
 AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c6eba34ebaa6c3dc9bc5b6f943234c2220dfef8c16fa2bb498ab929ca1c712ecf653664d7372ade7de SHA512 bbbfaea129f8b0ff89a66873f3d2ee2b774ce6f59adfb5efdd7bbaaf7d602a6933e888b68b73bf378864799088bf7f4e645785cbc16c51621bf2fed11a4cc55a
-DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1bcbe7741adb94e8486b81ccb4f9289f6aca7c33081b950f282e6aa0a68b2d23e6235918931faaf05666a4226666600f6b19d3d SHA512 e69743173ea0ff27265dca789f4203b58c271ec6acfeac1ffd87738a3a693f1393778ca70be5d0c8a3e461edfa350047cef3941d8e85679f7c930f3b63c1eeb1
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r4.ebuild 4044 BLAKE2B 63ece0686d4cba32ce9772d5370c5e847cd6bf866a3bacdd51e941c6617ff5b6aad1a4b1e2423ddf5b26e3f17fa02345dd8f471673aaa52fc1c51cf40e8cbbe4 SHA512 8865f6a30c5bad554ae5399c58d0e18f5a0716583c9b2e40c501525200f1f56b405716b3d9058739f1f1e978359b1b8a252690f634ccf2f3095249abb88e4bf6
-MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485
+EBUILD qingy-1.0.0-r4.ebuild 3778 BLAKE2B bf32ab97caf57825efcdcbff9cdf48948d6b56bddd4a4d893377fe86cc6ecf1061795db0f212ef611981da915e647210d4385f0ea1115e3a2dbc01b544a9edf5 SHA512 4d1e326896a4717d0b097ddc8e8c42060eefd144a084cc00c7bc6a92a311e738fccef140fd04bc3e0c0b0738588bd60f4827f8d7ab1c9c8d2807d515a9b4d185
+MISC metadata.xml 455 BLAKE2B 1f5c9e9578a79b34f81001fe4123f9027bd1c08f669359992ec7f046ecbdefc0da541d0c72091c2ae51c1ff4e920f7d7f2c32bc6d7d9feef1c7d587fb3f18e20 SHA512 4f6eed8a90fb3b6dd96a3e7036aeead5b9bb550b92f5b3d519461775a6d1c710e0a3434b31b9e371392c2219e952419a38c1b90edb1f4ddc450281b165a0934b
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index a5a65bc91a7e..6d78e724dd63 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="consolekit">Enable native consolekit support</flag>
 	<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
 </use>
 <upstream>
diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 5bdb362f4cc5..2aae7adf571d 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r4.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
@@ -10,13 +10,12 @@ DESCRIPTION="A DirectFB getty replacement"
 HOMEPAGE="http://qingy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 	mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2
-	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz
-	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz"
+	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
+IUSE="crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:=
@@ -34,9 +33,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${RDEPEND}
-	consolekit? (
-		sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-auth/pambase )
 "
 
@@ -46,8 +42,6 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-tinfo.patch
 	# bug #359637 and bug #462634 - fixes from upstream
 	epatch "${DISTDIR}"/${P}-screensavers.patch.gz
-	# bug #372675 - fix from upstream
-	epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz
 	default
 	mv configure.in configure.ac || die
 	eautoreconf
@@ -72,7 +66,6 @@ src_configure() {
 		--disable-optimizations \
 		--disable-static \
 		--disable-DirectFB-support \
-		$(use_enable consolekit) \
 		$(use_enable pam) \
 		$(use_enable static static-build) \
 		$(use_enable gpm gpm-lock) \
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 93a2a210a531..024cebf694ec 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -2,8 +2,10 @@ DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
 DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242
+DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
 EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b
+EBUILD s6-linux-init-1.0.4.2.ebuild 1684 BLAKE2B 87a4f9184c55aff9b1390c22bc72abbcf71b38451fda08c503c479800d89eabb8c5afc9663bf931800f1c92cdd3cc0e61ae0f0f9abce6114b2723a5c8cda79f1 SHA512 ab6701ff5a1f1f53d48f93c300aaf7f449149e53a0966afd77921ead2f58a3d2b3359f25ccb3b4d86d504afff518e60b5f069fd2f0a70045a6e421401914c465
 MISC metadata.xml 496 BLAKE2B e80d42ffadfc225ac5c6e6bc7470e136057a25c73effd1e0510740631bebec02a5df7b405977aa6be9a9a23cf2af7d5c03c74ca2882164e2394585f01dd6498f SHA512 98e0969469c67f17e91add2fdc82ecc31316e93a597e748119ce44340b81efca9548f3845f8abe9888855d711e2e573e5c8f97ee566ec0ded81a033e410a1d83
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
new file mode 100644
index 000000000000..fac1fd9f99a1
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.6.1.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--skeldir=/etc/s6-linux-init/skel \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 372a7b1c20e7..2c5ec77b61d4 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -2,8 +2,10 @@ DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4
 DIST s6-linux-utils-2.5.0.0.tar.gz 34976 BLAKE2B ccbe5a24c39d32a6d3e9c1ba09c76c278ed33e831ba9d124e30615204f4084823efd13500b2b2a0efa0ddd703996ec3a47ea66a2b5c1f832d8003cffccf6b773 SHA512 0433fd7863135629d2ab849db34c77f0cbc146f7a84833fcb9263d49ed8366f370f0513bb055990e40a17dff69a1b83a741b1bac2fc8d159d866b45a6b81bdc9
 DIST s6-linux-utils-2.5.0.1.tar.gz 35273 BLAKE2B 61ba3a8ee1fce5357d4c3e71b442ade2277adf6b0560646b78cab3b922183ff15478190a3c4b3a7cce88f13d3836711b81f2c37bc7e545012708ee25f7b036cb SHA512 bc4693486299d1027b6ce908684fe2c66b8173b17baad3bb35a660f1d42f00e48ae56c762c17d162c7be978f7246a9ac5218a5c93c0b93f24b5dc881782329d5
 DIST s6-linux-utils-2.5.1.1.tar.gz 35513 BLAKE2B 7b5e613b3ec7a8104cd53ce2a6db921994ded9d890baee022d16f98f461a71804d16122f303ae66f32d3766325d566c80e04e27fda60a61d1f624eb5a65ae178 SHA512 59c58c4d8e13b7a6e0215f21978f8ac2ac54fc3685884204ea1f011f2a882b9381a9686cbb24c9e566e322c14174dda40368c308e37e9c44f6a1687231d108a2
+DIST s6-linux-utils-2.5.1.3.tar.gz 35549 BLAKE2B e39dcf141839e6fc4554ba10fc89daaa7b9600ffa4360c80d3278d49224c88f124588ec988a2386a3243923002a16d9829d4828c829fda18745356fa6774175d SHA512 73c887e67251c162677b2151d37a1cdbb9cee6f50bd52c5eefd4750f9bf77452a023e0484891e384312fb169dfbe02af3d4cfecb17d34f1668cc0acb8d7a9181
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
 EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
 EBUILD s6-linux-utils-2.5.1.1.ebuild 1006 BLAKE2B 9cf302ee56e750aecc9c11b1b5bc0a8c47ea3f1fa5b97c7c2ded615f5eea59bd2793aebca3f58cee10a5cf16fbc5d8a507cce344c9cc32e71980d2d38d0cd020 SHA512 11ce68e1a66e0b13d47c0403c428c0885813ed2004ec3bd7d0520069caed21888106f8b52a826daf2e3253775b67e359320f31fb284b90db4b26a0f93ec07363
+EBUILD s6-linux-utils-2.5.1.3.ebuild 1006 BLAKE2B 775838d0b17dacddba4a208cd0d1c1d37e5f47f822fadd4fbca5ee3b83e1d040900782367969020593d32d1ac96cadb3dbcda84733273ec56d8d9eb5bec0b374 SHA512 919375509aaf59f8050622b6a90245fd319fca97b58045dfb1b7bcb689d49c707596b9253852f1d2424040d9e98b4d3c177529938e7b247391d3447240987ec9
 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
new file mode 100644
index 000000000000..21a3aee0c4af
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static"
+
+RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )"
+DEPEND="${RDEPEND}
+	static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 5f6e138e85a3..e0f2a6d34855 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -2,8 +2,10 @@ DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a
 DIST s6-portable-utils-2.2.1.2.tar.gz 47446 BLAKE2B 31093828bbff8d7ebd68e9b9024abff802511d6def436b6c4a42e127fc8ee84544a3e590db2e59d76f2ab407b29edbd462725d8f6c8b4923b999809c58126c8f SHA512 697356a1bea6a0d9ca2dc995667fb2c3ab0e0ec72f9cba9f64a3b745e17ff85793be4b9a3bfcb8137938b732195fdabd2ffba5cef26f86f3ad2705907c6a8ab4
 DIST s6-portable-utils-2.2.1.3.tar.gz 47619 BLAKE2B fc9c7a77f42bb64bdd1cd1cfd23d9e0aa0a208451d28d7b76b67a91aa93eebc75148604877af16f102b27581d81549c1fd6e9bf8ff6f62ad3bb9e344191c3886 SHA512 6640027e65a19417461e1e9c778d276d6ceb3f95ea5c720dd21b0d1755bb8f1a218cd9f42effd6ab6034889cc415ab935b4583b6696c2a96351417d9a8f4d7b0
 DIST s6-portable-utils-2.2.2.1.tar.gz 47874 BLAKE2B e1a9677c304d256f8a890da9c35716b513971d506e705db847e71355f7e10a49c3b4a3cdec220513964429db2faaecce5dd3c09d94fc71d19fada6f83f7619d9 SHA512 2e74befec59ae6d3f27cb5f2bb92db23af484043e4d5e53e4816d75927059af6698614a4c3ce7ed7e380a88d5bbe88e41dcbc97eb607a10d7a3e46b8a36744ed
+DIST s6-portable-utils-2.2.3.0.tar.gz 49239 BLAKE2B 3be6d6f7b92eea4fb67e3e52ced4409d2bc04c7bb23fea146d778b3739b4682f10dcd2f58cc37a7760368a645d0fa50c887445e6006a563d290c739e72634e9f SHA512 17cb58a49494bba323f031aa07db134505a0884827745ea48e4e93d1ea70b9d4dd141d065b126abb40d5c7625cbb03ba71090e66fd0adb0c54ab49478e929837
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
 EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260
 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
 EBUILD s6-portable-utils-2.2.2.1.ebuild 1017 BLAKE2B c8bf282a83274cd985fbcd41b530fa42d619a4021602a438d4b08daa23bc840cd8054b720a66cca29254e65cadd768925a2e187ddd14e5ac16a83403ff411d2b SHA512 3708099d6318515bc2746b738ed3dbbc8314ba58a7f81e5548f3bffc8cce18c16b6933199a6b64cc6c8fdf0de740a5aeefa924a864e4b8018d93d7ed4fdf38d9
+EBUILD s6-portable-utils-2.2.3.0.ebuild 1017 BLAKE2B 284b5576cf3ac0dff133e3fc70d6c8ec27aad7a820252564f7e8e0a903609e579ade7aa46d794b9710cc11273cbbbe021d9c8d72d453a53de5d17792eb26d7a3 SHA512 9a0a24a5a57eec4271a59bcccdb917ac30175e5191ee5fc2106d161f0446ba4c1dff553e516d3cd0a942658106f52b7bac329d1e9ec7ceb460b49441b009808d
 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
new file mode 100644
index 000000000000..f7e0efbb5a78
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.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
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static"
+
+RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )"
+DEPEND="${RDEPEND}
+	static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 723b38afdfc8..476048deccc4 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,10 +4,12 @@ DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded4
 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
 DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7 SHA512 3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18
 DIST s6-rc-0.5.1.1.tar.gz 97648 BLAKE2B 9c5363fafe19b970e61d5b6bdef1880b1085f4fea67c55485b6dc5c12ce857dd8828cdedd6880808fdb6d664af63ccac1884262f337b12f2a2ea4b2392016aea SHA512 88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772
+DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8 SHA512 663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
 EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db
 EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
 EBUILD s6-rc-0.5.1.1.ebuild 1496 BLAKE2B 55776ae5839593d33b77504e5f78bceac60c007647dee1124532360173cbaf23220c8071012b5da755bca90752226f6ae2c32449104cf7c9c45ebfd8eafbcf41 SHA512 d1fcc1adcfb715d48cbb79db91d6b76114d7e150a4fc5e5e1d80ae64ef4c329f5b25da60590925daaf730393b791fc7081ae8e8037c525d71fae55ac7193caa8
+EBUILD s6-rc-0.5.2.0.ebuild 1505 BLAKE2B c58ece484908002d3d05fb1d7a6cbe28a4afb4dfc64be42978fc9c9fcd79b77c4c40a0ad1d4f0dafb75b446cc48cd53f38b31df39a84d0a5af6cde7434a3867c SHA512 c737b7a4dcb1cf5889143034d405a50d9e8718d6c0f4f687c50bf81ddb8d6464828868e193149501c9cee7d026352332809c5ca93635111ac6b53cfd0510a927
 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
new file mode 100644
index 000000000000..6f0a3d47a42a
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
+	>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+pkg_postinst() {
+	ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
+	ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+	ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index b38c56fa03f5..9970b910bc53 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -5,6 +5,7 @@ DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec
 DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
 DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
 DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff
+DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee
 EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
@@ -12,4 +13,5 @@ EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08
 EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066ccb25af78fa70ad0ed1d624378cfd9769c54439f096f6606ca6edacb9c4955b7f021656f47f24bab0a9ca7 SHA512 33afe19eac96603b5c5a856a437b7c15fa86cec7dc074749e69e4f7e93c32a49ba03f810ab2e14335f7ccb4d5d0fde7c241be3c6b21b0751a8ed34a347ff74a8
 EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912
 EBUILD s6-2.9.0.1.ebuild 1184 BLAKE2B 2efc249add48ac861e56017ce27eba5cfe5d3bb11a5b345c677269ae73e8a1f0d6090ec1bc39e2a0eafe2518bd838c66a95e6b595439a3929badbc19aa51977b SHA512 299f09ccc8be432fe0c71ff3ca900f0ff05345911bed83040fb8c03a1c0a2596274eb5b2fa45947a40181b567a8e92f3045b1f7b2d9bb065119262d1683e769c
-MISC metadata.xml 523 BLAKE2B c4ea2993837db7521d17e1147bc02d366b75fe182bcf62502b90f91abb559ca53eaf8ed81b899b6bc3b6abc5211852919379e2adca996649d168d2ec6574343f SHA512 abc0bd7482be8f1ec719ac7c9dd0a8f754a8d6a4fede9107497cdcf6db3d4b1b57b5b6f38a32c41dbb7db98dd43a10846202ab084dad06dee0fa36d713dd2e17
+EBUILD s6-2.9.2.0.ebuild 1254 BLAKE2B 4f83b4f35ccb8b9f469a987f3966af0599b9dec91d268f342588a3aa070e62b4c505bb72ad8fe9d6422f2d1308c8bdd88c88b8796cb2e2656925f5228a549712 SHA512 9637e4a55844f31e270b66860cbe3138904e8c6ea35a9997241dff026eb57075b66ea59a31ca8245bbc3b93288d061ac6f38f8a5ac1d768d8bc20b0cea488806
+MISC metadata.xml 617 BLAKE2B 54bf4abe6178471732a42ac78f017567932bcfa1579d0815f4b2a365486cbe9ff3a0bee00bd6aa5b1b4a6b27182885790f5d80c099c7f404a28c4fb604a2091e SHA512 644271e7fc3b6bdaf85470bbb908df5a82f3988378a7a001db46d957974e3518664580ba55844917a70fa3f2d1b0480a90e8b7b56e0769209b70240093a84e91
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 1b7eef43c733..1718e243ff88 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -13,4 +13,7 @@
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.
 	</longdescription>
+	<use>
+		<flag name="execline">enable support for <pkg>dev-lang/execline</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
new file mode 100644
index 000000000000..f3a95ba0a93b
--- /dev/null
+++ b/sys-apps/s6/s6-2.9.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+execline static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND="execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] )
+	>=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(usex execline '' '--disable-execline' ) \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 2a3a5ade55c9..198a839682c6 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,3 @@
-DIST sum_2.4.0_Linux_x86_64_20191206.tar.gz 9732263 BLAKE2B 4c0c25ab5d3a8b533487287676efe38df164ab80327016172da76539081b90bb4a1de5a043609f35800a82651335f862ea08aeaa867270a7e21b309372facc81 SHA512 7b320590391434518e74491dbe093689c4dcee2763d361203be2d468fcfb20e508fba489291d4bd08fd97d93d72309def1737c69a34a9dcfefb06cb4b45806b5
-EBUILD smc-sum-2.4.0.20191206.ebuild 938 BLAKE2B 7dfab4976702112788ff228cd6576b896684aacc6b1e1b2877fa0b4a23c666bdeda5690c0d2ce7cc4c0f72137d38487ab2800143a3cadd07c77e3bef2ee7baa4 SHA512 f7ea58623162c521a6f20c33cb1a6e513b00bc4d65c97f65bb33f1c67f083597496a190bf7e1eab61f631b2ccc1e94580924d3cc45ec85feb5e8af5165d7c504
+DIST sum_2.5.0_Linux_x86_64_20200722.tar.gz 11280455 BLAKE2B 5c25c2b35b6d82b1d3c856e97f1669e92ecb3406188398ee29cca44e44bb30e651fe9db7a39c93a78375b3021d5836e8d92b680b07ead0892f588f6ec9a03454 SHA512 af99c3fef1436d1ef97fbd03c619d0f4e1eea9afd00d03c905cf92a5ec826b1a5aec1ae2a2f69fa406eee91d5bed4bd2fcd3935243dc6dbae4efe04e0dcdff21
+EBUILD smc-sum-2.5.0.20200722.ebuild 938 BLAKE2B 7dfab4976702112788ff228cd6576b896684aacc6b1e1b2877fa0b4a23c666bdeda5690c0d2ce7cc4c0f72137d38487ab2800143a3cadd07c77e3bef2ee7baa4 SHA512 f7ea58623162c521a6f20c33cb1a6e513b00bc4d65c97f65bb33f1c67f083597496a190bf7e1eab61f631b2ccc1e94580924d3cc45ec85feb5e8af5165d7c504
 MISC metadata.xml 1097 BLAKE2B 2614ed1fd32c33675e1e78fc069670ec2b156efc376beecead2ebc2d7212e918f0fdf923d90f9d6db61a1c672f565701c2fff812e801a6ed955d299506653cf6 SHA512 cebd02c5e048668caf78a5bfc19114ebef9fd55ae9c25adb8c61275b847d7311ae38ab1825b029770bc191b65b334eafcddcbf1c50825c234542e1454b78e730
diff --git a/sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild b/sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild
similarity index 100%
rename from sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild
rename to sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index fc60f16446c1..f030d7eb0296 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,8 +1,5 @@
 AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
 AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
-DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux.tar.gz 122153416 BLAKE2B 2d4224a76588fa4da41a8080bde5833ce3a7da01a11e45fc48069084077fe2e1e48f5e92ec266b10a390b3a40cfbc66f2b674c9ef59f8b3b11d42cb20eb992bb SHA512 e655e14751906d392f0f528c6d5afe83298f398025c5808d2efed142a3cdf9b56d06964feeed63fef58f2fe793d7de06c3eeb909e4467ce774317bb7971792d1
-DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz 119034481 BLAKE2B 032bbae5a3e608f6f51ae955df875d18a7b260fc0d49d6371af910cc1186c47b3db2b012dccd2837b598d5e405fde01390cfb44a5526297691c9bb99029c2dbd SHA512 9d721b8409510f75dbe36e8b5e3fdfb89f42f85365406f2c53890c1f5a6620f6abe00325017443b9af26bc60aeae7392065eb451d1a318de9898783562b43933
 DIST SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz 78810880 BLAKE2B fa4d0c7ed8cd7fb8b03847b30d22b4c70d74402be50ef217b237a0ba786e264a0832533476db5523cf3ce9a88c2191cbc9ff32d54911dfca54ff8835268f0efd SHA512 7770a1ec468934e1ac89612e77092f83ce91822326279afedcc5da9b5cdd84193e8077b87441c79253e366bde6f1ef3756ff35ff7fce8bc1759bb889ab8b082b
-EBUILD smcipmitool-2.21.0.181029.ebuild 2209 BLAKE2B 0cb30302e5cd7bbf9d0205dba7605d5a124ad5a54b538580b878c9111d24f61d9805011c8513a292525163ababc8f522507a484bafce3a2d26cc38a772bee1ea SHA512 a73f9d575679c44ad14092356ad53e4825690b4a3fbb32b5678cd7441e64d8bf80823d7e04939e1a9008c170f597f59483b758ebd3fcff3c3fc9a2628ff8ddc0
-EBUILD smcipmitool-2.23.0.191216.ebuild 2013 BLAKE2B a7b9c5ad65b954f16a8d5e40059bddf85796629a8090c63783ba69539cbd1e738d16b49348cc9d1906a627d299aee1ac9a4c1cd0028fb5eed33411493049d1ba SHA512 f8d284a8dd6e85a6acbfad95942bdbcf43091574fd5e3c76716192615b2f30956da4a747e7fa70f4814485045c4a3ff7e2b1aba1920fe88d3cc72c29226417e7
+EBUILD smcipmitool-2.23.0.191216.ebuild 1839 BLAKE2B 132b8c51469f0a37bc4ca4aa5170510f2741e2aa9121f056493964ed28941bed8e8fc5d0b8341c7b1b5ce7cf605e3b90260e3dd17d0394fae7b5b7414230dee7 SHA512 31347e3b5f314f2034f13f9f7f77496fb5baeb228cbf05a46872d9401ee64cbaf55d0b86040ca36a6132a6986f51b7fc68af6361f88a7907fefaab4c226fa44e
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild b/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild
deleted file mode 100644
index bd287818fb34..000000000000
--- a/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver java-pkg-2 prefix
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="SMCIPMITool"
-MY_PN_SRC_URI="SMCIPMItool"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="
-	amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )
-"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	net-misc/stunnel
-	sys-libs/ncurses-compat:5
-	virtual/jre:1.8
-"
-
-RESTRICT="bindist fetch mirror"
-
-DIR="/usr/share/${PN}"
-QA_PREBUILT="usr/lib*"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Don't use their scary launchers
-	rm -v lax.jar || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_doso libjcurses.so $(usex amd64 '*64.so' '*32.so')
-
-	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
-	java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}"
-	java-pkg_dolauncher smcipmitool-jviewersmc --jar JViewerSMC.jar -pre "${pre}"
-	java-pkg_dolauncher smcipmitool-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
-	java-pkg_dolauncher smcipmitool --jar SMCIPMITool.jar -pre "${pre}"
-
-	exeinto "${DIR}"/jre/bin
-	newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java
-
-	insinto "${DIR}"/lib/BMCSecurity
-	doins BMCSecurity/*.{crt,key,pem,txt}
-
-	insinto "${DIR}"/lib/BMCSecurity/linux
-	doins BMCSecurity/linux/stunnel.conf
-
-	dosym ../../../../../bin/stunnel "${DIR}"/lib/BMCSecurity/linux/stunnel32
-	dosym ../../../../../bin/stunnel "${DIR}"/lib/BMCSecurity/linux/stunnel64
-
-	local DOCS=(
-		"jcurses.README"
-		"ReleaseNotes.txt"
-		"SMCIPMITool_User_Guide.pdf"
-	)
-	einstalldocs
-}
diff --git a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
index c0b818a212c6..279c66adc7f2 100644
--- a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
+++ b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
@@ -12,7 +12,7 @@ MY_PV="$(ver_cut 1-3)"
 
 DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
 HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
 
 LICENSE="supermicro"
 SLOT="0"
@@ -24,17 +24,11 @@ RDEPEND="
 	virtual/jre:1.8
 "
 
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist mirror"
 
 DIR="/usr/share/${PN}"
 QA_PREBUILT="usr/lib*"
 
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
 src_unpack() {
 	unpack ${A}
 	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64 ${P} || die
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index f607f1552b8d..a35331eb95f6 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -2,5 +2,5 @@ AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0b
 AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792
 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
 DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3
-EBUILD tas-1.6.0.200601.ebuild 1736 BLAKE2B 23465f2a38b3cb4922e94255416a43ca0a44ac5a4e053723f8242314635a3ed9a34a9a3e3d77678704ed6830a85078c79cb91fc12adb61fd91829e7b16dd86b7 SHA512 38c05b38236c5efc4118ac8949001f0e1eaba88ee334e3d97a569fd1860b95b430b6aed0e789b2eb3ec2c6907edd3e9e1d5a2d2ccf5537953c3ebfeb05768322
+EBUILD tas-1.6.0.200601.ebuild 1605 BLAKE2B 09c5ed5740c8fb70ce83c4e4b4ffa14ae343a20daeafc2641e5bee84daf6f20833022a29bb270b6b7d799dc974c204ff8cbee4508dde28f5089a8506145d54a2 SHA512 f98300064d58d2a0e612fb5ff3db26b274c0465f96652788b9a2365a7727e670231983b8d6dbee2d41282e647d73a190f0ee7cb4aff72c4733ce21f91be5fc05
 MISC metadata.xml 871 BLAKE2B c8666715b4e9c7704f8f5464c95a9a3411cb4f97fe6631eccb4bb2a1ae70c987e858a4d32d3f6eef3ddc77d4ff1d8e441877da198e17f47fa65bec7bd915a565 SHA512 6b9b63a492af33946ac54c3a46fb6c27a48e8bd65472e10ab79510722a5a7bcdbd6cbded8f8182773e7fbd478e99d2a520a968e080996aa567289aa14ffe01ed
diff --git a/sys-apps/tas/tas-1.6.0.200601.ebuild b/sys-apps/tas/tas-1.6.0.200601.ebuild
index a2146bbbec85..6301047a3e21 100644
--- a/sys-apps/tas/tas-1.6.0.200601.ebuild
+++ b/sys-apps/tas/tas-1.6.0.200601.ebuild
@@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)"
 
 DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI"
 HOMEPAGE="https://www.supermicro.com"
-SRC_URI="${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
 
 KEYWORDS="-* ~amd64 ~x86"
 LICENSE="BSD supermicro"
@@ -29,7 +29,7 @@ RDEPEND="
 
 BDEPEND="app-arch/unzip"
 
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist mirror"
 
 S="${WORKDIR}"
 
@@ -44,12 +44,6 @@ DOCS=(
 
 CONFIG_CHECK="~IPMI_DEVICE_INTERFACE ~IPMI_HANDLER ~IPMI_SI"
 
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=TAS"
-	elog "and place it in your DISTDIR directory."
-}
-
 src_unpack() {
 	unpack ${A}
 	unpack "${S}"/${MY_PN}_${MY_PV}_build.${MY_DATE}_Linux.tar.gz
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index b6aac33d8db8..d996a18f175f 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
-EBUILD xdg-dbus-proxy-0.1.2.ebuild 554 BLAKE2B 8ffd6e9354ad47c154908dbade626feb2cc5e8d175acae927e3b83cf18ac2d0589cf97058c537c6911dcfcc869618ecfea0e89aba45f285ffea0cc8890ce08f7 SHA512 6c0ca27571526155b6c25b91409cf2179eaf8bec80b9cfb03b676d5028ccdc42029b4475aedd33691183db6b1f8387fe65ef86f1513dfbb63c93eb446caf71f5
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 558 BLAKE2B ac4db5377d7832aaa98a0c2cfde0f2d27637c0e18f6b102633f91915d08c0418895c3d9a24276065e171e5b4530796193c06d50aded45dcd934d7d8c86b42cb9 SHA512 f0de023eddc0c64810a17cc98d6a4ec9369fcc767327666bb88e2f88cc0dfbd4d39eeb3532fdb1edf1f2c2ecbb9d60d32c788613d1bcb6a56c6eab9cbe16f1f6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index a4cfc357adc8..c7971f014d42 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index 00eacc253567..c20987742ee0 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,3 @@
-DIST xdg-desktop-portal-gtk-1.7.1.tar.xz 369932 BLAKE2B 510652a0025fc27d447a0482552a0ae9c8e08f0471166466356043c026c922b1b0779053bcc7902f041f93ccd71e2e71882594eee7f4dda8cea295e419192941 SHA512 2a2326559a4ed7e44ffddc1a6881c25f14822465f5660bc806e7d8a120d66268e2987329f4bc9f7821329eea41ee96b15a39c5f7ac805a1e04d0604a88b31c08
-EBUILD xdg-desktop-portal-gtk-1.7.1_pre.ebuild 954 BLAKE2B 585d0c8aab3bd3da4367ef1a16a6f7fef458ae48197725a08e6984d3920159c0939a4a26aa3d6490e6bd78e44e6baaa073c748d639baac87cea7ecca0fcdfa7e SHA512 e1f4505340f25307ec7e4ac1ff572aba38df46e51580b738b9ed0c76a4758b2d75ab804f77a924d7cf3396d91302d0682997f90b95335943917aa243deda6a73
+DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
+EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 989 BLAKE2B 444acfed3ba0d08f524d9988d3b282ead88d81562b231b02ad221ee0e06922a11d938f2ccde1d953f30f334dfb11dccdea14cbcc296a4918c3253bce3722d6d8 SHA512 2406afcafce75ca6fc1e415e8beec73ced194f43ffaa91edc17ba24a6a2899fcea9b8b8cf9420c501218f162758d9e0c73c595735abc77a23f6e6fdb439d2e66
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
deleted file mode 100644
index ed07582361da..000000000000
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.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 autotools systemd
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="portal backend implementation that is using GTK+ and various pieces of GNOME"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="wayland X"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DEPEND="
-	dev-libs/glib:2
-	gnome-base/gnome-desktop:3=
-	media-libs/fontconfig
-	sys-apps/dbus
-	>=sys-apps/xdg-desktop-portal-1.7
-	x11-libs/cairo[X?]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[wayland?,X?]
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
new file mode 100644
index 000000000000..27f6469c046d
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="portal backend implementation that is using GTK+ and various pieces of GNOME"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:3=
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.7
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[wayland?,X?]
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index f385f2805610..388bd7230ba8 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 0dad223fea44..2e2befb9c58d 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,5 +1,5 @@
-DIST pambase-20200304.tar.gz 3466 BLAKE2B e4d406460d435403ed7a46d517f9006cacc54a94f5019a573c81b331731c88679ed6d388354b5946894bdfada556b4c73735c3f4de88fc7678cd831c68ab46c3 SHA512 c2a7f3fd143637fbdf5c0a3c58ba5a3c23c5e8adb1f057d02b4b9d64660435fc529031a0f710a9e5fc7091710f78dcb2f3e1ff48f033fb491ddd0399ef05b189
 DIST pambase-20200917.tar.gz 3342 BLAKE2B 4dde3a6a4a22f02464a2a703a2385038c53c05398904dc47431880a16d7dd1ba89c8f5fdf19a7d50406f2487f8bdf90264ca2941cc6a2ad9d404e89c3d73edca SHA512 0cae27f7cd7ef258771b61110ba3ce5a44a0f9d71030670b2a40aa47a609d30ae3e3d7bc0649dcce25a2cfe2e1259e6d9ff435118ab1d2db771a162898ab5143
-EBUILD pambase-20200304.ebuild 2079 BLAKE2B b1823baed1275d1da8333ed56640a2b122588bb4c867b29948959351ff54eace5e9a210c7f3e248a132502b807f71a9dfc1a1f24d1b613ec713bcef42291e382 SHA512 d43621824f26e919b40c3f8493703015f4c59079940d3631a10dd9bb7059ce154ddf2220d18809768e62c0f751fda99481e9802d4556e26af4c7739c9ad6e08e
-EBUILD pambase-20200917.ebuild 2640 BLAKE2B e5adae78bf0e9352a9912f5f6f9197206ebfa367754f16920eb55113e5a4f90d58908d40d0115c13215d6e7c6c235261dffba3facf3733b5ab75c8cd6277948e SHA512 69964dd314abe7bd2b6d86faaaa8f16c91fbdde84e2b3b76521e9d7bec5bce6dbbee5746cc95de9ff0b007e7d8798153a8da8f490fa2335829b5259303f103da
-MISC metadata.xml 4101 BLAKE2B ff946b16d2243d607e5f24afbbbe524cb6e01d7a56cf1f1987f10a78dd7591610a9ce839077121590a6c8e320ef44ba0475b2b9ec5c9446e672d17737e9f09b0 SHA512 0dfea40e34cff1d8d8ba37086ef754bc928d6d9aa26dc1a174d69d5199a6a605c135900cd06ef6300fca2c3f8bf51ffaa0d1514690ab84b3cc752ce84a937591
+DIST pambase-20201010.tar.gz 3319 BLAKE2B 269ae31c197cb438169111c079bc91f8c6714b4af1a1e049278c916a2975661b15ceacd8ac06cd9296a64295c876a1241ddec2efa1350e9278ad1cfa3655e750 SHA512 b37c82e8247bd2d90056877f6b1e5c0d943e75df27a08a03fc17865feccdeec30d93691aefdf99bad9618722824756f940525f9091567f71c4cbb3d511e2d745
+EBUILD pambase-20200917.ebuild 2637 BLAKE2B ecefbd2007494af658d926be0050bf170a3464b74756512ae29b06364d898c1dc0ae07eed0c26612a27535bc7ce42ae648806170b1a94fba8079da8b748268c7 SHA512 0b60d5bdc776331dfc73f588c5d12b970c3350e7732e66c1550228d479154e47847760c4c1ad7c51beecb2ba6e4e3d1558f32f1cd342bfb7badcebad8a6673c3
+EBUILD pambase-20201010.ebuild 2637 BLAKE2B ecefbd2007494af658d926be0050bf170a3464b74756512ae29b06364d898c1dc0ae07eed0c26612a27535bc7ce42ae648806170b1a94fba8079da8b748268c7 SHA512 0b60d5bdc776331dfc73f588c5d12b970c3350e7732e66c1550228d479154e47847760c4c1ad7c51beecb2ba6e4e3d1558f32f1cd342bfb7badcebad8a6673c3
+MISC metadata.xml 3810 BLAKE2B f4485cfec915c9e239c9328e6df338ba787ab26c3bb4f84773aa29361f4e2c48b56afb787c176fb38e8dc1c923e07c5baa6aeb5dba2774fe61f20250baf36b7d SHA512 ea58b1a801e68eeb8b7325192f5f26b406879bb70a46383222ffb9f69c71e5f9803532f2cca510ec0bc5cc3a96ceb165ed11725341a51b123fe8d4a712f4c26a
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 18296df50484..6b0d63269f7e 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -10,12 +10,6 @@
 		<name>Sam James</name>
 	</maintainer>
 	<use>
-		<flag name="cracklib">
-			Enable pam_cracklib module on system authentication stack. This
-			produces warnings when changing password to something easily
-			crackable. It requires the same USE flag to be enabled on
-			<pkg>sys-libs/pam</pkg> or system login might be impossible.
-		</flag>
 		<flag name="elogind">
 			Use pam_elogind module to register user sessions with elogind.
 		</flag>
diff --git a/sys-auth/pambase/pambase-20200304.ebuild b/sys-auth/pambase/pambase-20200304.ebuild
deleted file mode 100644
index f7a7d2084a87..000000000000
--- a/sys-auth/pambase/pambase-20200304.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
-
-RESTRICT="binchecks"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-MIN_PAM_REQ=1.1.3
-
-RDEPEND="
-	>=sys-libs/pam-${MIN_PAM_REQ}
-	cracklib? ( sys-libs/pam[cracklib(+)] )
-	elogind? ( sys-auth/elogind[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		sys-auth/pam_krb5
-	)
-	caps? ( sys-libs/libcap[pam] )
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( sys-auth/pam_passwdqc )
-	selinux? ( sys-libs/pam[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( sys-apps/systemd[pam] )
-"
-DEPEND="
-	app-arch/xz-utils
-	app-portage/portage-utils
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_compile() {
-	local linux_pam_version
-	if has_version sys-libs/pam; then
-		local ver_str=$(qatom $(best_version sys-libs/pam) | cut -d ' ' -f 3)
-		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
-	fi
-
-	use_var() {
-		local varname=$(echo "$1" | tr '[:lower:]' '[:upper:]')
-		local usename=${2-$(echo "$1" | tr '[:upper:]' '[:lower:]')}
-		local varvalue=$(usex ${usename})
-		echo "${varname}=${varvalue}"
-	}
-
-	emake \
-		GIT=true \
-		CPP="$(tc-getPROG CPP cpp)" \
-		$(use_var debug) \
-		$(use_var LIBCAP caps) \
-		$(use_var cracklib) \
-		$(use_var passwdqc) \
-		$(use_var elogind) \
-		$(use_var systemd) \
-		$(use_var selinux) \
-		$(use_var nullok) \
-		$(use_var mktemp) \
-		$(use_var pam_ssh) \
-		$(use_var securetty) \
-		$(use_var sha512) \
-		$(use_var KRB5 pam_krb5) \
-		$(use_var minimal) \
-		LINUX_PAM_VERSION=${linux_pam_version}
-}
-
-src_test() { :; }
-
-src_install() {
-	emake GIT=true DESTDIR="${ED}" install
-}
diff --git a/sys-auth/pambase/pambase-20200917.ebuild b/sys-auth/pambase/pambase-20200917.ebuild
index a1bd1d6b4bae..d7f758b33c38 100644
--- a/sys-auth/pambase/pambase-20200917.ebuild
+++ b/sys-auth/pambase/pambase-20200917.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 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="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
@@ -77,7 +77,7 @@ src_configure() {
 src_test() { :; }
 
 src_install() {
-	DOC_CONTENTS=
+	local DOC_CONTENTS
 
 	if use passwdqc; then
 		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
diff --git a/sys-auth/pambase/pambase-20201010.ebuild b/sys-auth/pambase/pambase-20201010.ebuild
new file mode 100644
index 000000000000..d7f758b33c38
--- /dev/null
+++ b/sys-auth/pambase/pambase-20201010.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit pam python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="https://github.com/gentoo/pambase"
+SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( passwdqc pwquality )
+	pwhistory? ( || ( passwdqc pwquality ) )
+"
+
+MIN_PAM_REQ=1.4.0
+
+RDEPEND="
+	>=sys-libs/pam-${MIN_PAM_REQ}
+	elogind? ( sys-auth/elogind[pam] )
+	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_krb5? (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		sys-auth/pam_krb5
+	)
+	caps? ( sys-libs/libcap[pam] )
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
+	pwquality? ( dev-libs/libpwquality[pam] )
+	selinux? ( sys-libs/pam[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	systemd? ( sys-apps/systemd[pam] )
+"
+
+BDEPEND="$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	${EPYTHON} ./${PN}.py \
+	$(usex caps '--libcap' '') \
+	$(usex debug '--debug' '') \
+	$(usex elogind '--elogind' '') \
+	$(usex gnome-keyring '--gnome-keyring' '') \
+	$(usex minimal '--minimal' '') \
+	$(usex mktemp '--mktemp' '') \
+	$(usex nullok '--nullok' '') \
+	$(usex pam_krb5 '--krb5' '') \
+	$(usex pam_ssh '--pam-ssh' '') \
+	$(usex passwdqc '--passwdqc' '') \
+	$(usex pwhistory '--pwhistory' '') \
+	$(usex pwquality '--pwquality' '') \
+	$(usex securetty '--securetty' '') \
+	$(usex selinux '--selinux' '') \
+	$(usex sha512 '--sha512' '') \
+	$(usex systemd '--systemd' '')
+}
+
+src_test() { :; }
+
+src_install() {
+	local DOC_CONTENTS
+
+	if use passwdqc; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file"
+	fi
+
+	if use pwquality; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
+				page and then edit the /etc/security/pwquality.conf file"
+	fi
+
+	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
+
+	dopamd -r stack/.
+}
+
+pkg_postinst() {
+	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
+}
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index 3a5fe0c20852..4dcc986fc5f8 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,6 +1,3 @@
-AUX passwdqc-1.3.0-build.patch 1773 BLAKE2B e954aa56f4f12c57430b9c53cac9220360b6450a747fd50305db8838638833e5f76fc893be762593f89ab02b665499fbc4063dfd7ad3019134ef81771e3dcc50 SHA512 da43381deab4c39e8c905187f17e49379e44b96c729d229a1fa5aff067b510fae5cbb107896fd83273cc8f41e916023eff5d1b1f37ad739e4de3cf3945f289b8
-DIST passwdqc-1.3.0.tar.gz 48833 BLAKE2B bf6353749376ca8b52a8aac89b05561d4a0dde54133361b77228dd4d35f2e1e75f0b53a0f9c4fc2f6be5717110c1d762e2aa76f6461281b60fa3bdc9b19f2f7d SHA512 d9c2fd075ed4ff1f1dfa63fe40010d446abf8db306cacc77fd1e429fbd2dd1a6d2e4e91df46beb4c30bc30ff0cdd183ba85cefd362455ead9629d3a1c4eefece
 DIST passwdqc-1.4.0.tar.gz 55219 BLAKE2B 3f96a2d219ee23f11db2ad8ba433eaa56b97a263ad1a49159e0356b779cb4486ec9aa74cd7002fdd6d273e5a7bae4fe1b94e02f60256d331e5afc30d63e81360 SHA512 b9be6632688a1d7d929ec546679a366a67d44e7841e106c7f739a8e0656842866125160c87b04c8e0b3189a3e85eb182aa789196f68925b2f8ec71cd6a479800
-EBUILD passwdqc-1.3.0.ebuild 1711 BLAKE2B 19a51a550eb5824a35341c0638c1c1fec3d9e5ce73772151b6e4eae9afa99211b562519a796aab117f4ebfad16e2c8716cb067ebc1162da4d021694f38102f72 SHA512 8e245c777ef722106cc0e89d413dfc83b434e9b90ff9559eea47d90245f4e9b8bcf9ed8a15d42922cef7084c8e1be618d60aca6b99b06dc73a619638aecb28e0
-EBUILD passwdqc-1.4.0-r1.ebuild 1282 BLAKE2B 80353f2c519fd5afb65a4d567948407088e3cad8605ac6f87f34aec548f5e27d277619ddbe4f7140dbd59bc823b89fc22a1c9ce5bf8c8bb3d34c022b419c137d SHA512 30806db924279bb17fd0f1466628f51c0bd7a7e110ff2b4959fc6c76f9222f9d232678a6906ad802ec50a01f1f0edae1de57a24ca3cfd0ab8b6b3ff9a4452abc
-MISC metadata.xml 328 BLAKE2B 708e739a28626b1451952b869907c4c2513774329dfdac794178b468ffe1044db82ea5c015c641a5142f1f6ee6176545193e97beed1698f7f8c42a3d38e3f84a SHA512 383c32b28259f9a70406eb6c9a3d05143212a63c347019143983c3e6a2c48eb9a32ed7e8e50c99339b65c60d680b530770c4fa3e826c6e746429274814716d97
+EBUILD passwdqc-1.4.0-r1.ebuild 1274 BLAKE2B 64a1c52ee69fc3697d85d11083a57853eb483c60f7a6c41ada89e06ee8a885f921705a81246b2ad566f6ffa205fd9d2a12334f5b9b17fdb854a3be023a3ae007 SHA512 3c9372041f51b688d43f29aca59f411a77c3497d50a3cce06ad895331486ff6869f95be0670b3f0f6dba9821598455e6e129de644d75ebe70c113aa0ea6098cb
+MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch b/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch
deleted file mode 100644
index c8adeb89b4ab..000000000000
--- a/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -20,10 +20,11 @@
- BINMODE = 755
- CONFDIR = /etc
- CONFMODE = 644
--SHARED_LIBDIR = /lib
-+LIBDIR = lib
-+SHARED_LIBDIR = /$(LIBDIR)
- SHARED_LIBDIR_SUN = /usr/lib
- SHARED_LIBDIR_REL = ../..$(SHARED_LIBDIR)
--DEVEL_LIBDIR = /usr/lib
-+DEVEL_LIBDIR = /usr/$(LIBDIR)
--SECUREDIR = /lib/security
-+SECUREDIR = /$(LIBDIR)/security
- SECUREDIR_SUN = /usr/lib/security
- SECUREDIR_DARWIN = /usr/lib/pam
-@@ -48,7 +49,7 @@
- INSTALL_SUN = /usr/ucb/install -c
- CFLAGS = -Wall -W -O2
- CFLAGS_lib = $(CFLAGS) -fPIC
--CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer
-+CFLAGS_bin = $(CFLAGS)
- 
- LDFLAGS =
- LDFLAGS_shared = --shared
-@@ -93,7 +94,7 @@
- 
- default: all
- 
--all pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils:
-+all lib pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils:
- 	case "`uname -s`" in \
- 	Linux)	$(MAKE) CFLAGS_lib="$(CFLAGS_lib) -DHAVE_SHADOW" \
- 			LDFLAGS_lib="$(LDFLAGS_lib_LINUX)" \
-@@ -126,18 +127,20 @@
- 
- all_wrapped: pam_wrapped utils_wrapped
- 
-+lib_wrapped: $(SHARED_LIB) $(DEVEL_LIB)
-+
- pam_wrapped: $(SHARED_PAM)
- 
- utils_wrapped: $(BINS)
- 
- $(SHARED_LIB): $(OBJS_LIB) $(MAP_LIB)
--	$(LD_lib) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB)
-+	$(LD_lib) $(LDFLAGS) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB)
- 
- $(DEVEL_LIB): $(SHARED_LIB)
- 	$(LN_s) $(SHARED_LIB) $(DEVEL_LIB)
- 
- $(SHARED_PAM): $(OBJS_PAM) $(MAP_PAM) $(DEVEL_LIB)
--	$(LD_lib) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM)
-+	$(LD_lib) $(LDFLAGS) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM)
- 
- pwqgen: $(OBJS_GEN) $(DEVEL_LIB)
- 	$(LD) $(LDFLAGS) $(OBJS_GEN) -L. -lpasswdqc -o $@
diff --git a/sys-auth/passwdqc/metadata.xml b/sys-auth/passwdqc/metadata.xml
index dec6162a1b7c..203fa55c746f 100644
--- a/sys-auth/passwdqc/metadata.xml
+++ b/sys-auth/passwdqc/metadata.xml
@@ -5,7 +5,4 @@
 	<email>zlogene@gentoo.org</email>
 	<name>Mikle Kolyada</name>
 </maintainer>
-<use>
-	<flag name="utils">Install pwqcheck and pwqgen helper utilities</flag>
-</use>
 </pkgmetadata>
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
deleted file mode 100644
index 61f8e548190d..000000000000
--- a/sys-auth/passwdqc/passwdqc-1.3.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 pam eutils toolchain-funcs multilib
-
-DESCRIPTION="Password strength checking library (and PAM module)"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="pam utils"
-
-RDEPEND="
-	pam? (
-		sys-libs/pam
-		!<sys-auth/pam_passwdqc-1.3.0
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.0-build.patch
-	sed -i \
-		-e 's:`uname -s`:Linux:' \
-		Makefile || die
-	# See if the system has a shadow.h. #554504
-	echo '#include <shadow.h>' > "${T}"/test.c
-	if ! $(tc-getCPP) ${CPPFLAGS} "${T}"/test.c >& /dev/null ; then
-		sed -i -e 's:-DHAVE_SHADOW::' Makefile || die
-	fi
-}
-
-_emake() {
-	emake \
-		LIBDIR="$(get_libdir)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	# The use of wrapped targets defeats the Makefile dep tracking.
-	# Build all the targets explicitly after the library.
-	_emake lib
-	if use pam || use utils ; then
-		_emake $(usev pam) $(usev utils)
-	fi
-}
-
-src_install() {
-	_emake \
-		DESTDIR="${ED}" \
-		install_lib $(usex pam install_pam '') $(usex utils install_utils '')
-	dodoc README PLATFORMS INTERNALS
-}
-
-pkg_postinst() {
-	if use pam ; then
-		elog "To activate pam_passwdqc use pam_passwdqc.so instead"
-		elog "of pam_cracklib.so in /etc/pam.d/system-auth."
-		elog "Also, if you want to change the parameters, read up"
-		elog "on the pam_passwdqc(8) man page."
-	fi
-}
diff --git a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
index 3861096f8540..462be697b147 100644
--- a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 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"
 
 RDEPEND="sys-libs/pam"
 DEPEND="${RDEPEND}"
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 8c1932e6f23b..ebb0022fac03 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,20 +1,14 @@
 AUX sssd 489 BLAKE2B 552ffc9c5053e6de3e4d59ae50cbd95ae44460f51d7f753d9792eefb10507225a32beb91c1a47adf0ddbffff339a245f09c260738a781d05a0a955b8bf283148 SHA512 eab8d42d0188e55a18803b738af77c1969bf7c4b59503ee99975d4739e3c532c300e394a393327b7b98254672c1c2b0b15f81c9c27479e7cbbfb4995ab12b43e
 AUX sssd-2.2.3-glibc-2.32-compat.patch 2699 BLAKE2B b05f536d5f189f005cf97e8f64a44ac88e18161b025dfa4e901c7670cebc55090d0c692a9f5a3287313892b59592982f17b22d97aad21a3f58a76d963ff2b31b SHA512 fd1eef46a1127393738bb3bd1aa6eb99a1953afb7e6979b938d4b0519291f74284e5443ba323052f4ee0d54ef64e73200bdd13177c7bca1399ca79336d16b774
 AUX sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch 1180 BLAKE2B 22b12936b8a4256af39396ce31a90742bc93331b2adb9c44442ddd1285ee19e03c24f99b899dfe35768d4383f7e46a241a0fa3975cc3cf4b32e93f1dd0805915 SHA512 d4519c7d9a63d6902da028584379457fda0be7b4e3b882498586504543e944462d93a3fe804f307562d75cd15257a1595c09bc1e804a41f47f1d2ff9999c7973
-AUX sssd-curl-macros.patch 1104 BLAKE2B c03179ab4d608988316224b184c6bc349230e4ee4b79b866615ceb76f091cc28a667f09a591a8b3b98655d1f6160d2e49a4df4177e616d27e7f1e50d465642dc SHA512 77b311c7a8101e5facf046d08deb7a7d363ef6e393fa44feddf82e1398dede44aa3ac57555c10496b5ba1ca370f0f6370ba8c7cd1ae80a3b2657c3e3f9fbb063
-AUX sssd-fix-CVE-2019-3811.patch 3745 BLAKE2B c09dcdd2d4f698771e099c1aca008a42833375b0d723348ead780f84ce3491b54b7a9266b83c5c7e481ec997f69662bd45e33520a0b1ec37b93a8ef800093985 SHA512 b9d95fb9515e367dd7d645778f330a5c7c7fadb9c49ddbbcd78aee18c5918d0bb8e45735c508bf1f574307afc6076a34c420cacb7963b70333e0f678ff3864b6
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
 AUX sssd.service 341 BLAKE2B 0cffcd43786633aa8e5bb42c54741cba676021c5a07554b08499504f8f630ff821ff334a21e2a4f9ae2d77d70d969018dd5a85d11b12bb31235a0ffcda4105c8 SHA512 99510d11f390722f56bc164059033fc40299dd4ea29f98cd5f08b2648f31b2e70afeb6b2d90f919bde595546c80b4e6941cf6f48130661ead09c0576043e4cf5
-DIST sssd-1.16.3.tar.gz 6217114 BLAKE2B eefaf8de466d0d76e9a4b60aefef6eb63c17a55b9a1f2e07e973a61d71cbe5432e92357656a1eb353d45bbc2fa92290cef45898d0b315d4a4c4074652ff25a23 SHA512 6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728
-DIST sssd-2.1.0.tar.gz 6463331 BLAKE2B 9226370dc384c58841d944bdf9b067d953bf138ee7a289f01a4b8bb5d09beee3b9f21609989123d8f4f9fc13237670d61e32dcb194555ddc6785c598ce78d08c SHA512 12a7e5b89d462350af3c43e15b24a437dd985ac4a2e419d5e52cc0d05c6eacb9319d39b23681595ef860120cd1ae6e5fb265054afeddcb05d3d5f5de5d6ffa63
 DIST sssd-2.2.0.tar.gz 6642715 BLAKE2B e6c16ca69effe59769fc166c02203faee445ebe2bf551c6a1460bdee2474ccbce1a38b3aa59b1ae4a79bb170696a784b800a9299025bf6a58bc9aeb94b946338 SHA512 9ebd8784e1f0c72cb808bbc153c0b0aa9bf507938f78336a260073a89b49350dc2c6172653509738ea7a50bb9da596725e1d6c92f99c7a03308aa42f6378dbbb
 DIST sssd-2.2.2.tar.gz 6767578 BLAKE2B e0eedaf1da1de953903730c96479af0709ee14dd83eca82a11316dc96c29573b5f3de5965f386d5c12a69e7d98b6168c9d197bbd46ac51f0122feababe52dfe1 SHA512 4cce8fdbcc05d1469dad5ba987cb0f9bc33702b37f85e8e248975461bb50b0740fec92ff213bdb640b506405be7ead936ff253ab02d4a27205ddf20cc0e54801
 DIST sssd-2.2.3.tar.gz 6894302 BLAKE2B b72443ebd4f50581a0d9d2b7cf691fdda0dfe3cfb2ed82c383595aeca8d6198c7f44f1c49e56bdfeac23f9151897ac2df70d1afbbeceb2231daee71492884420 SHA512 b61d52a53e26e8efa9cb799fc6efc2314bf9d174d3cacfe591a4ca77530637591eacc0dc70c0555252e04a9617e8b134b1ab2d9b0f7351b4228e7b61499e6a10
 DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
-EBUILD sssd-1.16.3-r3.ebuild 6052 BLAKE2B 4b869f470adef34441936aa90a0459bf844b0570c55cdc30b3a921c7fb5cb1ef1da7823cdca8112120291583ef57649979c5f4013954decb147dd029b00c6d2f SHA512 6a9e06194fd352ce9b2afca5c4307de5dbdb29177c67cac2a6ab31d01c4480912d7c9e362d3bf9f8144070c70de4a72c806a65a253046c58f8872ef543a47693
-EBUILD sssd-2.1.0-r1.ebuild 5972 BLAKE2B 59fe7c880dd738dd827f77b22522c8be2ad65f41bf8e5fc447a1c1bcd9631eda1549ddb6b15490c6e64b294338d08d41454da15fe6129dd7fb2611e4463f1349 SHA512 0057b815e569d4e0056d2117eb600f321b77b3dfcacbacb0230433e37134e48a90a54f8bf97444bfc29113860d4014cdf8399e493d9a5851c6bea37bf5209dde
-EBUILD sssd-2.2.0-r1.ebuild 5972 BLAKE2B 59fe7c880dd738dd827f77b22522c8be2ad65f41bf8e5fc447a1c1bcd9631eda1549ddb6b15490c6e64b294338d08d41454da15fe6129dd7fb2611e4463f1349 SHA512 0057b815e569d4e0056d2117eb600f321b77b3dfcacbacb0230433e37134e48a90a54f8bf97444bfc29113860d4014cdf8399e493d9a5851c6bea37bf5209dde
+EBUILD sssd-2.2.0-r1.ebuild 5970 BLAKE2B 700d5ab7604c65ae3a8e293cacb7406dcd7d8749a8513f5df5b81ade4cf7387a79586f08aaf9635f967db2d7171a4fe787a181b82d6cbcecc9d43e680d9f237b SHA512 97099d496e46380d55b059a440920684e88820b526b5ecfb662ad0c9b9c54459d63595a12b1f616dc2eab662eb3e40acc1955c0143df98055a32f70bdbe01b04
 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-r1.ebuild 7537 BLAKE2B ad16d49bd320814edf43bf982ba5e03ccb15e1d81e75d87be7090efbc0805b0bdd4bccf4dc6718a728c85f01e17f5bedec996079616bd4b967052994de6763e3 SHA512 a58f795102845b1f3d8337f11712d268cdd5d24935532d4d4caf3fc9a9a1c2293e0df10ff4703e84bffa067272bebb7e74ccdc27bc249da1eade8d24214a5435
+EBUILD sssd-2.3.1-r2.ebuild 7562 BLAKE2B deb06c3993c582210db0762a179aec92c84c3ac3bdffe93af62cd2c19d104aa4e5c0124ae06651b95ad2b6b05b18823bbddcfd87dd0d1ebd0c06058b87daa53a SHA512 2c165d86609bef9b74b98cac081f5f76ebf9fdfd6732211922c42fa6dd433b301718738699b6523e4f763bcfea4ee0fc405da7953cfdaf0386795ecb1bc3236f
 MISC metadata.xml 1480 BLAKE2B e2903840a3b7e9c92145fdded6fc6a7a275323186d2636e401b9d4c7992b61ea410f43a565482e0bdab6056feaf140a63e3f0db3da532c6686d4f7edb3d58c43 SHA512 35c81d5fdb496a9d2ca39379b0844a30c0313b2606a62e1bbf8816c0b95712089b99e4dd5f526a5bc593e8b93b8c47eb54125e25568b4c485aac379e0764d039
diff --git a/sys-auth/sssd/files/sssd-curl-macros.patch b/sys-auth/sssd/files/sssd-curl-macros.patch
deleted file mode 100644
index 91e71e837875..000000000000
--- a/sys-auth/sssd/files/sssd-curl-macros.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d3cdf9cbfbace4874c6e5c96f1e5ef5b342c813e Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Sun, 16 Dec 2018 20:42:39 +0300
-Subject: [PATCH] tev_curl.c: remove case duplication
-
-CURLE_SSL_CACERT and CURLE_PEER_FAILED_VERIFICATION macros are provided
-by net-misc/curl-7.62.0 and older
----
- tev_curl.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/tev_curl.c b/tev_curl.c
-index 6a7a580..ce6fdba 100644
---- a/src/util/tev_curl.c
-+++ b/src/util/tev_curl.c
-@@ -97,7 +97,6 @@ static errno_t curl_code2errno(CURLcode crv)
-         return ETIMEDOUT;
-     case CURLE_SSL_ISSUER_ERROR:
-     case CURLE_SSL_CACERT_BADFILE:
--    case CURLE_SSL_CACERT:
-     case CURLE_SSL_CERTPROBLEM:
-         return ERR_INVALID_CERT;
- 
-@@ -110,8 +109,6 @@ static errno_t curl_code2errno(CURLcode crv)
-     case CURLE_SSL_ENGINE_NOTFOUND:
-     case CURLE_SSL_CONNECT_ERROR:
-         return ERR_SSL_FAILURE;
--    case CURLE_PEER_FAILED_VERIFICATION:
--        return ERR_UNABLE_TO_VERIFY_PEER;
-     case CURLE_COULDNT_RESOLVE_HOST:
-         return ERR_UNABLE_TO_RESOLVE_HOST;
-     default:
--- 
-2.19.2
\ No newline at end of file
diff --git a/sys-auth/sssd/files/sssd-fix-CVE-2019-3811.patch b/sys-auth/sssd/files/sssd-fix-CVE-2019-3811.patch
deleted file mode 100644
index 87db45fd24bb..000000000000
--- a/sys-auth/sssd/files/sssd-fix-CVE-2019-3811.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 28792523a01a7d21bcc8931794164f253e691a68 Mon Sep 17 00:00:00 2001
-From: Tomas Halman <thalman@redhat.com>
-Date: Mon, 3 Dec 2018 14:11:31 +0100
-Subject: [PATCH] nss: sssd returns '/' for emtpy home directories
-
-For empty home directory in passwd file sssd returns "/". Sssd
-should respect system behaviour and return the same as nsswitch
-"files" module - return empty string.
-
-Resolves:
-https://pagure.io/SSSD/sssd/issue/3901
-
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-(cherry picked from commit 90f32399b4100ce39cf665649fde82d215e5eb49)
----
- src/confdb/confdb.c                      |  9 +++++++++
- src/man/include/ad_modified_defaults.xml | 19 +++++++++++++++++++
- src/responder/nss/nss_protocol_pwent.c   |  2 +-
- src/tests/intg/test_files_provider.py    |  2 +-
- 4 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
-index a3eb9c66d9..17bb4f8274 100644
---- a/src/confdb/confdb.c
-+++ b/src/confdb/confdb.c
-@@ -1301,6 +1301,15 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
-             ret = ENOMEM;
-             goto done;
-         }
-+    } else {
-+        if (strcasecmp(domain->provider, "ad") == 0) {
-+            /* ad provider default */
-+            domain->fallback_homedir = talloc_strdup(domain, "/home/%d/%u");
-+            if (!domain->fallback_homedir) {
-+                ret = ENOMEM;
-+                goto done;
-+            }
-+        }
-     }
- 
-     tmp = ldb_msg_find_attr_as_string(res->msgs[0],
-diff --git a/src/man/include/ad_modified_defaults.xml b/src/man/include/ad_modified_defaults.xml
-index 818a2bf787..425b7e8ee0 100644
---- a/src/man/include/ad_modified_defaults.xml
-+++ b/src/man/include/ad_modified_defaults.xml
-@@ -76,4 +76,23 @@
-             </listitem>
-         </itemizedlist>
-     </refsect2>
-+    <refsect2 id='nss_modifications'>
-+        <title>NSS configuration</title>
-+        <itemizedlist>
-+            <listitem>
-+                <para>
-+                    fallback_homedir = /home/%d/%u
-+                </para>
-+                <para>
-+                    The AD provider automatically sets
-+                    "fallback_homedir = /home/%d/%u" to provide personal
-+                    home directories for users without the homeDirectory
-+                    attribute. If your AD Domain is properly
-+                    populated with Posix attributes, and you want to avoid
-+                    this fallback behavior, you can explicitly
-+                    set "fallback_homedir = %o".
-+                </para>
-+            </listitem>
-+        </itemizedlist>
-+    </refsect2>
- </refsect1>
-diff --git a/src/responder/nss/nss_protocol_pwent.c b/src/responder/nss/nss_protocol_pwent.c
-index af9e74fc86..86fa4ec465 100644
---- a/src/responder/nss/nss_protocol_pwent.c
-+++ b/src/responder/nss/nss_protocol_pwent.c
-@@ -118,7 +118,7 @@ nss_get_homedir(TALLOC_CTX *mem_ctx,
- 
-     homedir = nss_get_homedir_override(mem_ctx, msg, nss_ctx, domain, &hd_ctx);
-     if (homedir == NULL) {
--        return "/";
-+        return "";
-     }
- 
-     return homedir;
-diff --git a/src/tests/intg/test_files_provider.py b/src/tests/intg/test_files_provider.py
-index ead1cc4c34..4761f1bd15 100644
---- a/src/tests/intg/test_files_provider.py
-+++ b/src/tests/intg/test_files_provider.py
-@@ -678,7 +678,7 @@ def test_user_no_dir(setup_pw_with_canary, files_domain_only):
-     Test that resolving a user without a homedir defined works and returns
-     a fallback value
-     """
--    check_user(incomplete_user_setup(setup_pw_with_canary, 'dir', '/'))
-+    check_user(incomplete_user_setup(setup_pw_with_canary, 'dir', ''))
- 
- 
- def test_user_no_gecos(setup_pw_with_canary, files_domain_only):
diff --git a/sys-auth/sssd/sssd-1.16.3-r3.ebuild b/sys-auth/sssd/sssd-1.16.3-r3.ebuild
deleted file mode 100644
index a887a0cb720e..000000000000
--- a/sys-auth/sssd/sssd-1.16.3-r3.ebuild
+++ /dev/null
@@ -1,233 +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 linux-info multilib-minimal pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/SSSD/sssd"
-SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEP="
-	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	net-libs/http-parser
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	dev-libs/jansson
-	net-misc/curl
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-apps/keyutils-1.5:=
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.5 )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	/usr/include/wbclient_sssd.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-	# from 1.15.3
-	/usr/include/sss_certmap.h
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's:#!/sbin/runscript:#!/sbin/openrc-run:' \
-		"${S}"/src/sysv/gentoo/sssd.in || die "sed sssd.in"
-
-	eapply "${FILESDIR}"/${PN}-curl-macros.patch
-	eapply "${FILESDIR}"/${PN}-fix-CVE-2019-3811.patch
-
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myconf=()
-	#Work around linker dependency problem.
-	append-ldflags "-Wl,--allow-shlib-undefined"
-
-	myconf+=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-os=gentoo
-		--with-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--sbindir=/usr/sbin
-		--without-kcm
-		$(use_with samba libwbclient)
-		--with-secrets
-		$(multilib_native_use_with samba)
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(use_enable locator krb5-locator-plugin)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_use_with autofs)
-		$(multilib_native_use_with ssh)
-		--with-crypto="nss"
-		--with-initscript="sysv"
-		--without-python2-bindings
-		--without-python3-bindings
-
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-	)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-			--without-secrets
-			--without-libwbclient
-			--without-kcm
-			--with-crypto=""
-		)
-
-		use locator || myconf+=(
-				KRB5_CONFIG=/bin/true
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib.so .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-	newinitd "${FILESDIR}"/sssd sssd
-
-	keepdir /var/lib/sss/db
-	keepdir /var/lib/sss/deskprofile
-	keepdir /var/lib/sss/gpo_cache
-	keepdir /var/lib/sss/keytabs
-	keepdir /var/lib/sss/mc
-	keepdir /var/lib/sss/pipes/private
-	keepdir /var/lib/sss/pubconf/krb5.include.d
-	keepdir /var/lib/sss/secrets
-	keepdir /var/log/sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-multilib_src_test() {
-	default
-}
-
-pkg_postinst() {
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features. Please see howto in	https://docs.pagure.org/SSSD.sssd/design_pages/index.html#implemented-in-1-16-x"
-}
diff --git a/sys-auth/sssd/sssd-2.1.0-r1.ebuild b/sys-auth/sssd/sssd-2.1.0-r1.ebuild
deleted file mode 100644
index 98af8535a88f..000000000000
--- a/sys-auth/sssd/sssd-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,230 +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 linux-info multilib-minimal pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/SSSD/sssd"
-SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEP="
-	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	net-libs/http-parser
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	dev-libs/jansson
-	net-misc/curl
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-apps/keyutils-1.5:=
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.10.2[winbind] )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	/usr/include/wbclient_sssd.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-	# from 1.15.3
-	/usr/include/sss_certmap.h
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's:#!/sbin/runscript:#!/sbin/openrc-run:' \
-		"${S}"/src/sysv/gentoo/sssd.in || die "sed sssd.in"
-
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myconf=()
-	#Work around linker dependency problem.
-	append-ldflags "-Wl,--allow-shlib-undefined"
-
-	myconf+=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-os=gentoo
-		--with-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--sbindir=/usr/sbin
-		--without-kcm
-		$(use_with samba libwbclient)
-		--with-secrets
-		$(multilib_native_use_with samba)
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(use_enable locator krb5-locator-plugin)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_use_with autofs)
-		$(multilib_native_use_with ssh)
-		--with-crypto="nss"
-		--with-initscript="sysv"
-		--without-python2-bindings
-		--without-python3-bindings
-
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-	)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-			--without-secrets
-			--without-libwbclient
-			--without-kcm
-			--with-crypto=""
-		)
-
-		use locator || myconf+=(
-				KRB5_CONFIG=/bin/true
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib.so .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-	newinitd "${FILESDIR}"/sssd sssd
-
-	keepdir /var/lib/sss/db
-	keepdir /var/lib/sss/deskprofile
-	keepdir /var/lib/sss/gpo_cache
-	keepdir /var/lib/sss/keytabs
-	keepdir /var/lib/sss/mc
-	keepdir /var/lib/sss/pipes/private
-	keepdir /var/lib/sss/pubconf/krb5.include.d
-	keepdir /var/lib/sss/secrets
-	keepdir /var/log/sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-multilib_src_test() {
-	default
-}
-
-pkg_postinst() {
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features. Please see howto in	https://docs.pagure.org/SSSD.sssd/design_pages/smartcard_authentication_require.html"
-}
diff --git a/sys-auth/sssd/sssd-2.2.0-r1.ebuild b/sys-auth/sssd/sssd-2.2.0-r1.ebuild
index 98af8535a88f..7b60f06f16c6 100644
--- a/sys-auth/sssd/sssd-2.2.0-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.2.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
 SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-auth/sssd/sssd-2.3.1-r1.ebuild b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
deleted file mode 100644
index 72dab04b2dc2..000000000000
--- a/sys-auth/sssd/sssd-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://github.com/SSSD/sssd"
-SRC_URI="https://github.com/SSSD/sssd/releases/download/${PN}-${PV//./_}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="pac? ( samba )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=app-crypt/mit-krb5-1.10.3
-	app-crypt/p11-kit
-	>=dev-libs/ding-libs-0.2
-	dev-libs/glib:2
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=dev-libs/libpcre-8.30:=
-	>=dev-libs/popt-1.16
-	>=dev-libs/openssl-1.0.2:0=
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=net-dns/c-ares-1.7.4
-	>=net-nds/openldap-2.4.30[sasl]
-	>=sys-apps/dbus-1.6
-	>=sys-apps/keyutils-1.5:=
-	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	virtual/libintl
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	acl? ( net-fs/cifs-utils[acl] )
-	netlink? ( dev-libs/libnl:3 )
-	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
-	nls? ( >=sys-devel/gettext-0.18 )
-	pac? (
-		app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-		net-fs/samba
-	)
-	python? ( ${PYTHON_DEPS} )
-	samba? ( >=net-fs/samba-4.10.2[winbind] )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	systemd? (
-		dev-libs/jansson:0=
-		net-libs/http-parser:0=
-		net-misc/curl:0=
-	)
-	"
-
-RDEPEND="${DEPEND}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-BDEPEND="${DEPEND}
-	>=sys-devel/autoconf-2.69-r5
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/check
-		dev-libs/softhsm:2
-		dev-util/cmocka
-		net-libs/gnutls[pkcs11,tools]
-		sys-libs/libfaketime
-		sys-libs/nss_wrapper
-		sys-libs/pam_wrapper
-		sys-libs/uid_wrapper
-		valgrind? ( dev-util/valgrind )
-	)
-	man? (
-		app-text/docbook-xml-dtd:4.4
-		>=dev-libs/libxslt-1.1.26
-		nls? ( app-text/po4a )
-	)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-	# from 1.15.3
-	/usr/include/sss_certmap.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's:/var/run:/run:' \
-		"${S}"/src/examples/logrotate || die
-
-	default
-	eautoreconf
-	multilib_copy_sources
-	if use python && multilib_is_native_abi; then
-		python_setup
-	fi
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	myconf+=(
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		--with-pid-path="${EPREFIX}"/run
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-db-path="${EPREFIX}"/var/lib/sss/db
-		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
-		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
-		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
-		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
-		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
-		--with-log-path="${EPREFIX}"/var/log/sssd
-		--with-os=gentoo
-		--with-nscd="${EPREFIX}"/usr/sbin/nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--sbindir=/usr/sbin
-		--with-crypto="libcrypto"
-		$(multilib_native_use_with systemd kcm)
-		$(multilib_native_use_with systemd secrets)
-		$(use_with samba)
-		--with-smb-idmap-interface-version=6
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(use_enable locator krb5-locator-plugin)
-		$(use_enable pac pac-responder)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls)
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with man manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_with autofs)
-		$(multilib_native_with ssh)
-		$(use_enable valgrind)
-		--without-python2-bindings
-		$(multilib_native_use_with python python3-bindings)
-
-	)
-
-	# Annoyingly configure requires that you pick systemd XOR sysv
-	if use systemd; then
-		myconf+=(
-			--with-initscript="systemd"
-			--with-systemdunitdir=$(systemd_get_systemunitdir)
-		)
-	else
-		myconf+=(--with-initscript="sysv")
-	fi
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
-			{NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-			--without-secrets
-			--without-kcm
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-		use doc && emake docs
-		if use man || use nls; then
-			emake update-po
-		fi
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-		use pac && emake sssd_pac_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-		if use python; then
-			python_optimize
-			python_fix_shebang "${ED}"
-		fi
-
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib.so .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-
-		if use pac; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
-			doexe .libs/sssd_pac_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	keepdir /var/lib/sss/db
-	keepdir /var/lib/sss/deskprofile
-	keepdir /var/lib/sss/gpo_cache
-	keepdir /var/lib/sss/keytabs
-	keepdir /var/lib/sss/mc
-	keepdir /var/lib/sss/pipes/private
-	keepdir /var/lib/sss/pubconf/krb5.include.d
-	keepdir /var/lib/sss/secrets
-	keepdir /var/log/sssd
-
-	# strip empty dirs
-	if ! use doc ; then
-		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
-		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
-	fi
-
-	rm -r "${ED}"/run || die
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-pkg_postinst() {
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features. Please see howto in	https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
-}
diff --git a/sys-auth/sssd/sssd-2.3.1-r2.ebuild b/sys-auth/sssd/sssd-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..9526ab80a3f5
--- /dev/null
+++ b/sys-auth/sssd/sssd-2.3.1-r2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://github.com/SSSD/sssd"
+SRC_URI="https://github.com/SSSD/sssd/releases/download/${PN}-${PV//./_}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="pac? ( samba )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=app-crypt/mit-krb5-1.10.3
+	app-crypt/p11-kit
+	>=dev-libs/ding-libs-0.2
+	dev-libs/glib:2
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=dev-libs/libpcre-8.30:=
+	>=dev-libs/popt-1.16
+	>=dev-libs/openssl-1.0.2:0=
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=net-dns/c-ares-1.7.4
+	>=net-nds/openldap-2.4.30[sasl]
+	>=sys-apps/dbus-1.6
+	>=sys-apps/keyutils-1.5:=
+	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.17-r1:=
+	virtual/libintl
+	locator? (
+		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
+		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
+	)
+	acl? ( net-fs/cifs-utils[acl] )
+	netlink? ( dev-libs/libnl:3 )
+	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nls? ( >=sys-devel/gettext-0.18 )
+	pac? (
+		app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+		net-fs/samba
+	)
+	python? ( ${PYTHON_DEPS} )
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	systemd? (
+		dev-libs/jansson:0=
+		net-libs/http-parser:0=
+		net-misc/curl:0=
+	)
+	"
+
+RDEPEND="${DEPEND}
+	>=sys-libs/glibc-2.17[nscd]
+	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+	"
+BDEPEND="${DEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/check
+		dev-libs/softhsm:2
+		dev-util/cmocka
+		net-libs/gnutls[pkcs11,tools]
+		sys-libs/libfaketime
+		sys-libs/nss_wrapper
+		sys-libs/pam_wrapper
+		sys-libs/uid_wrapper
+		valgrind? ( dev-util/valgrind )
+	)
+	man? (
+		app-text/docbook-xml-dtd:4.4
+		>=dev-libs/libxslt-1.1.26
+		nls? ( app-text/po4a )
+	)"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's:/var/run:/run:' \
+		"${S}"/src/examples/logrotate || die
+
+	default
+	eautoreconf
+	multilib_copy_sources
+	if use python && multilib_is_native_abi; then
+		python_setup
+	fi
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		--with-pid-path="${EPREFIX}"/run
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-db-path="${EPREFIX}"/var/lib/sss/db
+		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
+		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
+		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
+		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
+		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
+		--with-log-path="${EPREFIX}"/var/log/sssd
+		--with-os=gentoo
+		--with-nscd="${EPREFIX}"/usr/sbin/nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--sbindir=/usr/sbin
+		--with-crypto="libcrypto"
+		--enable-local-provider
+		$(multilib_native_use_with systemd kcm)
+		$(multilib_native_use_with systemd secrets)
+		$(use_with samba)
+		--with-smb-idmap-interface-version=6
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(use_enable pac pac-responder)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls)
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with man manpages)
+		$(multilib_native_use_with sudo)
+		$(multilib_native_with autofs)
+		$(multilib_native_with ssh)
+		$(use_enable valgrind)
+		--without-python2-bindings
+		$(multilib_native_use_with python python3-bindings)
+	)
+
+	# Annoyingly configure requires that you pick systemd XOR sysv
+	if use systemd; then
+		myconf+=(
+			--with-initscript="systemd"
+			--with-systemdunitdir=$(systemd_get_systemunitdir)
+		)
+	else
+		myconf+=(--with-initscript="sysv")
+	fi
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
+			{NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-secrets
+			--without-kcm
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+		use doc && emake docs
+		if use man || use nls; then
+			emake update-po
+		fi
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+		use pac && emake sssd_pac_plugin.la
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
+		if use python; then
+			python_optimize
+			python_fix_shebang "${ED}"
+		fi
+
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib.so .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+
+		if use pac; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
+			doexe .libs/sssd_pac_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	# strip empty dirs
+	if ! use doc ; then
+		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
+		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
+	fi
+
+	rm -r "${ED}"/run || die
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+pkg_postinst() {
+	elog "You must set up sssd.conf (default installed into /etc/sssd)"
+	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
+	elog "features. Please see howto in	https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 66ab3d080f3b..ebf8b82ccb42 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index e90d82596b9a..13d3467d140f 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
 DIST charliecloud-0.18.tar.gz 366210 BLAKE2B 0da9542cccc39ff6f3ce97532e8576b8eb91c9d7f104fb31c1fe47ca88b3eb0150370fe7585c96a3f9ac3eee28e853866cf9a2c4bfc03b6dd1961d3731ae5439 SHA512 0b23db2348fb1fd491e450fa8684c47dae5acbbdac10fc3b12b5019e1db5f7024d259b43d082e0a4a202b5e79e042e408460d4b52f1e634eff3d4a7f4e68c50b
-EBUILD charliecloud-0.16.ebuild 2026 BLAKE2B 238c72c93696886ee6d4fb233ffea8cb87bf8aba4ccd095ddff7e5986c805d38d64cb1357c45a41de98b9b3d9e2a142ee088c124976fadd6c1ddec8192df7dcb SHA512 133ecfa2d891f9a2d7ee829efb25260652ca6ff5cbc17fb0c059c029c49b4ce730d3a694cafa28daaf47d52a4c35430938b38336498a77a4c9d7cfeb01ea4008
+DIST charliecloud-0.19.tar.gz 370553 BLAKE2B a87fc00a88528dfaf5a0a666ff92b98ee4bc7d37c5eaaa7c5029e4269b497d280e1e84757bf882f94480b618ac2430b0cc0550406317e8247155e1b380d30c8b SHA512 e2a000155ac2cc5bd40e1f2a7c2d873e4860bd5ef28a362ce5a04a1f4152b2ad1124055755c288e6ae5d40067661dfacbb77a528e3c071aa189765e0d29addb5
 EBUILD charliecloud-0.18.ebuild 2088 BLAKE2B bac49be9e8685d0b7f95ef7687de37a4f4d35becef4a028da72cceb777ec097c1035849ec6706029b07e2ea547baed2e049cf054405dc0c218b076140a222ee5 SHA512 bc62ad817d4aab0789e39547fc2070c20b684135b713805e31d41626077248fc4ea74150141eef481ef3644966159fe737d9ef8bfdb6f62d1ce31c49f1a4836a
-EBUILD charliecloud-9999.ebuild 2088 BLAKE2B bac49be9e8685d0b7f95ef7687de37a4f4d35becef4a028da72cceb777ec097c1035849ec6706029b07e2ea547baed2e049cf054405dc0c218b076140a222ee5 SHA512 bc62ad817d4aab0789e39547fc2070c20b684135b713805e31d41626077248fc4ea74150141eef481ef3644966159fe737d9ef8bfdb6f62d1ce31c49f1a4836a
+EBUILD charliecloud-0.19.ebuild 2163 BLAKE2B 6b093391f3bbe38b0604eefa588f9a1fe846bc00afff920ecd12c9d27cddeea1ced4ecdc282c8088d75987e1597c10427abf157f272b3d0936dc31dac35b1ff3 SHA512 aab3d7ad72b2fd95bf0ebeedc4fd81b31b970aa1ab163bcc55aae55fc71694a1240ad15d56c00598d549f721850a6ee81979b795ed43ad19265a2e928c1366f4
+EBUILD charliecloud-9999.ebuild 2163 BLAKE2B 6b093391f3bbe38b0604eefa588f9a1fe846bc00afff920ecd12c9d27cddeea1ced4ecdc282c8088d75987e1597c10427abf157f272b3d0936dc31dac35b1ff3 SHA512 aab3d7ad72b2fd95bf0ebeedc4fd81b31b970aa1ab163bcc55aae55fc71694a1240ad15d56c00598d549f721850a6ee81979b795ed43ad19265a2e928c1366f4
 MISC metadata.xml 809 BLAKE2B 9dc29bca33e3a641ba5ddd913ee58d8c7703c55ca0e32db18a4f20ea70f871bf834637a1dab8934ef0034362dedf6b609acfcc5d534ac72d29b15ae32a56a17a SHA512 212cd70ac3e9fe0b91bc14feceef1f23e90c40c520ea8f9861847c93c6e341ca7f021a61d3608b3fd4a237c7681aa3fa7917c4ef1d849531eda0f3ca10ce4616
diff --git a/sys-cluster/charliecloud/charliecloud-0.16.ebuild b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
deleted file mode 100644
index d1d834d0655c..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.16.ebuild
+++ /dev/null
@@ -1,78 +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 autotools optfeature python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="ch-grow doc examples +pv +squashfs squashfuse"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
-	squashfs? ( sys-fs/squashfs-tools )
-	squashfuse? ( sys-fs/squashfuse )"
-DEPEND="
-	ch-grow? (
-		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-		')
-		net-misc/rsync
-	)"
-
-src_prepare() {
-	default
-	sed -i 's/ -Werror//' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local econf_args=()
-	econf_args+=(
-		$(use_enable doc html)
-		$(use_enable ch-grow)
-		# Libdir is used as a libexec-style destination.
-		--libdir="${EPREFIX}"/usr/lib
-		# Attempts to call python-exec directly otherwise.
-		--with-sphinx-python=${PYTHON}
-	)
-	econf "${econf_args[@]}"
-}
-
-pkg_postinst() {
-	elog "Various builders are supported, as alternative "
-	elog "to the internal ch-grow. The following packages "
-	elog "can be installed to get the corresponding support."
-
-	optfeature "Building with Buildah" app-emulation/buildah
-	optfeature "Building with Docker" app-emulation/docker
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.19.ebuild b/sys-cluster/charliecloud/charliecloud-0.19.ebuild
new file mode 100644
index 000000000000..ff37c4fd92ac
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.19.ebuild
@@ -0,0 +1,80 @@
+# 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 optfeature python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="ch-grow doc examples +squashfs squashfuse"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	squashfs? ( sys-fs/squashfs-tools )
+	squashfuse? ( sys-fs/squashfuse )"
+DEPEND="
+	ch-grow? (
+		$(python_gen_cond_dep '
+			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
+		net-misc/rsync
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=()
+	econf_args+=(
+		$(use_enable doc html)
+		$(use_enable ch-grow)
+		# Libdir is used as a libexec-style destination.
+		--libdir="${EPREFIX}"/usr/lib
+		# Attempts to call python-exec directly otherwise.
+		--with-sphinx-python=${PYTHON}
+		# This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
+		--enable-buggy-build
+	)
+	econf "${econf_args[@]}"
+}
+
+pkg_postinst() {
+	elog "Various builders are supported, as alternative "
+	elog "to the internal ch-grow. The following packages "
+	elog "can be installed to get the corresponding support "
+	elog "and related functionality."
+
+	optfeature "Building with Buildah" app-emulation/buildah
+	optfeature "Building with Docker" app-emulation/docker
+	optfeature "Progress bars during long operations" sys-apps/pv
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index b35d7def4f93..ff37c4fd92ac 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools optfeature python-single-r1
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc examples +pv +squashfs squashfuse"
+IUSE="ch-grow doc examples +squashfs squashfuse"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -31,7 +31,6 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
 	squashfs? ( sys-fs/squashfs-tools )
 	squashfuse? ( sys-fs/squashfuse )"
 DEPEND="
@@ -72,8 +71,10 @@ src_configure() {
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
 	elog "to the internal ch-grow. The following packages "
-	elog "can be installed to get the corresponding support."
+	elog "can be installed to get the corresponding support "
+	elog "and related functionality."
 
 	optfeature "Building with Buildah" app-emulation/buildah
 	optfeature "Building with Docker" app-emulation/docker
+	optfeature "Progress bars during long operations" sys-apps/pv
 }
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 6db44ba6baf9..edd306c5132d 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -5,5 +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
+EBUILD ganglia-3.7.1-r2.ebuild 1911 BLAKE2B ddd66e1b07d971e7025feaa33715375092a0a76a45c08a97b34f0fa623c14480c8b19f1128786e242cd0548dcd4e22533cf9248ec6afa9fce64f47820a7790b9 SHA512 1f7979617733f5484bab56f771cea3e4e71f62f7f2d122f40769ad8c172d5384c3464d26d897ca391ee9d94d7532cf0e12722f51d9c2b49416c1896b7f9c2dae
 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
index a5c08bf4977f..ee9127bb9304 100644
--- a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
 HOMEPAGE="http://ganglia.sourceforge.net/"
@@ -15,8 +12,7 @@ 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} )"
+IUSE="minimal pcre examples"
 
 DEPEND="dev-libs/confuse
 	dev-libs/expat
@@ -24,8 +20,7 @@ DEPEND="dev-libs/confuse
 	net-libs/libnsl:0=
 	net-libs/libtirpc:0=
 	!dev-db/firebird
-	pcre? ( dev-libs/libpcre )
-	python? ( ${PYTHON_DEPS} )"
+	pcre? ( dev-libs/libpcre )"
 
 RDEPEND="
 	${DEPEND}
@@ -33,21 +28,7 @@ RDEPEND="
 
 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)
 
@@ -56,21 +37,11 @@ src_configure() {
 		--enable-gexec \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--enable-static=no \
-		$(use_enable python) \
+		--disable-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}
 
@@ -81,19 +52,11 @@ src_install() {
 	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
@@ -104,23 +67,6 @@ src_install() {
 		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
 }
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index ebab8a39def2..1fc2b1daa8f5 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -6,17 +6,9 @@ AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d6
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
-DIST glusterfs-6.8.tar.gz 7572097 BLAKE2B 76b7c699a4fc864d8074b591b3583030d837a0beb63bb54e93458930a4af29bd9b1874dd33f0b7aecbf57d7dc454d448e67b71f38975281108a9fed76f9cf4aa SHA512 a28af19aa0ab2a356a2b7eff447d6b39ff821d7da59037e91a38d8cb43f51f7007b790f765fcbaccf9107554b59174e72d8b1ae9947e6342d2815bfae1adbad7
-DIST glusterfs-6.9.tar.gz 7580928 BLAKE2B 655544b7ffa70ac9980e1a1041af538f473b6b6c8cb77f6e3447908b903b3a2b3ee0234c18fb71f997f31f24f8a790ab2f5a05a6b392090601db455ac726262a SHA512 3bf167aed4f572f94ad4708c5fff7b578a334af1eb0322c36e15127a2089b6359e8d91a36793d8af93c8f76dbdf6ded649c3e0a6c1a879163c8d8b640cea334b
-DIST glusterfs-7.5.tar.gz 7649044 BLAKE2B 01088654051a33c3a009b42c6e7adf7cabc52927a83a3331eced428ed3e6bfb3f7198fcc53a2b1dce678ac58c2f2619d02cce72a9850a50f3a26b37d39baeeaa SHA512 dfd8f04fb398daa7d7f58ef978ab69c0a55a313ac2af3287f7e1e7044f708317227c8749af5fd8d56844dfb8ad47bbd3214c42b806e2e21191a6a8617ab0be38
-DIST glusterfs-7.6.tar.gz 7653500 BLAKE2B ff3d4817f2a8b85126669cfbe6f58990aaccfffd91464d7acd97d7092c8eb94c21552eaf5e2301e3e6a7f99534b40c2afce1ade593d8ac559baee2d175538333 SHA512 c26b2046e7afdbb37fdd395fd9f692a0513ebb58c91ea223fbbaf9f8b41641b1fd009f2975e187f0feb8d83fb5cd4a8a0c2fdf4591a8a31e920d6bba75ae7c0f
 DIST glusterfs-7.7.tar.gz 7675420 BLAKE2B cadd415053d791f5fe4fddbc45bf237275b29fb0340202eaf81bbd2e98c8e7a1b59fa276b8b47679224198675759287a2245095a751602a866d512155dfa73c8 SHA512 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125
 DIST glusterfs-7.8.tar.gz 7703665 BLAKE2B 39a2b459fc021bf17c2ea12661d8c808a688c5934de087d23550409f6c68dff5ea94156dcba52f15d78db8b600ebf9418152a6d6bf10d1ac6291d43d14f3ceda SHA512 40f7df4bb80a372b370366e8f370f9efdf838122be84d5524b2353027b4eb6005a43b808911214c56411264764164d6480418329db94ed0fe284fdcbd9bccbea
-EBUILD glusterfs-6.8.ebuild 6113 BLAKE2B 32f0c68de4c61fef290d80d13de98240e3da590e6ae60a0b5f9088e92d5b7ada00d7e46d55f15209e053a9b1502b49453f910b3af3e05bfdcb5163638d3b82f8 SHA512 0977bd902bc225f0ea0005ef7d057b72669cb002cf1ca35d7f24a036a45321f81ae981eca7ad69275138fdd08d2fcae4971e2302a41ba3f4e01a4bfa677a96bb
-EBUILD glusterfs-6.9.ebuild 6116 BLAKE2B e7ee1fe782c1ff3fdbd6ecbbd14494654826de439fd95b137546fd9f7259b14788b6caf1d042780579ecbe630e5fe8e1d1261d6d55b7318aa1ca506c1f3768ee SHA512 0464665f3b72f9fecf6bdbea8c3c19c38c780a9288780ba9390920e23ecb089875801b5f625bc47ad84cce9107e58dd14adbc29478a27ffdcfcf6a0b17dc6475
-EBUILD glusterfs-7.5.ebuild 6117 BLAKE2B a2f6a3c7f3e9071066dbdf85c9ae072757160de16eccabbd2fe08ba3fc805220451ff77b3bb3819c41199de61435067234de6ab0d98eb1b6695e5d88a0a8bfce SHA512 2c5ea8cd5d9a6f1957a699248678955c01b64125a9bb35bdbd8f71db6424819213f60c3bc69132dca7e89de3ed7ee497dd656d2eff67c3a1a3ea549466c0bb9f
-EBUILD glusterfs-7.6.ebuild 6116 BLAKE2B e7ee1fe782c1ff3fdbd6ecbbd14494654826de439fd95b137546fd9f7259b14788b6caf1d042780579ecbe630e5fe8e1d1261d6d55b7318aa1ca506c1f3768ee SHA512 0464665f3b72f9fecf6bdbea8c3c19c38c780a9288780ba9390920e23ecb089875801b5f625bc47ad84cce9107e58dd14adbc29478a27ffdcfcf6a0b17dc6475
-EBUILD glusterfs-7.7.ebuild 6024 BLAKE2B aef48438175ce0b69da2c596c0ff7e8ebb7dda0e8dd192c5667cc1acd9944448599c6a704a70f079895157323b95b7748d7e31de07c41473a48bada00c9c7204 SHA512 61e0063c749dd3aa3827d38c63e63c85672a4ecaa87f14fb70d8067df510b75225162b6bee9f0edc28cc0e298f9c84433ddcbf72fdf7fd0f3e41d28d5231bc1e
-EBUILD glusterfs-7.8.ebuild 6025 BLAKE2B dd301333d2a89a836bbb427a1b509cbc6405f125ecde11cb81c10912e841c7b686dbf563ae070dfd5eba79ea52754c6562e7ae0676f49ff89d6875f9f8703522 SHA512 f53a4b1cfe74537e4271ad6e982f883b31c7a256685c382583ecea5e8c280a87d73b3e3c9aaab43772cc16e03e64406538340f8521e358e373abef1decb97164
+EBUILD glusterfs-7.7.ebuild 6021 BLAKE2B 1dd2f57ea59477a40c6b1ce62323134b38813beedf4330e52a153cbf2d892f1364f3d482472bd725e630ae116cd3747543b3696ecdc964f35633635580d7581d SHA512 95e90355346f4edb887d0c5a343b0acb09450d3ad7ef7ce743d835c7d2968c81cdd1fefbfb321c06000c61ecb28ceab985f5edcc7f1a7cba5aa1070fda2e6005
+EBUILD glusterfs-7.8-r1.ebuild 6051 BLAKE2B b724c69f30e04d9e3767d11c0fcacf0e844276516bced38496d02f6d695ec2eeac8b632ea5a4afe9c98618633e19ea8fdfe92688e4bffa0c8efbcc1e08f66e9f SHA512 53790619cc6504f9c0a8172c1b5e68698a3c8003abe83e0513ab72c141c5ecfd226179a9500b9a14663e916086520b3546684ccbc36f47a970a9055a80fde448
 EBUILD glusterfs-9999.ebuild 5975 BLAKE2B e7dff556a3ce1af02657aa623f86870c574524a731ac24b15890e49c1ac1d7c80224354141b4aa59b64c47f851996aafb76ce34fc790b88ba8a8faf12f34bd4d SHA512 6daf0254c09e6d04580a3dfb819380f50fb4721b1afb2c2e765f9c1f80acaa7bfbe131d587ec0a5d44cb56263e03808422b60731eb9b2209698b66a28ccde9c8
 MISC metadata.xml 1361 BLAKE2B 3a105a6248cd2b4c785b15518bca119697aa9b7d3b8609cc38fdd4ec8a401caff9c772f900c65de9b75050994d5b147dd5461747b10b4aac5080ee3c83e8efb1 SHA512 d4aa9447507f9e3e145765e048089e31eac7b5969844798429a142e0089568254ff5ce1401db62addfa4584022f5e84bc1756cb0c7338f4fe08ac348feba77ae
diff --git a/sys-cluster/glusterfs/glusterfs-6.8.ebuild b/sys-cluster/glusterfs/glusterfs-6.8.ebuild
deleted file mode 100644
index 766aac8d9a85..000000000000
--- a/sys-cluster/glusterfs/glusterfs-6.8.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=( python3_{6,7,8} )
-
-inherit autotools elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/705536
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1793990
-	eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-6.9.ebuild b/sys-cluster/glusterfs/glusterfs-6.9.ebuild
deleted file mode 100644
index 14d47e542154..000000000000
--- a/sys-cluster/glusterfs/glusterfs-6.9.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=( python3_{6..9} )
-
-inherit autotools elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/705536
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1793990
-	eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-7.5.ebuild b/sys-cluster/glusterfs/glusterfs-7.5.ebuild
deleted file mode 100644
index 5812e989cf9c..000000000000
--- a/sys-cluster/glusterfs/glusterfs-7.5.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=( python3_{6,7,8} )
-
-inherit autotools elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/705536
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1793990
-	eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-7.6.ebuild b/sys-cluster/glusterfs/glusterfs-7.6.ebuild
deleted file mode 100644
index 14d47e542154..000000000000
--- a/sys-cluster/glusterfs/glusterfs-7.6.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=( python3_{6..9} )
-
-inherit autotools elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/705536
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1793990
-	eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-7.7.ebuild b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
index 2a489801e968..184736b866d0 100644
--- a/sys-cluster/glusterfs/glusterfs-7.7.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
 	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
new file mode 100644
index 000000000000..11c79b9d39cd
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools elisp-common python-single-r1 systemd
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.7-flock.patch"
+)
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/glusterfs-7.8.ebuild b/sys-cluster/glusterfs/glusterfs-7.8.ebuild
deleted file mode 100644
index 2f3011803d87..000000000000
--- a/sys-cluster/glusterfs/glusterfs-7.8.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=( python3_{6..9} )
-
-inherit autotools elisp-common python-single-r1 systemd
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="
-	acct-group/gluster
-	acct-user/gluster
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/acl
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.7-flock.patch"
-)
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
deleted file mode 100644
index 15256ec70c7e..000000000000
--- a/sys-cluster/heartbeat/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX 3.0.4-docs.patch 1735 BLAKE2B 4b203377382d88774f6e2cd535f06c9cccc6fd03599518f952f891cd82cf2ebf351a0ee62c6c67253c4a04e8e3b30db3289eeea55d720f3627e8284a57fc1cff SHA512 d8b9328ad8417998f6b3f8ae06a2d99d1b4a1fc53c21770df58b5ae1d2b38b9a396e5b77c9fc74a8a01e7cb239337bdc1b44065161a21f07261c18b7378c0f44
-AUX 3.0.4-fix_configure.patch 3300 BLAKE2B 6ec12a78004330c0f211c67d75c3957061941f3dae861a42ff836152acaf155bf236298344d4919a03ee2b11708e7cb81d2d35f64282f7abfacb289037b6df3a SHA512 39bb089d2ac6e4d7afb828b24d41e3b261588d8029347ab968dbe3909a3a2a9197fc0ac8f16e920f45870fefaeb86bae064a8625c24ca7cda68cbb79bb1b360b
-AUX 3.0.4-python_tests.patch 468 BLAKE2B bfacca9e7633828a43aef2f8c2af1d0ff93406a35202f5848fc81ea32ff693c7ed3194bdbc3f8df5bad422be2546994e8ad69ea0a895dccd0937abc8e63c64fa SHA512 e5652ec24b7a5b03347baabb4d09f058df9766020879562822ed3edcd26f78d28456df532c6c12dacfb609d197d06dc565f0bf25ba1b33736d89df2d36f43b9b
-AUX 3.0.5-fix_ucast.patch 4343 BLAKE2B 13be56f2e924cd473d535b77da23a947562a282fbd601f8bac5567e28a48b4e647a9e23911f0bc5e14b9b53ec79aefd8d0cf68180dfb1de79a4af6fe6edf034a SHA512 9eac05636bd72be663ab51085310f23ff506290000a8227b24be0efdaa2fb88a7868a848063311af91c0c151e73792a1e9a0ad33ab565f117f339ed6c3241b62
-AUX 3.0.6-configure.patch 2943 BLAKE2B a7a1f162bc6f2c3454ccd3cb60a61aff1464e19054b19740fcfad9282480916f832c36ecb05f0b9d495d51faf40bdd8c8c4b6879887073c3b055b1664eb70de4 SHA512 408402dd41aaa2afd14c5bcfafade753e4f2ca34b7668cb9f29566c3a41cd231ed8ab6b29f9865177c10e820b177aa9a899cf5a2b98db78b267e2bfb8f1d03d6
-AUX 3.0.6-docs.patch 1946 BLAKE2B 28db241adf3112a3122b2fb9cbeb2234eb4a0026c6517d56326d70a2f4930e7a535eb814628bda03b7b53190fb12c3564c318340728bac4aff0f19837c867c79 SHA512 e75f4b75a3340d0df9f81e3ef26a6212b2e6ed447f9f7b4a911f05eb6e383726164e7552e4b20d85874d3d3d7c82ce0aa176e886deab76a944e5d716e4a3a0a2
-AUX 3.0.6-r1-configure.patch 2884 BLAKE2B b994677de15605c76469135e23491c4020a28d378f4d972e59a1cfaf61234ce6c2aefeb768a82e6210d8eb0fec130bc02fed14fffcb09fe7b7628944a88d5945 SHA512 6c8c3b4bc392893684dc3d40954c93c0193c628101e3fb78c4331f5e65b8abdb74dbec24d537a340a5d70459163804818a6e8f4720035a297782182b537df20c
-AUX 3.0.6-r1-heartbeat-init 1781 BLAKE2B 7640093355c7d956ab958f22d1fd364df294fe6374cffe9e676a2a07b0469dad3e714d19f526ed899c5416d533cbdd9732f32320bddda13406ce9c4aad32b1b1 SHA512 9998ada7dcd9eb36aa7269db75f85c7964c76a2c019caf95f4d580b967efd23bf01bdd488325d656debd2f2a029b385450f31d798798465ffab8b180661e5e8a
-AUX heartbeat-init 1711 BLAKE2B c3799754f1925d10b26e44ab7c1437585c368c90f5b99f116f831003b2c47935234bdc3ff5664e6a1dc4db893f4d21a080f19d937eec1eb022266a76bd66c9f3 SHA512 2c91aea1a7fdcfd35a1b7e824fd7467f776f3f1e0d46b8b14a249f756ec6ac4b3ed379f291bc5c8075094bd386e06ca9e15279f136ae89be5c7551b1f20e208d
-DIST STABLE-3.0.5.tar.bz2 538986 BLAKE2B 3087c87acea7d6800e60960e67271263400eaffa929bd9c5cf438cb4c88ec1d03186e197669afa26839b6e42780bb71a7f30cd566696fb6bcb16b5ec876a41e6 SHA512 e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
-DIST STABLE-3.0.6.tar.bz2 532796 BLAKE2B 7c882312a4e528919fd94474233ffa0ac15121ef43a1c461a7e9ae26db91c0bb92b3d90859373e0285cc56ed7981e23592ad5d8b657d2dc5a43c92fc22259741 SHA512 c11fc2e333040b494e63cc0b55d7e5f7555850ba79d8ec6fea17960ec22ee210a81a63a6e486383b6d44d2532c0dc0d69dcffddf9354b7830771a7a532c33f33
-DIST heartbeat-3.0.6.tar.bz2 532796 BLAKE2B 7c882312a4e528919fd94474233ffa0ac15121ef43a1c461a7e9ae26db91c0bb92b3d90859373e0285cc56ed7981e23592ad5d8b657d2dc5a43c92fc22259741 SHA512 c11fc2e333040b494e63cc0b55d7e5f7555850ba79d8ec6fea17960ec22ee210a81a63a6e486383b6d44d2532c0dc0d69dcffddf9354b7830771a7a532c33f33
-EBUILD heartbeat-3.0.5-r3.ebuild 1853 BLAKE2B 1e0b6a3c24693857a42e0b46d503243473c1538da172a96f5d6773acad74f2bf0b94170bcd64636d892d924c8f9893d3865e90224ea9156166ec4a819bc4828a SHA512 31bc91b553856f954f1ca375f8e7f7d84a498e79279500dcce45549bd40509c45d02c8d1633bef221cb5a0b729f044f4c465ce8657a00584c39652fa00e041c9
-EBUILD heartbeat-3.0.6-r1.ebuild 1850 BLAKE2B ec060cdf0fd768f0b542109009cea0285c0182d7121513d74e216515e3074d9d5828a31b3e775e343010a19555655b31f37afaac4af530c4b2d99160840e9e41 SHA512 44723301d1dc3ea4f116b65006a2991dc9a7f9dd318755f726bad774a50d64803d3cdeada0536a4857271bd0db46a9de132c1c281e13195ec3c3d5c3a666cd12
-EBUILD heartbeat-3.0.6.ebuild 1813 BLAKE2B c599d24d425b41f4a50ee4c75183063a8c88fefdd102f3c46f4b28c71493e0a77673764ad7779d0be0ea3b4975964fef136db17a8b18326931144be7601a4a22 SHA512 3d9e3b765f62e27538c89210924773c53c794dcf67f218e36d1719cf93b4c0b9439e58d9530bdde0a5ca2f39e86244bbc973ab4d4883a6f8b7f2e8eabfd3672c
-MISC metadata.xml 263 BLAKE2B c9db7dc7f12c1017bee420587681f80a838eba2efed271c5a1fafa4595993917ea14b69fcc865a225561fa736bd93d9bfdac7b830a50d78707428d7fec4e987e SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5
diff --git a/sys-cluster/heartbeat/files/3.0.4-docs.patch b/sys-cluster/heartbeat/files/3.0.4-docs.patch
deleted file mode 100644
index a558dd36f5a3..000000000000
--- a/sys-cluster/heartbeat/files/3.0.4-docs.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -505,8 +505,15 @@
- AC_PATH_PROGS(TEST, test)
- AC_PATH_PROGS(PKGCONFIG, pkg-config)
- 
--dnl xsltproc is required for building the man pages
--AC_PATH_PROGS(XSLTPROC, xsltproc)
-+AC_ARG_ENABLE([doc],
-+	AS_HELP_STRING([--enable-doc],[Build documentation]
-+))
-+AS_IF([test "x$enable_doc" = "xyes"], [
-+	AC_PATH_PROGS(XSLTPROC, xsltproc)
-+])
-+AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
-+AC_SUBST(XSLTPROC)
-+
- 
- dnl ************************************************************************
- dnl Check whether non-root user can chown.
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -33,11 +33,12 @@
- 
- doc_DATA		= $(OTHER_DOCS)
- 
-+if BUILD_DOC
- man_MANS		= heartbeat.8 apphbd.8 cl_status.1  \
- 			 hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
- 			 ha.cf.5 authkeys.5
- 
--STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
-+STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets
- MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
- HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
- FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
-@@ -47,6 +48,12 @@
- XSLTPROC_HTML_OPTIONS 	?= $(XSLTPROC_OPTIONS)
- XSLTPROC_FO_OPTIONS 	?= $(XSLTPROC_OPTIONS)
- 
-+%.5 %.8 %.1: %.xml
-+	$(XSLTPROC) \
-+	$(XSLTPROC_MANPAGES_OPTIONS) \
-+	$(MANPAGES_STYLESHEET) $<
-+endif
-+
- EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
- 
- ChangeLog: $(SPECSRC)
-@@ -56,7 +63,3 @@
- .html.txt:
- 	if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
- 
--%.5 %.8 %.1: %.xml
--	$(XSLTPROC) \
--	$(XSLTPROC_MANPAGES_OPTIONS) \
--	$(MANPAGES_STYLESHEET) $<
diff --git a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
deleted file mode 100644
index 1df22b337c5a..000000000000
--- a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- Heartbeat-3-0-STABLE-3.0.4/configure.in	2010-12-09 21:09:47.000000000 +0100
-+++ Heartbeat-3-0-STABLE-3.0.4/configure.in	2010-12-28 17:37:45.080773140 +0100
-@@ -243,9 +243,9 @@
- mandir=`var "$mandir" "$exec_prefix/man"`
- dnl docdir is available in autoconf 2.60+, for older versions preseed
- dnl with the same value that 2.60+ uses
--docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
--libdir=`var "$libdir" "$exec_prefix/lib"`
--libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
-+dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-+dnl libdir=`var "$libdir" "$exec_prefix/lib"`
-+dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
- noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
- 
- 
-@@ -284,59 +284,11 @@
-   LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
-   LibCdir=`dirname $LIBC`
-   dirlist=`echo $LibCdir | tr '/' ' '`
--  LibDirSuffix=unknown
--  for dir in $dirlist
--  do
--    case $dir in
--      *lib*)	LibDirSuffix=$dir; break;;
--      *);;
--    esac
--  done
--  case $LibDirSuffix in
--    unknown)	LibDirSuffix=`basename $LibCdir`;;
--  esac
-   OutFileType=`file $tmpOutfile`
-   rm -f $tmpCfile $tmpOutfile
- else
-   AC_MSG_ERROR([Cannot Compile trivial C program])
- fi
--#
--#	The code above doesn't work right everywhere
--#		(like Fedora and OpenBSD) 
--#
--case ${LibDirSuffix} in
--	*lib*)	: Cool;;
--	*)	: Sigh...
--		case $OutFileType in
--		  *64-bit*)	
--		  	case $host_os in
--			  openbsd*)	LibDirSuffix=lib;;
--		  	  *)		LibDirSuffix=lib64;;
--			esac;;
--		  *32-bit*)	LibDirSuffix=lib;;
--		  *)		LibDirSuffix=lib;;
--		esac;;
--esac
--#
--#	This may not yet be quite right for PPC where the default
--#	is to produce 32-bit binaries, even though the OS is 64-bit
--#	or for that matter for system Z, But, it's a lot better than
--#	it used to be.
--#
--AC_MSG_RESULT($LibDirSuffix)
--
--case $libdir in
--  */*${LibDirSuffix})	: Cool ;;
--  *)			: Uh Oh... 
--	libdir=`dirname $libdir`/$LibDirSuffix
--	AC_MSG_WARN([Overriding libdir to: $libdir]);;
--esac
--case $libexecdir in
--  */$LibDirSuffix)	: Cool ;;
--  *)			: Uh Oh... 
--	libexecdir=`dirname $libexecdir`/$LibDirSuffix
--	AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
--esac
- 
- for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
- 	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
-@@ -386,7 +338,6 @@
- fi
- 
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
--GLUE_HEADER=none
- if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
-    GLUE_HEADER=heartbeat/glue_config.h
- else
-@@ -453,15 +404,6 @@
- 
- dnl	We use this in the RPM specfile...
- AC_SUBST(ac_configure_args)
--cleaned_configure_args=""
--for j in ${ac_configure_args}
--do
--  case $j in
--    *--libdir=*|*--libexecdir=*)	;;
--    *)		cleaned_configure_args="$cleaned_configure_args $j";;
--  esac
--done
--AC_SUBST(cleaned_configure_args)
- 
- dnl *************************************************************************
- PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
---- Heartbeat-3-0-STABLE-3.0.5/configure.in	2011-12-28 11:51:05.601673071 +0100
-+++ Heartbeat-3-0-STABLE-3.0.5/configure.in	2011-12-28 11:54:34.223094385 +0100
-@@ -2002,7 +2002,7 @@
- fi
- 
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -ggdb3"
-+  CFLAGS="$CFLAGS"
-   if
-     cc_supports_flag -funsigned-char
-   then
diff --git a/sys-cluster/heartbeat/files/3.0.4-python_tests.patch b/sys-cluster/heartbeat/files/3.0.4-python_tests.patch
deleted file mode 100644
index e6e1071573a9..000000000000
--- a/sys-cluster/heartbeat/files/3.0.4-python_tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/cts/Makefile.am
-+++ b/cts/Makefile.am
-@@ -21,7 +21,7 @@
- 
- ctsdir		= @HA_NOARCHDATAHBDIR@/cts
- 
--cts_PYTHON	=				\
-+cts_SCRIPTS	=				\
- 			CM_fs.py		\
- 			CM_hb.py		\
- 			CM_LinuxHAv2.py		\
-@@ -32,14 +32,12 @@
- 			extracttests.py		\
- 			getpeinputs.sh		\
- 			OCFIPraTest.py		\
--			CIB.py
-+			CIB.py			\
-+			CTSproxy.py		\
-+			LSBDummy
- 
- cts_DATA	=	README
- 
--cts_SCRIPTS	=				\
--			CTSproxy.py		\
--			getpeinputs.sh		\
--			LSBDummy
- 
- all-local: $(cts_PYTHON)
- 
diff --git a/sys-cluster/heartbeat/files/3.0.5-fix_ucast.patch b/sys-cluster/heartbeat/files/3.0.5-fix_ucast.patch
deleted file mode 100644
index 3bec9c89dd86..000000000000
--- a/sys-cluster/heartbeat/files/3.0.5-fix_ucast.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-
-# HG changeset patch
-# User Lars Ellenberg <lars@linbit.com>
-# Date 1392200751 -3600
-# Node ID 37f57a36a2dd1abf8461a9b758e62f6fe7a22f77
-# Parent  6d4324633600dc7ae7aa08c56d86c2fcc767977f
-Medium: fix usage of SO_REUSEPORT in ucast sockets
-
-Linux learned SO_REUSEPORT only with kernel 3.9,
-but some linux headers already define SO_REUSEPORT.
-Which, on older kernels, will result in ENOPROTOOPT,
-"Protocol not available".
-
-Failure to set SO_REUSEPORT is NOT critical in general.
-It *may* be a problem on certain BSDs,
-with more than two nodes, all using ucast.
-
-Refusing to start because of failure to set SO_REUSEPORT is
-not helpful for the vast majority of the clusters out there.
-
-While at it, downgrade "critical" log messages to warnings
-in non-fatal situations.
-
---- a/lib/plugins/HBcomm/ucast.c
-+++ b/lib/plugins/HBcomm/ucast.c
-@@ -461,12 +461,6 @@ static int HB_make_send_sock(struct hb_m
- 	int sockfd;
- 	struct ip_private *ei;
- 	int tos;
--#if defined(SO_BINDTODEVICE)
--	struct ifreq i;
--#endif
--#if defined(SO_REUSEPORT)
--	int i = 1;
--#endif
- 
- 	UCASTASSERT(mp);
- 	ei = (struct ip_private*)mp->pd;
-@@ -494,6 +488,7 @@ static int HB_make_send_sock(struct hb_m
- 
- #if defined(SO_BINDTODEVICE)
- 	{
-+		struct ifreq i;
- 		/*
- 		 *  We want to send out this particular interface
- 		 *
-@@ -515,12 +510,13 @@ static int HB_make_send_sock(struct hb_m
- #endif
- #if defined(SO_REUSEPORT)
- 	{
-+		int one = 1;
- 		/* this is for OpenBSD to allow multiple *
- 		*  ucast connections, e.g. a more than   *
- 		*  two node cluster 			 */
- 
- 		if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT,
--				&i, sizeof(i)) == -1) {
-+				&one, sizeof(one)) == -1) {
- 			PILCallLog(LOG, PIL_CRIT,
- 			  "ucast: error setting option SO_REUSEPORT(w): %s", strerror(errno));
- 			close(sockfd);
-@@ -548,7 +544,7 @@ static int HB_make_receive_sock(struct h
- 	int sockfd;
- 	int bindtries;
- 	int boundyet = 0;
--	int j;
-+	int one = 1;
- 
- 	UCASTASSERT(mp);
- 	ei = (struct ip_private*)mp->pd;
-@@ -563,22 +559,19 @@ static int HB_make_receive_sock(struct h
- 			strerror(errno));
- 		return -1;
- 	}
--	/* 
-- 	 * Set SO_REUSEADDR on the server socket s. Variable j is used
-- 	 * as a scratch varable.
-- 	 *
-- 	 * 16th February 2000
-- 	 * Added by Horms <horms@vergenet.net>
-- 	 * with thanks to Clinton Work <work@scripty.com>
-- 	 */
--	j = 1;
-+	/*
-+	 * Set SO_REUSEADDR on the server socket s.
-+	 * Below, also try to set SO_REUSEPORT,
-+	 * if known and supported.
-+	 */
- 	if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
--			(void *)&j, sizeof j) < 0) {
-+			&one, sizeof(one)) < 0) {
- 		/* Ignore it.  It will almost always be OK anyway. */
--		PILCallLog(LOG, PIL_CRIT,
-+		PILCallLog(LOG, PIL_WARN,
- 			"ucast: error setting socket option SO_REUSEADDR: %s",
- 			strerror(errno));
--	}        
-+	} else
-+		PILCallLog(LOG, PIL_INFO, "ucast: set SO_REUSEADDR");
- #if defined(SO_BINDTODEVICE)
- 	{
- 		/*
-@@ -600,20 +593,32 @@ static int HB_make_receive_sock(struct h
- 	}
- #endif
- #if defined(SO_REUSEPORT)
--	{
-+	/*
-+	 *  Needed for OpenBSD for more than two nodes in a ucast cluster
-+	 */
-+	if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT,
-+			&one, sizeof(one)) == -1) {
- 		/*
--		 *  Needed for OpenBSD for more than two nodes in a ucast cluster
-+		 * Linux learned SO_REUSEPORT only with kernel 3.9,
-+		 * but some linux headers already define SO_REUSEPORT.
-+		 * Which will result in ENOPROTOOPT, "Protocol not available"
-+		 * on older kernels.
-+		 * Failure to set SO_REUSEPORT is NOT critical in general.
-+		 * It *may* be a problem on certain BSDs with more than
-+		 * two nodes all using ucast.
-+		 * Refusing to start because of failure to set SO_REUSEPORT is
-+		 * not helpful for the vast majority of the clusters out there.
- 		 */
--		int i = 1;
--		if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT,
--				&i, sizeof(i)) == -1) {
-+		if (errno == ENOPROTOOPT) {
-+			PILCallLog(LOG, PIL_WARN,
-+			  "ucast: error setting option SO_REUSEPORT: %s", strerror(errno));
-+		} else {
- 			PILCallLog(LOG, PIL_CRIT,
--			  "ucast: error setting option SO_REUSEPORT(r) %s", strerror(errno));
--			close(sockfd);
-+			  "ucast: error setting option SO_REUSEPORT: %s", strerror(errno));
- 			return -1;
- 		}
--		PILCallLog(LOG, PIL_INFO, "ucast: set SO_REUSEPORT(w)");
--	}
-+	} else
-+		PILCallLog(LOG, PIL_INFO, "ucast: set SO_REUSEPORT");
- #endif
- 
- 	/* Try binding a few times before giving up */
-
diff --git a/sys-cluster/heartbeat/files/3.0.6-configure.patch b/sys-cluster/heartbeat/files/3.0.6-configure.patch
deleted file mode 100644
index 36054dd23d3b..000000000000
--- a/sys-cluster/heartbeat/files/3.0.6-configure.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -ru a/configure.ac b/configure.ac
---- a/configure.ac	2015-02-04 15:57:04.000000000 +0100
-+++ b/configure.ac	2017-04-25 13:33:58.668521006 +0200
-@@ -243,9 +243,9 @@
- mandir=`var "$mandir" "$exec_prefix/man"`
- dnl docdir is available in autoconf 2.60+, for older versions preseed
- dnl with the same value that 2.60+ uses
--docdir=`var "$docdir" "${datadir}/doc/${HB_PKG}"`
--libdir=`var "$libdir" "$exec_prefix/lib"`
--libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
-+dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-+dnl libdir=`var "$libdir" "$exec_prefix/lib"`
-+dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
- noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
- 
- 
-@@ -284,53 +284,12 @@
-   LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
-   LibCdir=`dirname $LIBC`
-   dirlist=`echo $LibCdir | tr '/' ' '`
--  LibDirSuffix=unknown
--  for dir in $dirlist
--  do
--    case $dir in
--      *lib*)	LibDirSuffix=$dir; break;;
--      *);;
--    esac
--  done
--  case $LibDirSuffix in
--    unknown)	LibDirSuffix=`basename $LibCdir`;;
--  esac
-   OutFileType=`file $tmpOutfile`
-   rm -f $tmpCfile $tmpOutfile
- else
-   AC_MSG_ERROR([Cannot Compile trivial C program])
- fi
--#
--#	The code above doesn't work right everywhere
--#		(like Fedora and OpenBSD) 
--#
--case ${LibDirSuffix} in
--	*lib*)	: Cool;;
--	*)	: Sigh...
--		case $OutFileType in
--		  *64-bit*)	
--		  	case $host_os in
--			  openbsd*)	LibDirSuffix=lib;;
--		  	  *)		LibDirSuffix=lib64;;
--			esac;;
--		  *32-bit*)	LibDirSuffix=lib;;
--		  *)		LibDirSuffix=lib;;
--		esac;;
--esac
--#
--#	This may not yet be quite right for PPC where the default
--#	is to produce 32-bit binaries, even though the OS is 64-bit
--#	or for that matter for system Z, But, it's a lot better than
--#	it used to be.
--#
--AC_MSG_RESULT($LibDirSuffix)
- 
--case $libdir in
--  */*${LibDirSuffix})	: Cool ;;
--  *)			: Uh Oh... 
--	libdir=`dirname $libdir`/$LibDirSuffix
--	AC_MSG_WARN([Overriding libdir to: $libdir]);;
--esac
- for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
- 	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
- do 
-@@ -379,7 +338,6 @@
- fi
- 
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
--GLUE_HEADER=none
- if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
-    GLUE_HEADER=heartbeat/glue_config.h
- else
-@@ -463,15 +421,6 @@
- 
- dnl	We use this in the RPM specfile...
- AC_SUBST(ac_configure_args)
--cleaned_configure_args=""
--for j in ${ac_configure_args}
--do
--  case $j in
--    *--libdir=*|*--libexecdir=*)	;;
--    *)		cleaned_configure_args="$cleaned_configure_args $j";;
--  esac
--done
--AC_SUBST(cleaned_configure_args)
- 
- dnl *************************************************************************
- PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
-@@ -2087,7 +2036,7 @@
- fi
- 
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -ggdb3"
-+  CFLAGS="$CFLAGS"
-   if
-     cc_supports_flag -funsigned-char
-   then
diff --git a/sys-cluster/heartbeat/files/3.0.6-docs.patch b/sys-cluster/heartbeat/files/3.0.6-docs.patch
deleted file mode 100644
index 7c5c9573109f..000000000000
--- a/sys-cluster/heartbeat/files/3.0.6-docs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ru a/configure.ac b/configure.ac
---- a/configure.ac	2015-02-04 15:57:04.000000000 +0100
-+++ b/configure.ac	2017-04-25 11:57:33.706753890 +0200
-@@ -574,8 +574,14 @@
- AC_PATH_PROGS(TEST, test)
- PKG_PROG_PKG_CONFIG
- 
--dnl xsltproc is required for building the man pages
--AC_PATH_PROGS(XSLTPROC, xsltproc)
-+AC_ARG_ENABLE([doc],
-+	AS_HELP_STRING([--enable-doc],[Build documentation]
-+))
-+AS_IF([test "x$enable_doc" = "xyes"], [
-+	AC_PATH_PROGS(XSLTPROC, xsltproc)
-+])
-+AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
-+AC_SUBST(XSLTPROC)
- 
- dnl ************************************************************************
- dnl Check whether non-root user can chown.
-diff -ru a/doc/Makefile.am b/doc/Makefile.am
---- a/doc/Makefile.am	2015-02-04 15:57:04.000000000 +0100
-+++ b/doc/Makefile.am	2017-04-25 11:58:35.459257834 +0200
-@@ -33,11 +33,12 @@
- 
- doc_DATA		= $(OTHER_DOCS)
- 
-+if BUILD_DOC
- man_MANS		= heartbeat.8 apphbd.8 cl_status.1  \
- 			 hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
- 			 ha.cf.5 authkeys.5
- 
--STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
-+STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets
- MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
- HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
- FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
-@@ -47,6 +48,12 @@
- XSLTPROC_HTML_OPTIONS 	?= $(XSLTPROC_OPTIONS)
- XSLTPROC_FO_OPTIONS 	?= $(XSLTPROC_OPTIONS)
- 
-+%.5 %.8 %.1: %.xml
-+	$(XSLTPROC) \
-+	$(XSLTPROC_MANPAGES_OPTIONS) \
-+	$(MANPAGES_STYLESHEET) $<
-+endif
-+
- EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
- 
- ChangeLog: $(SPECSRC)
-@@ -55,8 +62,3 @@
- 
- .html.txt:
- 	if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
--
--%.5 %.8 %.1: %.xml
--	$(XSLTPROC) \
--	$(XSLTPROC_MANPAGES_OPTIONS) \
--	$(MANPAGES_STYLESHEET) $<
diff --git a/sys-cluster/heartbeat/files/3.0.6-r1-configure.patch b/sys-cluster/heartbeat/files/3.0.6-r1-configure.patch
deleted file mode 100644
index ab24282e4208..000000000000
--- a/sys-cluster/heartbeat/files/3.0.6-r1-configure.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -ru a/configure.ac b/configure.ac
---- a/configure.ac	2015-02-04 15:57:04.000000000 +0100
-+++ b/configure.ac	2017-04-25 13:33:58.668521006 +0200
-@@ -243,9 +243,9 @@
- mandir=`var "$mandir" "$exec_prefix/man"`
- dnl docdir is available in autoconf 2.60+, for older versions preseed
- dnl with the same value that 2.60+ uses
--docdir=`var "$docdir" "${datadir}/doc/${HB_PKG}"`
--libdir=`var "$libdir" "$exec_prefix/lib"`
-+dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-+dnl libdir=`var "$libdir" "$exec_prefix/lib"`
- libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
- noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
- 
- 
-@@ -284,53 +284,12 @@
-   LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
-   LibCdir=`dirname $LIBC`
-   dirlist=`echo $LibCdir | tr '/' ' '`
--  LibDirSuffix=unknown
--  for dir in $dirlist
--  do
--    case $dir in
--      *lib*)	LibDirSuffix=$dir; break;;
--      *);;
--    esac
--  done
--  case $LibDirSuffix in
--    unknown)	LibDirSuffix=`basename $LibCdir`;;
--  esac
-   OutFileType=`file $tmpOutfile`
-   rm -f $tmpCfile $tmpOutfile
- else
-   AC_MSG_ERROR([Cannot Compile trivial C program])
- fi
--#
--#	The code above doesn't work right everywhere
--#		(like Fedora and OpenBSD) 
--#
--case ${LibDirSuffix} in
--	*lib*)	: Cool;;
--	*)	: Sigh...
--		case $OutFileType in
--		  *64-bit*)	
--		  	case $host_os in
--			  openbsd*)	LibDirSuffix=lib;;
--		  	  *)		LibDirSuffix=lib64;;
--			esac;;
--		  *32-bit*)	LibDirSuffix=lib;;
--		  *)		LibDirSuffix=lib;;
--		esac;;
--esac
--#
--#	This may not yet be quite right for PPC where the default
--#	is to produce 32-bit binaries, even though the OS is 64-bit
--#	or for that matter for system Z, But, it's a lot better than
--#	it used to be.
--#
--AC_MSG_RESULT($LibDirSuffix)
- 
--case $libdir in
--  */*${LibDirSuffix})	: Cool ;;
--  *)			: Uh Oh... 
--	libdir=`dirname $libdir`/$LibDirSuffix
--	AC_MSG_WARN([Overriding libdir to: $libdir]);;
--esac
- for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
- 	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
- do 
-@@ -379,7 +338,6 @@
- fi
- 
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
--GLUE_HEADER=none
- if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
-    GLUE_HEADER=heartbeat/glue_config.h
- else
-@@ -463,15 +421,6 @@
- 
- dnl	We use this in the RPM specfile...
- AC_SUBST(ac_configure_args)
--cleaned_configure_args=""
--for j in ${ac_configure_args}
--do
--  case $j in
--    *--libdir=*|*--libexecdir=*)	;;
--    *)		cleaned_configure_args="$cleaned_configure_args $j";;
--  esac
--done
--AC_SUBST(cleaned_configure_args)
- 
- dnl *************************************************************************
- PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
-@@ -2087,7 +2036,7 @@
- fi
- 
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -ggdb3"
-+  CFLAGS="$CFLAGS"
-   if
-     cc_supports_flag -funsigned-char
-   then
diff --git a/sys-cluster/heartbeat/files/3.0.6-r1-heartbeat-init b/sys-cluster/heartbeat/files/3.0.6-r1-heartbeat-init
deleted file mode 100644
index 5e15b322f503..000000000000
--- a/sys-cluster/heartbeat/files/3.0.6-r1-heartbeat-init
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-HA_DIR=/etc/ha.d
-. $HA_DIR/shellfuncs
-HA_DAEMON_DIR=/usr/libexec/heartbeat
-HA_LIB_DIR=/usr/lib/heartbeat
-HA_SHARE_DIR=/usr/share/heartbeat
-
-depend() {
-	use logger
-	need net
-}
-
-opts="start stop status reload restart"
-
-CheckBool() {
-	case `echo "$1" | tr A-Z a-z` in
-		y|yes|enable|on|true|1)     true;;
-		*)                          false;;
-	esac
-}
-
-# Run pre-startup script if it exists
-RunStartStop() {
-	[ -f $HA_DIR/resource.d/startstop ] && $HA_DIR/resource.d/startstop  "$@"
-}
-
-start() {
-	checkpath -q -d -m 0755 -o root:root /var/run/heartbeat
-
-	ebegin "Starting heartbeat"
-
-	. $HA_DIR/shellfuncs
-
-	# start the log subsystem
-	CheckBool "`ha_parameter use_logd`" && \
-	 ( ${HA_LIB_DIR}/ha_logd -s &>/dev/null || \
-           ${HA_LIB_DIR}/ha_logd -d -c /etc/ha.d/ha_logd.cf)
-
-	RunStartStop pre-start
-
-	CheckBool "`ha_parameter crm`" || \
-		${HA_SHARE_DIR}/ResourceManager verifyallidle
-
-	${HA_DAEMON_DIR}/heartbeat &>/dev/null
-	ret=$?
-
-	RunStartStop post-start
-
-	eend ${ret}
-}
-
-stop() {
-	ebegin "Stopping heartbeat"
-
-	RunStartStop pre-stop
-
-	${HA_DAEMON_DIR}/heartbeat -k &>/dev/null
-	ret=$?
-
-	RunStartStop post-stop ${ret}
-
-	# stop log subsystem
-	CheckBool "`ha_parameter use_logd`" && \
-	( ${HA_LIB_DIR}/ha_logd -s &>/dev/null && \
-          ${HA_LIB_DIR}/ha_logd -k &>/dev/null )
-
-	eend ${ret}
-}
-
-status() {
-	${HA_DAEMON_DIR}/heartbeat -s
-}
-
-reload() {
-	ebegin "Reloading heartbeat"
-	${HA_DAEMON_DIR}/heartbeat -r &>/dev/null
-	eend $?
-}
-
-restart() {
-	. $HA_DIR/shellfuncs
-
-	sleeptime=$(( `ha_parameter deadtime` + 10 ))
-
-	svc_stop
-
-	ebegin "  waiting ${sleeptime}s to allow resource takeover to complete"
-	sleep ${sleeptime}
-	eend 0
-
-	svc_start
-}
diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init
deleted file mode 100644
index 9316fcc81e8f..000000000000
--- a/sys-cluster/heartbeat/files/heartbeat-init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-HA_DIR=/etc/ha.d
-. $HA_DIR/shellfuncs
-
-depend() {
-	use logger
-	need net
-}
-
-opts="start stop status reload restart"
-
-CheckBool() {
-	case `echo "$1" | tr A-Z a-z` in
-		y|yes|enable|on|true|1)     true;;
-		*)                          false;;
-	esac
-}
-
-# Run pre-startup script if it exists
-RunStartStop() {
-	[ -f $HA_DIR/resource.d/startstop ] && $HA_DIR/resource.d/startstop  "$@"
-}
-
-start() {
-	checkpath -q -d -m 0755 -o root:root /var/run/heartbeat
-
-	ebegin "Starting heartbeat"
-
-	. $HA_DIR/shellfuncs
-
-	# start the log subsystem
-	CheckBool "`ha_parameter use_logd`" && \
-	 ( /usr/lib/heartbeat/ha_logd -s &>/dev/null || \
-           /usr/lib/heartbeat/ha_logd -d -c /etc/ha.d/ha_logd.cf)
-
-	RunStartStop pre-start
-
-	CheckBool "`ha_parameter crm`" || \
-		/usr/lib/heartbeat/ResourceManager verifyallidle
-
-	/usr/lib/heartbeat/heartbeat &>/dev/null
-	ret=$?
-
-	RunStartStop post-start
-
-	eend ${ret}
-}
-
-stop() {
-	ebegin "Stopping heartbeat"
-
-	RunStartStop pre-stop
-
-	/usr/lib/heartbeat/heartbeat -k &>/dev/null
-	ret=$?
-
-	RunStartStop post-stop ${ret}
-
-	# stop log subsystem
-	CheckBool "`ha_parameter use_logd`" && \
-	( /usr/lib/heartbeat/ha_logd -s &>/dev/null && \
-          /usr/lib/heartbeat/ha_logd -k &>/dev/null )
-
-	eend ${ret}
-}
-
-status() {
-	/usr/lib/heartbeat/heartbeat -s
-}
-
-reload() {
-	ebegin "Reloading heartbeat"
-	/usr/lib/heartbeat/heartbeat -r &>/dev/null
-	eend $?
-}
-
-restart() {
-	. $HA_DIR/shellfuncs
-
-	sleeptime=$(( `ha_parameter deadtime` + 10 ))
-
-	svc_stop
-
-	ebegin "  waiting ${sleeptime}s to allow resource takeover to complete"
-	sleep ${sleeptime}
-	eend 0
-
-	svc_start
-}
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild
deleted file mode 100644
index d0a16996c2b3..000000000000
--- a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1
-
-DESCRIPTION="Heartbeat high availability cluster manager"
-HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"
-SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="doc snmp static-libs"
-
-RDEPEND="sys-cluster/cluster-glue
-	dev-libs/glib:2
-	virtual/ssh
-	net-libs/gnutls
-	snmp? ( net-analyzer/net-snmp )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )"
-
-PDEPEND="sys-cluster/resource-agents"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}
-
-PATCHES=(
-	"${FILESDIR}/3.0.4-fix_configure.patch"
-	"${FILESDIR}/3.0.4-docs.patch"
-	"${FILESDIR}/3.0.4-python_tests.patch"
-	"${FILESDIR}/3.0.5-fix_ucast.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	ewarn "If you're upgrading from heartbeat-2.x please follow:"
-	ewarn "https://www.gentoo.org/proj/en/cluster/ha-cluster/heartbeat-upgrade.xml"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	cp "${FILESDIR}"/heartbeat-init "${WORKDIR}" || die
-	sed -i \
-		-e "/ResourceManager/ s/lib/share/" \
-		-e "s:lib:$(get_libdir):g" \
-		"${WORKDIR}"/heartbeat-init || die
-}
-
-src_configure() {
-	econf \
-		--disable-fatal-warnings \
-		$(use_enable static-libs static) \
-		$(use_enable doc) \
-		--disable-tipc \
-		--enable-dopd \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${WORKDIR}/heartbeat-init" heartbeat
-
-	# fix collisions
-	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h || die
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-
-	if use doc ; then
-		dodoc README doc/*.txt doc/AUTHORS
-	fi
-}
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild
deleted file mode 100644
index 26457bab784e..000000000000
--- a/sys-cluster/heartbeat/heartbeat-3.0.6-r1.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Heartbeat high availability cluster manager"
-HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"
-SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc snmp static-libs"
-
-RDEPEND="sys-cluster/cluster-glue
-	dev-libs/glib:2
-	virtual/ssh
-	net-libs/gnutls
-	snmp? ( net-analyzer/net-snmp )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )"
-
-PDEPEND="sys-cluster/resource-agents"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}
-
-PATCHES=(
-	"${FILESDIR}/3.0.6-r1-configure.patch"
-	"${FILESDIR}/3.0.6-docs.patch"
-	"${FILESDIR}/3.0.4-python_tests.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	ewarn "If you're upgrading from heartbeat-2.x please follow:"
-	ewarn "https://www.gentoo.org/proj/en/cluster/ha-cluster/heartbeat-upgrade.xml"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	cp "${FILESDIR}"/3.0.6-r1-heartbeat-init "${WORKDIR}"/heartbeat-init || die
-	sed -i \
-		-e "s:HA_LIB_DIR=/usr/lib/:HA_LIB_DIR=/usr/$(get_libdir)/:g" \
-		"${WORKDIR}"/heartbeat-init || die
-}
-
-src_configure() {
-	econf \
-		--disable-fatal-warnings \
-		$(use_enable static-libs static) \
-		$(use_enable doc) \
-		--disable-tipc \
-		--enable-dopd \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${WORKDIR}/heartbeat-init" heartbeat
-
-	# fix collisions
-	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h || die
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-
-	if use doc ; then
-		dodoc README doc/*.txt doc/AUTHORS
-	fi
-}
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild
deleted file mode 100644
index 1d86b2f1ab01..000000000000
--- a/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Heartbeat high availability cluster manager"
-HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"
-SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc snmp static-libs"
-
-RDEPEND="sys-cluster/cluster-glue
-	dev-libs/glib:2
-	virtual/ssh
-	net-libs/gnutls
-	snmp? ( net-analyzer/net-snmp )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )"
-
-PDEPEND="sys-cluster/resource-agents"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}
-
-PATCHES=(
-	"${FILESDIR}/3.0.6-configure.patch"
-	"${FILESDIR}/3.0.6-docs.patch"
-	"${FILESDIR}/3.0.4-python_tests.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	ewarn "If you're upgrading from heartbeat-2.x please follow:"
-	ewarn "https://www.gentoo.org/proj/en/cluster/ha-cluster/heartbeat-upgrade.xml"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	cp "${FILESDIR}"/heartbeat-init "${WORKDIR}" || die
-	sed -i \
-		-e "/ResourceManager/ s/lib/share/" \
-		-e "s:lib:$(get_libdir):g" \
-		"${WORKDIR}"/heartbeat-init || die
-}
-
-src_configure() {
-	econf \
-		--disable-fatal-warnings \
-		$(use_enable static-libs static) \
-		$(use_enable doc) \
-		--disable-tipc \
-		--enable-dopd \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${WORKDIR}/heartbeat-init" heartbeat
-
-	# fix collisions
-	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h || die
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-
-	if use doc ; then
-		dodoc README doc/*.txt doc/AUTHORS
-	fi
-}
diff --git a/sys-cluster/heartbeat/metadata.xml b/sys-cluster/heartbeat/metadata.xml
deleted file mode 100644
index f3834ba82253..000000000000
--- a/sys-cluster/heartbeat/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>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index a4ac4e743f35..0b83aa3e6bd5 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -16,5 +16,5 @@ EBUILD kube-apiserver-1.17.4.ebuild 1126 BLAKE2B 671e10c4dd12456049f4726ceadc725
 EBUILD kube-apiserver-1.18.8.ebuild 981 BLAKE2B 17432b3409ef9bec20e9f6995c8ff400b312b3798c50dfdd8f856f181b6ba741cdab0274fa99a0604ed74cd788183983078fbce965d0534ffb1d40c0e767fbcb SHA512 336a831540df29e80b34a93f9b4af67cdc4ec0f7dc740e4c1af4d1ecd220d9c5183d59d305ed92ad4be4dc5c2952364a72c2939a86008bb3daa8a179952cda05
 EBUILD kube-apiserver-1.18.9.ebuild 1005 BLAKE2B a5012338e60aa1ddebb47360b366bfb3b0dc0ab303bad91b7595287ff883058628ec96c4936e0084c314542b917ae8f6e1c29c9f7eb926555c59f097681ff295 SHA512 48aebd74d74e744e9f579e923459369a36774f80a17e81876664c0aae38d26b1d017f8656c968d4ca922c5bb2f66d5656a44a4d6b059cdcebb353202c1cca103
 EBUILD kube-apiserver-1.19.1.ebuild 988 BLAKE2B e97c6c79c21b7a898a8abed3f571fbc097aa3683b15887a2aa975cc8619cdae058cf3a109968afd4baf826470136de9099a3283df82c4fc2a96ba4895a3715f9 SHA512 4a1622dc3577501db3d6166d65830955ccfa98d27ad10df665d06da2de26d8552d13944c8909e8a77fdc02e2f4fb7cb6645911ee5fd65d78bedb89da81f2fb64
-EBUILD kube-apiserver-1.19.2.ebuild 983 BLAKE2B 9474bdf62d9a22e4d755ad32f8d06f050dfa8e520330aee5e5690f49c5722a2d7b6ab0bc2a200f8fe31dfd04fbf12387020792003765492ffba7b24a42b1dd6e SHA512 940e6a16c7f3c5a38aa5b8cfa5db357690331b7eaae60000168fbaa04b6f3b3c146f50eb74c718f84f97f8f15782d2b5602b5415239c24212e46960000b1ec11
+EBUILD kube-apiserver-1.19.2.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.2.ebuild
index 990e8375f176..0c60e4a0143a 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.2.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.2.ebuild
@@ -19,6 +19,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index e91342189366..c817a5faaa30 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -16,5 +16,5 @@ EBUILD kube-controller-manager-1.17.4.ebuild 1153 BLAKE2B 2ad827e85b8bfbd74c278b
 EBUILD kube-controller-manager-1.18.8.ebuild 916 BLAKE2B e8700bde48417106302eed56b70638810baf7a740d7537c2e07b59c0c9aa0a68eaa5e62b0c390c5e167514be96e1ac871212d2dc1b4bb93f8bcf0f695d302f46 SHA512 7949f3fa90e79ae65e883ff6c232fd4d3efbab6503bbf1426739b6403511e48ec892dc38be26cc937183d1b2bb0566b1e19bc20551e72a811413e2046ad57e8d
 EBUILD kube-controller-manager-1.18.9.ebuild 996 BLAKE2B 1b71359d516c24758c4c22ef0724aad19fd7cffabc0a1e22eba9809e635099d1934336309ba7330801eacdb2ec17136e080ac3de2868d56670d15216d3781042 SHA512 dc4c0d820fcdc1602952e42f4868f9e7a2a7f10a3b49633b11807e4a6bd22be44e19f4306aaf88b1a3b1f0442173fde980c0c7534c078e535f1251aa66548d00
 EBUILD kube-controller-manager-1.19.1.ebuild 916 BLAKE2B e8700bde48417106302eed56b70638810baf7a740d7537c2e07b59c0c9aa0a68eaa5e62b0c390c5e167514be96e1ac871212d2dc1b4bb93f8bcf0f695d302f46 SHA512 7949f3fa90e79ae65e883ff6c232fd4d3efbab6503bbf1426739b6403511e48ec892dc38be26cc937183d1b2bb0566b1e19bc20551e72a811413e2046ad57e8d
-EBUILD kube-controller-manager-1.19.2.ebuild 1014 BLAKE2B 7f9203140f31dbbea3a7fe2a176544e8a37f25b828436066e312f298dcbc6c8060e5b8a47f4a99487a08cb2420dcb1c54524825fdbfeb4f4d2c09ff2aa2e4e25 SHA512 82b9f09af2a6fc5311f5581f0d5df173c99efd78412cb49d391566899fefbd6342dfecf381046ca61969ce642f8e341745beba09e042bfa5f9701e1c2c42db4a
+EBUILD kube-controller-manager-1.19.2.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.2.ebuild
index 8cfdbdc861b6..7ebd21720e51 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.2.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.2.ebuild
@@ -18,7 +18,7 @@ COMMON_DEPEND="acct-group/kube-controller-manager
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
-BDEPEND="=dev-lang/go-1.14*"
+BDEPEND=">=dev-lang/go-1.15"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 57d8caccdc66..830c8ea9bf6c 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -10,5 +10,5 @@ EBUILD kube-proxy-1.17.12.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9
 EBUILD kube-proxy-1.17.3.ebuild 1035 BLAKE2B 68fa466d990f76cddfa22c6bdc7023ddb471c5d0ad074422b4edfd3812c110d801e8171c3d4964430fd1f9189c2d67ca017425a1283b229b3fa7c13dbdee794b SHA512 c22fbfa6ea34a7d292f2eed5b9d1d674be6361f16d80b71d71d8f3a1ae8d883b843814bbfa7b427387cc0708fb0924cad9e6097f2bf0437a06ca48efdf0a4f97
 EBUILD kube-proxy-1.17.4.ebuild 1035 BLAKE2B 68fa466d990f76cddfa22c6bdc7023ddb471c5d0ad074422b4edfd3812c110d801e8171c3d4964430fd1f9189c2d67ca017425a1283b229b3fa7c13dbdee794b SHA512 c22fbfa6ea34a7d292f2eed5b9d1d674be6361f16d80b71d71d8f3a1ae8d883b843814bbfa7b427387cc0708fb0924cad9e6097f2bf0437a06ca48efdf0a4f97
 EBUILD kube-proxy-1.18.9.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9993d8a5c0eca7121d771763dadc8bca702822c73362031609b9c15e05cacbac7a25d86f2df043d45242f1ff4a2d94 SHA512 57eb38bf2e407b32c61e1389e8b278c3d49602ca5480380d9cc7d86ce4beb781b5a7c64980b4c2cce6eb6d604ed220930eeb33fdd0189299688a04ff95f423c8
-EBUILD kube-proxy-1.19.2.ebuild 900 BLAKE2B a1a44946dae4bd48f14bb2813b73a022ea2bd33414fcca5d72713219ce7e69e3e8718aa09188b2d8240aba8999068a50113d66c02c5a50807e69a85583b55e80 SHA512 192a11952000001dd0775aa1121c56d9c121c4d7c53c64a37469dd380226dff29d4ed73f67935720d00faba3e2072009b05b96bed3fc7ea2c5c0c6bc5ed0f9fe
+EBUILD kube-proxy-1.19.2.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
 MISC metadata.xml 362 BLAKE2B 7f3bc6132d658d3af0f5ed69dc10e06a6aa93bcbf229a1f089ea6ff9d72fa4c489c2374e2932898d75d5eef61e6ccf1875ccb8c783c34864fd976ae845f10f28 SHA512 51b04b1a97ab16a620347142992b59fdeaacbec1940e69a7a98df386f978024fb27b92dd0ae7557ed1c31c36bc34ff7d2c86c935ce0e01dfbb1bd8d7080d807c
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.2.ebuild
index 324ae6a0bf0f..2bf8b1a469e1 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.2.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.2.ebuild
@@ -15,6 +15,7 @@ IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
 	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 684e23033289..131f2500749f 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -10,5 +10,5 @@ EBUILD kube-scheduler-1.17.12.ebuild 988 BLAKE2B 4c7066b2bced869b9fda00d96eb3b01
 EBUILD kube-scheduler-1.17.3.ebuild 1126 BLAKE2B 0d50f6da953e1a038d716b0b87284dd875686f1494a2dead30938b4549b37524ac027cf8a600ffac2c5965da13a9d2536f3348024d3ab8459ed83252c7d036fd SHA512 79eb3308402764b2ea332a67fbf3a2933675f3d9d9ce7fa3dca702366cc09f32d5b462b2361649e9d4f3fedb20d89a081eec1881fb9103afc22971b87611175f
 EBUILD kube-scheduler-1.17.4.ebuild 1126 BLAKE2B 0d50f6da953e1a038d716b0b87284dd875686f1494a2dead30938b4549b37524ac027cf8a600ffac2c5965da13a9d2536f3348024d3ab8459ed83252c7d036fd SHA512 79eb3308402764b2ea332a67fbf3a2933675f3d9d9ce7fa3dca702366cc09f32d5b462b2361649e9d4f3fedb20d89a081eec1881fb9103afc22971b87611175f
 EBUILD kube-scheduler-1.18.9.ebuild 987 BLAKE2B 85eebb87511bc0da654ec974f732d6ad6a62f524c311b8a78610df1da1c1eb0fd68932643398867dbdca87cc4a404034a6f6bdd10ed7e2d30aa9068319ec8207 SHA512 16f09a1f8f9fc3f73cce86763821a04390d8c8a0a4e82c61bf003e17ded37a3d5dd213567d8ce5ecef5c21c2ef9b0adb37544ac78330ec72bf82cf13a18390b5
-EBUILD kube-scheduler-1.19.2.ebuild 958 BLAKE2B 2202dbb3ab4e03b42eb6409bbacbcfa1b1394e630c2b35fc3276119598f431c92de91a172e9662a3bd325581536e7e45bc303588cafc5b120d9b75dd47875ea6 SHA512 60df55da494ea0eccfd864d74d7cd0c783f9ac78a5892312dd0f8968612b632cc653f684f57a2db746378c3e55bde917c8118f17fd698f179f00dca4f0e95187
+EBUILD kube-scheduler-1.19.2.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.2.ebuild
index 86e4c1bd6231..177edc1feff5 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.2.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.2.ebuild
@@ -18,6 +18,7 @@ COMMON_DEPEND="acct-group/kube-scheduler
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 74eac9258d5e..73cd1b4371cb 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -9,5 +9,5 @@ EBUILD kubeadm-1.17.12.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a6
 EBUILD kubeadm-1.18.8.ebuild 869 BLAKE2B fb668700da46e79d2fbc6b8091101478e30c46aa75cce920fe81cff91b65bfdc3ba1da4530619be76f4e5058946395d6a53717c680d7f609c86e0364a80a2aff SHA512 cefdbc6c641172c608ceb724a3cfb90db7ba2782b79396c4b89b673edbe1d8028dca392073de213a0369283aeae2e155190b2928fc066bec18d22d7105ca0328
 EBUILD kubeadm-1.18.9.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a609e687ed4806c0e07a42d103acd4e97986b67e2e7de94648233a205b85d9642a802e2863ec941ab6fdee632785 SHA512 1fba5a6a6bfa5513c53220d62f67adf6508b53c48e0d195ca363ccb9b7f56bc3290cd3a30fea925aab95da7410c6e33a8d525604918fc2416a97bf0a7564ff9b
 EBUILD kubeadm-1.19.1.ebuild 878 BLAKE2B 97372397c3de4e3de0f038bfd0c36f4ca190c2c02ffcf0e83453343dbc4f4f9c8c9bbc4f250f61ce62b9b64cf419241095a8839a41fce0cd1d54444dc49be42c SHA512 2a78347e5bdcf493ece5b8495fdfb94121057e679d25f766da238e8a23b8930435e32cc4ea45cc03ce3cee855c2e82ba3d6300394e7871741f9b0ed8f40a73dc
-EBUILD kubeadm-1.19.2.ebuild 878 BLAKE2B 15dc9311c913b7a8b50d3c002f08773d4b4e02d1ea2381ee885d38467d3249a21a71067018df2f2038848a147aaa1f486b0fdf67d784be075e422fd9667ce0e8 SHA512 082f4a7e083946efffcc791aca4658f8b6a1408adc9cadbbd3bd7d1869aabdc740e59bf7bff0252527601061fe71cfede02173674281fe60fd5630fa2150e130
+EBUILD kubeadm-1.19.2.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
 MISC metadata.xml 917 BLAKE2B ece7788c2a425d9663a25793715a9a2b1227c76f4ca0606340adf98bf524325524cbfde458125fc20cdfe4278950f4109d6a8a4d31c066f7884c33d856b5cd31 SHA512 587a9b0e0de0e18ccd2b8de9929f588c270172e795cede9093fa2380aa422f67e6e35ea0f534d8507ec278448bb1a7a2832bff561a92f8663e15824130be450a
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.2.ebuild
index 691a05d866ef..192287ce82c9 100644
--- a/sys-cluster/kubeadm/kubeadm-1.19.2.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.19.2.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e40d78c3efef..78cfd7474fcc 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -7,5 +7,5 @@ EBUILD kubectl-1.17.12.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8
 EBUILD kubectl-1.17.3.ebuild 1051 BLAKE2B a0bcd5e270a4b55cd36974b519cf48cfd4bf717fbd2101054ae5b39479a8ea8351754a3f2819f685fb1114c70f5196b152aea69ff08ca893a335cbce186512c6 SHA512 32322c110477b4b44d066b0c59d12991597b6d772d9f79b0ce10516c8563c3edc3e55b61f27bd5e5ed7567837615eb7a5b9b766786291683a4d26e2a4f4d385e
 EBUILD kubectl-1.17.4.ebuild 1051 BLAKE2B a0bcd5e270a4b55cd36974b519cf48cfd4bf717fbd2101054ae5b39479a8ea8351754a3f2819f685fb1114c70f5196b152aea69ff08ca893a335cbce186512c6 SHA512 32322c110477b4b44d066b0c59d12991597b6d772d9f79b0ce10516c8563c3edc3e55b61f27bd5e5ed7567837615eb7a5b9b766786291683a4d26e2a4f4d385e
 EBUILD kubectl-1.18.9.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8a2d1d3beb4236be91acdaf4f601bed9a08acb6d802cf6ceaa295ea9ff8592668868962155a8f621b9612475989 SHA512 6219eabfd961215925d0ce1817c9f6e1a3491a2471279005d8b1547451816456995635d046771e32c9b9dcd01575b1f2bdc43f03256e9be0f982e7f6b2096cd4
-EBUILD kubectl-1.19.2.ebuild 872 BLAKE2B 41416094a6dfdd710fd88ef2619ce4f5901a45524f07185a4470769262925b976fee0add8a29087838cbc68404ae1e89084c4004a1ed94be51d8943c7001e90f SHA512 afd51635ab0873936133bf045aae0b4f40e8b8fc6f79e225549479249aa80c9c95daad302ec48abecca648d4d983c20212b1ea25e88242763c2b9de8beae08cb
+EBUILD kubectl-1.19.2.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
 MISC metadata.xml 334 BLAKE2B e4daad1c0150025addcba294ef07c06e004c6d713e0d03a72b70a51bc44d6a4b0a86c9cd543af113c312f693d79c2985b679d6774a54370e9af9b0430de63f22 SHA512 f894ee487b6aff7d302bef231d72faba7ae9c0aa673974b306a4b74fe3b90dbc62c49b6bd829cc1b439a6d820ffe94db3a15ea2209250fc3b13c8b06297af27c
diff --git a/sys-cluster/kubectl/kubectl-1.19.2.ebuild b/sys-cluster/kubectl/kubectl-1.19.2.ebuild
index 3c9b5ec41411..716d7d53396c 100644
--- a/sys-cluster/kubectl/kubectl-1.19.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.19.2.ebuild
@@ -14,6 +14,8 @@ KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index d18e750be4ef..9be381cce839 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -12,5 +12,5 @@ EBUILD kubelet-1.17.12.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5
 EBUILD kubelet-1.17.3.ebuild 1215 BLAKE2B aaa430e041597b155183233742531db60fccc16d479e421c7d8a0e946294ffc27422566fa686b3dd1a2902b34568709a06e1b9cbc4981cdf793388008f20d2b5 SHA512 f62b07ae957ba610564284b17ef694c4555d8fdd5f62267d34f76319ccbb3036653e1d45f3b7f07c972a08ed2751dada1748c3ebe25ce4321ebcdf00df306637
 EBUILD kubelet-1.17.4.ebuild 1215 BLAKE2B aaa430e041597b155183233742531db60fccc16d479e421c7d8a0e946294ffc27422566fa686b3dd1a2902b34568709a06e1b9cbc4981cdf793388008f20d2b5 SHA512 f62b07ae957ba610564284b17ef694c4555d8fdd5f62267d34f76319ccbb3036653e1d45f3b7f07c972a08ed2751dada1748c3ebe25ce4321ebcdf00df306637
 EBUILD kubelet-1.18.9.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5657bccee14b3a1782ea91f4ce89e614a80d1a6bcd3b044908eec6a7560e462c4be50a3b9134c45cfac2481bd9f SHA512 ccf2ae644acc00e64935a0bee9556629d07632de7e1ef91c499a122847a17d9aa3964dbe87622ad97d7fd77d4315401eec5b4449d2516493945aaff451a7636d
-EBUILD kubelet-1.19.2.ebuild 975 BLAKE2B 0609939b2180aa943bf1f47287ab2177c6ac152fc86cd0498f038230d3e0522775a5f5a5f054119aa9a3c83cb85e5adbda37305074ccda440f49e528e4b78017 SHA512 f81e91550ff0997e0fe9bb9246443f4dfd816f8a2787d125d5552b7a88afb54fbce871498aee3d5839afb4a44de6dff2e8951bb1d129f835269ec1850a99d853
+EBUILD kubelet-1.19.2.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.19.2.ebuild b/sys-cluster/kubelet/kubelet-1.19.2.ebuild
index 8b9a262c2f46..03f40ee62ef0 100644
--- a/sys-cluster/kubelet/kubelet-1.19.2.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.19.2.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
 
 RESTRICT+=" test "
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/nomad/Manifest b/sys-cluster/nomad/Manifest
index 4f32dfb27e98..9538fc32b4f9 100644
--- a/sys-cluster/nomad/Manifest
+++ b/sys-cluster/nomad/Manifest
@@ -3,6 +3,8 @@ AUX nomad.initd 534 BLAKE2B 392ba0c199a401c278d47f2fb068831f331485d34eb6d81d7e14
 AUX nomad.logrotated 83 BLAKE2B 2c970621c10520b2aaa17172d9c99a741737393db9a6424278e12d8b6676492c97b628d4be419ab921f7cf7685bae1a5e93eb04efa2ca6242012cfde203e02da SHA512 0ebdbeab15b01145eb2b33e0c6fd43dde3e4ac8eae9d8aff81797688276530732f613a39cd658fa4f5c2e8c99d70e6255f814ca5f3cd2bc5de259be324ab2851
 DIST nomad-0.12.3.tar.gz 51432205 BLAKE2B 77090f387e25f226c8d05b6ea16abfac0f4b710a40a3e7e5455bd6c8b7992080980967d4ebb92257348968dddbb45d2e5c3b58f143ae1205742bf08f0dec2a71 SHA512 17d361db11104ddbbae12a17301005c8eca3650e3fdda8f2fd6db8474728f31a2b6f828f2fba7e7d9d132b08cfb070799273353a17f5f66baa4dc5a0492562f8
 DIST nomad-0.12.4.tar.gz 51468076 BLAKE2B 42ca90649263dae6aaa29921853816b6172b285f2675a3fe68aca423bd15213924263433e01d870fa502cfc53372cb6f30f810c7aaadfe63970f91c4bb630912 SHA512 2fb12f96a14772d0a382f40aa686d61823630d49778365447410e7c4a4d7f3cbff275fdeea823f3c397642ce7aeae3618c295d4b08ea884dc51190960f33110e
+DIST nomad-0.12.5.tar.gz 51464001 BLAKE2B 825160a751481972335c4f37ef0514ddeb676a13a210f0faa43d06f1601bb794edf72402b0dfcf96426611e20eb530a5f077b97b331ce07e5fb6b3d3c7598130 SHA512 a3ffff37f3342de041696b1d6e39661d809e5cb82d27d9b2ba67a33a8698eb4afca929679093ec0d23f364a41307e669a6948e58429b97f49ec046d01f8d97f7
 EBUILD nomad-0.12.3.ebuild 1152 BLAKE2B 5e46d8ab1d030bbbec3dc69ae154e2b362429c3256fd5689bed9ac5d108ac9d9a601a1e207a5b09f227d5ccff12ed4272a89b812cb21a0e9c94e4b0d5f3c1334 SHA512 7e922cd5d79af1d7d53f9304554ce11ff3dce19041b9a6571889888a081a3bd7f42f0ee284d12bd7ef5ab8cf71b0aceb148fb482d922bc57e4d5d994f3b1b1d8
 EBUILD nomad-0.12.4.ebuild 1152 BLAKE2B 91f68bb115152b3c49b094dcb88351e8fefa5837cb48128209e293e9811fe970a79090a9d4e076193ef7d9daf069793e3c633d8e2ccc7291c879ffe4cce30ba6 SHA512 43060c15c20ff40bef48f224d05474169f81948dc9844d6bac19c570e8ef89b52fa38a2a15c910377f10e33ac497c1cc2b9ea5f1bdab4119583e02b7e34feba4
+EBUILD nomad-0.12.5.ebuild 1185 BLAKE2B a38b06f4269316c5f1d4a857fb5d9535374c9072fd212570de3e772fd9c86ae3c46b54a87067e88b25bf839630acc1717cd2676ce6a2b9d2138b0b9823f76390 SHA512 45244a659b6e5314ddc0d4c56e5429dec2d0f10ad2deb9431f6bd7305ce0060a6233a9b55284162069809d3e1564a4dc53ebd9fb6f6670e60ee49885e4432c49
 MISC metadata.xml 324 BLAKE2B bff415652c0d5fd2e56766c32b6e5df0d9bd00808cee31a70dc36db2e558383e2c489a5315273a42b5fa14723aa88fc659a248589f0d849425cafb5f78ec75c9 SHA512 b8e9827b4c5dd03abac84db21aab8f2743e1421c45aab547bf754165767307e9f60b29b541ab7cc4242347f1510226896db815832d4780fb606c92f9d804c163
diff --git a/sys-cluster/nomad/nomad-0.12.5.ebuild b/sys-cluster/nomad/nomad-0.12.5.ebuild
new file mode 100644
index 000000000000..431afd5bbae9
--- /dev/null
+++ b/sys-cluster/nomad/nomad-0.12.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=ec7bf9de21bfe3623ff04b009f26aaf488bae2b1
+
+DESCRIPTION="A simple and flexible workload orchestrator "
+HOMEPAGE="https://nomadproject.io"
+SRC_URI="https://github.com/hashicorp/nomad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nvidia"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local go_ldflags go_tags
+	go_ldflags="-X github.com/hashicorp/nomad/version.GitCommit=${GIT_COMMIT}"
+	go_tags="codegen_generated $(usex nvidia '' 'nonvidia')"
+	CGO_ENABLED=1 \
+		go build \
+		-trimpath \
+		-ldflags "${go_ldflags}" \
+		-mod=vendor \
+		-tags "${go_tags}" \
+		-o bin/${PN} || die "compile failed"
+}
+
+src_install() {
+	dobin bin/${PN}
+	systemd_dounit dist/systemd/nomad.service
+	insinto /etc/nomad.d
+	newins dist/client.hcl client.hcl.example
+	newins dist/server.hcl server.hcl.example
+	einstalldocs
+dodoc CHANGELOG.md
+	keepdir /var/lib/nomad /var/log/nomad
+	newconfd "${FILESDIR}/nomad.confd" nomad
+	newinitd "${FILESDIR}/nomad.initd" nomad
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/nomad.logrotated" nomad
+}
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 7310e3994869..9b7507e78b35 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 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
+EBUILD pacemaker-1.1.16.ebuild 1458 BLAKE2B 3b9456e15527b474b5d6865012040046e4fa23f20c6294b4728a9482cba65fb154af4aabd3b288529c9a64ce0e8e9cc3bafea5a540850672f96f476bb14994de SHA512 506adfebe1059b3f03def9d08da0235aa482ebbceb77a778e78f6519a07f0d25d45efc00faa1546835a5d67d9b2f9bfe02909640c59c4dcee045bbf1407d761d
+EBUILD pacemaker-1.1.19-r1.ebuild 1493 BLAKE2B eab0b238de42ed3cf3debbe9337ee66cf3b521aa2536d877850c47f488090f97d6896b7fa97f915b248b5e75a1398111da5622e9ccdc5c65cea1944e323fb035 SHA512 79eb96bdfbec00370087849f1c18995ad1e9e50136eae2fb69c6f1cef70349ef4af49a12d7cab7f220a5532c6c8a0d1c5afd1c4ff1f103e9379e7ca073c3130d
+EBUILD pacemaker-1.1.19.ebuild 1460 BLAKE2B f06004d23b50a994c9b1f9efa838e53c48b36817d299976c5d805d2b40da37b410718c0de5ad57cbe443e409049495485fb3e9cbef01bbc647f4f5446df2dfa8 SHA512 ce1a47cedacfb54a9af73698bb8ddbd4a210fcacdf896857b0af5d3119673d13ad87e51935f04a2f7cc1b7a5fd181532a92148aeb2b69c98961f3360f5db575a
+MISC metadata.xml 808 BLAKE2B a4da9e3271b4b28e903675dafd9d7f89e04ba1f326a849bb61b74f9ee7a3d21acf32b64826752b5881e40a292e850242eb87d722a41caa2d6c5106fe7162a3d9 SHA512 a86d59e889206951e38efc0fb3ace9f54662abfc56edbf04e66f266e4d29c97bda968df5b16bc54150a5be24ccbb7f3ff3d04f8d527f12bc067fac02255b5119
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index 4548b53178e8..dcb0f854efe2 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,6 @@
 		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
 	</longdescription>
 	<use>
-		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
 		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
 	</use>
 	<upstream>
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index f6bef07a1217..ef21da20c787 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+IUSE="acl smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
+	sys-cluster/corosync
 	>=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 )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
 		$(use_with acl) \
 		--without-cs-quorum \
 		--without-cman \
-		$(use_with heartbeat) \
+		--without-heartbeat \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
 		$(use_enable static-libs static) \
-		${myopts}
+		--with-ais
 }
 
 src_install() {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index c20405e8e1b0..7790d983ce70 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -16,17 +16,16 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp"
+IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
+	sys-cluster/corosync
 	>=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 )
 "
@@ -52,17 +51,12 @@ src_configure() {
 		--without-cs-quorum
 		--without-cman
 		$(use_with acl)
-		$(use_with heartbeat)
+		--without-heartbeat
 		$(use_with smtp esmtp)
 		$(use_with snmp)
+		--with-ais
 	)
 
-	if use heartbeat ; then
-		myconf+=( --without-corosync )
-	else
-		myconf+=( --with-ais )
-	fi
-
 	econf "${myconf[@]}"
 }
 
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index 0c8299ce0378..d1e44f3de6f8 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+IUSE="acl smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
+	sys-cluster/corosync
 	>=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 )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
 		$(use_with acl) \
 		--without-cs-quorum \
 		--without-cman \
-		$(use_with heartbeat) \
+		--without-heartbeat \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
 		$(use_enable static-libs static) \
-		${myopts}
+		--with-ais
 }
 
 src_install() {
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 3a751aca0982..946c5d337370 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -3,9 +3,11 @@ AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa81
 AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05
 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
 DIST swift-2.25.0.tar.gz 3183764 BLAKE2B 865cfcc832edb1f30a4529b0ff550c987a7413c841b9f1ef0d0a145f5be55762963b32ea332aa6f51690a871124e84dc7fb036309f38d4120a1e095e60bfaa34 SHA512 60cbc4bae61bb287e93d9a6a4e9a58a9c97f407d07927dde99c923d1ee7ab4ef79350c7c0cdcaab8aa0944aee09c27da549f3ebf86eb9bb92766b2b301d593a2
+DIST swift-2.25.1.tar.gz 3161690 BLAKE2B 985bcb884f4de9a7a4fbb8e2e76ff416035ac4554d3135c04d679c1d88a8443b988b5a18b4f3f1864542c93109020bb77eef72836fd40e705a9293c8a481e4f0 SHA512 4943949a420fa174e30c178b07797af4dceb89174c2e13ac9db35ff66a648024c907b52b9cdba2f730bc587b4d712efa3da09e77ccca51bd537703fc3c17144b
 DIST swift-2.26.0.tar.gz 3235050 BLAKE2B 33b46ebc3bd57b6ca6ccb65e96dd11a754fa1b4d314c60eafd23ad8b6bb7b8fee42ce26ccf0f388ad33599520a049a2d36832ba3d1ea01b0a07a8bee3f803569 SHA512 5e4620831bfc75f231fa468ce68438a23ad7b013eef4173aa596fd2e42bd4eb7e6b4182026fa71b6f4dd31d2cfccc4e70480a42a77f93b15bf6e50e9287ea460
 EBUILD swift-2.25.0.ebuild 3567 BLAKE2B 79524bfd15b08c165957bac7e4f97c5d031299d9c10842ff684773e4f4e00b097fff48b30b63d75f063053d8ba3b05b3013439d480be1920e16ac7e4f6eb9bc3 SHA512 e73ff05580f793393e50df4b8f63e243b1a5e565650d5c32e5b261bd49f9bb473a341223dc324b8dfd1294400ab4ea251be3aa0650c6333120142da4e89aed62
-EBUILD swift-2.26.0.ebuild 3571 BLAKE2B 4415527a7b925556b0804a544cae5a0b739c0f63b62fdd4da7649fbaa157a90934feb68187268c9cbf098ca76651627d6a240130a506ec46b8eaeb5fa38110e2 SHA512 675bac0bc5aab5506298219fdf94aa61aeaf4dd693f338c5e9610dfb3ae7be90d3eb82674d82e031cc7954f1672375f147cbf5862cc2b26de4acd4340ddc5a1e
+EBUILD swift-2.25.1.ebuild 3569 BLAKE2B 901731709a4ca6289693213aad24d1c0192fbf3c86010a4ed30576171431444801d192d901a93b343cfb20d64c2a1eb88d9f65c08b08de43ccc31d0beb240f43 SHA512 0626d00a366fe4e9888a6d11fa8cfc4d14118b935168a702927e970b202c7ca29c7af792720631ea5caf814b220b552f779a403c1f6edcacb1a11bc50c06e0e9
+EBUILD swift-2.26.0.ebuild 3560 BLAKE2B 9c19277d049c3dc95727055588316c32c0e117502bc9063af06232b90b1f4931dd7750fc3c127cdf2742ff0a95302610a18a3d26663c525eddd7effea52a3350 SHA512 5442fa9054960255a79a8c59bef410c1bcdc512ba8dce13ed9c1022bd52eece85c1298ca89123fd8a3f6942a92b0d5f461b0e2489066029abef9685351a7dc1d
 EBUILD swift-2020.1.9999.ebuild 3569 BLAKE2B 901731709a4ca6289693213aad24d1c0192fbf3c86010a4ed30576171431444801d192d901a93b343cfb20d64c2a1eb88d9f65c08b08de43ccc31d0beb240f43 SHA512 0626d00a366fe4e9888a6d11fa8cfc4d14118b935168a702927e970b202c7ca29c7af792720631ea5caf814b220b552f779a403c1f6edcacb1a11bc50c06e0e9
-EBUILD swift-2020.2.9999.ebuild 3571 BLAKE2B 12c3ed054683ee1aa51a89cde71014d974d6c09866548edf3893819c3e810718fa1183e4ca096014213d82f08a43f2566499f7f43fd440e3e0231e40559bcccd SHA512 4ee1b8fe2119f80de4ff6de9ad0a296e57164cfb98f315f825f98d7175d41743be93c7aa3f9e65513533a195abd92a1d66312c764d503e1cce47f41755f38465
+EBUILD swift-2020.2.9999.ebuild 3560 BLAKE2B 9c19277d049c3dc95727055588316c32c0e117502bc9063af06232b90b1f4931dd7750fc3c127cdf2742ff0a95302610a18a3d26663c525eddd7effea52a3350 SHA512 5442fa9054960255a79a8c59bef410c1bcdc512ba8dce13ed9c1022bd52eece85c1298ca89123fd8a3f6942a92b0d5f461b0e2489066029abef9685351a7dc1d
 MISC metadata.xml 758 BLAKE2B 8b1f494e6c40f469c01b494154d32702dc9b848939ea67005d8065c39661fcb97b5ca9cdee524ca66f0e74af5f9c522ca236b628a9b0289eef4f808e5f32461e SHA512 94a6af6b29a7f968d1e23a70decb908b9de10f792f1bd0711b95ea18abf59595d42017da6f278ed4991695ebbe0941d8907c160412e20758697597179fc3bb19
diff --git a/sys-cluster/swift/swift-2.25.1.ebuild b/sys-cluster/swift/swift-2.25.1.ebuild
new file mode 100644
index 000000000000..8ac84d6415d8
--- /dev/null
+++ b/sys-cluster/swift/swift-2.25.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="account container doc +memcached +object proxy"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]
+	acct-user/swift
+	acct-group/swift"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
+	fowners root:swift "/etc/swift"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/swift/swift-2.26.0.ebuild b/sys-cluster/swift/swift-2.26.0.ebuild
index 2ea038c24b43..084afc372ec6 100644
--- a/sys-cluster/swift/swift-2.26.0.ebuild
+++ b/sys-cluster/swift/swift-2.26.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils linux-info
 
@@ -23,10 +24,7 @@ IUSE="account container doc +memcached +object proxy"
 REQUIRED_USE="|| ( proxy account container object )"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
+DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/swift/swift-2020.2.9999.ebuild b/sys-cluster/swift/swift-2020.2.9999.ebuild
index 68cffb20f363..084afc372ec6 100644
--- a/sys-cluster/swift/swift-2020.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2020.2.9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils linux-info
 
@@ -23,10 +24,7 @@ IUSE="account container doc +memcached +object proxy"
 REQUIRED_USE="|| ( proxy account container object )"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
+DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3e8ed5406315..4b43dbc219f0 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 4efaafcf495a..bdf945f1665d 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 585 BLAKE2B eba29728254e2058725429845a9f86ac1c577aad7377804399c638ddcca5e3e5ca1008228b60bbbeb15d705215a0c3617e3587a4e55098ea2ebbbadf9088e210 SHA512 5cbea86f0c2c675054ec8a3c635b74aae7d17fe4d322727d7fdd271d64e279f5c98128d8082fe4c79ea7582d65b4b8fd5dead54a0c3ae3a1c133718959ff6998
+EBUILD clang-common-10.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 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
diff --git a/sys-devel/clang-common/clang-common-10.0.1.ebuild b/sys-devel/clang-common/clang-common-10.0.1.ebuild
index b7f3cff25b65..636965492422 100644
--- a/sys-devel/clang-common/clang-common-10.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 789181f9983f..798b0d857eae 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,5 +1,5 @@
 EBUILD clang-runtime-10.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
-EBUILD clang-runtime-10.0.1.ebuild 697 BLAKE2B 8502127a36a497f8a67953b9ad2c1f1ed929c4ac74022e62c437fc67b2c863f94f35412586d510241569c47cabfb568a4ee7f4b372f70ca16ed05eb001350b5b SHA512 ff1898f3c34a9b7a3c64bd4a5a72dc34d098be2204379fb42e2afe7d08981704afb23444b5893147b4d2d2c636fcf3c7825723073080bb0cc8958a58a29187a4
+EBUILD clang-runtime-10.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 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
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
index 09ccffc50eb1..04d3897324e8 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 338f0037021e..f2c3f03b010f 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -10,7 +10,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 11404 BLAKE2B 565c8dedd35f05b8fd8e90b0350619d349bb253e63b0a5e745d42f7eee261360f6be21567c4e8784a057529966866395e239643b3722ffba0cba2fa997041ea1 SHA512 9ad9ae4ac291267d370a08321cefecbbce73ebe44dc62a61156f60c486427a7e9ec0149c07e8d5a959b13a6211c324a9f62ba0a8e0e8cdc3d2b3916671e61f42
+EBUILD clang-10.0.1.ebuild 11403 BLAKE2B d3aa0ebac0470104d8ad6878b4f52ea5af58e9b6feab58bb53913d84cc26a96eb5f008dd517f604f57fc09fc875aa45338bbbc34a9fc195d476e3c94920b8f15 SHA512 0380340a5d9c364d376448538401d56fd9253a6a8d70ec047d1a1e65fb1eee14064b22b180013c40dc7fbe58f5f74b08aa7e62359ea6586a13ed8a10d45a0749
 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
diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild
index 6add40bbfc87..d3aad2e7443d 100644
--- a/sys-devel/clang/clang-10.0.1.ebuild
+++ b/sys-devel/clang/clang-10.0.1.ebuild
@@ -29,7 +29,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx default-lld doc
 	+static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index bdfa6811a2e4..7207b5482f44 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,6 @@
 DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a
 DIST gcc-config-2.3.2.tar.xz 17444 BLAKE2B c66fd121770dddcb27033be228de691f766f1acd9ada9580ae96dc12f6fbd0cd823e6656dc9b0515d498305b10d72f9cd87cf69388791971e9eac1a20e3f97c9 SHA512 31327d9abd26fdadaaf25a63568fd860ae25030b4a99dcbf0424f2d8fb14e61f041e681eea90c781a3f4e5401e3a7ba3299b1260ceb6e51bda5bef24f65dcacc
 EBUILD gcc-config-2.3.1.ebuild 1463 BLAKE2B a1fde73d6467080de5de228043e405f95977b4f69db354e3f33c37ac28aa02abe4f3f016266f56017281f1bf2d822305afe0ccc0b94440cc83688e6d8aa04d0a SHA512 8f9ff76eb6cc1b847f661b16179d132de8178ea60fcc7c6cf6e96782156b167bd130dc780067b8250a511c98ab42e2ad77f81597100ee463fc38d58afb9385e6
-EBUILD gcc-config-2.3.2.ebuild 1472 BLAKE2B 46db37d20da238fc05515c2bc000fcea6261b0f1651b6b8a20c19c2753fbde9661f2b4ba6380008bf144dbde6caf7787d62f935613e1f455a3dc6487c16141ca SHA512 ada2817124fa574984d12e3936db1286ecd57d92f11ac5423f2c8e211ee5f75ccc9819eff0b158b9eb9fa0a8962a524dfabee3d7ab8beb8d7d41ad533bd8cfb5
+EBUILD gcc-config-2.3.2.ebuild 1470 BLAKE2B 98f3a7f98170259321d62e7b032d1020cc1a490eaf89bc2d5d3c0df5b427b68080b5060076d09501293615c0de6e47e66a26c335b8997c09996351174cc0a056 SHA512 2f0d469fa8ba737dffcb13656aecf76cedb7ef999650cb0d957a1957e32890e877ad85b048f908e336f927b5022ef2d6970f9462f4632225aa05eec2ec7390c7
 EBUILD gcc-config-9999.ebuild 1527 BLAKE2B 9d1206cbf2823cfce941012aed05e30b7a782c241039d10589a20c5cd3db454fc73ea16f788994f95ad07d8b3877fc41b9e9a5ffb55a0a1f39bcaaabbd69540c SHA512 3145defe6cefa8757b10408b11fab862e3be943accdb7bc0871c33bf39ff71cea92e15e60c75f36a2c75199f7bbab612790ac3f79decc4db2498729876ef112b
 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
index f18c030a06c7..0d91d0f8263a 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index cf524d1969b0..11661bc56fb8 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -15,11 +15,6 @@ DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa
 DIST gcc-10.2.0-patches-3.tar.bz2 22752 BLAKE2B 36880dff2b2f2266c7d971391be758a69b2bc452be664594f289f209b5e4f2c326abc38a4d958d81251ff29f8153182cdc759f76200ef34238dc0c27a6ae0879 SHA512 c441eeca05399f3f97f35e623b814b0091251f23756ed71e2842a49e9b8f17d2053e40c0787242da6c963d333834982786dc4ffffa2d249337d174344d15658e
 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-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
-DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
 DIST gcc-6.5.0-patches-4.tar.bz2 12270 BLAKE2B fe985ac4d232b3e237c99d9441ba8fa1ab8e1f223ef93e93580f53fcc54c874d7ce3b1dc0041a9ddbf540f532f32b2ced95c50f412a466c49a7b78fda8d5be0f SHA512 5c51dddbe6787b968bbe358ca6e5d3a18203d2fe59fceae636b820e757b9b91afe52b569d7ef1734077151e1c3f70744cd51f3c840bc050ce41685a345f5cd36
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
@@ -29,14 +24,12 @@ DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8f
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-EBUILD gcc-10.2.0-r1.ebuild 434 BLAKE2B 0a13b431e4ac099cb2ce6a33f35152778097a7f8444ab873bbc35b64284bcf870ea19239d4d0a64a926b9ceaf86cb5c2475528ab5683803b45bf7bec18b9e33c SHA512 1a4f4625297720efa27a50c4b1d96134efd86ed2717fdafa3644090cc957b0635ae8aefacca263a29c5a32770486f8d6b81cce08d10dc0534598b7b3bed72cc8
 EBUILD gcc-10.2.0-r2.ebuild 434 BLAKE2B d25fd7686823cc320c06775c9aaafbe369928332bb7f604e439d0745234ed28206f36772e172bfb8288124ccc5d3b59d84208c4e01a38717fbe15046238bdc1e SHA512 39d34ddfbe00a0614943f4f5c0f0be420d7657694d85145c552bb04e842813cef2c8ef318481af9d71054c7b54b2332e29c626cf8e61e9bc2a120b3aecf54b10
 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-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
 EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
 EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
 EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
-MISC metadata.xml 2848 BLAKE2B c1c7a91c7a636c4478cdc43daa110d0a3e5830ac632ac6ebfc3867a66f1efdad13d4efe69e91ba3fa1cf26b5dc774926a86e2d8fce933b45c11396d30776e005 SHA512 a7be1673fbae0972c7c9937b6de533f5263d7796e413a2055196c722a2d1f6a79f2b8730f7d7fde5264e4b924f497453efecec09fccf8b7a037c7aa4c54fda7a
+MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.2.0-r1.ebuild b/sys-devel/gcc/gcc-10.2.0-r1.ebuild
deleted file mode 100644
index 2d2ebe50bcea..000000000000
--- a/sys-devel/gcc/gcc-10.2.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="7"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
deleted file mode 100644
index c7c547b38e50..000000000000
--- a/sys-devel/gcc/gcc-5.5.0.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"
-
-PATCH_VER="4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="1"
-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 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
-	is_crosscompile && EPATCH_EXCLUDE+=" 05_all_gcc-spec-env.patch"
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index feeacd303176..1a676ab81391 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -23,8 +23,6 @@
       code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
     <flag name="lto">Build using Link Time Optimizations (LTO)</flag>
     <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag>
-    <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag>
-    <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag>
     <flag name="nptl">Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)</flag>
     <flag name="objc">Build support for the Objective C code language</flag>
     <flag name="objc++">Build support for the Objective C++ language</flag>
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index ac4271e9accc..1deac46e3fea 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -1,17 +1,8 @@
 AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 BLAKE2B 945e234afcbbf2b5d737d7a4b9fb9282070ece739e1e487723baf9aa4e7c0777ec7b43cdd4957c89b9fc42c15eb2aff0564b370dd6b3e1a3849bf32680c69bd1 SHA512 84d0ab9bcfdd18148392a7219ec0ad4a1e63d43bda3f45a13e22f551f2f119822fed700570bd659f9260b09b0958d4c49e339ad4f135740e5b60e46462de7f20
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
-DIST gcc-10.1.0-patches-1.tar.bz2 13432 BLAKE2B 2f0517778eb012288ae305a91f84eb31a5f08f842c504201f1a8085afd42ed4c9b4a5b15f7553982c926735e8ea57307a1749004e679880ef47abad7d4596115 SHA512 cc513d8b68dcf484d37c51961c809fc6c470a8341f068b4029430ca4677e7b49155c3d964b3b9ab50c69835b32db98bcb9a91f14de14417e4611521059192118
-DIST gcc-10.1.0.tar.xz 74591240 BLAKE2B d64cf01beaaff7af9e7d5b1d5e6fdfb37cce5667b4455c1c9bbfd190e631f03555d63d52d31e7be5ac232256be11058f89d5bc7d0dcb01de44e90a52645ad87f SHA512 0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096
 DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
-DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 BLAKE2B 38536e8a86a8296754311633b73da0bd7dddb3a6ac65e4b5ba1dde352789e9114a1129aad11bcb988a1baadec6fdf893290c6af83bb9fad5613f35a37ebbb12e SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995
-DIST gcc-4.9.4-patches-2.tar.bz2 27713 BLAKE2B daff50fcad1e06fdd04770d4be0c06f2c4a2abdcf28e3b7704fe5a41b6c02dedd33ea36db68b7f28fcdfc391f4731f85907ffa6d88bc98fb912db3749216e68b SHA512 e4cdbbb47ecf3107dc87889790020aef629a0b2070145df2cf23327c5343cb2ce5fe72f0d4661f19ba2a73ab1315a48d6f7a006d6d425f8de41db88308398937
-DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
-DIST gcc-5.4.0-patches-1.0.tar.bz2 28227 BLAKE2B 6a8a154259664b47c8b18b55e6f5180ca27396ffd3267b34406296dbad4fa966c945eb445a3013b972ce4468fdf1be14568bb20db89b4a0aa861a35404dbceea SHA512 70cd83b142abaa3c22d67d5d58185da2cfa178737ec963e230cc03ea8dc6dc757665c711fae91af4cd91062d3136c6f31a5ee3c4c7440ed9485c6f3632731940
-DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
-DIST gcc-5.5.0-patches-3.tar.bz2 31519 BLAKE2B 7ca1850e127210c8f594b0061adf578b9a94c69353a4a6e40722f7716ccaaa2979c0190171fbd84a756cbc1015d931afbf54a05c13ca7061105b626018b02506 SHA512 a3cbcf56c9655cb0f464da703277401046f309d4b06198dea18d3a8b67aafae30ecbfd01c74f2db375ce0801e75cb7be6016f96a0b61496e503e2fe22542c057
-DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
 DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 BLAKE2B 56f7f9722ba446d44753504616b877b522c7497be4cae87a6a090b8cd77aabf47a79e74640f6df9aea9a5fa981016627601e780c5632d6d5e09a1bd2ae163384 SHA512 e649e334eec4deb7c261d808ed460413d78a2a4a672823d214c1e173a13bc314ce898fbf3674a7c7fe3151a089384ee0a7dee479bc8d005a06b65b39216bdf75
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
@@ -27,12 +18,7 @@ DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c7
 DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-EBUILD kgcc64-10.1.0.ebuild 984 BLAKE2B 9ba2b63821afa1a5ad81c5da4061359ddb7c849ade370c3cbef946a85b5272eae334edf9105281c40371991c4f1fa919ee52a46c62db7b7cc66f63f6e79b0581 SHA512 563c435487a64a6b396852bcf6525f4efe170313d3c1c94adf040035e6c400fa2c63025040673201f914a874f1e4f214f9487edb55cbdd34691a9875a47fb3b0
 EBUILD kgcc64-10.2.0.ebuild 984 BLAKE2B 9ba2b63821afa1a5ad81c5da4061359ddb7c849ade370c3cbef946a85b5272eae334edf9105281c40371991c4f1fa919ee52a46c62db7b7cc66f63f6e79b0581 SHA512 563c435487a64a6b396852bcf6525f4efe170313d3c1c94adf040035e6c400fa2c63025040673201f914a874f1e4f214f9487edb55cbdd34691a9875a47fb3b0
-EBUILD kgcc64-4.9.4-r1.ebuild 992 BLAKE2B dfe61ccae8cdd17c841ebe7bbb6fec51725d75f60533f6135c28dbf873b7986985eeb412021319cf475ce3e8f776d152c57e233fae67c7561fac177c4e3d7359 SHA512 b3272023a529991488d6a8e5b950c547a6b0137d56faffbfa330e2cd1167360ccc42da38d6cd9c3b77f63f6ceac4f176701f0fbcb87774155954ad9d982a09d9
-EBUILD kgcc64-4.9.4.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b
-EBUILD kgcc64-5.4.0.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b
-EBUILD kgcc64-5.5.0.ebuild 985 BLAKE2B 248c8e93ca6bf689b9047c13a2c169b9568da5debedef850acdf88440e9450c6f0ff9d095b2b3e124f730e545add1241972ecbd639464e3cf2525ff533cbd75c SHA512 62ff3f36be9beee2d754ff193574ecd7382a94ccd1a6584d8473e447e89b7229c3e1581cf74d89e836c9d1495ae10c8581dd86ab35b08409d7afd29b685e22cd
 EBUILD kgcc64-6.4.0.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b
 EBUILD kgcc64-6.5.0.ebuild 985 BLAKE2B 74fbf80028f7ea7714f35dbd97993a301d70abbb648c6ee53f538f37000c451337a6fad5cd30f8cd5acab754293bded4f80d56e2a0f59bdb0e25a892c4e6f3fa SHA512 c33f877683b43fa8120001eb77265a841a6079842a3f069c933346e582ed1d66bc2220da3449bb459d32a5ce191634b0879cc580ab47cee3eeabcf90b81f566d
 EBUILD kgcc64-7.3.0.ebuild 1157 BLAKE2B 65104f756288207e86c110dfbfd1c617ec26cebb6c025ade86d0c61f3071c700e137aa0fc06d86484e463c9b592ec7ccf020dc4ea6959ecd67c03ce9d3954332 SHA512 29249a057bc9614939c43109c73aa0f91c479d0cb815ab6119d9c6a29471f82b97e9a0a4ac05d91c76dd1781ddc72fb8d3a3f8aaeb42d2768dcb2aac706733c1
diff --git a/sys-devel/kgcc64/kgcc64-10.1.0.ebuild b/sys-devel/kgcc64/kgcc64-10.1.0.ebuild
deleted file mode 100644
index e0c1432958e8..000000000000
--- a/sys-devel/kgcc64/kgcc64-10.1.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1"
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild b/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild
deleted file mode 100644
index 6e9d9cc4f374..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.9.4-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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="2"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.9.4.ebuild b/sys-devel/kgcc64/kgcc64-4.9.4.ebuild
deleted file mode 100644
index 4763f516019f..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.9.4.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa ~mips"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-5.4.0.ebuild b/sys-devel/kgcc64/kgcc64-5.4.0.ebuild
deleted file mode 100644
index 4763f516019f..000000000000
--- a/sys-devel/kgcc64/kgcc64-5.4.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-
-inherit eutils toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa ~mips"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-5.5.0.ebuild b/sys-devel/kgcc64/kgcc64-5.5.0.ebuild
deleted file mode 100644
index 6af7c6b045ab..000000000000
--- a/sys-devel/kgcc64/kgcc64-5.5.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="3"
-
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index f3cbf458213b..dcf26e6898d6 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 1328 BLAKE2B 12b98d28c64b9fa2a884a2df96fcbac45855fdddf7d9800d16ce13a9e7c2042d61cab0f3fb96592806c49cb5c2a4de6f7ef5d1b42e713885a68e312085040464 SHA512 8ffb473e317c972af96b7651b5ed420a2d8d17436bdf0a335249350e7ffbfbe4c22f446c1c8212eb7b5b4f273b59a394821eb64d12c549f000cf5524d6d56223
+EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3
 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-11.0.0_rc4.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
diff --git a/sys-devel/lld/lld-10.0.1.ebuild b/sys-devel/lld/lld-10.0.1.ebuild
index cda0aacf2880..39abe87632eb 100644
--- a/sys-devel/lld/lld-10.0.1.ebuild
+++ b/sys-devel/lld/lld-10.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index a692ef186381..e55084ac1ae1 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 600 BLAKE2B 12e0c2d32c599ea40d5954c2e087858dc67f391248d7c51e312f0aa9fca415a50cfd92821809691db33c038641a164503d73167bade5ebee69d9bf14825d01c9 SHA512 257505f43c05568b77f8be05f3504fc960a48634ba6f23b112aa69fa41ef49fe10bdc5f26c8beff1bee70d5cf8736ba67d8e29db4d797b86c57f74857ee40ca8
+EBUILD llvm-common-10.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 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
diff --git a/sys-devel/llvm-common/llvm-common-10.0.1.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1.ebuild
index 8b13e80cda6b..d12935e080d2 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.1.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 70af2a53c94f..2bc9d48d6900 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,7 +11,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 11704 BLAKE2B 9104330e2924e669137d5d0ec59633ddba695d9acf976f3177bad3576b3d28749f7d5cf6c03fd9fd61b7fafbfa78e5fe0123a4aa7eafc316ee12a6b3e6854e57 SHA512 500c09389dd6e2d86e372949a59c9c5dd5d986e67e8ad6cefbf14fd816b210947eb45562cb7c50b6ee7e66874a0a4dd1f88d7e9c47775cda9aa3ab58ef9d6023
+EBUILD llvm-10.0.1.ebuild 11703 BLAKE2B 949e754155f36b2bf44bdf9d4ba820e1ca18d4c7adaf798f5186c31a37443009d009d8b1eb637cbfbf116db75c4bf6b2bdcec5c5f12b527747037efa23498882 SHA512 f2e9bb018cc4b2e01fa621398f17027bb20e95947a7694c25f43b674f842982033066a09563a3847a32ec64d8ab59ca74f26bb1f7b7a77ccb68125071102aba4
 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
diff --git a/sys-devel/llvm/llvm-10.0.1.ebuild b/sys-devel/llvm/llvm-10.0.1.ebuild
index f9c28daef047..b162bfbdf27c 100644
--- a/sys-devel/llvm/llvm-10.0.1.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1.ebuild
@@ -28,7 +28,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
index be088cad5481..c4ea967e465d 100644
--- a/sys-devel/rust-std/Manifest
+++ b/sys-devel/rust-std/Manifest
@@ -1,3 +1,5 @@
 DIST rustc-1.46.0-src.tar.xz 101868452 BLAKE2B da9798596b124a10d79c236a871228f05e5f571d22c2259328e7026c91e088c85f5de9c0536a16531e0cb10477bfcd16d3ac11467979f5561cb6199442b877ef SHA512 099857f1d295043587a4e2a65ef3e6a90e12c8b6958e98535a1656c113c553f9a9b621aba8a19cf21bd8d2c79d27cbfa4b8e6fabbcb3cbfee23b545be7b450b4
+DIST rustc-1.47.0-src.tar.xz 104143736 BLAKE2B 0454094dde35275488046826da87655e51bf0795481d6d08fd70d644bfc12481bca8641166106ef32f20494906025244715b16ff21a1c023f4bd2818aab42521 SHA512 6ba83c0158f8130ddeae7e070417a2121d8a548c8fe97e28bce116d84048636c75aaee78e0c92cd43a50f5679a1223fc226cc8c5ba9bbd1465e84c5c6034d5c9
 EBUILD rust-std-1.46.0.ebuild 3220 BLAKE2B 29a66cd46bbd78d716fe0e7db483865b1b5a8b12200202e21f061624be9b3385e9fc1561a092b2f21be9a7d6cb84b9460a1ffafc67ac2d90db95f99be0e69bfc SHA512 129ab7a762c6dc633dde21235ab3d7267d3cb9ed800cb3b506b0e5a2de3ccad8fe4e5a31f51eddda6e840b457b9883827f94fdf41f80b8ece54fde3ebabec7e1
+EBUILD rust-std-1.47.0.ebuild 3373 BLAKE2B bf6ddc56195edc24bef02017050d6983b2447b4850919e4e47c22160a5b073f89e44878a69dcd551e2795b8a80e779b63dce89bfb1507df47bdb43c840a8f746 SHA512 d3ba029e6948db6283d0f479c4567cd1423bb5762552e772951d8d2ab10d7fbe7df454d2a09b65ee0568fcf6c5927cdb850dc6797c974fac3a54ce9f31791f76
 MISC metadata.xml 818 BLAKE2B 32766ac24fada44b46f8d4ef77164a4e4843b876347056223184ec6fe48af9a6e2fa7d3e1fd48dec299f328f37fbdf4c84225a7450b788ce3e6c92e87bf8f313 SHA512 c1c4a46790dedc83b6890bbb536927148b293eed7f4d3bbd1f602b7664a9b303ca9689d4d1d35ed8047c2c909d64145fc4098efbec279f630b86207b0216ca80
diff --git a/sys-devel/rust-std/rust-std-1.47.0.ebuild b/sys-devel/rust-std/rust-std-1.47.0.ebuild
new file mode 100644
index 000000000000..46fc2485f617
--- /dev/null
+++ b/sys-devel/rust-std/rust-std-1.47.0.ebuild
@@ -0,0 +1,154 @@
+# 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 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
+#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/${PV}/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/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		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) \
+		library/std --stage 0 || die
+}
+
+src_test() {
+	ewarn "${PN} can't run tests"
+}
+
+src_install() {
+	local rustlib="lib/rust/${PV}/lib/rustlib"
+	dodir "/usr/${rustlib}"
+	pushd "build/${rhost}/stage0-sysroot/lib/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 e671916b592b..ee2e2ad88a9a 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 6d5c78113e34..822d2d90b411 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -7,6 +7,6 @@ DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
 EBUILD edk2-ovmf-201905.ebuild 4552 BLAKE2B 17419a2aac385e5dac9abcc726622e0448e66bda44375f4fef1508651176b34cc944b1450dee525d9a5b8a4394428ffb73b456ce9066edb229c9f88afb547bbc SHA512 55397082bd25a84c4fd864dc9523457a98f26e579ae132d39730873b46fdec09f4d59fc6277fab90d19d4370ba3a4512b0647738e195df71fa54461fa13b4559
-EBUILD edk2-ovmf-202008.ebuild 5447 BLAKE2B 4fab70477f06d897ed7d7f4ac428129ca48809638d12d7dd9017dc459e9324499fe04c71febcd63ce263547bc7d94c250a32f0e3ae3414355296ae6318a84ab6 SHA512 aeecf2b6a00766abc903aa5918a98c098e0d99117b9838f44078f1714c5d26b51e69e6ac6fbd53b121f3478ca03b16319b6088779014e36d1b92522572f31606
+EBUILD edk2-ovmf-202008.ebuild 5446 BLAKE2B 63a6a921a69be797d730d188fb9c0914cfb3e445d9049cd3c57db7f50d066ed7c20fa5854b834d617677f461e3dcde8c0959c11b132770ca22f2a3f60a7630d2 SHA512 b53dda3dfe336205503acb8018918d2af702e33a326c1bc29b62a7bd9b229b975a5cd18f5d4d6ef53e931367e85b0e77dc4fe95f85875f5676e34775c6e20769
 EBUILD edk2-ovmf-999999.ebuild 3892 BLAKE2B db584887a75633b6ee59c6cac80a08471b05122ba03a505e457f418266464ad946e83c5a3324fbed0bf133ddcb6f6f964627923838e8b7f1bc0ab3760b60fcca SHA512 ceeaae071df011ac577e8e8ffd2430f877c0a778c6858868b2cbb89fadabb0390c9ffe8099da9a2d534212171078c34682eca54b62829453619a001a95beb718
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index bd9480eb4736..2366fe02e7d1 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e3c4724704bc..77d41ad7837b 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bashmount/Manifest b/sys-fs/bashmount/Manifest
index 0c18ac219960..354ba99b9b34 100644
--- a/sys-fs/bashmount/Manifest
+++ b/sys-fs/bashmount/Manifest
@@ -1,3 +1,5 @@
 DIST bashmount-3.2.0.tar.gz 18152 BLAKE2B 61ced33a9d912d1bb9ad7ba4f9331830523ad0a35aa643ca71aa30618b0d94234d74823c6170e4047c9517aa07d1b70a59b780e6950f7888028e0143867d5866 SHA512 9fd287f67ecb61c9b72d1fc6a5b85b39d48671299585ad456ff3e14cf2304ad540de1462bbf3eafd333ac038cf8a7f2286f5077b896ea88dff570306f7c7d642
+DIST bashmount-4.3.2.tar.gz 47450 BLAKE2B 0dc45580b62aa55872753de17ee50e77e716e87498193c8dab0998f5a70994ad5cc9434c104bc1d6cc77d75d63688afae8be8e0e8ee4344249ded5f1719051c5 SHA512 ac18d76dc27099524f4051299dc5421e1e5811e943df21d64a1405b5cdf6401189d78571596f27c89c0d76ab40874392c0c90756ef5fa9c036f447ac884ee062
 EBUILD bashmount-3.2.0.ebuild 584 BLAKE2B 9e9df6081c1e3a33a7ae4b9144e38db67ea102ce4b76f6a8a4d7982fc8ec84d0d84a36e7200784eae9b19b80320d29a7afaf1c9b04f9a29662396323852f3a89 SHA512 0a1ee47d5505d72ac0928be4dcbaca48923e0d04a47ce4a16bbfb58c421506ea291c45b77b344c86c5fe09b9912d56ca8dcdd86db7310030bd249c6a1b8a4389
-MISC metadata.xml 246 BLAKE2B a49e994b78eb6150dd71a093106b6117e24561440c58455f5ae2e5b3432089328121f4d6f58ab2ace94eb6af6bbc19c1c81d0acb9f5fdc2712ba34eeb30395cb SHA512 d9990b6587013c58d123758bb630e46ea6e7ac3435a075eadf0922bf3e48e8a97a8303d704da320b236d9cb9ec996288b5e6d7245f11175911b8cb3d9c649ccd
+EBUILD bashmount-4.3.2.ebuild 622 BLAKE2B e340c3fec7191b11108c01881883e2e018cf319bd5f6457f37b6e6171e2a76070d764f1fadef2a3d6caf11cbcf817fc0764943293dca4ad69df50023958dd9c6 SHA512 f3aee1b3747438a1cb287ac33615ba0172800678e9f1ba3bf3f85118f590fc2e3bd96c871a589aa5c9b6404bdf1cd3150dbce9ee98840c61e931c343a960b728
+MISC metadata.xml 447 BLAKE2B 8495fe20d357824d2c5ba05f50ffe45d209b016f56c13b61959341ecd592bfd4236cac2dafe6211b3755cd71e28f0a99b8bd597a2aed3375b448f5c535a839ff SHA512 03d0381cd11be4856fb54a60353684b9466e3b3effa47cc02415198f821077bad31663bb033b8d2cf8ae82578aa4fb2c462e253b862018d08f9bb19eca3b9ca4
diff --git a/sys-fs/bashmount/bashmount-4.3.2.ebuild b/sys-fs/bashmount/bashmount-4.3.2.ebuild
new file mode 100644
index 000000000000..4925180faf7e
--- /dev/null
+++ b/sys-fs/bashmount/bashmount-4.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Bash script that uses udisks to mount removable devices without GUI"
+HOMEPAGE="https://github.com/jamielinux/bashmount"
+SRC_URI="https://github.com/jamielinux/bashmount/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# sys-apps/util-linux -> lsblk
+RDEPEND="
+	app-shells/bash:*
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-fs/udisks:2
+	virtual/eject"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+	doman ${PN}.1
+	dodoc NEWS
+}
diff --git a/sys-fs/bashmount/metadata.xml b/sys-fs/bashmount/metadata.xml
index 16ee64e7f2d8..5f308339baae 100644
--- a/sys-fs/bashmount/metadata.xml
+++ b/sys-fs/bashmount/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="sourceforge">bashmount</remote-id>
 	</upstream>
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 6edfe8c799b4..b183ec364d0e 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,7 +1,9 @@
 AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c
+AUX diskdev_cmds-332.14_p1-ldflags.patch 300 BLAKE2B 40b91cc8361b456f4dc62716a122971c1e87d5ca8a20154f2c9fa991db700cff67c5d7436cd38da0f1a83b712c14886ba6fc42e93f9004068379e7de167b7b56 SHA512 aa6c56cc464d18a1dbea3ddb14915605a913c786c882840c8c3b82ebf19bb768a0576aecea38a4d95853415f0756a81d7270636385ae83836ba0b7419448e3b4
 AUX diskdev_cmds-332.14_p1-no-sysctl.patch 235 BLAKE2B 4eebaa367a3c1eef94c82755ddb848958984055b26097b98e078bf162a502632f1c0a29385db17aba61730b9ec28cf7dd46539520eab2a2d8fbf6a5a42106e8f SHA512 2dca72c6d7b82804e6355fe3262762c966dfaa848f5151f97946f4f9d0d29773f43f8f134d6e2dd52cb97430f2d98e02c37066ae8c88ca75c9fb7efb94c4c8c7
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 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
+EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1369 BLAKE2B b27a9c113b99c9663cc4feb1261e95aa6d423624cff07443b7f294f8bc78cd9134f8a0fe3cff3da225865986af3c12fe9257c4432ef55a6f2263cee96f56a03e SHA512 8fbbfd191085274791f0487bc28f555b293e7ef04b6488495cbf453d41eabe6e04c46851cb7684cbcb7d68b02d11f76e412b1332d48ae1c18ab343890824ce7c
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
new file mode 100644
index 000000000000..1ae1b2667e54
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV%_p*}
+
+DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
+HOMEPAGE="http://opendarwin.org"
+SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
+		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
+LICENSE="APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="libressl"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/diskdev_cmds-${PV}.patch
+	"${FILESDIR}"/${PN}-respect-cflags.patch
+	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-no-sysctl.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_compile() {
+	emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	dosbin fsck_hfs.tproj/fsck_hfs
+	dosbin newfs_hfs.tproj/newfs_hfs
+	dosym newfs_hfs /sbin/mkfs.hfs
+	dosym newfs_hfs /sbin/mkfs.hfsplus
+	dosym fsck_hfs /sbin/fsck.hfs
+	dosym fsck_hfs /sbin/fsck.hfsplus
+	doman newfs_hfs.tproj/newfs_hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
+	doman fsck_hfs.tproj/fsck_hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
+}
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch
new file mode 100644
index 000000000000..84b9c58417f9
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/newfs_hfs.tproj/Makefile.lnx
++++ b/newfs_hfs.tproj/Makefile.lnx
+@@ -4,7 +4,7 @@ OFILES = $(CFILES:.c=.o)
+ all: newfs_hfs
+ 
+ newfs_hfs: $(OFILES)
+-	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lcrypto
++	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} ${LDFLAGS} -lcrypto
+ 
+ clean:
+ 	$(RM) newfs_hfs $(OFILES)
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
deleted file mode 100644
index 63e7748b9996..000000000000
--- a/sys-fs/owfs/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX owfs-3.1-vendordir.patch 891 BLAKE2B def69d7f29b56ccf59098aa5b64a6c32eec8d016a9a34253f075652989a595b9af735905ac06b31b9d50bf3c0aae9e11ceb37996ae9c298dab373425d675afec SHA512 d7131a4500419976ff2e153c44fbafc6164441e9fd5abff0bc4923cbcf672893c1c93d76ae6d1fda8cd7b808feaf4cfa9da201020622c8b45131f68d6ead478b
-AUX owfs-3.1p4-sysmacros.patch 2913 BLAKE2B aac58472efa26662501be198cc69fd30c1b9d62377a5b58798f6ec450d50dcbdee2dccb7d4e12d951686876a39b9aeade9f039f273084a1acef2540f3f254c60 SHA512 9a634156f9de9c65bf13ab2a4395be086318feb77d15210484e757ca578ca0010f976b217bf696c4d65ae5b42b65cbd26236942a506355b49bc105685ac804c8
-AUX owfs.confd 86 BLAKE2B bb8e9e43dff7d8438d47791f3df93a20a74d66f2cb409217fff315975330a6f14504745dacc1e3ee94d6e5cbbebc81b84173d6f6952bf4ad6a512c93f088bd61 SHA512 7c23bd956d2e22cc3952eefa52bd6b5b08c1b24561d5ac9cfc5222595d083ea64ba26dd0b4826e0fad3e2eb5774cc06a7bb6c7afd9c4c0726ce2b4b6df4dbdcd
-AUX owfs.initd-r1 825 BLAKE2B bc0b1a1b243ffe09a58a22c0f58b5b28b3593ff88c3b263fe90e75a91bf1f3f5105b5e8c026113afa1b8490639ccc12ef5cb22cf57d0e0aa23b920ce84c806e2 SHA512 26623ab81bc3a1788ac2c4a51114f643bb18595a61f88856f25193b4c3c3723e785414448503ec89bc6cf9e16ea782890d56a6df4604711fe7eee06cd6613dad
-AUX owftpd.confd 121 BLAKE2B a99ee232bcfeb9e010e3e34f2c165351bd3d62c8f5fc7e816c8d67c913fc5c3da4d0b8e82148ea1a597d26681e86d93797ea39265fea04879f481e13c8981b40 SHA512 7b8baba17d576139e3a9a9640e3c2006d9f847061aeff8a1e79b32ff116936421eccf8b545d64fe294acde4d483c170c728e80479f55e015ef030cf3ee06154a
-AUX owftpd.initd-r1 853 BLAKE2B 0145c61acaf1cdf80bbec5a378f33d58f51dc99909087e11120a00302e18cea9aee9e4e227996b4e84d0cbd291aefa28e20669a45195bcbd9e4a2099708db5d9 SHA512 0736b5100684247828bb793873cf1112b3b2a87c5a74a8f65b6b115699892325fb12f3016482ce4f42deceab8fb0f5251851738736f68fb417f0c277dea6369d
-AUX owhttpd.confd 89 BLAKE2B 72a355cd1418b7d3c34fe765ff82d298a18c517404e61bfb0a5928c904e10a3f10566846da9a25f0037043157773ed020e1d51354c34a5e8f4152edd6082b8da SHA512 07a128115a830145c609a35813ba325b9b1ff3c2ecbbcece1e728a78971e1e7c4cf654054611c303ca47fd39ccfcff4707133a04fa8d689d3606ca7ceabd5a4f
-AUX owhttpd.initd-r1 820 BLAKE2B 4122ce01036f63083286162f33d576e2a953e7bff7e215093959d126f04d7d0e3c8a422f2b28d0dabcc160ba992e2f787d049e17860c0bc821894aaf8a5b5859 SHA512 79c0307bcb4913f563ca69e4a699b91a4e7a2133882d150694f6738eb8000175a7f840b5de9f07496c166c95fe71bb94c31ea167f6389dc9c37e0d08e2943bc9
-AUX owserver.confd 108 BLAKE2B 3279ee61b42a9573472657e4297a7988668c081cd66d0f64d53cbd2eb27248abfebd6c368d77a5a3eb84ccd95b41ce65c2f03e3cb8ee1f095e4b776b60e3283a SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411
-AUX owserver.initd-r1 802 BLAKE2B 8273790945eb4df7b8aadf7d19ac3397152d225495dba7e5e8a472ad7420f2e9e97ba35ec5e7655e0e5b3c37ed97ac740dbda8d1ae030dc9b75ba2bbf1dbf391 SHA512 3c2d186df7c3d4549333f90a87c80a44dd8ed67b10bacdc08edce2b45db35bd0bc7f0956bdee8f03a388ae8a5bab039f7bb19e3bad007632608f945c7e54c649
-DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338
-EBUILD owfs-3.2_p2-r2.ebuild 4782 BLAKE2B 05e42cf3d93fafcde9e875af9a91b16564846e9e7a487af8812a66c738bd66bf2600e9364864237c044379dec76eb48af9b9d9936695fb821a4ab86553fb1f08 SHA512 1aa74c96d39673636396e5ec76f5b829493a735542a86c4b7662f224e0d208ecf8bd4c579e9fa5740df0e6b59a5d439dcb53a151b9e5a25377c5427d9fd37d83
-MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe
diff --git a/sys-fs/owfs/files/owfs-3.1-vendordir.patch b/sys-fs/owfs/files/owfs-3.1-vendordir.patch
deleted file mode 100644
index 2592e8ad0fd7..000000000000
--- a/sys-fs/owfs/files/owfs-3.1-vendordir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/module/ownet/perl5/Makefile.am b/module/ownet/perl5/Makefile.am
-index 5823f4b..cebe1e6 100644
---- a/module/ownet/perl5/Makefile.am
-+++ b/module/ownet/perl5/Makefile.am
-@@ -8,7 +8,7 @@ OWNet/Makefile: OWNet/Makefile.PL
- if HAVE_DEBIAN
- 	cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor
- else
--	cd OWNet; $(PERL) Makefile.PL
-+	cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor
- endif
- 
- install-data-local: OWNet/Makefile
-diff --git a/module/swig/perl5/Makefile.am b/module/swig/perl5/Makefile.am
-index 8e5f583..49cd252 100644
---- a/module/swig/perl5/Makefile.am
-+++ b/module/swig/perl5/Makefile.am
-@@ -19,7 +19,7 @@ else
- if HAVE_DEBIAN
- 	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
- else
--	( cd OW; $(PERL) Makefile.PL )
-+	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
- if HAVE_FREEBSD
- 	$(PERL) -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' OW/Makefile
- 
diff --git a/sys-fs/owfs/files/owfs-3.1p4-sysmacros.patch b/sys-fs/owfs/files/owfs-3.1p4-sysmacros.patch
deleted file mode 100644
index dcb67a6d19c7..000000000000
--- a/sys-fs/owfs/files/owfs-3.1p4-sysmacros.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 6565314e775232cf1682b35720b8b1b207a16f3e Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 21 Sep 2016 15:38:52 +0200
-Subject: [PATCH] configure: Add AC_HEADER_MAJOR to find where major() is
- defined
-
-glibc currently pulls sys/sysmacros.h into sys/types.h, but this may
-change in a future release.
-
-https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
-
-Gentoo-Bug: https://bugs.gentoo.org/580922
----
- configure.ac                    | 4 +++-
- module/owlib/src/include/ow.h   | 7 +++++--
- module/ownet/c/src/include/ow.h | 8 ++++++--
- 3 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c1e3d77..3b32fbe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,10 +180,12 @@ m4_include([src/scripts/m4/acx_pthread.m4])
- # Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
-+AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
- AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h])
- AC_CHECK_HEADERS(sys/event.h sys/inotify.h)
- 
-+AC_HEADER_MAJOR
-+
- # Test if debugging out enabled
- ENABLE_DEBUG="true"
- AC_MSG_CHECKING([if debug-output is enabled])
-diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h
-index 9dbec5f..2a6050d 100644
---- a/module/owlib/src/include/ow.h
-+++ b/module/owlib/src/include/ow.h
-@@ -188,9 +188,12 @@
- #include <netdb.h>				/* for getaddrinfo */
- #endif							/* HAVE_NETDB_H */
- 
--#ifdef HAVE_SYS_MKDEV_H
-+#ifdef MAJOR_IN_MKDEV
- #include <sys/mkdev.h>			/* for major() */
--#endif							/* HAVE_SYS_MKDEV_H */
-+#endif							/* MAJOR_IN_MKDEV */
-+#ifdef MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>		/* for major() */
-+#endif							/* MAJOR_IN_MKDEV */
- 
- #include <stddef.h> // for offsetof()
- 
-diff --git a/module/ownet/c/src/include/ow.h b/module/ownet/c/src/include/ow.h
-index c157a7c..aeeba8e 100644
---- a/module/ownet/c/src/include/ow.h
-+++ b/module/ownet/c/src/include/ow.h
-@@ -118,9 +118,13 @@
- 
- #include <netdb.h>				/* addrinfo */
- 
--#ifdef HAVE_SYS_MKDEV_H
-+#ifdef MAJOR_IN_MKDEV
- #include <sys/mkdev.h>			/* for major() */
--#endif							/* HAVE_SYS_MKDEV_H */
-+#endif							/* MAJOR_IN_MKDEV */
-+#ifdef MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>		/* for major() */
-+#endif							/* MAJOR_IN_MKDEV */
-+
- 
- /* Can't include search.h when compiling owperl on Fedora Core 1. */
- #ifndef SKIP_SEARCH_H
--- 
-2.10.0
-
diff --git a/sys-fs/owfs/files/owfs.confd b/sys-fs/owfs/files/owfs.confd
deleted file mode 100644
index f85d25e74f22..000000000000
--- a/sys-fs/owfs/files/owfs.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs configuration
-OWFS_OPTS="-m /var/lib/owfs/mnt --allow_other -s 127.0.0.1:4304"
diff --git a/sys-fs/owfs/files/owfs.initd-r1 b/sys-fs/owfs/files/owfs.initd-r1
deleted file mode 100644
index fce0f5e52d4a..000000000000
--- a/sys-fs/owfs/files/owfs.initd-r1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need owserver
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWFS_OPTS:--m /var/lib/owfs/mnt --allow_other -s 127.0.0.1:4304}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/files/owftpd.confd b/sys-fs/owfs/files/owftpd.confd
deleted file mode 100644
index fc93d2fd7195..000000000000
--- a/sys-fs/owfs/files/owftpd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs owftpd configuration
-OWFTPD_OPTS="--nozero -p 127.0.0.1:4381 -s 127.0.0.1:4304 --max_clients 5 --timeout_ftp 600"
diff --git a/sys-fs/owfs/files/owftpd.initd-r1 b/sys-fs/owfs/files/owftpd.initd-r1
deleted file mode 100644
index 8bbf93b49dc8..000000000000
--- a/sys-fs/owfs/files/owftpd.initd-r1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need owserver
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWFTPD_OPTS:---nozero -p 127.0.0.1:4381 -s 127.0.0.1:4304 --max_clients 5 --timeout_ftp 600}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/files/owhttpd.confd b/sys-fs/owfs/files/owhttpd.confd
deleted file mode 100644
index 2a5200c31118..000000000000
--- a/sys-fs/owfs/files/owhttpd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs owhttpd configuration
-OWHTTPD_OPTS="--nozero -p 127.0.0.1:4380 -s 127.0.0.1:4304"
diff --git a/sys-fs/owfs/files/owhttpd.initd-r1 b/sys-fs/owfs/files/owhttpd.initd-r1
deleted file mode 100644
index cf3af54f50e9..000000000000
--- a/sys-fs/owfs/files/owhttpd.initd-r1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need owserver
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWHTTPD_OPTS:---nozero -p 127.0.0.1:4380 -s 127.0.0.1:4304}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/files/owserver.confd b/sys-fs/owfs/files/owserver.confd
deleted file mode 100644
index e764e2df10ec..000000000000
--- a/sys-fs/owfs/files/owserver.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs owserver configuration
-OWSERVER_OPTS="--nozero -p 127.0.0.1:4304 -d /dev/ttyS0 --timeout_volatile 5"
diff --git a/sys-fs/owfs/files/owserver.initd-r1 b/sys-fs/owfs/files/owserver.initd-r1
deleted file mode 100644
index 88b9790882f5..000000000000
--- a/sys-fs/owfs/files/owserver.initd-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWSERVER_OPTS:---nozero -p 127.0.0.1:4304 -d /dev/ttyS0}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/metadata.xml b/sys-fs/owfs/metadata.xml
deleted file mode 100644
index 3643be9f41d1..000000000000
--- a/sys-fs/owfs/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-needed -->
-	<longdescription lang="en">
-		OWFS (One Wire File System) is an easy way to use the powerful 1-wire system
-		of Dallas/Maxim. A simple and flexible program to monitor and control the
-		physical environment. You can write scripts to read temperature, flash
-		lights, write to an LCD, log and graph, ...
-	</longdescription>
-	<slots>
-		<subslots>Reflect ABI of libow.so.</subslots>
-	</slots>
-	<upstream>
-		<remote-id type="sourceforge">owfs</remote-id>
-	</upstream>
-	<use>
-		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
-		<flag name="ftpd">Enable building the OWFS FTP server (owftpd)</flag>
-		<flag name="fuse">Enable building the FUSE-based OWFS client (owfs)</flag>
-		<flag name="httpd">Enable building the OWFS web server (owhttpd)</flag>
-		<flag name="parport">Enable support for the DS1410E parallel port adapter</flag>
-		<flag name="zeroconf">Enables support for zero-configuration networking via <pkg>net-dns/avahi</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
deleted file mode 100644
index 49482396596b..000000000000
--- a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 linux-info perl-functions systemd user
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="https://owfs.org/ https://sourceforge.net/projects/owfs/"
-KEYWORDS="amd64 arm x86"
-
-# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
-SLOT="0/${PV}"
-LICENSE="GPL-2"
-
-IUSE="debug ftdi ftpd fuse httpd parport perl python tcl usb zeroconf"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	ftdi? ( dev-embedded/libftdi:0 )
-	fuse? ( sys-fs/fuse:0= )
-	perl? ( dev-lang/perl:= )
-	parport? ( sys-kernel/linux-headers )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-vendordir.patch
-	"${FILESDIR}"/${PN}-3.1p4-sysmacros.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-OWUID="${OWUID:-owfs}"
-OWGID="${OWGID:-owfs}"
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			if ! linux_chkconfig_present W1; then
-				ewarn "CONFIG_W1 isn't set. You will not be able to use 1-wire bus on this system!"
-			fi
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	use perl && perl_set_version
-
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	default
-
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable owpython since we can build python anyway
-	# and without it, we don't have to fix the build ;)
-	# disable owphp because it is not compatible with PHP-7, bug #651106
-	local myeconf=(
-		$(use_enable debug)
-		$(use_enable fuse owfs)
-		$(use_enable ftdi)
-		$(use_enable ftpd owftpd)
-		$(use_enable httpd owhttpd)
-		$(use_enable parport)
-		$(use_enable perl owperl)
-		--disable-owphp
-		--disable-owpython
-		$(use_enable tcl owtcl)
-		$(use_enable zeroconf avahi)
-		$(use_enable zeroconf zero)
-		$(use_enable usb)
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-
-	if use httpd || use ftpd || use fuse; then
-		myeconf+=( --enable-owserver )
-	else
-		myeconf+=( --disable-owserver )
-	fi
-
-	econf ${myeconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		emake ow_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use httpd || use ftpd || use fuse; then
-		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
-		newconfd "${FILESDIR}"/owserver.confd owserver
-
-		for i in httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use httpd || use ftpd || use fuse; then
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
-			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
-			ewarn "for more information)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-}
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index cf383a404ba0..96027cb071b3 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,5 +1,5 @@
 DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
 DIST simple-mtpfs-0.4.0.tar.gz 36234 BLAKE2B ec5739625286b63dc6285fb83a4c71f5ed9bb8ed757eab111e543e15efbc45a5fc3a2609382f01cf18d4c6160258800963c349b6d64b2648257cde99f9359432 SHA512 6f213f9df792f33cd3842357aecf444cdc8030c89e4abc19b56a2c60f58213b5545b3d7857b0d46cdd237d0c24d5d6eb3cbe59ba9fc3c32f91396c5724ac86d7
 EBUILD simple-mtpfs-0.3.0.ebuild 590 BLAKE2B ca37769d12403583490200c01da817db1856cddcc882c943b42dc3b2bf003dfe99f2db0df3de566da4828eaec369676c50c835a228b861df52e22ebcf8492725 SHA512 2e909dd230f69416557d0ec441ba23b845a6ccc6fd43d0ba93e0805cf571778514e747c14915503da31cf1bad013c399fb93d5d2728c64aa0be66aba9c5a747c
-EBUILD simple-mtpfs-0.4.0.ebuild 614 BLAKE2B 8e3120d6627f749e611208d74a8d408edb499f86679c5f674be0394b8613efef58ed82000c3447b098228e12c92602560509217c93aff7e27a69d4bcc557e403 SHA512 25e6717511b02fb406d82137fc5ea1fa6b3ac46ac7c8d778df287b93734f4acd3e575bed446d3eb429abed4ca0eab1792397f87b7943615da580cc075bf13b7c
+EBUILD simple-mtpfs-0.4.0.ebuild 613 BLAKE2B dcf466380e68d1fbaf22d9f0b402771511b2aaad81a34018675e2476e2d7c6029e6893e3289bb41cb26cf392a13b8a0de6e7f49ba1e3eff4c81393a3db011fb8 SHA512 3c30b37fdd28a0e35cea137c926cb90892ba800835678a36bb0cb59e4dbdb197c9978618201596a081e608bfe00a2ef8c41502233d4b55f34555abe759edac8b
 MISC metadata.xml 1002 BLAKE2B 146c014fef44cbca70892efa76c12f36a5f890742fcfc91801c995b9e7a78d4693a34fe7f1e1b708d2bc2d45e60ed7749904c10465de4d680e25456344644f9a SHA512 d5e83c61493b981f1871bc964e395877ac4adc6f75cca770140d364a9c1365f221dfe97f7e110338abea49afbc9313a5ca088dcb7899a18dc98386cb46c28430
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
index 04ebc09c1169..1ba00bb3f09a 100644
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phatina/simple-mtpfs/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/libmtp
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b5e5e852600b..4f0c64c8d251 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b8182c2702da..4e68b830e008 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,12 +10,18 @@ DIST gentoo-kernel-5.4.68-1.x86.xpak 53358098 BLAKE2B 6a35264a7514c1daa61e590d64
 DIST gentoo-kernel-5.4.69-1.amd64.xpak 61508476 BLAKE2B 979ca44a37cd0b7ee74f54cf505d9c77b057b52c88a6e66b340d815d534f5ee3fe3f8b569df480a0f8ea8e3ee661050ffd5bd69d4e8f447e9dbc63a99e3b1635 SHA512 68d37ae909449b7019161baccf7debf8452bb62a38a573837ed74a050141ef59bc1a635ab9b62e3d34679a6e641b41592c53d569d1a2cf063f0f87315e3d9de8
 DIST gentoo-kernel-5.4.69-1.arm64.xpak 56454811 BLAKE2B 282577ea53a68934f2b68eba46cfc788e5923fdad705300ed8f8968ee333078b20241544415d203686d268e14d57bb3f9bb72806e001d694b61c56c97b55bedc SHA512 77f323c643055253b5ee2b43ce74e26a7edf8371101b0c7f5d9aa3bf68e4bb4d9a9ce3d64d1f5e4d41d6858b9ed079ecd5329028892ce20cc872509ecea5a884
 DIST gentoo-kernel-5.4.69-1.x86.xpak 53415445 BLAKE2B 33a82ca465c271eb497d929bc71b2400dfd6551937aee3af860b503fbdacec12c44a6da40cf55e94a00dcb09a544a34da8472eca9e0bd627e596ac9266da1ea0 SHA512 f5466dbb14e0b523e42592cd69bfaefdb93ad6be74d318005f5a16ecdf4b65611ed69d51e0c432228530e9c058fdbfa44c24f3aa06074d82ccc625545e2a7eb8
+DIST gentoo-kernel-5.4.70-1.amd64.xpak 61529441 BLAKE2B 133cb75aa044fff71ac8de013fff304d4068426950417fb84e7a7b480660229219e86847d8c01394cebd55021aef910b11e9cdbdaedf9d9e0efc92002db56052 SHA512 63422bbce0f46179dd5d20c03f2b634da9f08e0bb92df2bcc02bcc3d0796cbaca8c55f6831222b6213200eff70b57f0eb71283813b8ccf9525cf0de371255c32
+DIST gentoo-kernel-5.4.70-1.arm64.xpak 56458036 BLAKE2B 4f94c556c82b61c6f26542e43caa9f2bf91b3f6635af4a4612ff7b8889ce8a8370b4f40e75e315dcb08ef066fb7b1c555621d32f074826b12594976e009278fe SHA512 ad0ad131561b0b96ea1bb87c2f22322f4ac8d927d9cf6750fdc147fea9f2f7af58b3cf6960186ce4eb8b0c81f1f9bf64ef7ff412d12b16240adb6bb21a66265c
+DIST gentoo-kernel-5.4.70-1.x86.xpak 53408406 BLAKE2B cc2537e797841c93d1bee210f261e23c6c9b4e652be28460cdd69a032efd33b9425a965416d7e1a8a61a2c39720c234ba12dd2aeae43fb8710006701a29f282d SHA512 999741233811b9956e6e50728cd96c08310a4f3d6f4219c3ee54d48970c646cdd68c878589c3f45d3e0d69e75786773fc3fd593c9117e60dba9e9c40bfddb207
 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
 DIST gentoo-kernel-5.8.13-1.amd64.xpak 64108552 BLAKE2B 9119f7bdbf1ef9e64f839ef485eb9dcf345d3b71a17a011eb7c2e6a4ee17409096b8ed8ce29fb5b6781c45b7d130baa6a03c6fc8be33972436a49b6233a08e1a SHA512 a18b1812bb547d95346df64b59e9f2cb98f378ad679d319b15fb84e04e7070ad73dd251e4e280d36905bf15f6737ea8b1f269716069a46e4c7cc985395ee15f8
 DIST gentoo-kernel-5.8.13-1.arm64.xpak 60528029 BLAKE2B ff6c8842121f54875697bdc8e710aeedfe4179b02954056a895dc3af06d99518822ef642ac58e5814ad1624ccf8dd2c106651834bb90d099f13e5715ce9e23da SHA512 d0303f782d24eb3b5860811863fdc5f5832cb6fca2382d6d767e4317525b6748ea5b5b4a236747f13b73bdd0c080d670524baba43d32518e37e9398d009015f2
 DIST gentoo-kernel-5.8.13-1.x86.xpak 56174425 BLAKE2B 87a7047433b196c087bc4d1bb4d9f35ed22cca9d3a03b243427657feec1004f9239406a28d9a03e4b0742dc1d529870ec31e5b5c06766f9259bdc1a98a582a89 SHA512 8e4a18fe6ae0e8eec7800fb24287f1ecbe4e41b3ba48b776fd8f52c744014d7e40175b0d2295d6889d158ecd1085ec7d89baa9ae6901770b9ed9c70b39c47380
+DIST gentoo-kernel-5.8.14-1.amd64.xpak 64154937 BLAKE2B 4238b440b83b43149d73deade748400ee5bbfbe97d8da670c37e4701bb557579a9db9822f1c1d2143a89bcc0194b39c2d06910a48886560968e5ebcfe9807572 SHA512 db3d8da7d511205dcfd2ca41ef3e3952ceadbb5bfd5ade189598c9cfd5135b55699ef6dc010dde49a17ac17a572c248be16f0d9fd472b3f1b897d17d2cb8e557
+DIST gentoo-kernel-5.8.14-1.arm64.xpak 60542375 BLAKE2B 53543d5e492cbb08f30c72864d84b8c70813282088a25ff270717b0669ddd8e529086636f6ba76876e75797d03387740c4df8a0b3e74daf44e62307b002eeb3c SHA512 6581776fc60688862d00caf4c136de83f0ff7e909c55f2410e310e9f417b7fed7b05adc2b4e4ca47008d63977ed23072cf0b2882b7416d2f6b55bf42a3e95a03
+DIST gentoo-kernel-5.8.14-1.x86.xpak 56176613 BLAKE2B f497efa354a9ccfb0869aad18d5cb33f3f1ddfd541265e2ecffa8d2eda0b10c8d0d6213bd8bf620dc2a05e1c6629d0f682fa7c2c2c9c5257b0f45c308ae11ed4 SHA512 4de1db79189fda9099da85553e463cdd05cbe5791f6bd99b2f6eaf138a2d6026b06f11436450333b29ca4d697be9c413f3ee9c99fb0cbd91d1d5dc26bec839d9
 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.66-r1.ebuild 1371 BLAKE2B b11c2f146a3f72d590347cdb433c3c998ad4a79de5e4e547914275851382af44107f01f6ebea0ffda0a0651689db7d2b0126ba58ea64da8c7bc4cee7974893ce SHA512 5db1e935269ba1b5bad9cee1a6c42cfe155281e11887522d7a256fd326b8ce89037b61b0df4b6f0570bae6c05b97b817bfb5d4e3a5a8c00b4ebe9c87dafd7fc7
@@ -24,8 +30,12 @@ EBUILD gentoo-kernel-bin-5.4.68-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824ca
 EBUILD gentoo-kernel-bin-5.4.68.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.4.69-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
 EBUILD gentoo-kernel-bin-5.4.69.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+EBUILD gentoo-kernel-bin-5.4.70-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
+EBUILD gentoo-kernel-bin-5.4.70.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
 EBUILD gentoo-kernel-bin-5.8.13-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
 EBUILD gentoo-kernel-bin-5.8.13.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
+EBUILD gentoo-kernel-bin-5.8.14-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
+EBUILD gentoo-kernel-bin-5.8.14.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.70-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.70-r1.ebuild
new file mode 100644
index 000000000000..2378adc3f352
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.70-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.70.ebuild
new file mode 100644
index 000000000000..d6e61fa69369
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.70.ebuild
@@ -0,0 +1,53 @@
+# 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.8.14-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.14-r1.ebuild
new file mode 100644
index 000000000000..d5d78a106e7c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.14-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.14.ebuild
new file mode 100644
index 000000000000..dca6aedbd789
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.14.ebuild
@@ -0,0 +1,53 @@
+# 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 4d5a654c503f..cf0ea6c88275 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,10 +6,14 @@ DIST genpatches-5.4-69.base.tar.xz 2362320 BLAKE2B 5f0a1f950d6b4edd2eb2189256e12
 DIST genpatches-5.4-69.extras.tar.xz 1768 BLAKE2B ab83c9bd71bb08d7356aa93c27c3596911fe67fcadfe97a80313d2a038001be7ccada663ab25aee1d5cc348b220d3c82970d08bd3ebd538a729918a7487e0a1a SHA512 6a780c1a4ab2d2acd313e45c3fca0ae013104e916961855c76b4bc2c4f732f8eec27240b728677bf8e3c0042694605f477e672af41e5e4e50e266320d126fc32
 DIST genpatches-5.4-70.base.tar.xz 2483716 BLAKE2B ec87f655614a22728baa721a291616f3c5f0516ec25dfcfba74ce72a8236e132dc2c66bc8b551cdac6cdd170d29a54545b05fec5d853afba33e70b23b7dd50da SHA512 246f449d7720de05a8527ce19ea47ebf79dfe970d87087674630416b438d31fe499b8fd053b7ea19ad81248435345b56544774eeb6298475145ae59b9ef718ae
 DIST genpatches-5.4-70.extras.tar.xz 1772 BLAKE2B b7dcaf96dabb3dcb2ffac6532b59b9eff8e9e55e309b02b4d774a3c665e4499f0353bfb91ed81f1cbc73b852f0de50adc6a03dc36e8e7beb88f0cf62a5fd9a42 SHA512 3fedd41a60c6941f9ee18485c92b67c3dc69d0b36a134adb89c246106d043e10afcc9114f5448ea4164b956934e2dc9efb1f3af95c2bd1a67eaeef5253b07630
+DIST genpatches-5.4-71.base.tar.xz 2499052 BLAKE2B f19927e24c884ed8849b9572b5d199d8e9d1ad57137af70658016cee341e4a45d0e974996138c61880c39adb83616d6399e798e5fdd020c6275becd57a9d56b3 SHA512 dad3be3fa63d809458b08b7da7f45c2a0c126ca1df75ed156b2f54a93204b4504d42e678a74df79618e137b7b565fbc97e108e2807c97cd1b4a8d0bec69151a4
+DIST genpatches-5.4-71.extras.tar.xz 1772 BLAKE2B e462c7bf461058db545a11d05d6f6de16d0868a4f162874682425424f07e6b78019ce65ba9bd51aa413433894cea8561cba33837b66dd600351f36c563a0edb0 SHA512 ba9930a24342f7ccb5514688913e2517c726137317563ce301dbf383d484a6243c04e4d7e6ba427c0269009f979aea8c623e677e9d7f763275c1e299519d2ee4
 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 genpatches-5.8-16.base.tar.xz 525416 BLAKE2B 53b0e2548b25b93999650cdf8eb920447367305049349a468b954f84368f803d2e1fd591fe4c01722515568257f1457a7480650a2debb1e9196bc41cebc07b5c SHA512 b708d0ad5303cabd7ba73b28391c138bf443c0af1dfc8296eb528e1a16cf00763a5a36aec1cb7bd0b0e9c9b0d844d4a135e2f1f5cf4ddbfa9742d7e05e0a4c0d
 DIST genpatches-5.8-16.extras.tar.xz 1772 BLAKE2B 60238a48924010a7ebe1214de7835522ad1ad5b156dd3bba13d315ad753f69ce7b82a5265bd4f8d8631699304526fd44279ba27413f10cc4f19e1a60880cf30b SHA512 f9760259d90cae491252c409c6521ca5285bc0f7655795055db8bbf7c5e2ca65948ffc5541d2c4499f6255e4462884a90cc3b2db485f37e6133ba03c1a519751
+DIST genpatches-5.8-17.base.tar.xz 547680 BLAKE2B ea21c869fba01bfa213444c19deb4e8c3bf312746ec0b17e6f407dac00e8c19c6d60e4e243ff5e16605b413c3aa763db9a8d91907fbd57c7443ef48b7f93a344 SHA512 7d66e6cad6a4aea50fb996608c45896c52cfb1797da24a486c9cfd0afd3121886fdba4ba91a044af2774c92805232ce988bd0b82cea0618c29c17f2cc3407905
+DIST genpatches-5.8-17.extras.tar.xz 1768 BLAKE2B 937be9f6fb92f23e8604b609de34c6f51e8e873203c9f7e6dea545f213d4be90e3d0c173b703bb6956c6d79097ea0f25528bb249a22d7edcfaec1be8f2ca636e SHA512 3409282b77cad9c06d13f814d1904819ea967b2c499c64a03bc188ca31aee991b7100946324c719d35cd4e5e30072f33e9e7ebb70986e1d4d386c47ab0ce8577
 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.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
@@ -24,6 +28,8 @@ EBUILD gentoo-kernel-5.4.64.ebuild 4382 BLAKE2B 7b74305d92ce5e96835fcbeff0d0430d
 EBUILD gentoo-kernel-5.4.66.ebuild 4384 BLAKE2B b363fccc63465a0b47754fddb05f2e1dbdbda1c45b14a64befc6396347930cddc6893fab15e999ee364bb7fbb2a420175f2a8a4c2278eaa8a98ffa1253970a65 SHA512 f42e8a205ece2bc26a81f7a78531dc81703eed827741dd474560eccb363bdc8b7b145bc8d86f836857c5b88bddbf0253b13d7483289758503246bce46d9ec080
 EBUILD gentoo-kernel-5.4.68.ebuild 4385 BLAKE2B 865fc5028592d4408053503b11117b98ced615020e6de40a26cc3cb8357065e28cfa70209d043537e69c23d62d3b9e29c978ea35db14b9f1bc94318a25e564c5 SHA512 1110813549c8a40f29bd0c224f247dc2c9826257f373bcc11961eafbc16ce2da4ccc75bf8c6f0b8805c701b84fac2efba58cce0e651d0cc4b9903b373354111c
 EBUILD gentoo-kernel-5.4.69.ebuild 4385 BLAKE2B 865fc5028592d4408053503b11117b98ced615020e6de40a26cc3cb8357065e28cfa70209d043537e69c23d62d3b9e29c978ea35db14b9f1bc94318a25e564c5 SHA512 1110813549c8a40f29bd0c224f247dc2c9826257f373bcc11961eafbc16ce2da4ccc75bf8c6f0b8805c701b84fac2efba58cce0e651d0cc4b9903b373354111c
+EBUILD gentoo-kernel-5.4.70.ebuild 4385 BLAKE2B 865fc5028592d4408053503b11117b98ced615020e6de40a26cc3cb8357065e28cfa70209d043537e69c23d62d3b9e29c978ea35db14b9f1bc94318a25e564c5 SHA512 1110813549c8a40f29bd0c224f247dc2c9826257f373bcc11961eafbc16ce2da4ccc75bf8c6f0b8805c701b84fac2efba58cce0e651d0cc4b9903b373354111c
 EBUILD gentoo-kernel-5.8.12.ebuild 4325 BLAKE2B 2641156befda0f1fe51da073f224cf004685b5518182d004b79017f66cd110d439f05527db851ed66234b1d0fec2f328bacc3f5e47d636f6d28b7e0e64207604 SHA512 afc25fed7b7477c5c12c7aabc243062aba13980b5da068e70e0794997732ad2c995eb77506ccf18467f8971e453ac1909239fd46d61dbdec9c048e0a35b4d6fe
 EBUILD gentoo-kernel-5.8.13.ebuild 4325 BLAKE2B 2641156befda0f1fe51da073f224cf004685b5518182d004b79017f66cd110d439f05527db851ed66234b1d0fec2f328bacc3f5e47d636f6d28b7e0e64207604 SHA512 afc25fed7b7477c5c12c7aabc243062aba13980b5da068e70e0794997732ad2c995eb77506ccf18467f8971e453ac1909239fd46d61dbdec9c048e0a35b4d6fe
+EBUILD gentoo-kernel-5.8.14.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.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70.ebuild
new file mode 100644
index 000000000000..ff0e401cd76a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.70.ebuild
@@ -0,0 +1,137 @@
+# 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.8.14.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14.ebuild
new file mode 100644
index 000000000000..1527024779c4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.14.ebuild
@@ -0,0 +1,134 @@
+# 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/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 32f488be347e..bdcbfd55338b 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -16,6 +16,7 @@ DIST pf-sources-5.8_p3.patch 1248429 BLAKE2B acf0911cd8b9c356bcafe754e54e982a6f7
 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
+DIST pf-sources-5.8_p7.patch 2546471 BLAKE2B 9eae65836ee0a4e67737462325753b6201c40fcf93f99a114e929f9557fb7bcf9ea619c2502f7824db6bdcf96c7a7640ad0cc1ff5dafa494a532e6f9ee4964b2 SHA512 0449f4ac292d8b0ac6222c273bc535acae5b1e8bdb9c6d196098d61de78fce6739911094bc8f710e4ef3ec187964ee8a146aa09c87f241e816ef5515272059eb
 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
@@ -25,4 +26,5 @@ EBUILD pf-sources-5.8_p3.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760
 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
+EBUILD pf-sources-5.8_p7.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_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p7.ebuild
new file mode 100644
index 000000000000..d2e345cf5fb4
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.8_p7.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 34d80475df9d..723330a7b1b1 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -10,12 +10,16 @@ DIST linux-5.4.64.tar.xz 109593152 BLAKE2B f0bea4ef1fac7a4744848d6328175d1cd2000
 DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357 SHA512 06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
 DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300 SHA512 027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
 DIST linux-5.4.69.tar.xz 109603628 BLAKE2B 8a9b8e44b5a1ae69a4422f22b31c48ea1cf0ccf4b7fe55baa8e68b4797f717b66b38f739a5e525455ce9ecf99fdf312275a856d7f6956f17f3ffbb10a749ab63 SHA512 3a161bce688b1e9d18703f6354b746d1e8c72dcbbf6e3c8759a98ef3611234a32d7e571977aa78f33db9d42cfd9ad82145f3faea028d335a1863eb624b940b6c
+DIST linux-5.4.70.tar.xz 109602192 BLAKE2B 2db07e8ed76feba1dbbb697f959540ec7a050098022a460b4251802a99f71c01a76f9cbf81806cf4bd5b814a0e6b1e9f36364fcf099cf44d90780e6e0dc9ecfe SHA512 ab356476eb68ac1b2c172be97286418be307303e11ddd21e2d15cfa978a5d47b2bfec5cc61a306b48e0587e5b78cb02cec856981db9013112f4cd895374a5f21
 DIST linux-5.8.12.tar.xz 114510484 BLAKE2B 85edb8bea54dc1952e7f3ec439d01b22181ac9ba527ca387a04168966398e615a052d7d9585cde47fa4a4f9f09a7dffffaa41508af9b0cb7c93357e9f54ecf15 SHA512 c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489
 DIST linux-5.8.13.tar.xz 114511960 BLAKE2B 1b3510440d07032fd38beec3f325fee6cde73ba07f2fa4d0e220c3d86069a21852a9dd16cdb993a714c12eee2a3eff02f13504326f83354126f02ee399205d92 SHA512 38c5c70b4327e1f0a46bde8acac5350882aaeb1308e5e88e5d8fbc229011ea03dca76489a8413c541bedc28a446f6453e3410afa5e84cde6a57d21ec783e6f27
+DIST linux-5.8.14.tar.xz 114506716 BLAKE2B b14f2306a7e503118e67e8b854341baadafeff39b526600f6e0855ad6e11723187865bf86fc5a1b9adbfa96f9c36a212554548dd146ca6f8abdeac1e29bae08d SHA512 33300ce45c0cdd2f0b152b942662c931b53d04216bb75219e69004a7ba0b7a6781afb0d391929cdae5541628722252603199cf7ca1478d293db27b2b43afbc0a
 EBUILD vanilla-kernel-5.4.64.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
 EBUILD vanilla-kernel-5.4.66.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
 EBUILD vanilla-kernel-5.4.68.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
 EBUILD vanilla-kernel-5.4.69.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
+EBUILD vanilla-kernel-5.4.70.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
 EBUILD vanilla-kernel-5.8.12.ebuild 4007 BLAKE2B 6ed6d6dadc0939bcad36d1f5730a7806dc1e5bdb77b413d7ae209596ad344fc5186a00cc12ea07becd6d378359c6e129b1db1b1a08cf0d4e412385d66b3067ea SHA512 39267d528574bb9dc9ae3e55fd4e6f09c177b13a7659af04b732fd5c18a131a842b3f40d1090d0304af2a9136b55f071b140f4a37ae99baa40991d12013d8527
 EBUILD vanilla-kernel-5.8.13.ebuild 4007 BLAKE2B 6ed6d6dadc0939bcad36d1f5730a7806dc1e5bdb77b413d7ae209596ad344fc5186a00cc12ea07becd6d378359c6e129b1db1b1a08cf0d4e412385d66b3067ea SHA512 39267d528574bb9dc9ae3e55fd4e6f09c177b13a7659af04b732fd5c18a131a842b3f40d1090d0304af2a9136b55f071b140f4a37ae99baa40991d12013d8527
+EBUILD vanilla-kernel-5.8.14.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.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
new file mode 100644
index 000000000000..ee1e12c459a7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.70.ebuild
@@ -0,0 +1,129 @@
+# 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.8.14.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.14.ebuild
new file mode 100644
index 000000000000..540a5ea3c744
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.14.ebuild
@@ -0,0 +1,127 @@
+# 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-libs/Manifest.gz b/sys-libs/Manifest.gz
index 96a60cce4458..e8d92e5c7730 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 2e6bf05b7384..99ce19bdf7e2 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 4502 BLAKE2B 4d10d03e2517e0df8749c38d846b5ada9b891691db03a5e7f18b9d5aee2ddfdf6062d99b46d5b3f0d4db8611dd4419223408245413b5d1d72a47fa11bbf04a44 SHA512 e7da09705833b98cf23a286fd78f15d9f03b8bb554177c1e76aa2815a707fefcddaaeb61fe8c20729cb104760370e4c818016ff1bf7bec54d09b15a26350e7a0
+EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4501 BLAKE2B 3a15cc67e7fdbf61e2103ca9e543f936cc6f3221f0f3b7d43788cef7785f5742674ab0325e8c0c5cefe8909cc860a9ff0d42b615c367c1ea736cc745817cd9d0 SHA512 97b6b2b68a6de75e211b5f181d76fcf573f72fef7ff8f49248d03d201c2fec6f7d525c048b5b8b5cdc79c8512948f0ec75d5dbaa286172df929d264956d2c675
 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
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
index 8c9212fe3a04..a14a857fafc0 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 8d215b7c9c3b..37afd4d2391b 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 2771 BLAKE2B 2204a8a61cb04607e43ddc0e1cea91a5e2fb558276c83105918a8fff8de9b3fa118744eee67835b5763c797bdbc06274c552f13bc409b0527c98c5d56fe0ea2b SHA512 2dd8497eb9defc2e7b582b696a468e4158b602fd0f4a41eb1f37a07dcb7df07f66c07cf52860849a99508a74fcb8daf6d34861d3bdf5480e947cf0057bcdf9a7
+EBUILD compiler-rt-10.0.1.ebuild 2770 BLAKE2B 68ee449ac28f519a2cc0ec03b73aac5c770064f0350b5d1803a861386ac6b295947da9362b26dd6cffd90985f429beaf382ed949fc56da32184c9dab3aaff843 SHA512 2aea27ca4b4ccdc9c295b82c5e19558653945f87aaca03e50158a584044f8b0694f99ceb6c27e9fc5eb4e89cbc7851a4953e5a0a1494a49c46da7079962e3b14
 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
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
index bd6d37c13861..36bc141096ec 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6c7073edcd8e..e27c62e03cd9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -31,6 +31,6 @@ EBUILD glibc-2.30-r9.ebuild 43267 BLAKE2B 5705e5c2c6558d1eecb0b1df532512cda073e1
 EBUILD glibc-2.31-r6.ebuild 44382 BLAKE2B 232d74149e6028963993873c373e1fc744e4b0a3eb33aed47cd045503d55c2a77836c5bf7a96a3496c9d2d863a691ae1268f62d3f029a5cdd417c9492f3b3392 SHA512 61d0bb3df2cba90d53956774d4b4d52fa63649c6d9e21cc08f903bc63dbb30d6e412c0e71824dde753553bd64dee711603cb094cdcf35bbd28f6b5e911ebf735
 EBUILD glibc-2.31-r7.ebuild 44392 BLAKE2B e95132758e6e12800e93b522b7f0063df94c8501384c6dfa3c0e70cd49feec489ac0803e24b2de190006960de26fb05043a6cc7c1c88213468be5444f48d3b21 SHA512 793f25c844814323ac1421914b399109768702bfc700593289e5a80a3cd12e6e14bd13b864561d1967dd5e64c17b21e6765064def79c3f5c640b40ada90414ca
 EBUILD glibc-2.32-r1.ebuild 44754 BLAKE2B 15b6de7f027bda31caf170311117faf0f82f68232559be863ce65e9edf1a9600fc50d6ce9cec84d8d40ed00765a3793ebeb18559a18d11b4b5f1105981a1aeb1 SHA512 00ae773906303be880f87a3f4c6413a5c99199e4c537081112fa6497d9c9f76b56dac1d06e822da213af248933a4a9168a68cc66d55951e65557466f21d188a2
-EBUILD glibc-2.32-r2.ebuild 44756 BLAKE2B 2b7cdcc97c4e91f8d34a189270a3a4f946efd631cef89108f56d23dcd8701119f183840f4140521d72eb5c711e6e10d434a3f512c91bf0ae925ce981367950cf SHA512 1f574c423747837d8e2ecb4f5f05b3ba8aee909e7403cb0869e66ccc4afd454fae467ee161e3145a3ecf0312aaf924dd9d4be776d4cb419a2b63e9f6027a5ae9
-EBUILD glibc-9999.ebuild 44194 BLAKE2B ad96cd2b5a212b66d13d7dff47c80f76cddd1662e695235f4fa0ade7da62a1a8ad7867cfc2b4f8b3806590a9e18e68f1ee601ea8d3c0481d5c550aef586c7881 SHA512 9db46fdc13890998c82e47753e28fed144e76909371426e18c7216a93afab119ddbb930c8071e16c761a9ff282ec033d25e24f559d7fcf7867446885918f5f52
+EBUILD glibc-2.32-r2.ebuild 44995 BLAKE2B 461aff69f22606755df2c54b8a9e8af6ece2953d02c6bc1dcb059ab77fbb78e2c9d296a2dbe42353dfea73838f7ff5a067108382cd7ecca49e9e7fc8a7a2c707 SHA512 680e8083bd72c75593e338976bed5d5ca44e8327fe5cdd35f927595a2f37b4f6c30f0b1f6d65d9dc8eeaae0632c1cc9547ffef73519b9e9fa398830410b8273a
+EBUILD glibc-9999.ebuild 44433 BLAKE2B 81aea542cce6d02d187d0316116dc82ef62abe4cc110b3885ad9be6c91575b41108105e0d92a7cf4174ef376ade89dd16b0fa2034942b8762ceb1132867ad288 SHA512 86c83afc0f54fc5e5f9cb053564a01f7cbf522aaf9307b465b38ec3c63395519c475ac9cc708e832df2a49683a34e889fce90b2086246b043518ddaf0e707827
 MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88
diff --git a/sys-libs/glibc/glibc-2.32-r2.ebuild b/sys-libs/glibc/glibc-2.32-r2.ebuild
index 8088edcc61aa..6dcb8cf95b18 100644
--- a/sys-libs/glibc/glibc-2.32-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r2.ebuild
@@ -89,11 +89,19 @@ fi
 # and that gcc already contains the hardened patches.
 # Lastly, let's avoid some openssh nastiness, bug 708224, as
 # convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
 BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
 	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
 "
 COMMON_DEPEND="
 	gd? ( media-libs/gd:2= )
@@ -107,9 +115,17 @@ COMMON_DEPEND="
 	!<net-misc/openssh-8.1_p1-r2
 "
 DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
 	sys-apps/gentoo-functions
 "
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 4caa8e76b1b1..ade64de2bd40 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -89,11 +89,19 @@ fi
 # and that gcc already contains the hardened patches.
 # Lastly, let's avoid some openssh nastiness, bug 708224, as
 # convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
 BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
 	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
 "
 COMMON_DEPEND="
 	gd? ( media-libs/gd:2= )
@@ -107,9 +115,17 @@ COMMON_DEPEND="
 	!<net-misc/openssh-8.1_p1-r2
 "
 DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
 	sys-apps/gentoo-functions
 "
 
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 93350b6ee3f3..868e816c1dfa 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,4 +1,7 @@
 AUX libapparmor-2.10-symbol_visibility.patch 219 BLAKE2B 37bb9ceabfedde6f21e313fcc6a85563fdeca86863e681fa40689b5ce8cb5bdf87947c19b176d7f96edac562b6420a0ae6aae717967782e1bd1bb6ffd4782671 SHA512 93c5e19a6cdfce232a71f9b33b1e96dff44b947c06fc6e348a31038ef78bec7b90e49698681a4010bffd4274ff17a304542b549a8840458b3ab17d4ef1b53d36
+AUX libapparmor-3.0.0-symbol_visibility.patch 354 BLAKE2B 292bb70c043908943ddc553395ccd2a7b61b6d1643b3f9e659057f65065b448e83f821ad6f86abd00aeb96a1dd701864b5491e03a6802b7cc05141594da67c5f SHA512 0fceef027707056b7a22b0782c761c672735bc663d7e0d0200a445ed388f71a646841c3f72bac1f261c0a9fa3c3c0ff239397d53b56b1ef6080a1400c97f89ba
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
+DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 EBUILD libapparmor-2.13.4.ebuild 2122 BLAKE2B 9343b5e365867cf38f2b5d321e397b103d278c3efbaff4d5f6ed49d10f08a092d3575a6264ddda85a93ee4066dd49d1987a4521e3cd87ce0501c3c511810d46d SHA512 42f8e370312de701f12c7aecd7210f0a3bf4a84a3cdaad279f523ff5df8d9b5f92ef78bb9bc92f21021f2901a28eb29bcafc6c3a5f244253ca13dcbf77fd371b
+EBUILD libapparmor-3.0.0.ebuild 2157 BLAKE2B 09fb1958e1efba5d35d60fcd3ad14aa4d84ec852aba95c96328f8b36f270b7750f1a7616b99127cbf2449771f34fb49da244839a5c7409e773748e727002f91c SHA512 d785d2293999838004d690448600a2b52f5334e1007ade1363b66e26794a84c5c22b531e3eaf07aadeabc2d16c328880496086872b17241e72ae4a0f1c198608
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/files/libapparmor-3.0.0-symbol_visibility.patch b/sys-libs/libapparmor/files/libapparmor-3.0.0-symbol_visibility.patch
new file mode 100644
index 000000000000..d5002461462c
--- /dev/null
+++ b/sys-libs/libapparmor/files/libapparmor-3.0.0-symbol_visibility.patch
@@ -0,0 +1,20 @@
+Adds aditional symbols to allow dynamic linking.
+
+--- a/src/libapparmor.map
++++ b/src/libapparmor.map
+@@ -117,6 +117,7 @@
+ 
+ APPARMOR_3.0 {
+   global:
++	aa_features_new_from_file;
+ 	aa_features_write_to_fd;
+ 	aa_features_value;
+   local:
+@@ -130,6 +131,7 @@
+ 		_aa_autoclose;
+ 		_aa_autofclose;
+ 		_aa_dirat_for_each;
++		_aa_asprintf;
+ 	local:
+ 		*;
+ };
diff --git a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild b/sys-libs/libapparmor/libapparmor-3.0.0.ebuild
new file mode 100644
index 000000000000..ea23d83ed8c2
--- /dev/null
+++ b/sys-libs/libapparmor/libapparmor-3.0.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools distutils-r1 perl-functions
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +perl +python static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig	)"
+
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-symbol_visibility.patch" )
+
+# depends on the package already being installed
+RESTRICT="test"
+
+src_prepare() {
+	rm -r m4 || die "failed to remove bundled macros"
+	default
+	eautoreconf
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with perl) \
+		$(use_with python)
+}
+
+src_compile() {
+	emake -C src
+	emake -C include
+	use doc && emake -C doc
+	use perl && emake -C swig/perl
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C src install
+	emake DESTDIR="${D}" -C include install
+	use doc && emake DESTDIR="${D}" -C doc install
+
+	if use perl ; then
+		emake DESTDIR="${D}" -C swig/perl install
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins swig/perl/LibAppArmor.pm
+
+		# bug 620886
+		perl_delete_localpod
+		perl_fix_packlist
+	fi
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		distutils-r1_src_install
+
+		python_moduleinto LibAppArmor
+		python_foreach_impl python_domodule LibAppArmor.py
+		popd > /dev/null
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index e4cd5c40ad19..1df4b4461ba1 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,6 +2,9 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a
 AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff
+AUX libcap-2.44-build-system-fixes.patch 5589 BLAKE2B fc101cd0780cfe71105b38ecc533057224012ea24b6a2825993af425c34f130317c1e9de3116e1369ba540c061e8200542b3b987d7bd7c144ac92ec0b1945bb9 SHA512 6a8f77da9be8f44039b58751dd84bcb401a2ad03c4d7a204f0f15c99eee5f3a6e1f439e9c70353503c3675362560421e52e82db1256549a6ef1a1d3c75329e04
 DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
+DIST libcap-2.44.tar.xz 125568 BLAKE2B 758b756648d27e7fa81024e33712a77f2b676fe1aa0519c232412d1468afb6b982d5ab54162e2f46ebba5dbcb962d5779e5b15550c938aca52e499d406990a6f SHA512 1bb323ca362923bd6bd0e2e4639cf8726975165a620a243b31e797056439eb7efb2bfbc8e5521636783a86c7415b2037b1638c98747b79183ca7d3d42a04ff20
 EBUILD libcap-2.43.ebuild 2172 BLAKE2B 94abe1f5d3ebb812f67f7d1170c4f1fa9766b75526ac1a088bd8019b76c76695784b8d57f5740f0c684f8a3fe4440bf8b61f5eec3fbfdd1bd1eb7543fe8710f5 SHA512 7593c942c3650af81cbd905d97f5265efb53a16ac9bd9156eada840ea10c85e64de2464fbc4088306a73e3761a1606f8000e9a95e9ee36b15db741e33aa08612
+EBUILD libcap-2.44.ebuild 2246 BLAKE2B 9c2d5b8613b7d40f4b5092c39bc28915669d5a62b2cd9a2f95a47039cdcabea05990d5d47c40a679af1947291c48449d6dd9d18d29cc02a4e5c3c6da0b82b294 SHA512 ccaa49098bd02ecc82fbe4a6734d68097bf38c5f1108332ee39089f0c81fe39978264c14b817532180bb92c46f3572840643a0d8fc0c57e68b283789e56d8a2b
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch
new file mode 100644
index 000000000000..eeee8ba2ccf1
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.44-build-system-fixes.patch
@@ -0,0 +1,173 @@
+box" for people.  Specifically:
+        - allow toolchain vars to be set via environment
+        - CC / BUILD_CC / AR / RANLIB
+        - CFLAGS / CPPFLAGS / LDFLAGS
+        - split CPPFLAGS out of CFLAGS
+        - break -fPIC out of global CFLAGS and only use where needed
+        - use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+Forward ported from libcap-2.24 to libcap-2.25
+Forward ported from libcap-2.25 to libcap-2.28
+Forward ported from libcap-2.28 to libcap-2.29
+Forward ported from libcap-2.29 to libcap-2.33
+Forward ported from libcap-2.33 to libcap-2.34
+Forward ported from libcap-2.34 to libcap-2.37
+Forward ported from libcap-2.37 to libcap-2.39
+Forward ported from libcap-2.39 to libcap-2.42
+Forward ported from libcap-2.42 to libcap-2.44
+
+
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -52,7 +52,6 @@ GOMAJOR=0
+ # Compilation specifics
+ 
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC := $(CROSS_COMPILE)gcc
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+@@ -60,7 +59,7 @@ COPTS ?= -O2
+ CFLAGS ?= $(COPTS) $(DEFINES)
+ BUILD_CC ?= $(CC)
+ BUILD_COPTS ?= -O2
+-BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH)
++BUILD_CFLAGS ?= $(CFLAGS)
+ AR := $(CROSS_COMPILE)ar
+ RANLIB := $(CROSS_COMPILE)ranlib
+ DEBUG = -g #-DDEBUG
+@@ -75,16 +74,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread -Wl,-wrap,pthread_create
+ 
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ 
+-SYSTEM_HEADERS = /usr/include
++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS) $(DEBUG)
+ PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+ 
+ GO := go
+-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
++GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
+ ifeq ($(GOLANG),yes)
+ GOROOT := $(shell $(GO) env GOROOT)
+ GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
+ 	$(MAKE) -C go $@
+ 	rm -f cap/go.sum
+ endif
+-	$(MAKE) -C tests $@
+ 	$(MAKE) -C progs $@
+ 	$(MAKE) -C doc $@
+ 	$(MAKE) -C kdebug $@
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
++CFLAGS += -fPIC
+ 
+ all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
+ 
+@@ -50,7 +51,7 @@ libpsx.pc: libpsx.pc.in
+ 		$< >$@
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+@@ -82,10 +83,10 @@ $(MINLIBNAME): $(CAPOBJS)
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+ cap_test: cap_test.c libcap.h
+ 	$(CC) $(CFLAGS) $(IPATH) $< -o $@
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -3,6 +3,8 @@
+ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ 
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ 	$(MAKE) testlink
+ 
+@@ -16,16 +18,16 @@ install: all
+ # written (and you know why it fails), email me and explain why. Thanks!
+ 
+ pam_cap.so: pam_cap.o
+-	$(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
++	$(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ pam_cap.o: pam_cap.c
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ test_pam_cap: test_pam_cap.c pam_cap.c
+ 	$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
+ 
+ testlink: test.c pam_cap.o
+-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
+ 
+ test: pam_cap.so
+ 	make testlink
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -27,7 +27,7 @@ $(BUILD): %: %.o $(DEPS)
+ 	$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@
++	$(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -24,19 +24,21 @@ test: run_psx_test run_libcap_psx_test
+ 
+ sudotest: test run_libcap_launch_test run_libcap_launch_test
+ 
++CFLAGS += -fPIC
++
+ install: all
+ 
+ run_psx_test: psx_test
+ 	$(LDPATH) ./psx_test
+ 
+ psx_test: psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB)
+ 
+ run_libcap_psx_test: libcap_psx_test
+ 	$(LDPATH) ./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
+ 
+ run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
+ 	sudo $(LDPATH) ./libcap_launch_test
diff --git a/sys-libs/libcap/libcap-2.44.ebuild b/sys-libs/libcap/libcap-2.44.ebuild
new file mode 100644
index 000000000000..50d850b8a01f
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.44.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://sites.google.com/site/fullycapable/"
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+
+# it's available under either of the licenses
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="pam static-libs"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	${PDEPEND}
+	sys-kernel/linux-headers"
+
+# Requires test suite being run as root (via sudo)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.44-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
+	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+	"${FILESDIR}"/${PN}-2.21-include.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG=no
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a cap
+	if ! use static-libs ; then
+		# Don't remove libpsx.a!
+		# See https://bugs.gentoo.org/703912
+		rm "${ED}"/usr/$(get_libdir)/libcap.a || die
+	fi
+
+	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
+		rm -r "${ED}"/usr/$(get_libdir)/security || die
+	fi
+
+	if use pam; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.notes
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index d0be8d8884fa..6de9d4312045 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de
 DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 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 2894 BLAKE2B 1a150947b0df00ba82a886647adbe78473db0135995e029fafc029a8dbc05e38a26ca18a097e812c432725315575672972bf799e3c74e9492fce883951b61399 SHA512 9b6036a8ba371776f5acddd94feb4607b0f4039e430ae393c2eb354811f33f3ab8882ff689a7b88b7046cabc61662e0d272b85ea350bb308c22f9a57064ad1c8
+EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B e91e074bfa0d1584d40d997a1661507f404d6a6e4593e6da2a6825a1f8260ff02c4daebe4b9183d6ea025aa5c3be6986f3f7a920f578ad16d993ea10db272943 SHA512 558940389a55b5ea0e6e4c5b0fb48a8eaad5c00e26c1af90d5619106711b78341a532c59535f01ba5eedf99902af4494838b6edf5a0ade8693524d662d55053a
 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
diff --git a/sys-libs/libomp/libomp-10.0.1.ebuild b/sys-libs/libomp/libomp-10.0.1.ebuild
index 33f6fa96982a..9908059ef41f 100644
--- a/sys-libs/libomp/libomp-10.0.1.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 594f099ce57d..b38d0985c55d 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,9 +1,4 @@
-AUX openipmi-2.0.26-readline.patch 291 BLAKE2B 82885b89bda01db81472e6dd72883450dc83e78a2a8f6f49d0909d828009897f2bcd7218fbfc971c4f2a0e368e1a80024040ce17f23a3d349a1da7a56ea146dd SHA512 f2d401bfcc155f0488cf1f23942a177e29de6439b42a8521ff35e9cc61601ce00cd7e458f651e422ab8cee2f901b85431414dd8e2bcf41f633e0f09c82d27b23
 AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659945bd7d85758342438f261fedce67bace7795a74ff6010f68d04d8ae33936b6c60780986c9e0d66e93061577132f SHA512 2deae71fd039126cb3dd0a348658ddbf568345c782c2467a4712d36006217f86eaf86950c821d36a400aea4cf18409684e8abd3b1e504928f5bc6d4cf943c4bb
-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 2323 BLAKE2B d618b032ee5af5254c6f7f4db49348118f740cd4abb1a819b2f8954449270621a502ae2d224d136399d4dae85d525c05e558296e42bddddebaa3d29d775698c7 SHA512 f5c84a02eac84d9352251997e60341f81108cc942952d638ac3b73c08ce9d805a997ad09604de314bfae4142b5f3d7c295f268c019afc8b36fd56ee8ea928e08
-EBUILD openipmi-2.0.28.ebuild 2290 BLAKE2B c4417b513a033deff931d30e128abd7f00d79792ab6240c353d2c694104c75f1c82939d0ebb70d475b8eafd20d23c849394c67f74f60cd13567f17bc83f2ed8b SHA512 91b2813a586ab265b54dfdbea2f052f9ac956c87c88d3a06a48a69a721e57b9e95427f301929f0c5da93f01280c13400d0881d571c2c50632ae6767358d45bd6
-EBUILD openipmi-2.0.29.ebuild 2294 BLAKE2B c1d73393de3fc5e0c9f54dd068b177486d82abc119dbcb74d21107e93fe15ba045e5d3685e6ed87444fadc5aeb499f78f23bde078852868960208a3e11c7b984 SHA512 4cac4e7614a28bed6e14014a5b7b9687b01651d87156e771a9789fe2b3606518a813df5db0caf37ee7ecd87cf884f5528a1bf5fd084a0b8c35626580ad5d0800
+EBUILD openipmi-2.0.29.ebuild 2293 BLAKE2B 3ba70592875413025abff558478f725ebc6d8be0707ced4b8cdcab07803627d88d20336034c4cb992411d0889be416cadd57898d3997d2779ef31a0cf12ede59 SHA512 532b6633550e245a04a6caee5675f7fd56ee649dfb04a22baa1d4e7039f1a1b75a7e629215a28ed2261bc62f1552eacc0469cbf6207056dbd1c1f73599db5b72
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/files/openipmi-2.0.26-readline.patch b/sys-libs/openipmi/files/openipmi-2.0.26-readline.patch
deleted file mode 100644
index 79fc640ab5ad..000000000000
--- a/sys-libs/openipmi/files/openipmi-2.0.26-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenIPMI-2.0.26/sample/ipmi_serial_bmc_emu.c
-+++ OpenIPMI-2.0.26/sample/ipmi_serial_bmc_emu.c
-@@ -42,7 +42,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/select.h>
--#include <editline/readline.h>
-+#include <readline/readline.h>
- 
- #define _GNU_SOURCE
- #include <getopt.h>
diff --git a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
deleted file mode 100644
index 049d5cd95eae..000000000000
--- a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
+++ /dev/null
@@ -1,103 +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 autotools python-single-r1
-
-DESCRIPTION="Library interface to IPMI"
-HOMEPAGE="https://sourceforge.net/projects/openipmi/"
-MY_PN="OpenIPMI"
-MY_P="${MY_PN}-${PV/_/-}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86"
-IUSE="crypt snmp perl python static-libs tcl"
-S="${WORKDIR}/${MY_P}"
-RESTRICT='test'
-
-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_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.21"
-BDEPEND="virtual/pkgconfig"
-
-# Gui is broken!
-#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.26-tinfo.patch" #501510
-
-	"${FILESDIR}/${PN}-2.0.26-readline.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Bug #298250: parallel install fix.
-	sed -r -i \
-		-e '/^install-data-local:/s,$, install-exec-am,g' \
-		cmdlang/Makefile.{am,in} || die
-
-	# We touch the .in and .am above because if we use the below, the Perl stuff
-	# is very fragile, and often fails to link.
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# these binaries are for root!
-		--bindir="${EPREFIX}"/usr/sbin
-		--with-glib
-		--with-glibver=2.0
-		--with-swig
-		--without-tkinter
-		$(use_with snmp ucdsnmp yes)
-		$(use_with crypt openssl yes)
-		$(use_with perl perl yes)
-		$(use_with tcl tcl yes)
-		$(use_with python python yes)
-	)
-
-	# GUI is broken
-	#use tk && use python && use !tcl && \
-	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
-	#if use python && use tcl; then
-	#	myconf+=( $(use_with tk tkinter) )
-	#else
-	#	myconf+=( --without-tkinter )
-	#fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
-	newdoc cmdlang/README README.cmdlang
-
-	use python && python_optimize
-
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-libs/openipmi/openipmi-2.0.28.ebuild b/sys-libs/openipmi/openipmi-2.0.28.ebuild
deleted file mode 100644
index fa54ed37ba3d..000000000000
--- a/sys-libs/openipmi/openipmi-2.0.28.ebuild
+++ /dev/null
@@ -1,101 +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 autotools python-single-r1
-
-DESCRIPTION="Library interface to IPMI"
-HOMEPAGE="https://sourceforge.net/projects/openipmi/"
-MY_PN="OpenIPMI"
-MY_P="${MY_PN}-${PV/_/-}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="crypt snmp perl python static-libs tcl"
-S="${WORKDIR}/${MY_P}"
-RESTRICT='test'
-
-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_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.21"
-BDEPEND="virtual/pkgconfig"
-
-# Gui is broken!
-#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.26-tinfo.patch" #501510
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Bug #298250: parallel install fix.
-	sed -r -i \
-		-e '/^install-data-local:/s,$, install-exec-am,g' \
-		cmdlang/Makefile.{am,in} || die
-
-	# We touch the .in and .am above because if we use the below, the Perl stuff
-	# is very fragile, and often fails to link.
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# these binaries are for root!
-		--bindir="${EPREFIX}"/usr/sbin
-		--with-glib
-		--with-glibver=2.0
-		--with-swig
-		--without-tkinter
-		$(use_with snmp ucdsnmp yes)
-		$(use_with crypt openssl yes)
-		$(use_with perl perl yes)
-		$(use_with tcl tcl yes)
-		$(use_with python python yes)
-	)
-
-	# GUI is broken
-	#use tk && use python && use !tcl && \
-	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
-	#if use python && use tcl; then
-	#	myconf+=( $(use_with tk tkinter) )
-	#else
-	#	myconf+=( --without-tkinter )
-	#fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
-	newdoc cmdlang/README README.cmdlang
-
-	use python && python_optimize
-
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-libs/openipmi/openipmi-2.0.29.ebuild b/sys-libs/openipmi/openipmi-2.0.29.ebuild
index 970dce7c65a8..61fda309670a 100644
--- a/sys-libs/openipmi/openipmi-2.0.29.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
 IUSE="crypt snmp perl python static-libs tcl"
 S="${WORKDIR}/${MY_P}"
 RESTRICT='test'
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index cdde322f64f1..22b3ab6ceb79 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,7 +1,4 @@
-AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
 DIST pam-1.4.0_p20200809-doc.tar.xz 42680 BLAKE2B e8371bd76b589db06ce95f2d10343be163aa5149f566f7d9bd5e9cd0340b95eecedb6a7d20d299fd2188c736fca3c69c0bd2f8eea4541dfd3312227c3dcf4e2d SHA512 5007aaa811b6321f124245493c6a4bc9ae07ab4ff651fc817843e8b4a74661c07418e2479363a72c35320f0f1cb469a2494c5d354dc819b920de7d1918e6ce5e
-DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
 DIST pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz 810595 BLAKE2B 897f64a7f55c033601665b0ecc292cdcbd0d9b2f24199ed6ca5fc69c2da4da7401677493bed09a118b1fc0a475dc016fc7a3a318787c650212b056064ed0b817 SHA512 3c2bc401df51dbd4118698afc80a0448559bc6b5d8c7c45c800c2f6421034a131c0bee971f9640aec6b0d77f8a31ec055c7a84a646d9a11690dfda4af4e1068a
-EBUILD pam-1.3.1_p20200128-r1.ebuild 3536 BLAKE2B e43cb4b3c60177b3abc2a41b89922c1b49649334d073ef0c2bd01c293cdbd59aa2dad79088174ca1f85ccaec29f12913662ea6d977b6f4d4ffd7e8eb5cbe8f57 SHA512 9f51fdb2cb3a60981e93fdf30cc968b757188fe9a05afe2ec3e4bd017cec292b338dbdc01d9a4779f2341e329754c41fb4fcc949f347d9cf121528262bfeace1
-EBUILD pam-1.4.0_p20200829.ebuild 3894 BLAKE2B d1376649610e75807a8dec847e6722e4d7ee52a78e8d39783a8f63a99773e6e9a5a15833c00db1ac12abe9dd86665a61ef8fc475871f3c5bcf468929d438de8d SHA512 fd3acd3ea543204dd29a88a50446794e187ca4a266a70871fc0ef68a035843631c19628fcc36e2cc3490096cd7fc6a3fabadab232d5492d825a11f57e6aff678
-MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
+EBUILD pam-1.4.0_p20200829.ebuild 3886 BLAKE2B 4e0a13eb1f9e851d1d19f3ed437a84426a17426b191bf215ec44baa0f7b675f7cf1eaf7cb8f115bb230fec7f914e662f8d2e5d4686f2e261643e869b6bb5bad8 SHA512 618415a67947353bc62cece832d92816d63e04a6d495551b940411c7157e4ed110b266a9ab763a3022b129c7fd45f57d34a86e6e55efe9468a55439cd3e7f06c
+MISC metadata.xml 695 BLAKE2B 26bfcf404440c1262220cc12bba80561529e9bf1c5f7f0c9f84375874f348f35b08866117061c087f4b870f6d6f80ebe16f4a42a63ff5e95aa69ae9bcf97c9d9 SHA512 87045043ba8805232883ffdbcfa50dc53de3d46e7889e520481c7b126b4ef9c9c2b83878a73d26a8edd71c0edeff8dd7bcd4a8b2a34893574b8bc8e7e94c6fc7
diff --git a/sys-libs/pam/files/pam-remove-browsers.patch b/sys-libs/pam/files/pam-remove-browsers.patch
deleted file mode 100644
index 7e3ae99731ad..000000000000
--- a/sys-libs/pam/files/pam-remove-browsers.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From baadfdc644fcb88170c358c449a731520e1747a5 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Mon, 1 Oct 2018 23:12:08 +0300
-Subject: [PATCH] configure.ac remobe browser logic for DocBook
-
----
- configure.ac | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3012ceb..e7e7dac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -554,17 +554,6 @@ JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.4//EN],
- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-                 [DocBook XSL Stylesheets], [], enable_docu=no)
- 
--AC_PATH_PROG([BROWSER], [w3m])
--if test ! -z "$BROWSER"; then
--     BROWSER="$BROWSER -T text/html -dump"
--else
--     AC_PATH_PROG([BROWSER], [elinks])
--     if test ! -z "$BROWSER"; then
--          BROWSER="$BROWSER -no-numbering -no-references -dump"
--     else
--          enable_docu=no
--     fi
--fi
- 
- AC_PATH_PROG([FO2PDF], [fop])
- 
--- 
-2.16.4
-
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index c172b5d30353..22ede6e6496c 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -13,16 +13,6 @@
 		provided by <pkg>sys-libs/db</pkg>) installed in /usr/lib and
 		will thus not work for boot-critical services authentication.
 	</flag>
-
-	<flag name="cracklib">
-		Build the pam_cracklib module, that allows to verify the chosen
-		passwords' strength through the use of
-		<pkg>sys-libs/cracklib</pkg>. Please note that simply enabling
-		the USE flag on this package will not make use of pam_cracklib
-		by default, you should also enable it in
-		<pkg>sys-auth/pambase</pkg> as well as update your configuration
-		files.
-		</flag>
 		</use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:kernel:linux-pam</remote-id>
diff --git a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
deleted file mode 100644
index d5a007ca1d2c..000000000000
--- a/sys-libs/pam/pam-1.3.1_p20200128-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 db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-HOMEPAGE="https://github.com/linux-pam/linux-pam"
-
-COMMIT_HASH="4dd9b97b762cc73816cb867d49c9d0d0b91d642c"
-SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
-
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/libxslt
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	virtual/yacc"
-
-DEPEND="
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
-	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="sys-auth/pambase"
-
-S="${WORKDIR}/linux-${PN}-${COMMIT_HASH}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${PN}-remove-browsers.patch"
-	touch ChangeLog || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Do not let user's BROWSER setting mess us up. #549684
-	unset BROWSER
-
-	# Disable automatic detection of libxcrypt; we _don't_ want the
-	# user to link libxcrypt in by default, since we won't track the
-	# dependency and allow to break PAM this way.
-
-	export ac_cv_header_xcrypt_h=no
-
-	local myconf=(
-		--with-db-uniquename=-$(db_findver sys-libs/db)
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--exec-prefix="${EPREFIX}"
-		--disable-prelude
-		--enable-doc
-		$(use_enable audit)
-		$(use_enable berkdb db)
-		$(use_enable cracklib)
-		$(use_enable debug)
-		$(use_enable nis)
-		$(use_enable pie)
-		$(use_enable selinux)
-		$(use_enable static-libs static)
-		--enable-isadir='.' #464016
-		)
-	ECONF_SOURCE="${S}" econf ${myconf[@]}
-}
-
-multilib_src_compile() {
-	emake sepermitlockdir="${EPREFIX}/run/sepermit"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install \
-		sepermitlockdir="${EPREFIX}/run/sepermit"
-
-	gen_usr_ldscript -a pam pam_misc pamc
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use selinux; then
-		dodir /usr/lib/tmpfiles.d
-		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Some software with pre-loaded PAM libraries might experience"
-	ewarn "warnings or failures related to missing symbols and/or versions"
-	ewarn "after any update. While unfortunate this is a limit of the"
-	ewarn "implementation of PAM and the software, and it requires you to"
-	ewarn "restart the software manually after the update."
-	ewarn ""
-	ewarn "You can get a list of such software running a command like"
-	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
-	ewarn ""
-	ewarn "Alternatively, simply reboot your system."
-
-	# The pam_unix module needs to check the password of the user which requires
-	# read access to /etc/shadow only.
-	fcaps cap_dac_override sbin/unix_chkpwd
-}
diff --git a/sys-libs/pam/pam-1.4.0_p20200829.ebuild b/sys-libs/pam/pam-1.4.0_p20200829.ebuild
index 7667b4ca24ab..f34326b6b54c 100644
--- a/sys-libs/pam/pam-1.4.0_p20200829.ebuild
+++ b/sys-libs/pam/pam-1.4.0_p20200829.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/$
 
 LICENSE="|| ( BSD 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="audit berkdb debug nis +pie selinux"
 
 BDEPEND="
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 225ccff4c562..840a6194fcf2 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 4022258b73fd..69e1404df666 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -5,6 +5,6 @@ DIST sys-power_acpid_2.0.32-r1_extras.tar.xz 2204 BLAKE2B 7f3b6c7c93c0989071c4e1
 DIST sys-power_acpid_2.0.32-r2_extras.tar.xz 2196 BLAKE2B 0975289f7cff6ce24523246f1daac22149d69c410e07a19a5952457e269fc1f736bd3636c93038f660c411f3085d375250c31dc3de3ac1bc6335a97e1fa3dea3 SHA512 f49cf3f75f5db4ca454d29330ae40461deb1109f076e140188a7560fedd78970572a6c023146c4d33c0778ff65056abcbc66725c000ece8e6861419d02d0c6ca
 EBUILD acpid-2.0.31.ebuild 1963 BLAKE2B 849a3193c21d908549798a9a553ae4af336f45a4450a115c9311993dffaa2c7d2bba42a040305120be72e835ae5256d8ff65aa9e8bb0c5b3659906537bf22e4e SHA512 7243e2dba4a56c2c59620615a1752abc4978f67e199d6bbd841eb1cab8c8c5ae2eb3e2ddf84693a786e8e5204b4fcf0708ee2b00b6d28fd08b9864a5df0158e4
 EBUILD acpid-2.0.32-r1.ebuild 2038 BLAKE2B 2c9c8d25586695143f9e036f886793829a539095392b6ba74ac055e55e6a0ec0d90c33d797d195da667fe4488d8dbd88865d60064cd2c60d6ee068a459467609 SHA512 3cad647a535eabcdfd73beef403b7c910254cdd5782340dab3e8d564bdc5834722b134dda6a2aaca832abf87d1b37444f984206a27dca8836026b586341f0931
-EBUILD acpid-2.0.32-r2.ebuild 2039 BLAKE2B 471a8d89bb59e52ce80f7378f2528557e170bdc7ee515e55208327153df8ef6388ae7d1174bafe4d522e02090ece360b2a17d812f876fbc6630cd0952242d362 SHA512 adae150792fa0952a017fa41ae2ce53c4d5e48a4620c66c164c2377d5038d3749ca239df4c83d2d41a424a359dadf956a2fe4ee726dd32827f3b5f6fabcff829
+EBUILD acpid-2.0.32-r2.ebuild 2038 BLAKE2B 712efb866adc81c44e2e47ab7e8582013ebed69791868ec25c886ed985d42257abfc17fd5cbca6e4f0e0731a155cc254bf9a592988e9d885c00aa2ec5be7868f SHA512 bc6c7609356cc501379c85ebf9f069a0e9ac14ddaf823adbcd493582437e9c4d0d6eac5119d498719ca2d45c35f3300a09de31f78f1108899be64f6fcfd447c1
 EBUILD acpid-2.0.32.ebuild 1966 BLAKE2B ec877eb0334d301be61fe4ebc3d458e1c4b98895137d92d8fa6e6c320aa83c9b2199fe61a40ceb5d0fa3cb153da7c11f005d41705b1f0955c1bc223d28e72882 SHA512 ac8d3f67c720261d3d3757118e8196df612e024c0025ffd55861089e85ba8e63fee0ff6daa0ae5d64f90f02f3fd4ecc45f08c884a1afceb2c07d9b4f8579c1f3
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.32-r2.ebuild b/sys-power/acpid/acpid-2.0.32-r2.ebuild
index 2afced21655c..1414427f03db 100644
--- a/sys-power/acpid/acpid-2.0.32-r2.ebuild
+++ b/sys-power/acpid/acpid-2.0.32-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 299a3d4ad858..0c17e42b0707 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 50ddb8c5b5ef..164443ef414e 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -2,6 +2,6 @@ DIST parallel-20200722.tar.bz2 2101118 BLAKE2B 989b0fbf6d359ddb4fc86d1509ccc9d92
 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 635 BLAKE2B a10cc73325ce748d300360fd3c3f200d395e9f50ea380466aca20cb9a4c19053cb39a0a4570810fd9a652930001c74e99e10a75ef6e874fd17b2e767d828f02c SHA512 53908576cf756ac9272d4238543efb7f7fff2c42b4f9ba45ebf1656bac262d7e7e674e25ba88c91fca8cd308160c572fdfa7e3a894d34e4e9f216cbb661b49d5
+EBUILD parallel-20200822.ebuild 634 BLAKE2B 3937842c027464703f2aa2fc03407cd349174ac4f8286004ce4a91d008803a113e4ef014df6b4f93c44b0fd415f535cb2f6817b1bac3fa76f5e52730b6ab8876 SHA512 dd9271c6b3ae7a78d9917f3d19f4c97244c5cf6a51f95a16bda46e42387f334e4c135ab962664c9ac7d7d29c07f93f06ac9e52b72a656dcd4b1392cd36a48d82
 EBUILD parallel-20200922.ebuild 638 BLAKE2B b9dbb07e6bd05e6fd839db8684e3e00f833ef4d3070c8e6f2ceae9726b6d382eb312c56abdeaa53294853fd3b6f4ff149983d83a318d37270e4f6e8e29f6eeb1 SHA512 174793db3e189d3f35e92bdc4cd6b32c98a36adebc0e7b68cfacea6f8b1ed137075049483e60b8882b50dedd88af6b276ffb6c63d4f65683e31f5e2200902251
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20200822.ebuild b/sys-process/parallel/parallel-20200822.ebuild
index c68ca32399af..669e8c068dcc 100644
--- a/sys-process/parallel/parallel-20200822.ebuild
+++ b/sys-process/parallel/parallel-20200822.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 625fbc829958..c97d7ef2996a 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index fd25e3fa1a14..2f8564c4aec0 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,2 +1,2 @@
-EBUILD awk-1.ebuild 466 BLAKE2B 3c180cce419f4cd09b4d8bce996ec4eaafcfec6ed138fcc97f9179607ac1ece6f6217bac6ea62c8c335c432d40b74732cd113d631ce4e4b8a2e383ea5e2c8774 SHA512 9b5975ee2c8a3ec282ef2b5cc0f535bc3f4d770765321951e7187bde22b3d834baac95b56bb5aa2cab53a9ff3f113d1ecc0b225158d695e4aba20b02a2363c13
+EBUILD awk-1.ebuild 473 BLAKE2B 62938a0fffc883bb74ca223dbd4862a85f62146255c09c8d90598b9e6157c7c64d9bcd2ac0f911aead6d91c94f50b67246f662726a43ec7c5b67fa27b6245ea8 SHA512 12e1665eefa09e34efd7eb1f8ee1f0c899e501334bd6283513539eb5f92fa91d0d010c77a09ecbabab0285070d358b8c4e2f5470e8bc6fe4b75468ed89f39310
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index 478d3848a79e..c405925c8a05 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/jack/Manifest b/virtual/jack/Manifest
index 61d6b2d9b8b8..01df204578f7 100644
--- a/virtual/jack/Manifest
+++ b/virtual/jack/Manifest
@@ -1,3 +1,3 @@
 EBUILD jack-0.ebuild 486 BLAKE2B 60967690c2ce1a6beaaaff9fbb62f7eff812afa4408d4909e6f8c1f4639411e95126cc2d96cfa905d84f541afdfa439025f92546bd5411e920b9fa13a4ef3998 SHA512 81f1440ed477f1786d3e6deb213943fec483b17075df8fa00be819ec8dafba20342cf3c8d87b38322c76a99696c6100fd828ce71a5c7321a2e9f82804e6d72ac
-EBUILD jack-1.ebuild 475 BLAKE2B 538157334d1e772e66cca3ad0c337c7909ea906f620e8d20f7441d8738c0532e2cd248687e7dedb98f91a6a12e5e59e9165999199c389f351da7f54f8ba7e813 SHA512 2be5af24cd5ff35079cd94209fcab53b7a962e96e75f276bc9ee7ac644c6359b13af24ec084dd4beb0b20d1487d321980e9945f56636c44647a364396d3c7d72
+EBUILD jack-1.ebuild 474 BLAKE2B 000bf10c3bbd94d9202b451e9696bdcfd2033c050f198a1226f676bbee4af3158ef783603a19430e8992cfc0cf94673ccc4ec9e1885cfca3da85e5b62f54c49d SHA512 3f7393686e83a6486fad4e71ad901111936de0f57b092e5981dcbeed3b81d5a6b96817e0e86e4bc5663e6a0286b32f7bc533d5d5d53700eb9b7e1f2226e04fcc
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/virtual/jack/jack-1.ebuild b/virtual/jack/jack-1.ebuild
index 76141f82b8c5..2e2a526760cc 100644
--- a/virtual/jack/jack-1.ebuild
+++ b/virtual/jack/jack-1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for JACK Audio Connection Kit"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 92435cd3d42c..97ca639d94ab 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,5 @@
 EBUILD rust-1.44.1.ebuild 359 BLAKE2B bdf5cf7593eeb2712785ee42ffc53ea60db682591cf9f1d50a1a79dfad0295ca7432ccddc3a42b2070e4ad757786ad72788088f585fbb4a791780dca5bcf724e SHA512 45d2e5b01c193150ce67e9bf03c7792ca41d2d8c888fb344e50abc45c8a2746105421bb98bf5e610ec24386a6b00d2767fa59bcd445968dec0b6745b1ae0ea79
 EBUILD rust-1.45.2.ebuild 359 BLAKE2B bdf5cf7593eeb2712785ee42ffc53ea60db682591cf9f1d50a1a79dfad0295ca7432ccddc3a42b2070e4ad757786ad72788088f585fbb4a791780dca5bcf724e SHA512 45d2e5b01c193150ce67e9bf03c7792ca41d2d8c888fb344e50abc45c8a2746105421bb98bf5e610ec24386a6b00d2767fa59bcd445968dec0b6745b1ae0ea79
-EBUILD rust-1.46.0.ebuild 362 BLAKE2B d5774499294ba5e0828939e443aadd69b7a28cc6c49cd705dee38c2098097469627118964e14601057629455904600e243b59f608d440fa81ba5c111c5c743a9 SHA512 ea786116128446c36102533eb20ed78b2c7cc8a8c271dac25657a0ac58f65c1d1d3586e4d0d5fa4be06254ad74e268ee588ecc1b8c81fdc4cb9d1fc5d6a39bb8
+EBUILD rust-1.46.0.ebuild 359 BLAKE2B bdf5cf7593eeb2712785ee42ffc53ea60db682591cf9f1d50a1a79dfad0295ca7432ccddc3a42b2070e4ad757786ad72788088f585fbb4a791780dca5bcf724e SHA512 45d2e5b01c193150ce67e9bf03c7792ca41d2d8c888fb344e50abc45c8a2746105421bb98bf5e610ec24386a6b00d2767fa59bcd445968dec0b6745b1ae0ea79
+EBUILD rust-1.47.0.ebuild 364 BLAKE2B abd8065706713d741bfc63e7f7f1e7b2f2e1119c38bead9fcd7aefb4777b371b6685790dc2962bf5b8f36b4a167fc51b1ae21ffdf379e69a3b4e216b1a0ee910 SHA512 59607c4c32ae7db32be5e77912f109beb28f3fe8ed0adee814bc1949301ed3376cbecd69dbbc2554b6ccfd4142177381af659c3a0e861d6255f079ecbcb419fa
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.46.0.ebuild b/virtual/rust/rust-1.46.0.ebuild
index c9c318a4de65..6f32b771ca56 100644
--- a/virtual/rust/rust-1.46.0.ebuild
+++ b/virtual/rust/rust-1.46.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 
 BDEPEND=""
 RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/virtual/rust/rust-1.47.0.ebuild b/virtual/rust/rust-1.47.0.ebuild
new file mode 100644
index 000000000000..7cf8d65440f8
--- /dev/null
+++ b/virtual/rust/rust-1.47.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 2947548d9dad..3eaf9cc20f39 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 284aea634617..f4c1aecd33d4 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -4,5 +4,5 @@ DIST modsecurity-crs-3.1.0.tar.gz 250617 BLAKE2B 6081d09e90f3c18435e046264ff8c0b
 DIST modsecurity-crs-3.3.0.tar.gz 290379 BLAKE2B 557a41e937564698809ecca40d4e76e5c1d3617b62189b7ca230ac7533cba14fdf619bef81c1e40a996dd260d2eb52c27563437dd795c2412bf38715f026f300 SHA512 12043aae12b5e01455e229136411e1fdef3a14318aff191d190b567463b63efb72630a695449b56f1d654ed1cfc0b4eb452a64502c35337d37cce920d5fa4ea4
 EBUILD modsecurity-crs-3.0.2.ebuild 1557 BLAKE2B 975e0ecabdfc9d9158a8f6f8284175a096cfe6c8666da074466d48a9c7d81d467fa08ed7b449bf232712e3cc4c6830b66fc15fb62f9b04189a6af5da7f6ba23f SHA512 6d50e03a2cd5a616a90e4c0a2814c4d58bfc68109ca1341a4da189463626922a6fbc7db7892f9184b147a896d585817fd778eea84fcab7ca62a95c1ec3beded2
 EBUILD modsecurity-crs-3.1.0.ebuild 986 BLAKE2B 793c4d63573b131adbde573fce00cc6c5febb50afcb54f254c0aad22dcfc80741f23c3cb0b4f7a51b060820f1e421e0ccde9169686f0b54cb269dacd9672d045 SHA512 043f688d07a21ee803fbabd4e1429ee88b3cbb2d66573ab557b9c2dbaacb3f8ac5f2346b79c6eb7b21791baaf64887d717cd622abe5d50e6e01328b484bfb5bb
-EBUILD modsecurity-crs-3.3.0.ebuild 866 BLAKE2B 0abd15a5e22dce636114d4d7a5f05a190d1d3cc197a1ccccdd1cdb741285f4b5ad07cda2dad8a664869d8bb8d716c0cf3e7347e7d8c54aad22ed043c521efd47 SHA512 0333513378ccd62c3b0161a59f4b573a9a0ffd6462a361085352d811fe26791c0c305c4904fb67c54a9e9981edde296f5f2fae592673aba3023c8bc254643903
+EBUILD modsecurity-crs-3.3.0.ebuild 864 BLAKE2B 769a64d8e35dee1c0296ad34a60b06382ca765f6ef98fc615a7f476174833c372e1dc3cc09371b231bac4c136af256b0c3fffe491be3dfd64349a6e738a019cd SHA512 ff94015763f77eb7e28d817af420548693ead124c960d97dae1a02cfeed8714b607430364823de0beb0c1d4ce1b81e081368fff8ed6a27f2282bf3305b4ff134
 MISC metadata.xml 258 BLAKE2B ccb4061e467d01526bf0a751983d67745c80a59d427f964d52460d16d325a318e30bd453eb398bec6fe7f6e5a434ec0b0da313519e303dfb94c117489be2b706 SHA512 5b9b093cf1089ee3f2f46aa2275c11a5d2e4ef3b75e2a922e09fc3618ca803cd35a3991b3a59d34b26aba41e6a51efd615d98ff90f81525cefcf64c1ac778b6e
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
index 985caa850729..3e3e7bfcfc79 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=www-apache/mod_security-2.9.1"
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7a96dbe51bd7..561f00b8b31f 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 656edc942155..4e8c0b5d0db9 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,13 +1,26 @@
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.4.mod 1006 BLAKE2B ed912b9fe91ee4e16f58b599232ea85bc1f994a290e8f514f6d053bad6312422c18e868b9d419079c63cd547781dcf82994b53af6ef10bb23fea05b66f55747f SHA512 8e12292cb0c83d0ea8d4227c27fdabaed182de6f42bc6a29bd53848c41c87754994dd50df282ff30ab78411d54a6667a371d84b620d1b02f3f953429e3c2e97b
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod 1059 BLAKE2B 175c6f53a17c785d18eef838f35553aeb65463c35c4c56f617be30971ff9196d6642629eb71abf95ce39c4d5f6b1dd93b3e21c1f71f901e7a5c6eaf655b0aeab SHA512 8c0fbd092acafa28279d7255079d433968960cc57cffc36d69df114e9f9e87ba06e3dbf4f39fb5bd8ff60c46be965a6d3a74fc680a12fe45b935613537399333
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.39.0.zip 2869565 BLAKE2B 8bdffe82920f768d148425fc6e4c469253958a4074f991f3343b8ad8cbe186ea25f03ea273f88154f25c3122bd90c656e994768cd9d0ced3b31df18c653e3f3a SHA512 ebcdc77d1a5e1554a3c95653fbe3b09accb1b75f69d7112733e44f60d84b427cc613812de4032fde7c7f5d6c2234d55c28bc941e1726312c32668a6daa2d11fa
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.zip 1195278 BLAKE2B 34c2662f7ff89dc98d6e9f156e77eafdfd26df0f6fd5d4858bac571261e9488dc5d4541e745b173387f42dcd497cd02345ca3e0acce0e326129997b77ca04a81 SHA512 bbcda7aee6a580061cfd9858fc8d7dbafefd8eecfad25e4c6825d16b2e038e6a5be7b5d876b348d86059763a0e0eeae7d1546fe35fc98f5b479f478a25a11512
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip 393806 BLAKE2B 76acd4273e7b2b77b81e4363cee62f498846a6072b26c0229917ae984802134cb41da5ec081e5e71e0c97180dfb49306e624174ce86ee6eea59b22fb1584c45d SHA512 9583b5d95556ab6e798d3d0d8c3eed51d45a6fd32b6dea207a089a33a1e50ca5e468e975d386fe00b704d568971d2f3b7fd3937b0494c4ae920dbee84d36a120
 DIST contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod 120 BLAKE2B 326a975321b8f3912d8c91f69fd27e3e59b8e0921c4cd41fabe2ae77a2d5ce183e4ab7ae5acc98e72626ce30a1d4c16a3cf808618b8beec553b217aa5f73935a SHA512 e47a5e15b0e0b884fb8a9b27778f557cb170c974200848447a59c43953c3d0c3fc6895ad962e47cc6839a1a8efb1680fc1ae229abb9324227ccac9ed5954e2bc
 DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.mod 385 BLAKE2B 0f2f1cf4e6f3c7c077581eda5d58abe44a40922f77d77f7b679c7f75a060c6341b59f32d96205dbf162ac7c915a6cd0ee8fa1c38e96c5d5fa8f877a46e50d87a SHA512 39d2d0883241829c4923434d321c6d675b3d4324a8062bd70006fb88ba700fe46b0164a55f0c6bba7cf9dd667a460dc1be0b58636481f521b3ec220365028667
 DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.11.0.mod 638 BLAKE2B 748904ddb5433cc43caf06dfac67a59deb9f47d6e90789d7a9b928cc1d14bfed5009d233606de0f9cb1747b698c00cc831041abc90f91f517268fb3a82d79c10 SHA512 5b5872f682976363f536d37d007ba4bd198dde74ea411c9f63bba3743672d9548a0b6d2337ab09fd63a5ac4ac3ef43fb5fdccda6cafa573497ea78196fbbb2ee
 DIST contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod 51 BLAKE2B ad5183c28197a963db05cf512f677e170d45629ee83351071da4fda3085c20efd3f3722896bae3f9a9ea802f38a2faa6c837ea98863e0ae9934a3bf93bf39b15 SHA512 3b21ef555adc99c8acd8a037ac9205a0ca2a629b43095c1a7f850d22695c1c9f4149f10256cfd0d0420d9dbf1345df8cdfb81c5a0162f06dbfc989d969694c2e
 DIST contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.0.0-20190131005048-21591786a5e0.mod 41 BLAKE2B 639bac549658805f4d1a72df67aa74331c31c3baea598a2b27970d3561c7a7b905bcc0492ad52dbc94c34792569b3df637234f446f3ca4e487051115d7737a83 SHA512 58d1897cf3f5b661e344d5bf91b93e91d5cd8e741ea5f213687cd5ced518d102a9a92f0c6354fbca2bf88d4c6057f78d56900e75591490f0a22ea87ad536b21a
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2F@v%2Fv1.1.3.mod 675 BLAKE2B a520e6d473b712dfac9e2013dc79f3d1fb87c94556d016c22aaa86077a9657809105271b1c2ebc7fd77f405031dcb628c483aa27d856695836f076df4bc465c7 SHA512 fcd112cc1a7c438385a0f7bdd0900985117901b44d7f7dd8b1526f2ab082ecd4da94e7263510e8e31beabed37222a5ccc50b4ba4163ae74d91a13fa16af0ec16
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2F@v%2Fv1.1.4.mod 675 BLAKE2B a520e6d473b712dfac9e2013dc79f3d1fb87c94556d016c22aaa86077a9657809105271b1c2ebc7fd77f405031dcb628c483aa27d856695836f076df4bc465c7 SHA512 fcd112cc1a7c438385a0f7bdd0900985117901b44d7f7dd8b1526f2ab082ecd4da94e7263510e8e31beabed37222a5ccc50b4ba4163ae74d91a13fa16af0ec16
 DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod 42 BLAKE2B 918e7b776b2a84db7ceb26eb9a1938899e2fc3c982dec44c8930b016d5d922b0050f4d5fa7301e572785f5d47560575db94662e81a66a1bbfdf0303abdf6baae SHA512 e62709dae4886e56dbc610b8d2fd2e06940f2274d5b17c1802e2ae93ee6d95d153af4cbf7fc651a526bfb675d63c77ceb7246267a916f0511e07e0b13492c9ec
@@ -27,6 +40,7 @@ DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c6
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip 3289 BLAKE2B 9ee2622ac02197b10ee4798bba13513b6cbd319827ec14688f5950de6d8784813397155694e54ef756ead56791a669a61c190c4d3adbe4bf9795ead4896dcfb4 SHA512 953c2b7b855a5798948b52e82c7cae799b9310ca5978bf3168fdce310b6695647f997c7a9d70e7156870977be2de26479865980acfa36d765bd21fb4fe823bba
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
 DIST github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod 53 BLAKE2B ed6781e3006723a251f94bf5f96aba2964e7926617255ddedfb932ba74fd3265fe28ec906b90f7f1956509f521dc2c29701fcc7301513eb1a1764d33e50c2c8b SHA512 e46209635777bfc42c4399ff0eef13320a9b5d7a23dbe26f79da44a462b14941a949d812c586c023e3b4e617e741612ada3db8da7ae4e70ab242b8ffc123e880
 DIST github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod 349 BLAKE2B c25e546d66f5bb4679a66949169f3a4568602a7b6f8ac1386bfa7993704d79821c07d4f0931cc2779fb862b73465ed41d0f050f59149bc39dfa1602ea706f207 SHA512 51a8db67904d3f632dfad620e223c7b59efe42d8254bd4e0ef49ef1a40759e1dbe4558f87209059841b80e0ccda5130cabef7c869a399eff3786d4b4d8d3a747
 DIST github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20190418212003-6ac0b49e7197.mod 53 BLAKE2B f269abdff53719acafb9701f8756ae2140c4d9ffed0e3e6a4f31c0cd83a9bc991415e0d92fb3ac8049ed8ef8aed6581f1a95b73927bdd5acee25a7ec2e5e7e66 SHA512 5862546783836b9bf14f5891c177ff3a9821c802915a2bbc76fd3e6dbddd4dc56acd6a1e6ebca29e5a3a4c305622d6ae736ae277caba06030b511fbf4ec6af87
@@ -40,13 +54,17 @@ DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
-DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.1.mod 783 BLAKE2B bc0b87d963797e17d47abfd3221e24934e1c901b9e4499f3072fe5c63efe0cfb579f78fb8db9168956dc1d3077b72fea40228ad0f800ae6c28bdbd13da937911 SHA512 7b6eb2db67662716f37ad4b75c9ed39128949c9cb9f8d0f33c9c93eea899f024eff32fec0637b1de7d495ae1e2ae87ffad15425a591e57198e07ee496557276a
-DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.1.zip 755104 BLAKE2B 46910e78d0d68c5738d184a65554e4994caea3a7f1a3d33c01504acbcdf6b9ac23daf18edee581d946ca2176d21f868ea20dcc0b9faaf5bd28e7e17dc72f5f70 SHA512 32b2d1935b2c36461bdfd46d1a5c8c11cc86087d70106009b3d55495c5c761a797513eb56782de607082b29a99984e754f0d768af83ef60d76952dfa7b6c4e49
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.0.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.0.zip 795117 BLAKE2B f271cddcaaa2b428c91a916f63fe5ef194ad11a7af6a921c2ac15dbb39507e0f6f8f71e097e49a46953bf7d647285f73aed8784d1fd38d987f6ea1e25809318c SHA512 ac7bbf0f173de0d7100db4d28b457ee1f810441198415365cfc501e731b28c0b396e8446ed3ebb0fcc849a5ad00b2704d994f493dcc172b5c538441d8be73c98
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.1.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.1.zip 800438 BLAKE2B 84a09d08b7f6d3f544bb80dd61e9345b2e07c11d9075aaa23b8fd3dd68dab29838d996d11352f28abd9f1e7c28ec2b6a00b864996929aafb69de80e406506d70 SHA512 d94838ddfcf392a72340184c80c3743cf82c2ae1f1711d29f025da521da8ef1e0646c1e765765d143822fa7117c0fe8e75a884a19888e6a5596b0bb5562b750d
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.zip 292216 BLAKE2B 910a699520ec253ad24cae6d0c1dc94ca6f3f8313b9cf59cb1e93489e81e7a1622d44889924c8c7c10b52d2da9e33c3b44105df0c702d263772c31da13a89c0d SHA512 701ba04afcb52e1173737ef96ae89a64bd5b29755b4e6b7dd42092ac030aae1d181b47f58a759134c72e44728717dca77c94c1aed5365e483efa3f97b3abbc55
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
 DIST github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod 216 BLAKE2B 60964b79efee4fbf34288b3d659551eb51191e85a067b5c73751f22496bb8baafb68199cdf4580bf256133c1cc51e9229952cd4436b241f98db4d1e5e7b61fd1 SHA512 44eabb63e8480c53e9abf8ea92ef6cdb6dd5a6318f62993f5e21e4d1ebf80fff7217a5f5137da822e6d84f1ea7b078f04ff97f8e33fb36b9b37a478b0eefd527
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352
@@ -55,24 +73,43 @@ DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zi
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.18.6.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.16.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.zip 15058887 BLAKE2B d4e5ddf20a35e9f624054b03e9f0e1d804decceeb22ac993dfcd35c6faf5e28caa07e975eccc0bbf80273a9ad07a64784418290318dac4ccef0520c3d311abbb SHA512 260cd3683e883b02d194d906ce025375692d81b04b950120a04caebd1c51c5f3293d81175438159041e07abf7abe6cc9c3669c0afbca043ff0486bd29b5d0193
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.20.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.20.zip 17496626 BLAKE2B cc48d6adf58a1eb9adad48b1083a44942d61623bab93b0971a5b6e098b80f7e1247d9717cbbd9576b787e1b6bbcb10cb0d3ec31f6d878abe1eb6ee923c1d509a SHA512 adca62424f682659ba50569af9befb2bdf5c4ff0708bf9437c44be1c631f94f3f50c3836b4276a96973ae220ab5a16b8cfea4a180f042d0ebf9b713bccb0a332
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.21.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.21.zip 17537587 BLAKE2B b8a3a2571b81daafb23526f32eb23389e6d0cdb3f5bee7f3453a31e222abe8d355bdfb7b90a2a42c83a89bc9135a826a84dc3ba00174d4c8af75a4101831d95c SHA512 a6168eb3e0764d82aa0ee4d10f60a41e05f92101b9215544a491de82092135cccc2c9f10eafcd2af472c4605452503b45e5f75cfb54877bb43c56a84754e07c0
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.22.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.22.zip 17545129 BLAKE2B ea3fe46a7ca37980c0a00c4383390165d74c887cdde7d5ec037f599900fdd561a67289bdc76c41cbcadd5fd2a0da73848e193b956df13b22011c6ceec3ccdd9a SHA512 9e478eadee98b19ad768c812487ba1eff0de209995cafe39629bed56f462fde6cc4c187de79ff0d6c1945d3aef66d81764366c4f2a60f416c0dadbd8128b6185
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.26.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.26.zip 17587525 BLAKE2B 16ead6c13f23f4042cd2086cdb6421c6f607bfceb4b5e263d34676584e5f0556f46635819237f2ba205519832069fcfb6b6c68f0b670878240fb27c51027a278 SHA512 1646b5712807fe96084e18e22a8e402fae0abc9ea90dc6883833d40140c88ec8160820f41fe2e14a00773fa21ec0dd297e5d75ada660644f0efef3134f36f5a7
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.27.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.27.zip 17591280 BLAKE2B e1bf86a5f5cfc86e35b2b60ca44c09b8c4fbc76e8dea0e5f5ba93ee9f48b3623959b79591a9bf9537dece22aff3a3e3cd1c1275382a763dd1723e838e703d76a SHA512 cead9f8a18a40f70deaf7b1a4d563566ebbf17b822f82e53510ae2c67a64b81265b00667812859e3bc5bfc61270f7588215e599971006f6a7d5538f967fc1090
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.33.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.33.zip 17639529 BLAKE2B f8ff6dc7f64b69d350d2fce25a4244608694d5f28b947a299b4011c1fce33484b34445e8ce64c3889cfbfef322e362f57e2f91decaae882000c12e8762442826 SHA512 b538550b06779699c2238c6fca44a7895ad5936e9c82c177c97d5e9efbeaaeda6394441b6278508ee6143571c8dab91626cb4edfbe6aab780d6828971f868a3a
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.34.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.34.zip 17688924 BLAKE2B c54035348a0f15a814af653eaf671e0cb9ae32593d6352887f526b17ad2839b4111405103759d290c2f3397b7b4495f34861efa209dc3ab1cc67bade76d3d9a4 SHA512 a0c252761c6278757ed42b03d3660f62e298a3d36e395730abe382f3fc4d4f679ac985e4b6c1772524bf55884a355287626de103bed2671ea6b8557ba614d830
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.0.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.0.zip 17790116 BLAKE2B cfbefb6947d15febfd0a49c159b9378f10181781798adca1b7d81effc6bc9e9b45af44a710659cee6414102250523b18dc345eec84959fbb704fcf36b3683ae6 SHA512 fce7571de1c49c4c2c3e4cc94722446c8ce7a07c0f767a264facaf7ef0a6dec52d332ce5eca9f14244cdbab1b2a1d2046e8673143ff691a992de40c193537edd
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod 31 BLAKE2B 77d3cd0b41521832b89f14be184b784eb6d3751282c4eed77939e9ac164a2a0735d7e025cb02027888cb6e2544b5d7163de967a238cfadafe88c081d0d737c08 SHA512 408521f704ab6f3454c32473fd7eeb4bd8c9cd1b74db9bd69cdb822a5098354bee05b1f9cab5cba15e8445de7d3038d1b7e36b1291b05bf46ed2a9346d7c3d20
 DIST github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip 4207 BLAKE2B ef5d5b2f9c3c5fc7d33693ef58d1852dfce3ab089741cbd3fdbe97bb36c66cc30d51b6d8d9b2bf3acdce358f7f412924d748275124718a7e254890186ec12661 SHA512 1782e6ff636479b2b7450881664f064db6468bf341ee6bcf103ae37b292e7247cda869550935909b2302335f03c6b706100ab998b5634f24c2785a590b374a87
 DIST github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod 29 BLAKE2B 4cece08b1112e806860f0665a6838e88abd4491465357cd0ab27c3bf8d953bb31acd10bfa99014185a77d3ee92d7e4b430c86a8c4778eb7cd2339c8b5154e369 SHA512 818cc980e9190e6dd4a8f4345cb9a260cff8ac3e3642390b50fececc8c194d83a57ed3af1e99ae503cea18fb6433df192981f31acfa86cd45979284967321e65
 DIST github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip 6740 BLAKE2B dfa98bfd1df8237b8d8c369fbd127a3f63a5daed9ca1b56611346ff433be9d826895ca4e2a669c046a80a4a3c3378337959a4881835ab7cb27c5617d02e09c90 SHA512 4a8e1105204e1ca18f874ba873bb7c15ff45c1279c6be42ac4fe2935ee8d86d5c432fd520ed3c830840306a1938c8aa9ada4a7c8aec7adf575a73fc86bdba034
-DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.5.0.mod 87 BLAKE2B d00a18c1859bad94dfd08ec6e3f110f887d2f33434f42a1b556a7f880e2d5fd82a145448a7160b8ac9c8683c80d8d5655a9968c3e102a04e9dba1c22c6f29823 SHA512 88edf10bc2fcc343c9d07c5a2396f192d6fd734ff169f7b6302748966cec0ab972e40c64c415771493bbad04543a878ad7b9280766e5d71dce37518652169e8d
-DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.5.0.zip 480699 BLAKE2B 4b6c78328c5cb94e7670a28f832f91559f226c1c7364a14936e811c548fdc9d2463cc74d806c389fe8fbb812f0d69124740d2150ca4a1a50efcc69a7d9a54372 SHA512 76377bee0b7d8763e62d2fc189f9526a1e9539f542cc673e8ff20d7633bf9780f3a465057051284d8692a79d3a6aa8a372e6e31dabfe61993e1695f151ac7493
+DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.mod 87 BLAKE2B d00a18c1859bad94dfd08ec6e3f110f887d2f33434f42a1b556a7f880e2d5fd82a145448a7160b8ac9c8683c80d8d5655a9968c3e102a04e9dba1c22c6f29823 SHA512 88edf10bc2fcc343c9d07c5a2396f192d6fd734ff169f7b6302748966cec0ab972e40c64c415771493bbad04543a878ad7b9280766e5d71dce37518652169e8d
+DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.zip 492475 BLAKE2B f4a84abe97df3f69c5a96a1d84b33f01d7d91185e47b34def4bbe73a2a3a3a93c1b6b61e74c1f300dbccac556e34014f651683fdae658c2baff707365513a0e6 SHA512 7bd09650d91bf16f4852a4c93b10690f0a04ffbbb9985c125a28ecdd95420b127859e72ebd1aa750d2b9d2ac965f792c6d323e694563b015597b64999dd90e59
 DIST github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod 176 BLAKE2B 6910a08bcd7e5c56d1de06787dfbce567ec00658047cf7911af84d5abb4a4f4be26a49e510db91da10710ccf710cffac4b29ec7750f9d0ca84cc598444b55b4a SHA512 ad71b79e925da23c03dbd96b2dcadebfc09e2bfaad735e2058d708e46e13085946f262f5ee220bfd1172e71ff7473f4f1f511e573cac7b6f62a136155f1823f1
 DIST github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip 11353 BLAKE2B 5097b03788270309f3cd886b3fa9c71e8324849bc835f4eaba6045489c373d8ed67e74629baf27189c45d861c9ec69b564b8e92d7bc226ae5293278925ef016d SHA512 961e58a2f52be77d4783afef09c80ff16eb396829f8c57958bfe5c7a3daf447da57118f923b1b01f32efb80a3dca0bedcaa3bbfea215e8e6c1da9b14a2c8ddfe
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.mod 32 BLAKE2B 49a6d3b092b95b721fa95ebc79b370a112c44474130a63854c5a0cadba149824fda5fb32cd9d262241a38f57659ebd71e809e531264d77cf2551da543b8ec0c7 SHA512 bac95e43558eaf04fc634b9b87039bc3e7ffa17e84cd94c6be19a6ffc0fe1c90dfe67b43b5d6c4262b4fb2c6ddb30f19090320ffbc20cc75c1a1649bb4441e27
@@ -82,12 +119,14 @@ DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb7742
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip 112043 BLAKE2B ebb78032f634a43306bc3f098aa44a7c47bd50b2552c4ae5726b3b20cfa688a77764242c9942942076594d4805dfaa6d32aebe1819202b4dc060978ce9301d92 SHA512 2ae536eec8ee6a515e3b53c16d59d7b40311f3e4c0c69206a5f6adaa412daa03c47e01ac9ba183633bc332d1ce863fd66a7f3452710874b3f8aa96c5c5e39102
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
-DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
 DIST github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod 43 BLAKE2B b7f6d4dca865e691a66b70dde813bf817f089aeaffc8c49d2d61f6efdc1271ecf380740213d28b12585ca60e0a00d8707ba0880710a1b82e578bad08f4a9d979 SHA512 55103bdbd54979e045985ac6176821e9eb480611acc20f430311cc02944dc8a303468536651a54cbe653117890a3e4c6ad48b02e638abe96cc8df7b4df7fcdd9
 DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod 39 BLAKE2B 066fe4ec077d7fc003ec3450de6899062f4e0500efa3b410cf2afd8315c2f7166e4a21605d5970d3be17692b8b4d2fd0e4b48b32a01a09a310799c3faa1c31b3 SHA512 ce1047915fc0d4f3dc7148b20b90edbd878c7f0016823997aa5dc030d000f59658ddffcd911fc98a387387ac2175ddad9ceb9c8af18e0595549ea2c3859df6a9
 DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip 6032 BLAKE2B 0265eaf68c186fc505148e41ca53a84aa096eae82243502ccb3b3703bd248c3b42ff0cd87015d11e427dccc9564c69d58676df34c353d7fac22ab2260061b137 SHA512 04bbd7a8cef79a432684a2c84f4180401893fda4f43f18e7e78d9dff6380b645aa86a41c54526f8f18b8599889c4a167da364e197f6d090fa3450f71d6aa5177
@@ -109,22 +148,52 @@ DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb7786
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
 DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.6.32.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.6.32.zip 896002 BLAKE2B 713507965e38cb4fa6aac2f3621168900fe4d983b8fcbba0b1431524b47a91aba123bc35e47496820693f5fa48b571009f0dd26ba07ea9e687cf0a6ffa650b24 SHA512 4ae082642ab6469da19014e88bd5906581e583bae0ee6fbd0e33287a8515715fa11d8c974d33850f784fed6757922b0e22d4db08b5fd2cca06eaf0c7d3ec1384
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.1.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.1.zip 906463 BLAKE2B 819cf71e2e20ca4b5f2794370143cb71f8e31c34a2c664c8ab0dc0d7800220212a528ca0374d3360975c0b19bc100d83a551c67ffd434f700ed6070dee8ad81c SHA512 0eeb8ed82f657061f88bb8d9f6a9d1ec8568fef8e02392e8bf4623fa27e3d76de685f40b018e6d533baeed699a3ee034ab8a528039e0c09d863a29a9fc209f5a
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.2.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.2.zip 925019 BLAKE2B 1f7fa8e67df70449580ffff36b8aaed4266c79800f8d12a1e341cb821762f9128598ee201a05f809169bad51782fa59e60d1c9d742806a9da849a66c06c15881 SHA512 2c1327992f90e6f0b8dfb3f744b452ddda3036f9c413d42c12837176bf4ebf3db769ede076152e69ee6a70db7d387c604175314c25db4fe915a17ca2a0e33ac3
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.4.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.4.zip 929097 BLAKE2B cce475816c0ff1d7c767781d9e8642db6e810682de51294494a6c036f59aa2868d74bd2cbd98860c5af1bd9f968cd70bcc82db78ab769ce6fb2acacafaec7eaa SHA512 2f393e04cf5ebb7c8ff226d7f41e1e34c73089f1d9d800b4c6695a466bd27a401a3688b6fb827a2146b5cadb3e9f90ab5b0e8d03522af5831162a4217b65f06e
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.7.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.7.zip 941614 BLAKE2B 3163f137e46d7d69ab8711e4c3cdc4f9b35ef1732ac5605a98a262b466918f2547126c0c57959770bc14af0962bc4b7bc741b40337e9f2aefd069a12d5c7e02f SHA512 143898f42e8f0362b52f62dd9675808ae8a2894bffdbfa4245cc6a8bb10ea4d2c5f710a58e9187dfa8ff543aad40229a3df0183145ea37b0a50e8f5aa6565198
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.8.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.8.zip 950056 BLAKE2B 9ef4a63a34278bb7a7d54dc16eb06784dbaf5f7c49762b4fedc390f0d4cadf35c617414965b2a1c6a5d68b0ed483d699f85d2c03097f842ba71345d074556f4f SHA512 a6d1520d3c7c92a8a4a50cf3528e1d0add06634a35fbcf4548c3e41df2088384ff4850655562bf2e3474de4a00213b422b56688298dc804ce27c29c75c753a19
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.9.mod 145 BLAKE2B d177eb2f56fb78e805bffdd19667f3442d1c24e6729c052d0fa2177a86fe934062fc212002a6e01948e519ef0b6fa630749008ed4e904f5357c9509eba4ffb71 SHA512 822546395a852603652e816b3396a18283797085dda57eba1a6d6092fd1632c34363edbeb0f9d8bbef6042f60350ba09d4623c731424a8bd851d9c5b6d747505
+DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.7.9.zip 964705 BLAKE2B 95acd55f1d25d7dc68b28d924e3b21102c420754d7abb711c6c646075599d55e2a1e594c9df13c52cc1f103a90090c54631a65fae1b9d48c15094c42136713cf SHA512 abafec0e858ef181ff30fda6a05239999802afb1cfdad1591cecd77b5c935d99788d612acfb03cf438e4882bb471a6243f04664edfef0e77bcc0e639f71f413d
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.zip 5721 BLAKE2B 68d668861b5cd03036281d924961d4d68869e73e8ec70b9a1d70aef1d5eb4db895c80f6735a53e4810a42a8b46a040ef02069af1208dcea97664df48e82f181a SHA512 2db9aabb45445636a642116b6887a7f0048d047810fb687ea7a81c556720c32f3b0b87170092020e8763443e37ac86f559be2017b7bc1ecf98bd7ed2e6371257
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip 44891 BLAKE2B 71044665123da95afb442b491c4a3d9c6e9ada650784ea2391a9a6c3d11ca8a471e505af7ffbaad00f1786b86683e2d5bb72a10012b8dbc618ea568f0e652677 SHA512 f83f91deb3b2d243f07bc8922276245f85d31f620aec192417ed7d413e823f8694f93bacffc6c83163cf528c19460dbf248063d5388d9c622a4255831fca5d37
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip 49672 BLAKE2B 792273745cd9cdb2913387fc305cb0a5e9c444c5e97bd469fdd94f91f6bb0a6a2c9223a9a5fd8798db79922e6056c9b266df2a7091fba4e81d783339c1b78284 SHA512 04ab61faa2934ec2ff4dccc43e74a20457874cf091ed182d28c13db97072b953a4040a0109daa8d2ed740069e89e4e0076f1c0246d7c93ba3119ebda1d659f0e
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip 36823 BLAKE2B 748629d0224bc4598ca2573286d49e8623ca17a9438cb525a8d080d14cf37549943418d170dc5b107e2a39271be21e1ffe2f9224b469b3eb82574a0c64218851 SHA512 1d451dc97018060ba5fee2dc1696807fb98aee809bc8cd2994bb83a35550edae819fb46cf17ecaf89fa8a22b277ae20b35c32c779640a47679e5ec965bca007c
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
+DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.14.0.mod 163 BLAKE2B c491928ceff4a7b3ca803d43106511177e78d06ed64d91f27210a63ff827489504dd995c08f159228c1fbb938590c2ac01c49233583810363cac9a4f594a26ee SHA512 4aac01661231ec1e9bab32754210850371af6f0e13ac94dba77d6ce9e8bb0f261b4f683451d18e9ee6947042010b29303222991c763d9b7eb37113683ce8caf1
+DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.14.0.zip 151866 BLAKE2B cfaa733a7ba70f031a9835d077e73c44ea0544b299d435581170719875074f176e5b19aace4ca985a43733a0d771eca64d3d6c74dedde06e928ec616ddf07ed7 SHA512 74249855423bd52b7a64b0dad729ef92a9da8e1d5ab2125d5425e1856cc46423e60fb6617acc0d2bc9818aa53bcc3b1377fa352b7a6c122bda2d97ca80d8177f
+DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.0.mod 163 BLAKE2B c491928ceff4a7b3ca803d43106511177e78d06ed64d91f27210a63ff827489504dd995c08f159228c1fbb938590c2ac01c49233583810363cac9a4f594a26ee SHA512 4aac01661231ec1e9bab32754210850371af6f0e13ac94dba77d6ce9e8bb0f261b4f683451d18e9ee6947042010b29303222991c763d9b7eb37113683ce8caf1
+DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.0.zip 158119 BLAKE2B 9605d6eb7a363b5bbd680b607d4457e6b36a2a4f1ae7f63d8961b30a8fdb8007cc36e5deaa52fb5f0dce45c04e3a326d9f68e96499917c6bf6657bab6cc2e02c SHA512 9dbeb4c3566d016b6b1ee0e4cd1f9c0805033bd451268a125be986dbe5879550175886e8e498241c792f4c6b0096c0dace1a26ad867fc89fc2becb896a782868
+DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.1.mod 163 BLAKE2B c491928ceff4a7b3ca803d43106511177e78d06ed64d91f27210a63ff827489504dd995c08f159228c1fbb938590c2ac01c49233583810363cac9a4f594a26ee SHA512 4aac01661231ec1e9bab32754210850371af6f0e13ac94dba77d6ce9e8bb0f261b4f683451d18e9ee6947042010b29303222991c763d9b7eb37113683ce8caf1
+DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.22.1.zip 158117 BLAKE2B 0c83c88a833cd619b085b4dd786f90cd75e4b6b013b1ddd470507ac5136427957ebf577431496d711acd22a63edf7c3ba01f38f65f745f795bb022177d8c62e0 SHA512 2cd5ef3943af659c3f7f1bf16ca2a2bbf8be055c46230802f56fe47351dada78a4fe280c93061db23fe0f4907fef40e922c6192b380f0f8590090d1a296332f1
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a
@@ -138,10 +207,13 @@ DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -152,13 +224,15 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.zip 103243 BLAKE2B d2c6b891788c76992a341bac41faa2a122e996dabefaab4f7b7dc72ac58d3595caf10c4bf74ddd5f061c50c980135f3264485111cbafcd4bdd2e4852efeebf6f SHA512 6679cdfcebce080fae845f593095967f7a3647775af6edad24392e73e1c21ee36c63d6cd534c482cb0d49fc40fac40623a77976778fc63df9f47bb56b6b27f60
+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%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip 269532 BLAKE2B 00b678032e2b8c19490507c2a07d17134432313f09b92dc6635f222e7004e8c06f0c375bd0947e4638a2b04924317eb60f5215f40c9a459d6b763d0bc9598948 SHA512 318cb912ff414c874d69423d476ac797423076083de0dea926a5ea769f34ee30e065b51f694d50a69d5d8eb5e743289f65e7eefcedbe86919b7f2dfdd209e675
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 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%2Fgoogle%2Fwire%2F@v%2Fv0.2.2.mod 367 BLAKE2B d699905617767d350a26a78d88a896b8493234fc3f5c194f1ccd764a77bf6eadb922d2f88d7e589c69ec4c0ecd09c8b4e0d593135d54a81fa70df19161a5d98f SHA512 fdcd94faf56244ea4109db8a70a214a5e57438733113d69bebfb5e33e749072ae757bcb0e70c8bdd3d6aeeb5f4f13aeef3b8c91dcd795bc8f8bd0295960bdd85
@@ -167,6 +241,8 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod 36 BLAKE2B
 DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip 14095 BLAKE2B 14b36bc8e9ec2be3d0bd31d578953c4d911db72a92a29f0a17553f0eeae8b35ffca3f08d5eb3fc3859432255d802624141a18425bf687628d40ee4e4584fb5a1 SHA512 e8d236722ef338098d87bf6756e151f3549220a5b153254b2d7cddb1a6fdf135b682f089f7970445396acfb378b25ed74e7a976d578695e5d44d15cedb187a68
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.zip 14233 BLAKE2B e8823d65705a9ee5cc0bb6e3e2d99800d9c94ba6d65d6bcaf45687312bd28a48a6f814b3e40f7e7cef7e750c64034c7cb537efaaac1a7d213cdc89a886dc52c8 SHA512 30f32cc78130823149f4cef944582435bc7ed15279dd04e0273ee1d9361d01546c68f4485cc230d2b1582f21093a39f4279aafff827d0c6f0da5ab595a60de58
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
@@ -177,29 +253,54 @@ DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f78
 DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod 39 BLAKE2B 18dedfc007aad3087ef83c141ac6fc1835681c7f09af9a657f879e1f2bfce5e8d501113ca0e044435979b1dfb0ac5ad6954661f91118af7ff00b929076a39206 SHA512 f5596bc3919bf32ebdb9851ba6b8e5931eb88583e5129c277f6d5de4b339433ca8a180c40b1bfb44420c35cc8a01f53e4bf1cf6f0aef6f3b790590234bbebf61
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
 DIST github.com%2Fjdkato%2Fprose%2F@v%2Fv1.1.1.mod 31 BLAKE2B 6e746acd91a4dab1efe5e1685186386deda782765be4645a0fdd97439c046d87d839ce20abd3701b862e8b287ac5eb218051c964d020129a5b3a8b2955dec11e SHA512 7f877e2b7cc6749a838fc675c9183042b33e56f22742071c3ada38ab4e7a3e041d5532c4179a0e20dcfbcb5b23e85a109294f0f91fddd8a1c249f714fec63e52
 DIST github.com%2Fjdkato%2Fprose%2F@v%2Fv1.1.1.zip 4455396 BLAKE2B 5ef19e0a08e83b02d279f30c9b6668982caa9576e4c79d2e137b3fc8497950e4de7b37a98e55e9f5bfbca37195d23bcd1a80064ed3340adb8ae19fed9b9cd302 SHA512 738988a383da886dac48d21efb917d37ede4ef1fb72216f7f48b07091b3b3c4f95bbbd6e36a4b0f9a30315cb922c7a17c557c4f9654d7556c8fe4d4639d2ea7c
+DIST github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.0.mod 267 BLAKE2B 55553ca2e0ba07e129427d8aa663dd3323d0c68e6f98e16eab0dd2330500bfeb461ea5fec91866324a3144102a6e8887d0ee21d01932ca3f3f0efce93fd76a23 SHA512 f3dfc61aa4829dc0e262fa9323297cd9d04a0c8686bf9c0ed5e1ae27c75ec2d0c3b4f9b069aaa0dcb5d82110c58562474534032f0aa91e3789fb0a8f0730c4aa
+DIST github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.0.zip 4456860 BLAKE2B 5046fba6c0756adbfa776c61815e1fefc2f69a16ed091185e0855e81dd4c89b501b40a6f6e357db8446721ae79acab7eb19d3cf9bb78dba45d3faac20f4b7a3d SHA512 851d2e80a833596809a7c421eec6b9a3bd1ea87bc110d78d4c2f8b0f22157dfb248c4075cf456a07f61363284adb3aa8386f28135b7c9d88f824f6bbe2156dc4
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
 DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
@@ -207,19 +308,22 @@ DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod 26 BLAKE2B cb393cd37dc2b7c07fc316b588fac0f245ee33a37ff3d4ca0df67ce952976463df9a79d600a37d5cbd3f596c0135c2c0330aba871cc941cea13325eb24e6e56d SHA512 c151e8d0c5002b25d399fe4a7420e5735cca46dc6f3bd18837f110f5a72659406a3b92d7f870898c97f58b6f42364d4c97e9457491a0534ce456ec46d15b1697
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
-DIST github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.1+incompatible.mod 32 BLAKE2B 44ce0db4ee2df9d61f55e6e4e3669fe409054fbe3ebbcd2d5f11bc81d5bf55b7570431fd785a7128c166f82b37ab5a1c7203c6aaa6b2e6333e5cbb8cee345ff8 SHA512 917788ef1d457d5a86ee0f85cb83c048c061a2fb313f5c461634c09b4d143e63788bcbeac5740feac297faa98ac001496e4683a701e0ad6706322f44b36d7ecd
-DIST github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.1+incompatible.zip 103750 BLAKE2B 86e38cfd967b6018ca038800dba55e71ea34eeb453daaccee5ac995ef38e64a3739efff168d8ca7bd48c4b0c8777764464909f2ea359899dc9eaec0def02f633 SHA512 499df2f6e111868e2d560b3dbcb17d928492556bba0b2bff50a74235cfd821f1e12d317f5c49bdd59ec6c5654f1fe6e49a7ed0e913e78f06f8b5b4502da043fd
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f
+DIST github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.4+incompatible.mod 32 BLAKE2B 44ce0db4ee2df9d61f55e6e4e3669fe409054fbe3ebbcd2d5f11bc81d5bf55b7570431fd785a7128c166f82b37ab5a1c7203c6aaa6b2e6333e5cbb8cee345ff8 SHA512 917788ef1d457d5a86ee0f85cb83c048c061a2fb313f5c461634c09b4d143e63788bcbeac5740feac297faa98ac001496e4683a701e0ad6706322f44b36d7ecd
+DIST github.com%2Fkyokomi%2Femoji%2F@v%2Fv2.2.4+incompatible.zip 98679 BLAKE2B 5a1bc1da3499313426e4c7565b457eabcd262e9eb91d11297587e638005759f0f8fdfdaea16beab70760263f19fe1e40b1435e2bdec36dbd060c4ef02631ec39 SHA512 76ed50d462fd0bf64e6ff62bd6aec1f5ff0bc4cbfffd5029da80039693d82f2c3a7d0b5a3145d4ec209213922733e31b4b732adc3ebe598b1a3557b0ae24bbfc
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
-DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod 41 BLAKE2B 6269fdf51dccf032b87cf8e7ea710c01933f0be0fea993963af14eb9274fa1a8bb078ad75f90279b4ba1b83d70035725c2f19f0241db615828231a2fa32c2cff SHA512 00bd89d63559cd13e21f6e60155e7c1c200848129dfbe4819a964efd14eb36141ee3dd9fd0c43fe28c7ff9f9255e8954e9d2145eb409f3e30b3474054737811c
-DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip 8877180 BLAKE2B 47c23f5590437974a0c03fa730ff9b3217014d40cab7076e6eaff142941f95328652134b4ffceda1bac0e30f968733afef66d6f94132158c86eb069b99d8638e SHA512 7dc6a0e8a2f5d907136a894ae27aa5e9f96f0adce3a904632e635312b7b564e861f25765db18279d996ba0107d87c8277e279176888f0129f2bc2ab4c499be82
+DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod 41 BLAKE2B 6269fdf51dccf032b87cf8e7ea710c01933f0be0fea993963af14eb9274fa1a8bb078ad75f90279b4ba1b83d70035725c2f19f0241db615828231a2fa32c2cff SHA512 00bd89d63559cd13e21f6e60155e7c1c200848129dfbe4819a964efd14eb36141ee3dd9fd0c43fe28c7ff9f9255e8954e9d2145eb409f3e30b3474054737811c
+DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip 8889874 BLAKE2B be8ffdaeeb4384ac5d68a1e8e009327e63a3a5fea4b22f4f0421916c0eda23ddcbfa5b550f4d8f3d37d75f5254dd9d00b95f0f57172903f0bd8e2f63fd75cf77 SHA512 24e0c406b185f7ef2cb5175f9c77dff18746ddd1ba96a441eb2b94d5cb62426c7a024c92d8c34a26f393726b545de26bc1f1ae7629e98ff3570f7632fe2c667f
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip 38603 BLAKE2B c0b783439b139f5df0c9bd7654e4a85b5eff2a37349f0c68b713a00018764ef355622756e7ed23d9eceb3201c93e45d0c0f7a7b17e3ed27dddadf523e79e7a89 SHA512 b10057680da719464890d8bf7ae3c3d375c9fcf6ff833250eddbe897b9ef68790bc5e2d4cc5936caa69cea311999263cdfbcc71431839df8214f6b0a1d1fdfc7
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
@@ -229,30 +333,46 @@ DIST github.com%2Fmarkbates%2Finflect%2F@v%2Fv0.0.0-20171215194931-a12c3aec81a6.
 DIST github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod 30 BLAKE2B f00882e1ca299718f10afb3cd662ecb428c04d1a239a17a66c82f631d81dd44b5a5b9b468d15b1cf188d1778747a4b72bf2c0c13fc2db98d8ec0372cd16e87cf SHA512 a5fa95d6c5fc23283fdd629d47a0a1ebfd759ea04e6721f1989fdfbe0d47577ac6f4dc8ec0d01a96a6f8a52b1f22da15c1e05759495852af8624ad648ac01d70
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip 19130 BLAKE2B 85321c6a52022df0bdd9672de52cb5b7c1a652432047d94c088a71d612a81fa71d0cf9fa611c713f8f57c4e540ee0212223e987eae040e95014bea07e135171e SHA512 9ea745a6ca03c046d7b77707616fa756c01f58862286fa9805e99e3a0090be2fbdafd763f432f3c9ca927518db73ee0ef74e0b95248e515f50c2c2c1d9b14065
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod 30 BLAKE2B 8f61bdebac4f364bc3cc298f81f8f8dd5ce9d73ba1b2aac72a3fa4af3541321bbf14536df81ee032dc56c7579c63f0a77bc9d848349a2458800b131683668ce6 SHA512 842856979fe9c022b2c1b961d66394e39722eb5a69f24e8a6018f70d0a3bc14e9e1e5f5106653a84cd09300be20b9f0ddaa4640ef799b8b6fb2a6cb9f8e42216
 DIST github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip 227924 BLAKE2B 2836092f4781c5c37de10b7e808d33b2b1c77eaeac537dda1f1b789dfdcf64f297b633592102ccfee77e1af3817f934eb3c89cb30fc0d044900bcb7f149a3768 SHA512 69025f1dbfe177075bb788a7763160cb653e89843935828d37454c1eb4d60977cbb897f1bc181b37bf3c02b514b23d492e5631f4f57566d0f5b5043c5c6dc047
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip 8207 BLAKE2B e83d1907a09b00eac0ff79803983863e643961fefe9ff69fe0c8ca7ea590d0878d416109df385eddaa7eaea4cbb86fa60ad0df16a09254fc16d06cadfab82219 SHA512 c4d665252984e51420039cea5d2fb7e435b31cf8df3fc915bf01eb19b739514ccfd632c6e4b4f93df575b0e1fb02ed7ea822a5e02790442bae4e421b7cff44b4
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod 37 BLAKE2B 19d1ea7d880f811795d06af263c6f11c05c45b65e95a035b0a46bc132f456c41a5ec726fd934672b88129ce172ddbf5d584f524939f494cf3f6ae66671d6ea31 SHA512 b624ab08a47139a1fa45e00136e8199f27fb2d82b9589ea9227a323a7d7f3e0f58114876c0af82281ff3300eba8b1241ba804d73e63370768f58881bf45fabf7
 DIST github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod 35 BLAKE2B f58a5fde6532fc5ee36b27749d6cdc79d003130d6cbbe38a471e8986967c1bf31f33dbe364ebebcf0a94d8f7f5ea0eed2d2a357b5787e26c097d9cfa5cbf53a0 SHA512 e5eae9fae34286738bc0adffcc16776ce9b376de39317205dbfa2440dfdaf606a8d974cff8926524e45e89bb70f0a5803e3732baece125babae0bbd35808fb4a
 DIST github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip 452025 BLAKE2B 74c3cc4c35d6ca1dbcd6f1a5f3a4e4273326dcc342dcf8d1d8c27c4242abf1a5c3013a70cefcddd6de3c356b098d71f9d727b0f0ba5acc26a9dcf14b00c697f5 SHA512 4741aa973a2a39b9c8c83ba7716388b2a4870fc0bab2c30a2b9ae3977e30d544c8de887fb37b68aabc194826b56cc765b534e75f8ab47e06de692ae1a4fce2f6
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod 30 BLAKE2B f341cbc3c99d90e1f30ce42b1e0442916e1c5e79d673a0a77347b4f9de6a145c630e4e4b8c11a4aed24f4d8e7344121524605bf85f6c8a29055ce2ad83ecc42e SHA512 2014d24781e25f535cef3ec241bf618048237c877e4299a1fcfc8f2598cf59f8f7cda2e1ec3617dab6879bb612addb6f796764a0de6c5400fe3c8ba77c3c41cd
 DIST github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip 21438 BLAKE2B 4a8c00534953ce7dd836750cebad46a6c74581d6260c6da1bb4fab90b3ef9e811a0beb8c85ebe1080e670a470a5480ca01c0a7bf061ac79353e8fe3fd837ffa4 SHA512 7a4b7824bc8b2431d731acca009b1cb2de5e9432a9a2c43f5dfd3b65cd83696b8f299c6f98a97b16fbde101e8a3bedf1d21f0ba2633c377c77d44df44b4e1d62
-DIST github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.0.mod 37 BLAKE2B 531cf26834cf272dba718aa55549227c828e2899dff36cb15a1d8e07d1f26373ef4a67629bf1968b26a9814f868cc6560bc6f4484f71f2724c83a780685cba2b SHA512 de04f413d52470afbcf2477062667c2989768bbb40369d6ebd89d5c670ed5270a6325929c30c996727eb507982cbfd94f88538892a2de64079915ed58b8f82d8
-DIST github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.0.zip 68295 BLAKE2B d7bf3efd8ada6cd5d1b1b51c0e16cb250e454c9487a1ea612e7936e4e90c33c2bc2ffd316a0eb57a2fc83140183cc3d4bf123b18a18324f333d082c598978576 SHA512 8196f0fe5c72213585c3fc7757fd89acf85e9044e61e0b4fbedf2972be5d2b5503189792a8cea20feddf6d8e6bdb9f6d7b8c36ffa8b25563fc9aad18dcbfdca6
-DIST github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.0.0.mod 40 BLAKE2B 2f8321836ca32d0dd0dc78de1dcf9a648dc5ca4ea58774446782988eece7bbdd9f68800837267ee3b84fd4952d8f693e740b1ed6103ebe9e2246d17fada5d1ad SHA512 bdfe7569124f22a1be2fd21018af71bdcc4d2fc4779513afebccf10f10653dee750fa3a8e1e110fc2b3eacfe9518c8add73f766efb08e8551f29adbd6245e4ef
-DIST github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.0.0.zip 254082 BLAKE2B 7dbc8d6a233bf8cb8162099c22c83851b3dc5c36220764735396733871db86889ff06d8a260cc827408ea98e64942d6e48a717d20b7c0c9179af26df7c3478f4 SHA512 3860489c18e9feec6a55703befb637f4dd22f20ed844403bdfb2477fb7375012005d1d5b7e8f75eff206aa8a8a838b6848145e32da095899652fa63ece4d9fb7
+DIST github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.1.mod 112 BLAKE2B be3f8961d512d80528be4db5ad5450da3d12748df2e119843b4e34a8fff45c620bcfbecd373169dea7670ce9918c31c2eb3e8517a588ec92d0e4b221d4ac04cd SHA512 6487bf13420b31bdfc0d915f0488f2e1ec4e116dc994c4259b98118826078b6a54c951a63ba26fb7b45f71d384011144775ee04d1f7dec3ecd95c6eb779e6e75
+DIST github.com%2Fnicksnyder%2Fgo-i18n%2F@v%2Fv1.10.1.zip 70303 BLAKE2B fc173a8d199c8a8b1399d09484531ed71da618c6808e1d14ed8a4f0d8e42e4c0ce870e0f53a5ded0eba6380c8ba549b6e049d723ae3a10e82d31a3ae4a71cf25 SHA512 f9c488b50eb06519f8a9c20858f541476a2c64e47828729bb0dffe06e14ad43dbf23c4093159942dad642fbd222aaa5e1b1aabdcaebcc25d36b2f19b43c9ee17
+DIST github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.1.mod 147 BLAKE2B 50123ac6ecf98a09050ab5e225400c4fa316045d7573956246447ca48901353531921f0bc886ae486d9ff96c01fbaf8f81da054a33bc46257b7c94650a6b12e0 SHA512 3eab2496fda3b346141d048edd95ec1763786f231c03574bbded4055201bebbaefdba06bbfebc1fc49647ee7f09e5a01c7cd6d5138c8368a37e4cef1df9d96c0
+DIST github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.1.zip 55511 BLAKE2B b380227637b9805ddfcf3c394104fb60ff4ceef8b29666a2dd58f4a32a855d87c57b7f68ad22b06cef0d7b620c0e25a88942adfed8bb02c613f33ba3f449689c SHA512 647af4f71d9bc55eb24ce58efd3276529584e317a8933bcdfa825f34ae5c757ff4b614ddb9bcca47c214be03043ceed3845865802819f45ee9c7a950e9251835
+DIST github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.3.2.mod 40 BLAKE2B 2f8321836ca32d0dd0dc78de1dcf9a648dc5ca4ea58774446782988eece7bbdd9f68800837267ee3b84fd4952d8f693e740b1ed6103ebe9e2246d17fada5d1ad SHA512 bdfe7569124f22a1be2fd21018af71bdcc4d2fc4779513afebccf10f10653dee750fa3a8e1e110fc2b3eacfe9518c8add73f766efb08e8551f29adbd6245e4ef
+DIST github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.3.2.zip 276950 BLAKE2B 425e0a982df433b4654a8afaaf81022981a574d2ee26b1cafd16103a04d6d78daba1788705b2998287729302c5d5797b029ce3173f823e0d8bd4eddd43c08cf7 SHA512 6dd55ad75e5590a9edeed76ddb1cb0c9f8d56d183d6639a3aedea8c919a82c0e58d80b78ba09ec4510fc8039673f43fdbec6e8e58d7ff12a8e01f97cf96fcd72
 DIST github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod 38 BLAKE2B 8d79ae5544eb700b505659942ce726874401d745f09108817e3d5ef9f520a3967b5f8fdae71f0206a9397ec3b298fb7531846cf6a7d66c72769f9f80d05f1187 SHA512 54cda8d52ccfb537609ca642d4b86226da9e8f9795f482137708c1e455b01e3163f0fa446442fb353fb345ade0967d9059e0a365c33bbf39551abb530f422e3f
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
@@ -262,18 +382,25 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip 75347 BLAKE2B a6f74be69c8d42d3cc84e957dacd59f5f96fc49d48972c04ff26b623dbfcd3b5c2de13ae3e561e9a491a32cd52cb83d26e171f624191ceb4d659e5b0a3bc7623 SHA512 5dedfbc126ef5a3d146b2f3df2e4efa21cd4f1132bdb9f71801e55bc8583959777e57ee2664a85f3a222d656b910e1017b9b855378c93f65e2f623b568ef12ab
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod 153 BLAKE2B eb918832463d06e37d522e86feed16ac3efc2f6bca36524a0956920ac639f2efa6b87bf70ee22015108b4c9c7ae63eba7345b6c770568f605438863ad23fe0e9 SHA512 89b6489f7666b4eedab8c8edb345c82d42626c567d2e402a87344d18e63133f89bdb5c0f3aeca8568e8c4c76cfeac132a4b8904902f2ac47a734209d1ce814c8
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.zip 106195 BLAKE2B 82d4ca0510361ec78b71e07e0d64b4ada1f5fea6699795ed0a2285aa52552a37162b228b42d2934795906d71465f44177f45a528269ed0c672f2eb9d4505bd42 SHA512 0dc5b88b554bdf47708b43f1d9f0bb6b35aaf22f1374414146e184ee33b91c531e417b6e8ae84cadb5b0d66ec14bd138edefa675d4b61dfee0c43b838a87e235
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod 88 BLAKE2B d66a44b5b8c2818d6342f621c9821daefd16b262df9fcd630839073cafc65a1352e22aa52662bbd291a65abec09fd0c14576a6aa9f86bda4610db670f8d53e43 SHA512 0e73093ef44bd32ae02910471bd85f6d135cde6d0fbf48780b8a58efb7419e16ac1b01497d451e8d3ee32602b7e32c0673dffbfc822c8f3a2d7670378f47f7cb
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip 117762 BLAKE2B 3ef20be014c5e2419f28f7d5db4cf8e7a7589445eee7e34ac4705b5dfa3cca3c441d14df2be10244472dd6599a2b6c45811f9fef11f2b68fc77f75c32ff8a769 SHA512 09cca3645bbd191ffee980c80c747a8952a37a0e1bfb9615cc1d0c0c3fec7783a9254fa3e31239a036c2bfaabe8028525e9113327c6d72c385c8b9bad3b46017
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod 196 BLAKE2B ad2d0b1c9f2c509812872f3e24d86ad3a1b193e624092b8225cf1f3bdfcb28e634ce330934bd742617b3d141ccda41de177231cc7501fea2b18a6e798e27aa77 SHA512 0fb15e3a1ab36a6d413110e7d6e7e441c9d7943f4d7bab935b2ce53feeb7e560d63960f1a9ce340d6b3f3e7fc400824354945a12628c65de1ce2d81856b119f2
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
@@ -289,18 +416,26 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.1.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.1.zip 192853 BLAKE2B 12a03a9cc0316da15267db14da4fbf0b5421a5dd3e338633387e48574897c8fc32e0b06f60c9f89899779679125aa72692ad9044958d3b8c27844793aaab8d9f SHA512 a734914fabd5c05c5a2a7236fa0d875d5551b2567545b626df1d9739659e8467bca836f5b8f5127486109758e571c800b12eda4e7d79d6a7bd92a5f4cfb5d37b
-DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
-DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip 196384 BLAKE2B 938f3486294fcdb95056c8434ff787c1e16aec8ee030cbb6edf9e897b1c5c97bb747c94a07fd952728cbd89d7c84592e98f582068678fd66e55d9b22fd14330e SHA512 9a77af402afa843f83d5d98296524e49d30e35a79e20f3fd58427a7284f42f7ac826b1ecb7c963772de8950b78d331775aa537936bf9abed2779eaf8e2d23bbc
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip 109710 BLAKE2B 297364f2e7c0e7f2c7c2558e23c198f4a7e5d97ffc6a177834144c822aa91f0d5e9a6a700f6feda3c3c6f83db1cadc1ec174ba0b89872a20900076b02d2fb4db SHA512 e62c55a80759f62532cee4fed8e7ea0616c10c42075da8a927851d2f9359d6919f8e555034e2d9bcb2cbb60f81cf61a74666c464dc0fef0becd1635faa42f3c0
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
 DIST github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod 35 BLAKE2B 7251cfadfa22c0c57f7a488965d5107c55aeec8daa23dc37d845248b4c2659f6dde54ad64873a38f2bd6ae32324bfd01d5734591160c8dd2faeab2cc4f12a72a SHA512 631314183e232ea80b4cd52fe6b2b8116af4960427e7cf71b1a7c6a5884063f39ab649ff8178897d2a7ef14057e1aea53bb2e6f85a84be90b89c17866987f878
 DIST github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip 985726 BLAKE2B f983de8ebbd14b1e521e57adbf348c946ac0ebad1d5fc91b080e752e48c0648c7a46c74cf7a32e627b6f0a2d63cfb10311aa32d333d5370b539a3f4c1523dff4 SHA512 baaf37e35d0e6d1e7f186fae593d4e596528291c6aae14b2ac341dc0848a15866a33a5142e65c9aa3ca9f5fcd05a44694f912da64369a4c292bdba35bc030c95
-DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.2.0.mod 265 BLAKE2B c5b8ad2401668a6066a25ed51a7e3c52b7c848b2f127e57e4bbf6681230b79c4c113b80759649d82621a6ef13528656c6bbc1684461fa170da07cefd8819bf70 SHA512 0e7d3e26d71c418bd34a333a2ba96e28fe7d17e837a635b25e55369ea404674247c5cb4de284b4df2283806ccff3e1e6471bf8e9fc2e777672bec284be9d0c9b
-DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.2.0.zip 17726 BLAKE2B 249a76f98a48974d05d8c1b9491b4e8b63f661358530e24a86d13e99fb8c1242c4ec4c7a981e0cd7dfb01cbca49795639bcf792604bca563e1eda248a6a0164f SHA512 e0381014c39fde430119af4818f197d7eb8d854c80279b573677cc2ba8f8e5c876234226d6e54d82d7bb9b190a06bc6c7c83bd776ab9136c94c11d087aa690ff
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.3.0.mod 274 BLAKE2B 4c342f63063d4e810f971cbfd09e076bc8763b0c0ca985a26b83e0f0431babafe7724a45df3e4d8e0f094bfa786f3e2b2cc0b5b470a2a6920f8e06595dc585bf SHA512 892695c807816eb820f586b9fc1bb16fdbdc8aa9d81203f97b5d1f9df4ef6ad02b3ba259bbb9abb5a1c96ec403c7e5ac1ea84eff453a7fa8027ff7af35582ca2
+DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.3.0.zip 19467 BLAKE2B a0d1ff1bcce7f55eead51723d637f89109ffa7efb407f69da4b17dce140eef32cfea4b7067e42d1c05bb896a9dee6f1192f4c0e7da4be88c697c0e9ca9702909 SHA512 bd429a1717b57b14d63adb49409169670342a8f61d7fab096579613d45f1671d947b7b023fbc5a769db36413fc1384753870e16b602697a77a7d5eb2b7cf151d
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
+DIST github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod 40 BLAKE2B 5afb548ac6ef611fdd2966e8d985b6276118f90532b4968743f9589316581d75f578942615c1534c1cbffbb58a9e077601bc0752f3c2066b8dc2f1d20da61d5e SHA512 aa5970cf21c0a1932738f32f9933905203bb40be1767f5573e49e3b44b425b5e40d0132fd6f0acc9c8fa38148cb84f24bb10fcd6b99a704ce9ba0d8616cab4e3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
@@ -312,12 +447,14 @@ DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip 67427 BLAKE2B a05dbd2305c67d453c5e8ad02b407be2fde660ca88ebbe2c4b4ec7e89666900248cf0170c19b82bd9679c542395e893d5efd833669738b4232d4a18949569f86 SHA512 aeb73f790a1b6804aa46a4031c4df4ff9bdfe809d225622da428119ecc83b02d3f45bf58f39fc9364540a0eb7c7f3ddb66e3f6949136b3d0d52786804728cead
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.0.mod 163 BLAKE2B 78976e3b857b07f201d0e0d65209cab8ed73cc9aa10f2977646b655d541e9a6a3dbf1d40e037ef0dd36c0c6f6813cf807e7211afc3683b9bc95f3b3e4bf5e6fb SHA512 1f0348cb522ec6a39f5667339dbdad2a16521eab1d7cf710e6b939c8156c928d7ed1da3c4cf1d976f6c8b9e41e74a43ef1328407119fd55d8fcbc0d91eb1dd7b
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.0.zip 84511 BLAKE2B 9cfc4aa05d118795501ef616ff48b4714213b1791f2be12b8d6573836dee29d15a8766800110250a0f1fbd44173048c2755ca873ab9fbfd189a40699713b3212 SHA512 636612faeaecd6829882fd8e27788a990790e69beeeb989b8ec058a60cfe0d77a2d130ef761e1952a0bd992b80fbe1209dd87a1d8d023632548a1c5a63617292
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0c6d09fa259a266d879e2fcc1db85939481475f71df2dd91db5794e4492ebdf61cc6f694501d94cfe8e761f986f857f62e328e596413403304 SHA512 cf0a047c617e014bfcd50dbdf466431efba7d32186027dcd714e0a63a483d4abbbba00716265309f10477f7739406fd3710fa137a4dd6fad4a9d3c4ff84c991e
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.zip 157664 BLAKE2B 4ab61020499bffb5e3f7a03df91ba049a84876f6dc59916e38bb4d29cfc05b66083ee20a507256b1ce4ec6d87ffbc50b7b945b872d193b4a0f6212baa80e5c02 SHA512 5823b36455cc91f82fc13be66e35c075d596670f16ce0f91c921ff8fcd869e455fdd7b29eca43ab6cbee33a5e144ee74bf59eaf0fee5f0c3e4af5c02a8d6a5de
 DIST github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod 39 BLAKE2B bd8cdee5ce89bcdf06dd2cf35b2b63784c9b2f17b49f5c99fcf89399366e14450b0822c0244392b9f09e5eaf2fe68a230fa6ee38c3680e800be7412741e1f40f SHA512 cf710b7fa9c1bd35b3eedf39c6b60658a45787c93845ee20b9ae3e2acb07801b05f7b387f1e445ec7174e4a699fc1b117736184b5262ff20675a44f185eac153
 DIST github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip 5953 BLAKE2B b2d898212a34353ed4d5ec5ef9d095401a4cb8af6d3c312ccd10ec41ad2b14bfb99d333c0dbd3831096ac5fb38bc6cb3738fa95d90b701d141289f979cb9b7c0 SHA512 24a2446e5deaccbeb1bfc383288557039f39cbdf721ab150d09c2a38edf5ef5873fd21539cf44991eb15d320b8762bf9ceb26029ab5460d13a95c360fc0b9f6c
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
@@ -328,9 +465,11 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf8009
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod 2141 BLAKE2B 156a151b0a2adc3281ce942a6b33dd518a60248a9aa927241d787a6a6e4c37f8acb76cde85d8ce6e7351bea257bf0dd8a671c22c5f4d5d6a8ffb150e17ae291c SHA512 21bc1c47e67da822efa2fd98ffe8c0a9f432e95be723682a738a82098fab25771a2ebec1903561118fde91a08ae370989cd5375432cc21d80ce07ba2c44ff6d5
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip 58955 BLAKE2B d166997642948f605267acc424df7c6c73af2e1d1f8c549112573398d5b335cf958e16d3a670d738117f6b67b4a13cf30fe51052fd25418fa4935f4311eb418b SHA512 f383fce33fd0d013af0d577102fe4a92782119ef46fd3191ea44122bbaa77a47b689cd4ffecc3d086f5e02374b0d36aa10946c7505d5b22bded154da4190787a
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip 85905 BLAKE2B 4991f928bfae17cd4c242dac625f63815342168da5e7ec7ec416856ea2b08c9cf4fdb02a90568624e3bccc39ed887eb6ad6e0e5bd140f73dd0c8bf87a6fcff06 SHA512 2bfa48ce8085921796ed788b03f818c1972313162482f023e1dea5b6513ea4e89d0e656159d0051ed0420e2e138c33a5c76c73a0d6ec8fc7344548b1061cbc86
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
@@ -339,21 +478,25 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
 DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip 10296 BLAKE2B e82879edb9db32d5d9482b6d99f0bda1a04d5b54125ab92629c35777e3ab9001ec9d5321ac0112a245d59cf5b06cb96d1dae785cc2b64ef922d904bf6a731f57 SHA512 6bdd2a829369530a1a8e2b2ff93094b5b0a6fb35873a63f79498b45dfd8c557ab0c91a393974089af1309d626c3fdbde1b02bcb64ffa05550a48fbd0a9d76148
-DIST github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.1.mod 433 BLAKE2B d10ec69a31fd30610e3031f1a9ed173cf25380cb8eeb142358c6cdea3a409ecc4aa20689a0d3fdea704d809d9315ae92ed7761733aad3fed89eaa3ba4b1b0efd SHA512 64ba003444a931a82ae656e3294183ba5b13dd945d3adab0e1eb52063b59811c2482b1fbe552903010648abfec7b29259653629895a525141babddd2cadf2676
-DIST github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.1.zip 2281181 BLAKE2B 92bec5a8307c6cdda09d6de334306b41ec97cb4db1b831268a4ff6bba0d87e44bb7a68d6a1dcca7fec79c42d1fd3c91e6ee5ed5ea3ae0948b39320e167a43223 SHA512 e1c8b509500735e400201be2a5394e3da9db8226934deaf03307275164087f885c95a851ccfc6dfdcf306a29060c123a3c0def4a69f8059fac36bb354bf0a462
-DIST github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.3.14.mod 86 BLAKE2B 7126f15adfb39a8f91e7d454064edca6e727c7f5526001977752855c7fcae32d0cf118839adbd0de1472fe1c5897ba646b68e59a6ccacbb41b984d9fca9b2b24 SHA512 841ecd26919cd54b31bc9a6f954b1e8eae0fc1ce540a31ab1891687e88124e58534236495158f566ab01601e7a982f9869d9afcfd07e5d9a5fd6c8ebcf669f4b
-DIST github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.3.14.zip 105272 BLAKE2B fc9b89593fd9f9f7797504f577e9b888cd5b75e7e777ce9b592cab728d2acf0fd683dfd178828717a14260c7a017a6e96d1cbab25071638903366006a470698d SHA512 373aa36b3ca2a1da87fbffb1acba6d3041517140423ff6654579792533def9ed3873a7f943629390abe1ef9726c5c2bc51e13c5f181ba415a85ba3f9ac3f6df9
-DIST github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.4.mod 41 BLAKE2B cf1f752c1456da4e2e16c0c10e58c3b37a10203ad5d2a5a754a10d1c745ace1cf8c99f5335129b5d2da25d938c90dad59925f3109e634e344bdad23f1709b324 SHA512 074740b374382fa54c03de7a99e25cecfbb84a04354646a28b85902f1b21bd707df1bf639055c530eee18c80fbf4738c00a7c4b27036484248d89b88379a0a07
-DIST github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.4.zip 3786 BLAKE2B dcd69376899a6334f88728809c7c1c2a7dd6f8a34cc3ee6748d65be2626b214bb1338eddd47ccd14ea6a929874f8181fec14b08cde63826b2ab7d6dad0dfca0b SHA512 3898c0ab1ea577b07f1555ddd66777e03c862b67e98fcbff73f5460e5bb3892b2378d36c1b94a84d5b8d9921f0fbf1423ebedfeb80065dcedc74233157b8b128
+DIST github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.2.mod 432 BLAKE2B 99141d19b0d56871d5927c120aab17c435a714ee16c8b0df0dae1fd28116143d2fc50b4434553b1a8152272adb4d93a18c15cc3758516b9fdbbe61bc5c3a8294 SHA512 efcfc07bb8e909082dbf8063e94734639f4a9bb5a3aa65a09a64ecf272a5e6cacd6b59481c40adec190955a1a84ff1af8a94674a1f0989d1419fea43af8f5103
+DIST github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.6.2.zip 2281398 BLAKE2B 4fa3a63775c758e2639fb9f5ebb3f1a89e4021f543a20427e32ddf56c32de22391f33eb400bb87204bf6033b4c8c0abb60ae311950ea43fded67662af7a7b4e2 SHA512 92b4aa571a7fd9a06eef3cb52b26072afb8bfc0e817f748681942c08dbe371927dc6abc0911322341fca5a7813921a672ca5c16c9060dec6bb9d6896de6b516d
+DIST github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.4.2.mod 86 BLAKE2B ae51947808d9ec063c9c75ef706c7a201413d5879202c9a63e669381ec80c99d76334d1d3e85aca82884b0692a5808781e1f390490291a5534e8bc86c2bf708f SHA512 10158d1743c15650ed5e062c768edd31b3560ad606ed0c672f70e2ac5927ef8656058ce60d40a8904ab1fd6159ec035bf9302591a96cd8963fee9b0c97a592e6
+DIST github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.4.2.zip 110331 BLAKE2B 971a63b83e947eef913e0138f266a2a233b45b11d43933554a767d65c0f77f272f6f5ee1997ffd8f8bc0a7f9e6ff08a446322ee3363bc151adde67900724e5d8 SHA512 dd42b57a243ceed5474bf0c1a07e030f2dfb202004293be53b50b151f07799c69ca58b7b17eea699826e61425e5e3f8e5c63de613e12b11a730184f04a5f85c9
+DIST github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.mod 41 BLAKE2B cf1f752c1456da4e2e16c0c10e58c3b37a10203ad5d2a5a754a10d1c745ace1cf8c99f5335129b5d2da25d938c90dad59925f3109e634e344bdad23f1709b324 SHA512 074740b374382fa54c03de7a99e25cecfbb84a04354646a28b85902f1b21bd707df1bf639055c530eee18c80fbf4738c00a7c4b27036484248d89b88379a0a07
+DIST github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip 3808 BLAKE2B 0aaad022d517aaa16298930ad9b5e5970a45191f56fb51ad5d5cca3484e42359075bfc8d477dda06b2ca1f78a16bcbc504fdf2621a230b5065d5093533c3865e SHA512 92423fb0308c197aa64dd82c3b76319f44e69c60bdf00e4b79ffbfcc423a2286f1d1485e2507afa1ad3a6a77fb612c12ea2a492e91019bfcf7af678f12a5f9ff
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv0.0.0-20190325153808-1166b9ac2b65.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.15.0+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
 DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv1.5.0.mod 34 BLAKE2B 86524b6dd4255f923cdf5eff9681366c6eaaae6fe91f082ec77b87aab1ea6c96d890ca356e06abcbf7219590d08a6eed13131d39a253ca03baf9614c1e775506 SHA512 57a8b8c1e0646693137815a820547a8b9dbb35a132b25a735d1fdbe1fb829efab1eeec4907d5de44e248e953f033f3bb8040f6632bc899238b4329be1ce552fb
 DIST github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.mod 33 BLAKE2B b8f402df04871126c882aebd00d4a30ad765f21204b13f33676f6e4e768b6e64605987bce39ca277d445afc5a500a1b7e3394fbc5d506991dd52f70830cfda75 SHA512 16996218af60471a1865ecfcf15e1f749ffbe6ab2878ebc666cb32cbc61334d4889a62462fe399205f096d72a6a023af68e7798141ca10d4b2b428291f0ab5a8
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
-DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
 DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
 DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
@@ -362,10 +505,10 @@ DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mo
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.zip 250734 BLAKE2B d253bdc181ed56fa007fcaa4fa807a0845822357ac31a6342805ce539c44c9b5ac302779d8cafb2c187452f7508568fccb2f2bf30e4468995d120b009084ebab SHA512 dabd268a4c190cf47e90978ffa242741bdab66187b48d139f2a4d539628d59b40306894e1ca4ceedd4087ca0d28249bd8581e6a723e0bbb23285ae6a93cc9a7b
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.zip 260116 BLAKE2B 77a2a26a4390bde58483594a8b41adcf042439fd90bb32e6f06abe2747689c281178b87ce0c274022798b31cbc401d0379178b7a79e89b38f6ea7fefb14f5eb2 SHA512 66c655fe1b87057ef181b3ef88a27905353091bf906ba52674afd8489883929e6cf7b35e2d9dd14f44f21f4d2af3b3c19f1aad9d02dc4998b9503502cfe47d85
-DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200218065240-d1af22c1126f.mod 451 BLAKE2B c2a0c29a72ff3a2727107c5f9266f029d952dc28e86c6171a935981feb4545b88d5e2b34aeec16dd3331c0001d004c39d26e2ff565e50b0246a9db07833ea1b8 SHA512 f4a2608ca06f3510004be2066e65b559d27a935b1fb541a525f3a7b0908888de85a7aca8dea2e0bff4057d833577c458cacdd16bd9983343d7fa75ae28012338
-DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200218065240-d1af22c1126f.zip 12596 BLAKE2B 137b19b9d16881e1b1693f53dc825dcb421ac4b87294b2010d1ac9aed9bbe160065a2bfe1c80a3ef85ac8a3ee800efd6b127f30490a822c39ea2a0d9870234b1 SHA512 35966b639c5afffbd9469af70762e01c3a26aee65de6300d1e8deebed844c682b0e2e587527fd2e01679381a9db317f9cf14f1c06f66c683803d1809be889839
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.zip 263657 BLAKE2B a7c0c2a837b83e2a5bbb0f21ada91ac4cdef986b55485a52d01b6c52ed18fbe886bee72e6b66cf707704eca08bfc9590c5e9ba8ed4298dd2b5a71434999fdad3 SHA512 145fc11ace7aee4026d69884d29c7c01ff2c975fdc4597ac01b03e97c5ac7185e5bc04b3de103539fbc28424144502c78fd1b3b0ebd820776f863a13d92b7931
+DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod 481 BLAKE2B 7f6b0f2bfcc73b9f02244e0310b0ee8f511ba654cbaf737dd896ba2090168795835635fa5f520c6584a47a156c7c1c71150a60e8d283f7cc5edd8b140f70ea2d SHA512 42b1f424182644a589d0add502d537fcc508077e5db59757f70b8c9bada92a71ec9345149cdcdf5c33f479c3beef0740d297f3b64f9897aa12e7a858dcb3e9b9
+DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip 12715 BLAKE2B f681c484ec877951d3c6f2bda0b6cff6ac109443637c887d9eeb74c70d37ceb8dbad999a8656f42175a8c91317a6a6c4e25ca829375137ec4fb7dd5957479b4a SHA512 b47bcfca1fd927ba733de1cae29328ad44293ea0b33cd498b878733ccf7faadb221c3f9f1d5913e00d8cbff3565bcb5ead52a03dfca3cbf5d098e7d8c96cb713
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.opencensus.io%2F@v%2Fv0.15.0.mod 24 BLAKE2B 85855582571fd53e79b7badaf424c22a945e7367d8161f2c348ab762392114632264cc36187001da7e54eed58ebdbc519770977fcc56c3f846ce3bab22115835 SHA512 3b5d738ca5504c5c7f74f7557e389a002365294cd58bba99e8af5aca5a6fd4a0108f8ac5e8267eeaf73cfdec7bc3b2db0e445bd337670ea92470a05106f67461
@@ -384,22 +527,39 @@ DIST gocloud.dev%2F@v%2Fv0.15.0.mod 2810 BLAKE2B 29e9a87514eb4e7818348c9eabeb679
 DIST gocloud.dev%2F@v%2Fv0.15.0.zip 2413585 BLAKE2B 47ff1313a828763a5971a6628e7662cf41d8f94c4a6d38da7f2925d496193aa8b18d580d940e057fb9738bcd997d5bc9509f862b3218640b6e401b9f27e8e142 SHA512 af2000d3944c8b4c644022994387ce79a9af16293fee7d676a5277b13abb3d857891e62161169ae27b91ee738c7f93748edf3cea67d0e6ca4b1cd2465bc05234
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181001203147-e3636079e1a4.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422183909-d864b10871cd.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20191214001246-9130b4cfad52.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20191214001246-9130b4cfad52.zip 5095082 BLAKE2B 808956f50c0a505dd6ade6dbb9c001189236911eabbc6e4d450f316c203a59c1a96457017e13b6c80380a806f4cbb1e5cf027b2ba733c96860eef0ed51f6b10b SHA512 9c3dc13f3062501dad18819a6e24ccef564853f2540bf877cb819ae39ed6f30d8924c45305c1958d46008e22203813851cd086fac6e57fb47e7875704e7450ce
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip 1330901 BLAKE2B 903b05cbfebe91b05b01a7466d868aa0172f770e74316f56ad7ae5f4e3c5d130be3f48b7ce685ca76bb175fe2eaf8b897faf85043c5cece26ab4d064d32b4a0a SHA512 778c50561a0599c5e276e939db6dd0bdd1cf0b8fde49abcb5831c3cef3fd8fb72e67f11714942df57fe447b7ea5b300e90821ceb8e35105554ff2a2e4e4bd2e9
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -411,10 +571,13 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190420063019-afa5a82059c6.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190424112056-4829fb13d2c6.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.zip 1416913 BLAKE2B 7e1a22b66a657eccb07b704a7e3b4baf9ddb2cf1b3556d82ae292c724474a0d80904cea46322a931aa152c7ae577f6a68fd66561497f3e60f8d4bbd477e4bf00 SHA512 7cfe8f334afe0a96a3a10e49a516bed3c6e2fb9237a2c34e4bcce3e6bd5031982a06aadc2a4d6d9fc02838c09e97d1d5b4065b9ab90c3f474eabf7a27f62b7dd
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip 1499692 BLAKE2B 2ca64710a73a42e2c956ac30aff1ef35e9df2619ae3eaf7ebea4e6efe6cd322244daac868fce5842f08d14eb2ae3b20654d721bd8713fe2141b409aac593dbc7 SHA512 49ce7d40e2a126a4bece83b274e7c5ec18dfbc3fe2203290022a47d4eb651425dd3e90e23e747229e0b5c734fde374bfdbff629ff8466767cb17e8e94385719d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.zip 81372 BLAKE2B 46b673266c761439a95c89293e800ddb92b6cc7c1ad7c982acb26415983681bfe628957a9f7d5cf36dd8c2d519372f07644fcec6f5efffd8e37584f8ef4cb8d2 SHA512 130d81179637a116a43ddb7e1eecc7eaa9599313a30fade2d7743a80bf5409c66dbcc3b1e7e922a854e7fec9f42249d6cd7845be49122ce0e100cd98348f5ecc
@@ -422,6 +585,8 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod 233 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190523182746-aaccbc9213b0.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190523182746-aaccbc9213b0.zip 81744 BLAKE2B 63c3280c3ba58476b8bd875dbc5306531ed5ca0a2cbcd0de020cbfbde343063de102246d02dbdb72bf2fde2934c024b0035677081e0b01393e8af0ff816ab01f SHA512 8f730bd144f136f0af03e8883c37487edded594a76ba9a5de049a0fca72eadb0ed7e1a8cac3a9a045179d4ca61f95dd57e070695eb540a461dda71aa96d540ae
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 24878 BLAKE2B b405b445c49834f5b9e5ee82326dcd5f4807963a38d29b851fdd1e914d2695fc5066e17066288e539818ddc52f83c209325d9318d1e4e76f9a2a9a1859f82ff8 SHA512 1f94b8b8c8e4aed577fba2cb65403424cd649c2c437c115d52e08338194f447a4939fb39d73237c2906ea15a4b5089642abdd0bc6ad8a34c8b8e6f097cb43fdc
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -432,24 +597,32 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181031143558-9b800f95dbbc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181031143558-9b800f95dbbc.zip 1437414 BLAKE2B f0c98984a26c3bc22b4146dec45314f5cb557c3073e52f9660aec50b08dd14da0568610c9d996e2f74bfa921c07da878363d4766baba8ae25fd82a1e6627a58e SHA512 072a1e83c9350f0164fb23fa0202fe761705746db31364f77923bb3297b7f2fd62d98e90c862a2b49d275aa50863af3ca582f322f5a83f45dcc2f15d2c8fdaa6
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107144601-ef85f5a75ddf.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107144601-ef85f5a75ddf.zip 1913207 BLAKE2B c5857f80c52bb60cc0a707d7bc3e9cd0aa83b0920159762c5f821c70d0b51027404eed7855bb44232b67d92d4312726e8951d30038fc5227cf59e1df97f4a22e SHA512 c56e491a96b29bbd980cf9a8596a4dfbd27f2529e6e0e2abd164f8572dda5199f82b367e3964ba0d1b223cfb3f802127e23757e606bbfa65e51d4f7a724e6980
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.zip 1476811 BLAKE2B c3f6fdbf0bdfb0c7dad72572cca2edef51716d23e6c6cb1a9294973d8b535abc08b1c60bc4af29c4db5e704f89295aeccbfe4c40b213d27d4ffd6cc959c6c3ab SHA512 d44bdec9efd70d9d17193c48b3c49ef1789e587781692b7790a98f72b103b4cf61f2056e58ec8937819b01135d175119102af8bc18344d01ca17489950341bc1
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -457,6 +630,8 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip 68729
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
@@ -466,29 +641,55 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.zip 20009 BLAKE2B 60e04979e9fdcb37b8dac7d3a1703d9a8c3bf399eaab76a7bfb1041c1e974cfb83aaa97fdbb258758b17813f22a44ca6355972c4b54b503dc5b2a96ee24dde27 SHA512 aab0e6fa0e68bfa59aa0b217e4a0f5910190898f5d24e172de3726bb6d2e70102c114ae37060f797f9efe8702a935300726205328cd8ae2656b9031b68d9aa50
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.zip 13472820 BLAKE2B 6c6f6e44b9d899e18cc2344d9bf221ebf82bad59b12fa37d726fc263ab2fe8aed774d157136f966f3d273280c456e07db81d576dcb90dc18de0f4b51f84f187d SHA512 a2eb6f10e397f08400d78d903f9fa0e659859c05a90a38c9eec4875af9a6d3bd079bf1f81a5e212c6177cac6a1261cf7f1434d045eca843a5db673eff7518528
 DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
 DIST google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.zip 12739743 BLAKE2B ecf97082c6f434758266939c742f4ba94ef04fa17a430bb84b9842c376b79cbde4589f18216b4e8cd324484aaa5809a8f87d0fc8119646a8160806c56ff3522f SHA512 6df3b0f297df126a535786bcd80bc103a4220fe61b5ab7f79e6cd5821b3bd6ac0348da112ef02f2a4dbecf90322e82b4cd3ee466b25dd41a88b6f876d6c42e72
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip 417366 BLAKE2B 71895742e5a6ad69c7b0db979f725e0171b6df432633912dfda6f367510b0b4d5a2b41d94c7a8eecdbb4de90d2e92818d7f6dc1ba99e41ba54184d39134513b9 SHA512 263419180987380202def791006a59739446ed956bef6314ea378cb6da54079967ddcecf031080295e66755b7312f76795b0f74b876e4928700b877fe1e1e9de
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.zip 6205890 BLAKE2B 8610383da35b1b8ef9b040b24be4562c7512259d2eacbea5a1b28b433a403b5b7eb3cdfa57ed3fa01e7049c7bf5367b66d71be47b5d3951d52ed5c5601e4b4b9 SHA512 c842a0d526632eee8bd3f00ec7700603207899c98274363a9d6e6457d09c32a69db86960c75ffc95c5ae23cb790af1c10538467e3a2e4e28714e494781f2874d
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.zip 5299917 BLAKE2B 1e9e17b4453165e49537ec7edaf7be3959ea31c5ed6d434b7e3d4206f584fbb462e19469d40347cd89d9cc184cce8c215b1984f82b77e6f9e558cb5fa7b4a3c3 SHA512 c7e1da10eff6349af97c415b3a981601e40b384a7541668c0d55d969cdfbe5535582128a4cbeaab8978480760b56d3e2363bef6c0a6b709e2469fcda143421bc
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.zip 7746115 BLAKE2B 0a046f00ae1a4017134511b1f99e8754103f7e9b73fb569f32ba2f16f78189fc67044e1902318c9456d6dafc2e45fd17c057018bf236b57ed20ca68b204ac260 SHA512 16d591b6e74550e4e639f6a748fc2a1e13e483783f44f49371741b8eefcb693c9115b6973ce7ce6c2061275c98cbe457e90284b59bebc351d763554809564bdf
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.zip 856318 BLAKE2B 1e6caee44e8839463776d42a897d5de0e8ec0f76a080d9290346f4c777042753e14f7e136be92347e8d0c60c18d0b1d53f55a7eeeaff8d220837645af5bff583 SHA512 f1c7963c187d23174094f1659974e12d23b1c42761915cb5a06ce3a0a043716863703d856451e570b2f56034e83d528e817dbd849584f79444c2228c8fe1f44c
@@ -496,6 +697,8 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod 833 BLAKE2B 71052eaeaf40883bff6
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.zip 1027057 BLAKE2B aea0c3492c86bffd080c6e1c2d1bd213a6a6c9f6a47a63557f87397901177a78bbbfd40798ecb05bac315c250ad8d0d13e792e16cff69b5dec4557d7dc292d07 SHA512 ade68a1bb465469ad19340518e388da498afbaacad5e4decba807fad863fdaf22a36baf13b6bd629b15f18211057a94393aacfc31a5753216cffd86368cf74df
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip 1027160 BLAKE2B 9cc654c2155c5306cbea34e57f9c6e527cd8504278921bb46186c9997a3dd15278a6cda877df9cdac8368a03dd793a071fdc55ab7591cb9d6bd26dcfbed469bd SHA512 8cd3c2d502dbf4955b29e3b0bc5439b7c9ea82c0bdbc2749bd378d5dd30eea81631dffb4aa3306ee4633b0c988f45e73103aeb5ef38d6cc63e6622886456fd06
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -509,6 +712,7 @@ DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip 59485 BLAKE2B 40d0f1ea8656496c49c0329754c6a8d27ca47ce78757727bd86163203fcad81b079772a78f13b7d5ed3321ed29bdeeaa7a24bf10a1f3fef1a3ae4904fa0a50fe SHA512 73bc289af9201e5b7921f072dc22469e38a269af0a682c9d45bb7d134d9569670d9dd25cf05460d782131370c29f567535751e4c5cca5e40009fb744f9f06d77
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip 60242 BLAKE2B c813626bb38afad9bc3064400989ee298d938a1b9a6e619c512965361f80c7da9a5654fc47b5deba2fa758822dc542c9a6d1f756be881830a6b68e3a39e06a41 SHA512 b47b1ad2eff5abead86f0611bf6355e699ae5fe3ded89fab6efc3b940eba7ff295aa2ffd64bf3eb93cfe9b77fcdd82f8db25fe0ca91823019c9b3fb89feadc75
+DIST gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod 39 BLAKE2B cd7a3249615dce91fbe569b8f698d9c49d53d314e694b89bd504457749f1a0e12a02f30cb8f923bef0827fe69bf9f99fa2050f46b0fc51f1a2c18d4d6b319972 SHA512 a575f862e4d3f90ac0dc914d616fa948cd4e1bd2fcb22b412c71eeab1d2ee4a7b5c5df8961b8ded44be2f14001b27187f240782951291e08933a066b9825e4e4
 DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
@@ -517,13 +721,18 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-DIST hugo-0.69.0.tar.gz 32527452 BLAKE2B de2fabd0a74a88b307f3fcf781f94d015caab4bbe8ce9e66769a60a358a183c086ecacccf22e259c93da6181d50e8bf30df48a3a556ad36dbdb254edb4e37fc5 SHA512 585d38b438f6a888c623b3fe84bb652613037acfdfe53df00e13fa6597cd67c18d587986a35ca67876345d2c601c765e67e5e0fad25ed10e8002c99a99654f8f
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST hugo-0.76.3.tar.gz 35392822 BLAKE2B d8f1df996f4b9884de532fdd959fb9e34c3d4e4ee95a1167590e2a42d3a42b9a3d01d35d752864d8d9aee0b47afa77d4f29d06852e1033c09752ad48e513078d SHA512 48e9d1f54063e00e1e7282f3e812c512303a929c4dd75b63d39a668a867829c293dd26867c6012223eed9c6630b54494b23f15b0cd1f79c92a865bcaabd542de
 DIST pack.ag%2Famqp%2F@v%2Fv0.11.0.mod 20 BLAKE2B d5f63707dc993966cf972285b18d24c5448f4e40f4a9dd5cd5b2eaa20ac8b7c19d5a6391aae35d2fa108cd21275c5e624a1adec488e4d214bdb770c83d7ed3d4 SHA512 fd1aa736efb3454de105d381170d31621ebb53f331e8c677498c90843ff2b1230a86e721905a93e621369b3c50d513d957b7447803e31576c4e3ebba6ea44dc0
 DIST pack.ag%2Famqp%2F@v%2Fv0.8.0.mod 20 BLAKE2B d5f63707dc993966cf972285b18d24c5448f4e40f4a9dd5cd5b2eaa20ac8b7c19d5a6391aae35d2fa108cd21275c5e624a1adec488e4d214bdb770c83d7ed3d4 SHA512 fd1aa736efb3454de105d381170d31621ebb53f331e8c677498c90843ff2b1230a86e721905a93e621369b3c50d513d957b7447803e31576c4e3ebba6ea44dc0
-EBUILD hugo-0.69.0.ebuild 53368 BLAKE2B 338dc0f30464c120f02bc6e68b1aa6824baaa5489ac9cf31beef28251099b2cbed7458042aa39ee3a16c84e70b2cb18ca993c5a536e3cd392bd840a564c7b08a SHA512 52c9ea0542f70944997984a58a32bfccb1a96dc4b1b4b62b92f4b0a3c0c3141c98b30ad2b2d5ec4f11a5a668b6ee0aa9ec9faeed1f6905017412996cb1f32963
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+EBUILD hugo-0.76.3.ebuild 73795 BLAKE2B 71273129a36a1cbe555d6c2675d8d02d7a708d65f01f3cab6c3a616cbbdb3c31466ba4aa6c496bc1779b4b1086b2b914ab6dfb110a04feec73a2d42dae99613b SHA512 f6d0a523f5571afd416cfb7da40a32e6ade84f80e96b942d8571a6c4299baa458bfef6dd4d7e3b4a13df8f988386f297573724238fee9bbbb686d2b41dbfd151
 MISC metadata.xml 507 BLAKE2B 9549b71610a247c052bf902bf0d8f65be3454a86ed1fd5762b2de50b898cf751617832dba5f125f3fd9f98c6e1d18abdb027dc826f7646be8c807b491a9516ee SHA512 8ebfb00a61b421105618a2b9adc4fdcc794ea33db5bfcd5e8797933b3284ce95a248805317b6403d1c8c3dd67f704c116c1ed1775d60fb3c29a7a33b23bcf4cc
diff --git a/www-apps/hugo/hugo-0.69.0.ebuild b/www-apps/hugo/hugo-0.69.0.ebuild
deleted file mode 100644
index 2f0f97d160ec..000000000000
--- a/www-apps/hugo/hugo-0.69.0.ebuild
+++ /dev/null
@@ -1,579 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-KEYWORDS="~amd64"
-
-inherit go-module bash-completion-r1
-
-DESCRIPTION="The world's fastest framework for building websites"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw="
-	"cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw="
-	"cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw="
-	"cloud.google.com/go v0.39.0 h1:UgQP9na6OTfp4dsAiz/eFpFA1C6tPdH5wiRdi19tuMw="
-	"cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts="
-	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA="
-	"contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA="
-	"contrib.go.opencensus.io/exporter/stackdriver v0.11.0/go.mod h1:hA7rlmtavV03FGxzWXAPBUnZeZBhWN/QYQAuMtxc9Bk="
-	"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE="
-	"contrib.go.opencensus.io/resource v0.0.0-20190131005048-21591786a5e0/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA="
-	"github.com/Azure/azure-amqp-common-go v1.1.3/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8="
-	"github.com/Azure/azure-amqp-common-go v1.1.4/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8="
-	"github.com/Azure/azure-pipeline-go v0.1.8 h1:KmVRa8oFMaargVesEuuEoiLCQ4zCCwQ8QX/xg++KS20="
-	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg="
-	"github.com/Azure/azure-pipeline-go v0.1.9 h1:u7JFb9fFTE6Y/j8ae2VK33ePrRqJqoCM/IWkQdAZ+rg="
-	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg="
-	"github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc="
-	"github.com/Azure/azure-sdk-for-go v27.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc="
-	"github.com/Azure/azure-service-bus-go v0.4.1/go.mod h1:d9ho9e/06euiTwGpKxmlbpPhFUsfCsq6a4tZ68r51qI="
-	"github.com/Azure/azure-storage-blob-go v0.6.0 h1:SEATKb3LIHcaSIX+E6/K4kJpwfuozFEsmt5rS56N6CE="
-	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y="
-	"github.com/Azure/go-autorest v11.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24="
-	"github.com/Azure/go-autorest v11.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24="
-	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24="
-	"github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88="
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
-	"github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ="
-	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
-	"github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0="
-	"github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0="
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190418212003-6ac0b49e7197/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo="
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU="
-	"github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI="
-	"github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0="
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M="
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE="
-	"github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo="
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI="
-	"github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c="
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U="
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI="
-	"github.com/alecthomas/chroma v0.7.1 h1:G1i02OhUbRi2nJxcNkwJaY/J1gHXj9tt72qN6ZouLFQ="
-	"github.com/alecthomas/chroma v0.7.1/go.mod h1:gHw09mkX1Qp80JlYbmN9L3+4R5o6DJJ3GRShh+AICNc="
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo="
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0="
-	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI="
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae h1:C4Q9m+oXOxcSWwYk9XzzafY2xAVAaeubZbUHJkw3PlY="
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI="
-	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA="
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY="
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ="
-	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E="
-	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ="
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc="
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0="
-	"github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ="
-	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8="
-	"github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI="
-	"github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8="
-	"github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0="
-	"github.com/aws/aws-sdk-go v1.18.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo="
-	"github.com/aws/aws-sdk-go v1.19.16/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo="
-	"github.com/aws/aws-sdk-go v1.27.1 h1:MXnqY6SlWySaZAqNnXThOvjRFdiiOuKtC6i7baFdNdU="
-	"github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo="
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q="
-	"github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8="
-	"github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo="
-	"github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0="
-	"github.com/bep/gitmap v1.1.2 h1:zk04w1qc1COTZPPYWDQHvns3y1afOsdRfraFQ3qI840="
-	"github.com/bep/gitmap v1.1.2/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY="
-	"github.com/bep/golibsass v0.5.0 h1:b+Uxsk826Q35OmbenSmU65P+FJJQoVs2gI2mk1ba28s="
-	"github.com/bep/golibsass v0.5.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA="
-	"github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI="
-	"github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0="
-	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU="
-	"github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc="
-	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764="
-	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U="
-	"github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw="
-	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI="
-	"github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s="
-	"github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk="
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE="
-	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk="
-	"github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk="
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA="
-	"github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk="
-	"github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE="
-	"github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E="
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ="
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk="
-	"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
-	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ="
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no="
-	"github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8="
-	"github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc="
-	"github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI="
-	"github.com/dlclark/regexp2 v1.1.6 h1:CqB4MjHw0MFCDj+PHHjiESmHX+N7t0tJzKvC6M97BRg="
-	"github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc="
-	"github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk="
-	"github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc="
-	"github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo="
-	"github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk="
-	"github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs="
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU="
-	"github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I="
-	"github.com/fortytw2/leaktest v1.2.0 h1:cj6GCiwJDH7l3tMHLjZDo0QqPtrXJiWSI9JgpeQKw+Q="
-	"github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g="
-	"github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw="
-	"github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g="
-	"github.com/frankban/quicktest v1.4.1 h1:Wv2VwvNn73pAdFIVUQRXYDFp31lXKbqblIXo/Q5GPSg="
-	"github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ="
-	"github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk="
-	"github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o="
-	"github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I="
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo="
-	"github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04="
-	"github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8="
-	"github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as="
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE="
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk="
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w="
-	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
-	"github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y="
-	"github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8="
-	"github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ="
-	"github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ="
-	"github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4="
-	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95 h1:sgew0XCnZwnzpWxTt3V8LLiCO7OQi3C6dycaE67wfkU="
-	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod h1:bOlVlCa1/RajcHpXkrUXPSHB/Re1UnlXxD1Qp8SKOd8="
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58="
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q="
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc="
-	"github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A="
-	"github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A="
-	"github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM="
-	"github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U="
-	"github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg="
-	"github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U="
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q="
-	"github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q="
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ="
-	"github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ="
-	"github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ="
-	"github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M="
-	"github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY="
-	"github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU="
-	"github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg="
-	"github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU="
-	"github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93 h1:VvBteXw2zOXEgm0o3PgONTWf+bhUGsCaiNn3pbkU9LA="
-	"github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU="
-	"github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no="
-	"github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs="
-	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE="
-	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs="
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc="
-	"github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY="
-	"github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo="
-	"github.com/google/wire v0.2.2 h1:fSIRzE/K12IaNgV6X0173X/oLrTwHKRiMcFZhiDrN3s="
-	"github.com/google/wire v0.2.2/go.mod h1:7FHVg6mFpFQrjeUZrm+BaD50N5jnDKm50uVPTpyYOmU="
-	"github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww="
-	"github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY="
-	"github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc="
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg="
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8="
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY="
-	"github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg="
-	"github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI="
-	"github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ="
-	"github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs="
-	"github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs="
-	"github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4="
-	"github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q="
-	"github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ="
-	"github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM="
-	"github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE="
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs="
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk="
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY="
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY="
-	"github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo="
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8="
-	"github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU="
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8="
-	"github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4="
-	"github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ="
-	"github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU="
-	"github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM="
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8="
-	"github.com/jdkato/prose v1.1.1 h1:r6CwY09U97IZNgNQEHoeCh2nvg2e8WCOGjPH/b7lowI="
-	"github.com/jdkato/prose v1.1.1/go.mod h1:jkF0lkxaX5PFSlk9l4Gh9Y+T57TqUZziWT7uZbW5ADg="
-	"github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI="
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k="
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM="
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k="
-	"github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg="
-	"github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo="
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU="
-	"github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo="
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU="
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w="
-	"github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q="
-	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc="
-	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
-	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
-	"github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs="
-	"github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI="
-	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
-	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
-	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
-	"github.com/kyokomi/emoji v2.2.1+incompatible h1:uP/6J5y5U0XxPh6fv8YximpVD1uMrshXG78I1+uF5SA="
-	"github.com/kyokomi/emoji v2.2.1+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA="
-	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE="
-	"github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A="
-	"github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY="
-	"github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ="
-	"github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4="
-	"github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ="
-	"github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6 h1:LZhVjIISSbj8qLf2qDPP0D8z0uvOWAW5C85ly5mJW6c="
-	"github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88="
-	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs="
-	"github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4="
-	"github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU="
-	"github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs="
-	"github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4="
-	"github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM="
-	"github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE="
-	"github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54="
-	"github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI="
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0="
-	"github.com/miekg/mmark v1.3.6 h1:t47x5vThdwgLJzofNsbsAl7gmIiJ7kbDQN5BxwBmwvY="
-	"github.com/miekg/mmark v1.3.6/go.mod h1:w7r9mkTvpS55jlfyn22qJ618itLryxXBhA7Jp3FIlkw="
-	"github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y="
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0="
-	"github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y="
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ="
-	"github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE="
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y="
-	"github.com/muesli/smartcrop v0.3.0 h1:JTlSkmxWg/oQ1TcLDoypuirdE8Y/jzNirQeLkxpA6Oc="
-	"github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI="
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U="
-	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ="
-	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8="
-	"github.com/nicksnyder/go-i18n v1.10.0 h1:5AzlPKvXBH4qBzmZ09Ua9Gipyruv6uApMcrNZdo96+Q="
-	"github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q="
-	"github.com/niklasfasching/go-org v1.0.0 h1:lDh8zKtmbaQupKQhLyVp1clG+JojkVoVBH9bT7c9O70="
-	"github.com/niklasfasching/go-org v1.0.0/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU="
-	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E="
-	"github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U="
-	"github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8="
-	"github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA="
-	"github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE="
-	"github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE="
-	"github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY="
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o="
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw="
-	"github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc="
-	"github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic="
-	"github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4="
-	"github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys="
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY="
-	"github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw="
-	"github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I="
-	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
-	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
-	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
-	"github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw="
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs="
-	"github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso="
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo="
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo="
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA="
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro="
-	"github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4="
-	"github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4="
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk="
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk="
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA="
-	"github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU="
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4="
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg="
-	"github.com/rogpeppe/go-internal v1.5.1 h1:asQ0uD7BN9RU5Im41SEEZTwCi/zAXdMOLS3npYaos2g="
-	"github.com/rogpeppe/go-internal v1.5.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc="
-	"github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo="
-	"github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g="
-	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 h1:tlXG832s5pa9x9Gs3Rp2rTvEqjiDEuETUOSfBEiTcns="
-	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g="
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc="
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk="
-	"github.com/sanity-io/litter v1.2.0 h1:DGJO0bxH/+C2EukzOSBmAlxmkhVMGqzvcx/rvySYw9M="
-	"github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4="
-	"github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ="
-	"github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo="
-	"github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo="
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM="
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc="
-	"github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s="
-	"github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA="
-	"github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM="
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA="
-	"github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI="
-	"github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ="
-	"github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc="
-	"github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk="
-	"github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8="
-	"github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE="
-	"github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng="
-	"github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE="
-	"github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s="
-	"github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU="
-	"github.com/spf13/fsync v0.9.0 h1:f9CEt3DOB2mnHxZaftmEOFWjABEvKM/xpf3cUwJrGOY="
-	"github.com/spf13/fsync v0.9.0/go.mod h1:fNtJEfG3HiltN3y4cPOz6MLjos9+2pIEqLIgszqhp/0="
-	"github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk="
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo="
-	"github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk="
-	"github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo="
-	"github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg="
-	"github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4="
-	"github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA="
-	"github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg="
-	"github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s="
-	"github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk="
-	"github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k="
-	"github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4="
-	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
-	"github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w="
-	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
-	"github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q="
-	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
-	"github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s="
-	"github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw="
-	"github.com/tdewolff/minify/v2 v2.6.1 h1:UJLhbs2Q/iDrqA79EEyKE48uYHeAMPVdiUzdtKsatJ8="
-	"github.com/tdewolff/minify/v2 v2.6.1/go.mod h1:l9hbQnH096st77OkscoRUvKdd23oUM6pDZpYx381sPo="
-	"github.com/tdewolff/parse/v2 v2.3.14 h1:Tzam5YoUXx7gybFEfR/zcuR74PXADnrfUqYUXL+K5oA="
-	"github.com/tdewolff/parse/v2 v2.3.14/go.mod h1:+V2lSZ93xpH2Csfs/vtNY1Fjr8kcFMsZKjyLoSkZbM0="
-	"github.com/tdewolff/test v1.0.4 h1:ih38SXuQJ32Hng5EtSW32xqEsVeMnPp6nNNRPhBBDE8="
-	"github.com/tdewolff/test v1.0.4/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE="
-	"github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk="
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U="
-	"github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g="
-	"github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk="
-	"github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U="
-	"github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc="
-	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0="
-	"github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc="
-	"github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8="
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I="
-	"github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y="
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU="
-	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q="
-	"github.com/yuin/goldmark v1.1.22 h1:0e0f6Zee9SAQ5yOZGNMWaOxqVvcc/9/kUWu/Kl91Jk8="
-	"github.com/yuin/goldmark v1.1.22/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74="
-	"github.com/yuin/goldmark v1.1.25 h1:isv+Q6HQAmmL2Ofcmg8QauBmDPlUUnSoNhEcC940Rds="
-	"github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74="
-	"github.com/yuin/goldmark-highlighting v0.0.0-20200218065240-d1af22c1126f h1:5295skDVJn90SXIYI22jOMeR9XbnuN76y/V1m9N8ITQ="
-	"github.com/yuin/goldmark-highlighting v0.0.0-20200218065240-d1af22c1126f/go.mod h1:9yW2CHuRSORvHgw7YfybB09PqUZTbzERyW3QFvd8+0Q="
-	"go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU="
-	"go.mongodb.org/mongo-driver v1.0.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM="
-	"go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0="
-	"go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk="
-	"go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk="
-	"go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg="
-	"go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU="
-	"go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4="
-	"go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8="
-	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU="
-	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
-	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"gocloud.dev v0.15.0 h1:Tl8dkOHWVZiYBYPxG2ouhpfmluoQGt3mY323DaAHaC8="
-	"gocloud.dev v0.15.0/go.mod h1:ShXCyJaGrJu9y/7a6+DSCyBb9MFGZ1P5wwPa0Wu6w34="
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4="
-	"golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4="
-	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4="
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
-	"golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA="
-	"golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 h1:2fktqPPvDiVEEVT/vSTeoUPXfmRxRaGy6GU8jypvEn0="
-	"golang.org/x/image v0.0.0-20191214001246-9130b4cfad52/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0="
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE="
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU="
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE="
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA="
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190322120337-addf6b3196f6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco="
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks="
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8="
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U="
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI="
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
-	"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
-	"golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 h1:xFEXbcD0oa/xhqQmMXztdZ0bWvexAWds+8c1gRN8nu0="
-	"golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA="
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI="
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc h1:SdCq5U4J+PpbSDIl9bM0V1e1Ug1jsnBkAFvTs1htn7U="
-	"golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4="
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200107144601-ef85f5a75ddf h1:9cZxTVBvFZgOnVi/DobY3JsafbPFPnP2rtN81d4wPpw="
-	"golang.org/x/sys v0.0.0-20200107144601-ef85f5a75ddf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg="
-	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To="
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
-	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
-	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ="
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ="
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ="
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY="
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc="
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk="
-	"google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk="
-	"google.golang.org/api v0.5.0 h1:lj9SyhMzyoa38fgFF0oO2T6pjs5IzkLPKfVtxpyCRMM="
-	"google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE="
-	"google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM="
-	"google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508="
-	"google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4="
-	"google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw="
-	"google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4="
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc="
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk="
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
-	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
-	"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
-	"google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 h1:4rNOqY4ULrKzS6twXa619uQgI7h9PaVd4ZhjFQ7C5zs="
-	"google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s="
-	"google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs="
-	"google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8="
-	"google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c="
-	"google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c="
-	"google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38="
-	"google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0="
-	"google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM="
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw="
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo="
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys="
-	"gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno="
-	"gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k="
-	"gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho="
-	"gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k="
-	"gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo="
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw="
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74="
-	"gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw="
-	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I="
-	"gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo="
-	"gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
-	"pack.ag/amqp v0.8.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4="
-	"pack.ag/amqp v0.11.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4="
-)
-
-go-module_set_globals
-
-SRC_URI="
-	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0"
-
-SLOT="0"
-
-IUSE="+bash-completion doc +sass"
-
-RESTRICT="test"
-
-src_compile() {
-	mkdir -pv bin || die
-	go build -ldflags \
-		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
-		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
-	bin/hugo gen man --dir man || die
-	if use bash-completion ; then
-		bin/hugo gen autocomplete --completionfile hugo || die
-	fi
-	if use doc ; then
-		bin/hugo gen doc --dir doc || die
-	fi
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	if use bash-completion ; then
-		dobashcomp hugo || die
-	fi
-	if use doc ; then
-		dodoc -r doc/
-	fi
-}
diff --git a/www-apps/hugo/hugo-0.76.3.ebuild b/www-apps/hugo/hugo-0.76.3.ebuild
new file mode 100644
index 000000000000..11b4f843c84c
--- /dev/null
+++ b/www-apps/hugo/hugo-0.76.3.ebuild
@@ -0,0 +1,788 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+KEYWORDS="~amd64"
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="The world's fastest framework for building websites"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw="
+	"cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw="
+	"cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw="
+	"cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU="
+	"cloud.google.com/go v0.39.0 h1:UgQP9na6OTfp4dsAiz/eFpFA1C6tPdH5wiRdi19tuMw="
+	"cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts="
+	"cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU="
+	"cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY="
+	"cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc="
+	"cloud.google.com/go v0.46.3 h1:AVXDdKsrtX33oR9fbCMu/+c1o8Ofjq6Ku/MInaLVg5Y="
+	"cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0="
+	"cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o="
+	"cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE="
+	"cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk="
+	"cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I="
+	"cloud.google.com/go/storage v1.0.0 h1:VV2nUM3wwLLGh9lSABFgZMjInyUbJeaRSE64WuAIQ+4="
+	"cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw="
+	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA="
+	"contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA="
+	"contrib.go.opencensus.io/exporter/stackdriver v0.11.0/go.mod h1:hA7rlmtavV03FGxzWXAPBUnZeZBhWN/QYQAuMtxc9Bk="
+	"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE="
+	"contrib.go.opencensus.io/resource v0.0.0-20190131005048-21591786a5e0/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA="
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU="
+	"github.com/Azure/azure-amqp-common-go v1.1.3/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8="
+	"github.com/Azure/azure-amqp-common-go v1.1.4/go.mod h1:FhZtXirFANw40UXI2ntweO+VOkfaw8s6vZxUiRhLYW8="
+	"github.com/Azure/azure-pipeline-go v0.1.8 h1:KmVRa8oFMaargVesEuuEoiLCQ4zCCwQ8QX/xg++KS20="
+	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg="
+	"github.com/Azure/azure-pipeline-go v0.1.9 h1:u7JFb9fFTE6Y/j8ae2VK33ePrRqJqoCM/IWkQdAZ+rg="
+	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg="
+	"github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc="
+	"github.com/Azure/azure-sdk-for-go v27.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc="
+	"github.com/Azure/azure-service-bus-go v0.4.1/go.mod h1:d9ho9e/06euiTwGpKxmlbpPhFUsfCsq6a4tZ68r51qI="
+	"github.com/Azure/azure-storage-blob-go v0.6.0 h1:SEATKb3LIHcaSIX+E6/K4kJpwfuozFEsmt5rS56N6CE="
+	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y="
+	"github.com/Azure/go-autorest v11.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24="
+	"github.com/Azure/go-autorest v11.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24="
+	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24="
+	"github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88="
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
+	"github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ="
+	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo="
+	"github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0="
+	"github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0="
+	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190418212003-6ac0b49e7197/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo="
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU="
+	"github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI="
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0="
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M="
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE="
+	"github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo="
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI="
+	"github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c="
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U="
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI="
+	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod h1:fv5SzZPFJbwp2NXJWpFIX7DZS4HgV1K4ew4Pc2OZD9s="
+	"github.com/alecthomas/chroma v0.8.0 h1:HS+HE97sgcqjQGu5uVr8jIE55Mmh5UeQ7kckAhHg2pY="
+	"github.com/alecthomas/chroma v0.8.0/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM="
+	"github.com/alecthomas/chroma v0.8.1 h1:ym20sbvyC6RXz45u4qDglcgr8E313oPROshcuCHqiEE="
+	"github.com/alecthomas/chroma v0.8.1/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM="
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo="
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0="
+	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI="
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae h1:C4Q9m+oXOxcSWwYk9XzzafY2xAVAaeubZbUHJkw3PlY="
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI="
+	"github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE="
+	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA="
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY="
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ="
+	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E="
+	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ="
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc="
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0="
+	"github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ="
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o="
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8="
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY="
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8="
+	"github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI="
+	"github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8="
+	"github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0="
+	"github.com/aws/aws-sdk-go v1.18.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo="
+	"github.com/aws/aws-sdk-go v1.19.16/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo="
+	"github.com/aws/aws-sdk-go v1.34.20 h1:D9otznteZZyN5pRyFETqveYia/85Xzk7+RaPGB1I9fE="
+	"github.com/aws/aws-sdk-go v1.34.20/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0="
+	"github.com/aws/aws-sdk-go v1.34.21 h1:M97FXuiJgDHwD4mXhrIZ7RJ4xXV6uZVPvIC2qb+HfYE="
+	"github.com/aws/aws-sdk-go v1.34.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0="
+	"github.com/aws/aws-sdk-go v1.34.22 h1:7V2sKilVVgHqdjbW+O/xaVWYfnmuLwZdF/+6JuUh6Cw="
+	"github.com/aws/aws-sdk-go v1.34.22/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0="
+	"github.com/aws/aws-sdk-go v1.34.26 h1:tw4nsSfGvCDnXt2xPe8NkxIrDui+asAWinMknPLEf80="
+	"github.com/aws/aws-sdk-go v1.34.26/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0="
+	"github.com/aws/aws-sdk-go v1.34.27 h1:qBqccUrlz43Zermh0U1O502bHYZsgMlBm+LUVabzBPA="
+	"github.com/aws/aws-sdk-go v1.34.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0="
+	"github.com/aws/aws-sdk-go v1.34.33 h1:ymkFm0rNPEOlgjyX3ojEd4zqzW6kGICBkqWs7LqgHtU="
+	"github.com/aws/aws-sdk-go v1.34.33/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48="
+	"github.com/aws/aws-sdk-go v1.34.34 h1:5dC0ZU0xy25+UavGNEkQ/5MOQwxXDA2YXtjCL1HfYKI="
+	"github.com/aws/aws-sdk-go v1.34.34/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48="
+	"github.com/aws/aws-sdk-go v1.35.0 h1:Pxqn1MWNfBCNcX7jrXCCTfsKpg5ms2IMUMmmcGtYJuo="
+	"github.com/aws/aws-sdk-go v1.35.0/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48="
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q="
+	"github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8="
+	"github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo="
+	"github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0="
+	"github.com/bep/gitmap v1.1.2 h1:zk04w1qc1COTZPPYWDQHvns3y1afOsdRfraFQ3qI840="
+	"github.com/bep/gitmap v1.1.2/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY="
+	"github.com/bep/golibsass v0.7.0 h1:/ocxgtPZ5rgp7FA+mktzyent+fAg82tJq4iMsTMBAtA="
+	"github.com/bep/golibsass v0.7.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA="
+	"github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI="
+	"github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0="
+	"github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs="
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84="
+	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU="
+	"github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc="
+	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764="
+	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U="
+	"github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw="
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI="
+	"github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s="
+	"github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk="
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE="
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE="
+	"github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk="
+	"github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk="
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA="
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU="
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM="
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU="
+	"github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E="
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ="
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk="
+	"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
+	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ="
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no="
+	"github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8="
+	"github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc="
+	"github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI="
+	"github.com/dlclark/regexp2 v1.1.6 h1:CqB4MjHw0MFCDj+PHHjiESmHX+N7t0tJzKvC6M97BRg="
+	"github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc="
+	"github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk="
+	"github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc="
+	"github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo="
+	"github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk="
+	"github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs="
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU="
+	"github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I="
+	"github.com/evanw/esbuild v0.6.32 h1:hVuqC+IgEENPWnr0gic01EFgGCmyW8dUPnr78zC7K5k="
+	"github.com/evanw/esbuild v0.6.32/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/evanw/esbuild v0.7.1 h1:bkC9MpDxHPCLESOf3AQzK1QiyaxbnxFa3XLPnyARLSI="
+	"github.com/evanw/esbuild v0.7.1/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/evanw/esbuild v0.7.2 h1:LBY35Gw3fKs7jVpsbQwOmw7pJLDHdpliI1Mc/DqP0Hs="
+	"github.com/evanw/esbuild v0.7.2/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/evanw/esbuild v0.7.4 h1:mLb2tQ9315u23ulh/5Gg8xejOfgqHs2zm7bDNtNnNcM="
+	"github.com/evanw/esbuild v0.7.4/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/evanw/esbuild v0.7.7 h1:l/M5wHuU738LEX8RyGDP7Zkdrw84j3bpCPrJbKX33Ks="
+	"github.com/evanw/esbuild v0.7.7/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/evanw/esbuild v0.7.8 h1:DyCpTDLRAtjqRixfXFslGSsYaoKRQfYi+gwGkzW1FHI="
+	"github.com/evanw/esbuild v0.7.8/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/evanw/esbuild v0.7.9 h1:jXSoYpNpGkOK1VNx3tvd/KnbVbn5ULRYzvkumXaSkxo="
+	"github.com/evanw/esbuild v0.7.9/go.mod h1:mptxmSXIzBIKKCe4jo9A5SToEd1G+AKZ9JmY85dYRJ0="
+	"github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4="
+	"github.com/fortytw2/leaktest v1.2.0 h1:cj6GCiwJDH7l3tMHLjZDo0QqPtrXJiWSI9JgpeQKw+Q="
+	"github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g="
+	"github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw="
+	"github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g="
+	"github.com/frankban/quicktest v1.4.1 h1:Wv2VwvNn73pAdFIVUQRXYDFp31lXKbqblIXo/Q5GPSg="
+	"github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ="
+	"github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk="
+	"github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o="
+	"github.com/frankban/quicktest v1.10.2 h1:19ARM85nVi4xH7xPXuc5eM/udya5ieh7b/Sv+d844Tk="
+	"github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s="
+	"github.com/frankban/quicktest v1.11.0 h1:Yyrghcw93e1jKo4DTZkRFTTFvBsVhzbblBUPNU1vW6Q="
+	"github.com/frankban/quicktest v1.11.0/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s="
+	"github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I="
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo="
+	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
+	"github.com/getkin/kin-openapi v0.14.0 h1:hqwQL7kze/adt0wB+0UJR2nJm+gfUHqM0Gu4D8nByVc="
+	"github.com/getkin/kin-openapi v0.14.0/go.mod h1:WGRs2ZMM1Q8LR1QBEwUxC6RJEfaBcD0s+pcEVXFuAjw="
+	"github.com/getkin/kin-openapi v0.22.0 h1:J5IFyKd/5yuB6AZAgwK0CMBKnabWcmkowtsl6bRkz4s="
+	"github.com/getkin/kin-openapi v0.22.0/go.mod h1:WGRs2ZMM1Q8LR1QBEwUxC6RJEfaBcD0s+pcEVXFuAjw="
+	"github.com/getkin/kin-openapi v0.22.1 h1:ODA1olTp175o//NfHko/uCAAhwUSfm5P4+K52XvTg4w="
+	"github.com/getkin/kin-openapi v0.22.1/go.mod h1:WGRs2ZMM1Q8LR1QBEwUxC6RJEfaBcD0s+pcEVXFuAjw="
+	"github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk="
+	"github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04="
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU="
+	"github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8="
+	"github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as="
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE="
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk="
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w="
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
+	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
+	"github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y="
+	"github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8="
+	"github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ="
+	"github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ="
+	"github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4="
+	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95 h1:sgew0XCnZwnzpWxTt3V8LLiCO7OQi3C6dycaE67wfkU="
+	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod h1:bOlVlCa1/RajcHpXkrUXPSHB/Re1UnlXxD1Qp8SKOd8="
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58="
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q="
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc="
+	"github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A="
+	"github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A="
+	"github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y="
+	"github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM="
+	"github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U="
+	"github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg="
+	"github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U="
+	"github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs="
+	"github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U="
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q="
+	"github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q="
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ="
+	"github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ="
+	"github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ="
+	"github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M="
+	"github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY="
+	"github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU="
+	"github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg="
+	"github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU="
+	"github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM="
+	"github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
+	"github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no="
+	"github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs="
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE="
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs="
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc="
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc="
+	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
+	"github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY="
+	"github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo="
+	"github.com/google/wire v0.2.2 h1:fSIRzE/K12IaNgV6X0173X/oLrTwHKRiMcFZhiDrN3s="
+	"github.com/google/wire v0.2.2/go.mod h1:7FHVg6mFpFQrjeUZrm+BaD50N5jnDKm50uVPTpyYOmU="
+	"github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww="
+	"github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY="
+	"github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc="
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg="
+	"github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM="
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk="
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8="
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY="
+	"github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg="
+	"github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI="
+	"github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ="
+	"github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs="
+	"github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs="
+	"github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4="
+	"github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q="
+	"github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ="
+	"github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc="
+	"github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE="
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs="
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk="
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY="
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY="
+	"github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q="
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8="
+	"github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4="
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80="
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60="
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM="
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk="
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU="
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU="
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4="
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro="
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro="
+	"github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90="
+	"github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo="
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8="
+	"github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU="
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8="
+	"github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4="
+	"github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ="
+	"github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64="
+	"github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ="
+	"github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I="
+	"github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc="
+	"github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU="
+	"github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM="
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8="
+	"github.com/jdkato/prose v1.1.1 h1:r6CwY09U97IZNgNQEHoeCh2nvg2e8WCOGjPH/b7lowI="
+	"github.com/jdkato/prose v1.1.1/go.mod h1:jkF0lkxaX5PFSlk9l4Gh9Y+T57TqUZziWT7uZbW5ADg="
+	"github.com/jdkato/prose v1.2.0 h1:t/R3H6xOrVuIgNevWiOSJf1kEoeF2VWlrN6w76Tkzow="
+	"github.com/jdkato/prose v1.2.0/go.mod h1:WC4YKHtBdAMgBdmfdqBmEuVbBD0U5c9HQ6l1U8Cq0ts="
+	"github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI="
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k="
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM="
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k="
+	"github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc="
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik="
+	"github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg="
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo="
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U="
+	"github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg="
+	"github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo="
+	"github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU="
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU="
+	"github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo="
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU="
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w="
+	"github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q="
+	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg="
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc="
+	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
+	"github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI="
+	"github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI="
+	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
+	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
+	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
+	"github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc="
+	"github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw="
+	"github.com/kyokomi/emoji v2.2.4+incompatible h1:np0woGKwx9LiHAQmwZx79Oc0rHpNw3o+3evou4BEPv4="
+	"github.com/kyokomi/emoji v2.2.4+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA="
+	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g="
+	"github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A="
+	"github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY="
+	"github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ="
+	"github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4="
+	"github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ="
+	"github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6 h1:LZhVjIISSbj8qLf2qDPP0D8z0uvOWAW5C85ly5mJW6c="
+	"github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88="
+	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs="
+	"github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4="
+	"github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU="
+	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
+	"github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4="
+	"github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs="
+	"github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4="
+	"github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54="
+	"github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI="
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0="
+	"github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg="
+	"github.com/miekg/mmark v1.3.6 h1:t47x5vThdwgLJzofNsbsAl7gmIiJ7kbDQN5BxwBmwvY="
+	"github.com/miekg/mmark v1.3.6/go.mod h1:w7r9mkTvpS55jlfyn22qJ618itLryxXBhA7Jp3FIlkw="
+	"github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc="
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0="
+	"github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y="
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0="
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI="
+	"github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg="
+	"github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y="
+	"github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ="
+	"github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY="
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y="
+	"github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE="
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y="
+	"github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8="
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo="
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q="
+	"github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0="
+	"github.com/montanaflynn/stats v0.6.3/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc="
+	"github.com/muesli/smartcrop v0.3.0 h1:JTlSkmxWg/oQ1TcLDoypuirdE8Y/jzNirQeLkxpA6Oc="
+	"github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI="
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U="
+	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ="
+	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8="
+	"github.com/nicksnyder/go-i18n v1.10.1 h1:isfg77E/aCD7+0lD/D00ebR2MV5vgeQ276WYyDaCRQc="
+	"github.com/nicksnyder/go-i18n v1.10.1/go.mod h1:e4Di5xjP9oTVrC6y3C7C0HoSYXjSbhh/dU0eUV32nB4="
+	"github.com/nicksnyder/go-i18n/v2 v2.1.1 h1:ATCOanRDlrfKVB4WHAdJnLEqZtDmKYsweqsOUYflnBU="
+	"github.com/nicksnyder/go-i18n/v2 v2.1.1/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs="
+	"github.com/niklasfasching/go-org v1.3.2 h1:ZKTSd+GdJYkoZl1pBXLR/k7DRiRXnmB96TRiHmHdzwI="
+	"github.com/niklasfasching/go-org v1.3.2/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU="
+	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E="
+	"github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U="
+	"github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8="
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA="
+	"github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE="
+	"github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE="
+	"github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY="
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o="
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw="
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc="
+	"github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc="
+	"github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic="
+	"github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4="
+	"github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys="
+	"github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM="
+	"github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc="
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY="
+	"github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw="
+	"github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I="
+	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
+	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI="
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
+	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
+	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
+	"github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI="
+	"github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw="
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs="
+	"github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso="
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo="
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo="
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA="
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro="
+	"github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4="
+	"github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4="
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk="
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk="
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA="
+	"github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU="
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4="
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg="
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
+	"github.com/rogpeppe/go-internal v1.5.1 h1:asQ0uD7BN9RU5Im41SEEZTwCi/zAXdMOLS3npYaos2g="
+	"github.com/rogpeppe/go-internal v1.5.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc="
+	"github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0="
+	"github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc="
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 h1:tlXG832s5pa9x9Gs3Rp2rTvEqjiDEuETUOSfBEiTcns="
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g="
+	"github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q="
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM="
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc="
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk="
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts="
+	"github.com/sanity-io/litter v1.3.0 h1:5ZO+weUsqdSWMUng5JnpkW/Oz8iTXiIdeumhQr1sSjs="
+	"github.com/sanity-io/litter v1.3.0/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0="
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc="
+	"github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ="
+	"github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo="
+	"github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod h1:2htx6lmL0NGLHlO8ZCf+lQBGBHIbEujyywxJArf+2Yc="
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo="
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc="
+	"github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo="
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM="
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc="
+	"github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s="
+	"github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA="
+	"github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM="
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA="
+	"github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI="
+	"github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ="
+	"github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc="
+	"github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk="
+	"github.com/spf13/afero v1.4.0 h1:jsLTaI1zwYO3vjrzHalkVcIHXTNmdQFepW4OI8H3+x8="
+	"github.com/spf13/afero v1.4.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I="
+	"github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8="
+	"github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE="
+	"github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng="
+	"github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE="
+	"github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU="
+	"github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE="
+	"github.com/spf13/fsync v0.9.0 h1:f9CEt3DOB2mnHxZaftmEOFWjABEvKM/xpf3cUwJrGOY="
+	"github.com/spf13/fsync v0.9.0/go.mod h1:fNtJEfG3HiltN3y4cPOz6MLjos9+2pIEqLIgszqhp/0="
+	"github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk="
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo="
+	"github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk="
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo="
+	"github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg="
+	"github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4="
+	"github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA="
+	"github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg="
+	"github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE="
+	"github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk="
+	"github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k="
+	"github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk="
+	"github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg="
+	"github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4="
+	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
+	"github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w="
+	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
+	"github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q="
+	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
+	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
+	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
+	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
+	"github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg="
+	"github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s="
+	"github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw="
+	"github.com/tdewolff/minify/v2 v2.6.2 h1:Jaod6aSABWmhftvnxvXogxcEoQt6yogfFeZgIQEMPOw="
+	"github.com/tdewolff/minify/v2 v2.6.2/go.mod h1:BkDSm8aMMT0ALGmpt7j3Ra7nLUgZL0qhyrAHXwxcy5w="
+	"github.com/tdewolff/parse/v2 v2.4.2 h1:Bu2Qv6wepkc+Ou7iB/qHjAhEImlAP5vedzlQRUdj3BI="
+	"github.com/tdewolff/parse/v2 v2.4.2/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho="
+	"github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4="
+	"github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE="
+	"github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk="
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U="
+	"github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g="
+	"github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk="
+	"github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U="
+	"github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc="
+	"github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0="
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc="
+	"github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8="
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I="
+	"github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y="
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU="
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q="
+	"github.com/yuin/goldmark v1.1.22 h1:0e0f6Zee9SAQ5yOZGNMWaOxqVvcc/9/kUWu/Kl91Jk8="
+	"github.com/yuin/goldmark v1.1.22/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74="
+	"github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM="
+	"github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74="
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691 h1:VWSxtAiQNh3zgHJpdpkpVYjTPqRE3P6UZCOPa1nRDio="
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod h1:YLF3kDffRfUH/bTxOxHhV6lxwIB3Vfj91rEwNMS9MXo="
+	"go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU="
+	"go.mongodb.org/mongo-driver v1.0.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM="
+	"go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0="
+	"go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk="
+	"go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk="
+	"go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg="
+	"go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU="
+	"go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4="
+	"go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8="
+	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU="
+	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
+	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"gocloud.dev v0.15.0 h1:Tl8dkOHWVZiYBYPxG2ouhpfmluoQGt3mY323DaAHaC8="
+	"gocloud.dev v0.15.0/go.mod h1:ShXCyJaGrJu9y/7a6+DSCyBb9MFGZ1P5wwPa0Wu6w34="
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4="
+	"golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4="
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA="
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA="
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8="
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek="
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY="
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js="
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0="
+	"golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 h1:2fktqPPvDiVEEVT/vSTeoUPXfmRxRaGy6GU8jypvEn0="
+	"golang.org/x/image v0.0.0-20191214001246-9130b4cfad52/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0="
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE="
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU="
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE="
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE="
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o="
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
+	"golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY="
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA="
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4="
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190322120337-addf6b3196f6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco="
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks="
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI="
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U="
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI="
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
+	"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
+	"golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 h1:xFEXbcD0oa/xhqQmMXztdZ0bWvexAWds+8c1gRN8nu0="
+	"golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0="
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw="
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA="
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI="
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc h1:SdCq5U4J+PpbSDIl9bM0V1e1Ug1jsnBkAFvTs1htn7U="
+	"golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY="
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w="
+	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To="
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
+	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ="
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ="
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ="
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY="
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk="
+	"google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk="
+	"google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE="
+	"google.golang.org/api v0.5.0 h1:lj9SyhMzyoa38fgFF0oO2T6pjs5IzkLPKfVtxpyCRMM="
+	"google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE="
+	"google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M="
+	"google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg="
+	"google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg="
+	"google.golang.org/api v0.13.0 h1:Q3Ui3V3/CVinFWFiW39Iw0kMuVrRzYX0wN6OPFp0lTA="
+	"google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI="
+	"google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM="
+	"google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508="
+	"google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4="
+	"google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4="
+	"google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw="
+	"google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4="
+	"google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0="
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc="
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk="
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
+	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
+	"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE="
+	"google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 h1:4rNOqY4ULrKzS6twXa619uQgI7h9PaVd4ZhjFQ7C5zs="
+	"google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s="
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc="
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc="
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8="
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a h1:Ob5/580gVHBJZgXnff1cZDbG+xLtMVE5mDRTe+nIsX4="
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc="
+	"google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs="
+	"google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8="
+	"google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c="
+	"google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c="
+	"google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38="
+	"google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0="
+	"google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM="
+	"google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8="
+	"google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM="
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw="
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo="
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys="
+	"gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno="
+	"gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k="
+	"gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho="
+	"gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k="
+	"gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod h1:YlK+SN+fLQZj+kY3r8DkGDhDr91+S3JmTb5LSxFRQo0="
+	"gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo="
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw="
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74="
+	"gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw="
+	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I="
+	"gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU="
+	"gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM="
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4="
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
+	"pack.ag/amqp v0.8.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4="
+	"pack.ag/amqp v0.11.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4="
+	"rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8="
+)
+
+go-module_set_globals
+
+SRC_URI="
+	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0"
+
+SLOT="0"
+
+IUSE="+bash-completion doc +sass"
+
+RESTRICT="test"
+
+src_compile() {
+	mkdir -pv bin || die
+	go build -ldflags \
+		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
+		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
+	bin/hugo gen man --dir man || die
+	if use bash-completion ; then
+		bin/hugo gen autocomplete --completionfile hugo || die
+	fi
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	if use bash-completion ; then
+		dobashcomp hugo || die
+	fi
+	if use doc ; then
+		dodoc -r doc/
+	fi
+}
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 69bd4059e526..83698cec6931 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,9 +1,7 @@
 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 2548 BLAKE2B 3531c33758419a96439ed038ec6425207573cb1102eef16f4235de5827b7a501f766b6994d2a690385c2628a315b64fe3cf7eae751bc2fac06d37e38054638ad SHA512 f3d785d54af9b1abaf11382c7d8af357c29841ee8db2aa36227f8f4884a149332a90ba7f56dfbc3cfc3910639e47cffa0b37403331c3d4a89a71362d9597a4b3
+EBUILD mediawiki-1.34.4.ebuild 2547 BLAKE2B 671e90fbf8be26c4c3817e112a1c34dee51712cf44d2e35a27b20ef4b58c10014e6f0d8a22625ee6a9ca5d0637325444c90b80abd775418b86a96cccd84969e5 SHA512 39687dd0c3e6a03a13cac0d7343c1e261266b6ff5b9c9ad710d7fed2e1e853923fcc7ff038dbfa1735592bfaf0074bc5cca5ecaeac6dbfc06e0bfdd3df11c67e
 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.2.ebuild b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
deleted file mode 100644
index f8b511b8a3d6..000000000000
--- a/www-apps/mediawiki/mediawiki-1.34.2.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
-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.34.4.ebuild b/www-apps/mediawiki/mediawiki-1.34.4.ebuild
index dfb22a79b612..f8b511b8a3d6 100644
--- a/www-apps/mediawiki/mediawiki-1.34.4.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.34.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d2e01184da5f..3751c4fdbaf6 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 661e2c57abb9..a2ef22316a0e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,9 +7,9 @@ AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
 DIST chromium-86.0.4240.75.tar.xz 825512672 BLAKE2B d7b596c6f3b0ac15eafdca53c10d520206f562331e6b858da585070f0f6f6be97e49524ffba2fd1c31429eb21ad0f0d5047aa5f78de7d338b84c9a989cfcb675 SHA512 d553d2ea1fd1d7e3fc64f0d0c5a4fd53235bdabd07c9f85b58c26d371ff587f2917cf0d50993d878c72a4a9f7d8031bf7e542be3bc3e9aeeb8625e4c1570efd8
-DIST chromium-87-patchset-5.tar.xz 7932 BLAKE2B d97f2f901e51288504cc6313d517251daf23d4f4b0f7802453076774c019ef4eeebef5e38c64c12efb156cc770f0fa3e0b00d6b832f8e0614988a0961b1ebb05 SHA512 b4d70cca16ec944771238140765c63487b7306a800298d896b6b5b46761af57b6c58f080d308bfd7d9e131e05d8b79503651c94b200a3ff3e18d11dafab3db0c
-DIST chromium-87.0.4278.0.tar.xz 832042784 BLAKE2B 5f02a03ddd076aa543a2c9620295d99f87a337f22afb7ebdee6533a57cfe947aa887522d53e83431b83ee213e56d4415624112d9bf094f39381d9cdf30a590ad SHA512 32ce81904659e07b63ced9ff0bbf9a1a61f6a201701e8154674d7107d0e62173c544fa4724bd1326e47209db44f65a7b29ae5c3832e59863126a7714f2947e0f
+DIST chromium-87-patchset-6.tar.xz 7012 BLAKE2B d2b865afe9ac4b84fdaa1d12c5e4dcd1130ae92a7fc022ec819b3e2e24a354e8680479764823c2c2b0102b1381e6c65eee7b6b1b63ee710e35758d22321f2a9d SHA512 aa8e1650a3cec2f48021f2ca47db94630d7be4bcfd5b555a06e46eb6017adb09e6a105c714ba4767f439e5079169c2ef52ecbf4b40b5a11078f3a00c101321cc
+DIST chromium-87.0.4280.11.tar.xz 855748348 BLAKE2B d8c0e5205f6eeb9e694533bcfbebe5240f114bed589c58597d99d5e98883e0f4648513904b30025574d98f44cce23a0e772fda8508fd05111b7a79700c000333 SHA512 abd12258ea465ed7d28dd55c02eeb04bde614c2b67529edd409064979e3a6e2e9fe417c7a496d2a260bda90bf4cb9a49e2db1b5b318f6a749e86c7025922890e
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-86.0.4240.75.ebuild 27930 BLAKE2B aea9ea973ce0be536b7dfcccef64c7d22d809c91c8d74b338257044d6a6ac33591c43ed2f6d6739316de5ea3417a73485d00558c49709d41d17892ef68be867e SHA512 3d5bc635b2842d34af41fee0938295a1dedcad0bd30e3da115166be211ff0ee7bb10016355a4ad88d1137a400173517fbc74f0c37d326f28482a9eb31bf03141
-EBUILD chromium-87.0.4278.0.ebuild 28314 BLAKE2B 34fa65aa1a8c10a57541ea6f5bf239ef89e1dfeba285a4d68d3d4c96883cc97b8297ee98a2da7226569bf58e161747232f38a16c6c818050b1761ae44460a312 SHA512 02c6f1dca8e23f111de0969d70ad7b42ad980a452ffdf159ef6959f3987784205ead4c005eb93c794c472436f917414090cec16b0497fd2be044dfb48c385198
+EBUILD chromium-87.0.4280.11.ebuild 28314 BLAKE2B 1c5f67197e81ec3693976d68f82a02d1a5157f81b083c973039db14e4e90a12e69490552b8d9dd6281bd9d6550f6228469839841db645afc890e08d83fa40397 SHA512 546be43cf79b94b0ed102bc9a3f57fd723cfa1607274e059e3dfba94748cca4813105e3f9f892dac496961bd14257be028e2ea3ed5b0f2da977b5d68aae5fa33
 MISC metadata.xml 1712 BLAKE2B 07346b7372c3a52dd3c08b320527793f8fcd8be2308503145d6f7a7068d8113035559c7b2576ec009c9488364ed43837dc73581284e563e47b54a49028c9e22e SHA512 756cd5106e7680e33d1de45b5ad8a8154d9f4f7dedef865aa6e1b218d7b690ca8017a9e00696377a33a45aa03c77ecff91f42c6e0b00cf263396b700e5815c3a
diff --git a/www-client/chromium/chromium-87.0.4278.0.ebuild b/www-client/chromium/chromium-87.0.4278.0.ebuild
deleted file mode 100644
index 7f1d855b62c0..000000000000
--- a/www-client/chromium/chromium-87.0.4278.0.ebuild
+++ /dev/null
@@ -1,895 +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="5"
-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"
-	"${FILESDIR}/chromium-87-webcodecs-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"
-	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/shaka-player
-		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"
-		# Disable PGO, because profile data is missing in tarball
-		# (https://groups.google.com/a/chromium.org/g/chromium-packagers/c/2ID9c4j6UkY)
-		myconf_gn+=" chrome_pgo_phase=0"
-	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
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
-		elog "inside Chromium or add --enable-accelerated-video-decode"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/www-client/chromium/chromium-87.0.4280.11.ebuild b/www-client/chromium/chromium-87.0.4280.11.ebuild
new file mode 100644
index 000000000000..15eece70ebee
--- /dev/null
+++ b/www-client/chromium/chromium-87.0.4280.11.ebuild
@@ -0,0 +1,895 @@
+# 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="6"
+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"
+	"${FILESDIR}/chromium-87-webcodecs-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"
+	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/shaka-player
+		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"
+		# Disable PGO, because profile data is missing in tarball
+		# (https://groups.google.com/a/chromium.org/g/chromium-packagers/c/2ID9c4j6UkY)
+		myconf_gn+=" chrome_pgo_phase=0"
+	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
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
+		elog "inside Chromium or add --enable-accelerated-video-decode"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 6d438402aeaa..f613b9ca83bc 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,7 +1,4 @@
-AUX 10firefox-bin 32 BLAKE2B cd6d8dd86d0c8ec95d468b10faf65a7076dc1946f13e719f34092a15e095d6800d92b162e6370c32f1b0f0326fc50ab5bb324c849234bda61d80a705c9d09fb5 SHA512 24f2c370316540b70b2053e2ac0c8ca67714c928d570c9df9dbeb3b179f29b78e7f6dbdad6e452ef312b796f68f4d7105c92f027e75a56f07084ea9ccb58ab69
-AUX all-gentoo-3.js 883 BLAKE2B 36f2f86ae80e3b23a875d5a1da5911055bd19c7068c3c822d12306998829a6426900b147b20a8b9fced8e5aa311f3c5c1c3a54c2ad7e93fae9d92882ad8bc74f SHA512 c1ed6b6b46f04eacefeac8a789361dc8869d7113b21495480f04479be1bb94056b265ae84ef39c77fdcb78949d76fbca2b9e06dc831fd6671cbe05705961023d
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
-AUX firefox-bin-r1.desktop 7966 BLAKE2B 35b6b569024efe703dbcb0a6840fd85127db110f5c81c87dc910f61c262603967d1906c66fa1c926cf122551f61a59cded1d084d31e81291568765959e4c77ba SHA512 179bdaecc965ead95f32897d43efe530a358c8886d427fea37dab733871690955198aa6b55209e5167d11cc5cf1a76969bcdf1ea05571eb2b6dd7e72be44052c
 AUX firefox-bin-r2.desktop 7954 BLAKE2B 48580dd537cfb1c85a42c711ddb6f0cf2a9a5ac116713080b130763be42b7a9d969a57cbd2517b4c75d6bb19720a3a0dc31cd52aea97b42133159180214346e1 SHA512 b4c12ac9c4741828bb0f3e214c378e6022acdaa0f62d59b8567baa74549d87171e6733f553792879591016040141a229bb060d2fe631a26ddf28114910314343
 AUX firefox-bin-wayland.sh 117 BLAKE2B 0b52edd5d4910d14a92d9c4498d1eae41a6b3f91da58582c774d31f60477fcd80ddde139db03b3b4641b02a982337477c46c172079029127d29c0a9a50b1cc2c SHA512 eca0384752925b1f1ce5e5430e91670cef42541b8685d9993c1cc5a1e756adc27265c1ef0b4a21c184f9ec86fe2c242630f092ec326d6dc2fff512c716249f14
 AUX firefox-bin-x11.sh 114 BLAKE2B 3364763147b27192611592afd29ff6954a66b3fa6926f0d0aa85583bcf1055b3eee056782f2b13f12b1d032efce7d9a6da331b196c8cc3f1fbc1501b5eb283b2 SHA512 5f3b0c2ebeed7e28dfb446b8998f9207604313cef8b75ddf4d7c82a5d2ecbf36e675290d8e64cea88673c11716f26d9f6d9cac5ec7264fb5cf8be4b0f702f550
@@ -9,98 +6,6 @@ AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd
 AUX firefox-bin.sh 2930 BLAKE2B cb10a59067ab05342c344c72a6692e44439c6943d91d22f0c6007a27b56d5b163dd54dc9c9858bdf2c0385e367b1811fe966b1613f22bbb48256aa5102016f1d SHA512 6eb5f9ec2a3135b68d41bb7421a074a04146e431f4aed94043d41c493dfa0063bb2cb77884036473be69de97862271aaa5c5ce7556af0e5cf15929777e803a52
 AUX firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
 AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8ea8110d9417ea1f7efd5307568a3e099acf921ec5abad64b36075d716fa5892f4e5600f32bbad9e36a0a1c45 SHA512 5a55cd2ae13ce6ef01646c0a6188a3fd81e1eab0e547b2ba292eb42094aff0f5d5ee383686131bfed845d1e4b34bc1bd11e145e65eb151f0e342a1d49e0c688c
-AUX local-settings.js 129 BLAKE2B 8d6778900d4746baeec5d167bcb73476d36de38e4ba5a09904a66ba094ce3c003467a22de32113abf3fce80e7159d5faf501be2e2c45d2e7cbb31d1046f5ed6b SHA512 2ae80875251d0ea322acb64370a0077b10f2e2c8bd258cd4792c6cf7152c0a6f8786353167d71fc99607b5f15142af28eb565483a3115b25c2f040c06319ba6c
-DIST firefox-68.12.0esr-ach.xpi 471594 BLAKE2B 067ac8a1dc7773d198f7421ae43aa1dcf7ba3f83a9b4e9351813e0997171dfd3f24247c909993856ea0ee9738e259a54bf031b5dbeffe24e6181eb74041137fa SHA512 f070eb67eef8a441f285c8f91b41adde9d5a720852a24cc95137242602708d70371ad4abf20897232c73ff5b6f2556a00ae83ab5dd59d2674e291be3bab007b6
-DIST firefox-68.12.0esr-af.xpi 450297 BLAKE2B 80791e09eb4ac3545193f68a2f8f5f7483d64a15c3f454d20bc91467e5eef06cd4e6cb936ad1a0b26de019bc5405ee16bb3aa82c142918d4c89ddc4502c507a5 SHA512 d0cf908cc8bdcd02cbbe59b652c6ce9de43441a1bd80d6103dd3d7defd8f60696e72dd1b0e3825df187dae859cfd4a3d62c365b33f704b58fa0a6465ee9b6178
-DIST firefox-68.12.0esr-an.xpi 482748 BLAKE2B 207d425d09ec9cf43fdd0bde38bc675a3b8c70e6e2b086b51845c73a63baa77c492f2fe824fd832ca70752f5de4f83970d794f91a0c260d3c54fd34e720e70f3 SHA512 156a9aee6306448b364cf12c45b203cc1b633d8a439fe65ea24532fc8c12b4f5ddb8ac77161cb446c30db5732227857b10725311387ee35051e44c7dd457376d
-DIST firefox-68.12.0esr-ar.xpi 538835 BLAKE2B bae640259de19cbe09e9f2082a13566f5282bbf4387e7acdaa15ee256d533a69d247d6785e1e79b78df2bf2a585c21cdab1e41a97f5092b3cbbd734079042641 SHA512 3a6f82c192a040a1ae5cea18604d716edd90832c011488a9d2971480c864c8b91374ee6759205c46fd8fcdb982074ac4cdf1c65e5dca6ce450d6815811c478da
-DIST firefox-68.12.0esr-ast.xpi 480468 BLAKE2B c29625808ddc53b754f5df19aecf8c562125e1239b35d80c41fda3c666bd51c4228d16461394bab21b5abc2d2a916af8bc7c4c5d1a433dfb8f6d0a04c13d11f0 SHA512 8b415e73abf395230fb06370efc09dd4df005ae71bde76d19744c91d17e34f3ad552c48e6452c80407fbb8ffd7422a9ec843621a859fcd4571ac9c64aff12312
-DIST firefox-68.12.0esr-az.xpi 510015 BLAKE2B 50bbc1f62b740edfdf658bc6ef0231ee94e238fc5372b022e14682cc9b641ee7c87c0fffbcd60bece8aa3fd0d12eba1e5d145db13369208db55a9ea93f4a54d8 SHA512 fc2b1823980d93365b371fdc9b6b3420fb024b24066eb85325a2639799d55366e188f0a1fd0d92fbaa9e580e836d9b13d535aa04511bf8887df68590f416369c
-DIST firefox-68.12.0esr-be.xpi 581916 BLAKE2B b96f6e5e6bac87dbd014632889445cbcb570b98b9eaf5387edd2dfc28a365ceaad04954d92b39463b2f422561af891787d426457503b701c04ca9efa67418262 SHA512 29fa74aa02435a618488a712370692178ca99a2ab0b10dc9357df7b5bcdb0aaa767abb71e75dbd4f449f0d6eac08081716d2ab4ef27ec5b2d22bb0f95cdf49f7
-DIST firefox-68.12.0esr-bg.xpi 545024 BLAKE2B 4d8d56892ade0a5bda902f4a3803fcde934fa921c624bb17f20418dac4a54a44568334d52a921f56785bca92b66a22667662679a3d55b63f7dfdea71968d4163 SHA512 6deb6df5e096e568c4d4352b85b642d807acabe92f4bc806dcfb38a00d37b51502583b3c742dd523bf12407d8138ade857ed5dd0f5366d6b70917ba2d46cc1e0
-DIST firefox-68.12.0esr-bn.xpi 566405 BLAKE2B c8a38040f14d960ff6982af401b17847f1a6f7c3919b178086d63958189cdc8fd7839fb65a88b7fb28be8092e14ec0213cc5d8a20801e57476e544a041bb6d43 SHA512 de079a47e49456abb15cf8a7525c044c741cd4f7bde2162e82158b3ea787430d3eda9c6fe352a7c693714d9b68500a788c2eef96c5035582ae3b98ae41f9bbb6
-DIST firefox-68.12.0esr-br.xpi 501491 BLAKE2B 64a826fe9952e4c2aad80f15c1e9ff7e4f5ad18752457be282eb2ad8f0dd8038881a84c846b71827c9c96033018fa9326a667c07596ce790b6d3896182b73a1f SHA512 0f6c26b51b6eefe6b73fcbf306fa50de27c3b9e805b2da30dfc4aa7ec91aae49d7e75fe2acbc1e9659d9c3bee42c8eafea6f51f4c1565d4f6580593dc3303ed4
-DIST firefox-68.12.0esr-bs.xpi 482788 BLAKE2B 082106537cef6fb0dd6cb06745d566dc28041d7a408bc61564376843611cae5b094164d5885ca2b3b229a065e0786d52b47db36bef6ae62565f8962a0643fa02 SHA512 cdbb270b460f2e8a6d0d1ed9e5fdbc3050b0f3bcc0ebf99c842328658586d3ab544801f59aafbf76c7b3fb553d0ecd79dac2b3a2d9b59618a3488d19fd7ddfdd
-DIST firefox-68.12.0esr-ca.xpi 499738 BLAKE2B ec399608d729eab2bff4fd8064a67484864adac1aa1b9a95bccac7c66a11a9b09a91fb8da2186a3a7cda6361561167e28040cb513f3981ea0f2ef0e3db8eb177 SHA512 c0db28f83a6e9e45edb6e45f5b43b1750636fa168064e360d044348059450198edb50cecfd11cbea286bcdba429523c0da22ff785dbef237c14bd9d53acf257b
-DIST firefox-68.12.0esr-cak.xpi 527178 BLAKE2B f294ffccdc3f32105a82d4011c4bc625d728aee5b3853a63c7772fc635ce6b1595ecd761f5a3df837898d758b1154c4ebab06a239aa7c1bb6f19e5dc928e4459 SHA512 503ebba0afb2ca2d95db04b631d188f45a4c6127c836eeeef452c2f7a1fc3087913d0b279e71de697317515fae2ad0b30700767608eef03e6546331e4df67c80
-DIST firefox-68.12.0esr-cs.xpi 519721 BLAKE2B 99663880b6ef212f2bdc21f42acfc2be7aef069bb1fc419df676f1dda4e7325988ef0f92453535c2316357d9362afbff00f30302796ebef8e47362bdc9b25af8 SHA512 595824388881983a9d1d66dca262d661249a2a1f035f2b44d67a2b3299810645991b4380495b9767f3158df5f08a93d5f6e378e27f551b140178312666bab73a
-DIST firefox-68.12.0esr-cy.xpi 506946 BLAKE2B 377454b0b59e7d77ae55461034c82bf0a91b64bcb8a57d2c9704aed5156965442471df2d0948a0265609018e41650955a584c5a9a67ea988d5ff0ee3706cda27 SHA512 6b03d89506117a6789336f6c9bc69e84697bb9addaa4970362e6edc6f4643f04defc00fcf748d11b96560f91bd493e577d0496dabb6eb48805f1ff8586993b9b
-DIST firefox-68.12.0esr-da.xpi 520050 BLAKE2B 328decacae2ab33f81e05123591c4c5b4595c45b5f6e0f7f52e78a5b328d17f2c5a3c5118d29e2474027067888e023cd47d74fa720f3cbd58c55461b34638b33 SHA512 03308d4158ef1642bcef17542775f217b75dabb99e06104d5a42dff76c85be583913b3f160f0c53e79bf848aa682ff6e51d002dc61ab62774adc8f1fe575d19c
-DIST firefox-68.12.0esr-de.xpi 523520 BLAKE2B 54644aed20714b213166b87087165aeaf944fe443c73a2f7b75c8e72d48bee7986c5804b94c881f3e4024b4c7015987a7d31cde86fd5f70160ff555c4b493edd SHA512 6a8d083b3def572dfbaca2f94fbbbc3904079d39c2aa5bc02239cea04a6b80d573e0089ffa36c169faae274a57e2bbe2702a3e86e8d068dfe081345c241189b7
-DIST firefox-68.12.0esr-dsb.xpi 528447 BLAKE2B 591949429f630563d543b59a6274283988dd48627c6d2729b1bbe59c64798cf7faeb533641a912a30ad9970d0c5e4dc5eb4ba79e06898957aa7e526f7e779ddc SHA512 d07abcd45fce2ceee5d18c2a406a423a07f74b5876c13bc9a38e83fefaf9ababbff560f948b82584162422c3d65d47cb7017597ad577717b17c04bb06fa8cd02
-DIST firefox-68.12.0esr-el.xpi 597168 BLAKE2B 5e32c29e024779860d2165d7c7aee27967b2b60fa9975ee7138859ee8c1e789f542ebfbff84643440d36a6aabd10df17715890e7e03188e00338f2ada4cd47e2 SHA512 a89515e2eeddfa5da5fbe1a431f9411a503614e6c31b01fffc063c028afca70d09fe77c7146a4c547a25087ec6e1924180d88b81e51dde7010445380d61aa2fd
-DIST firefox-68.12.0esr-en-CA.xpi 478281 BLAKE2B 3efcfeaaf41c2e5e2e4ae29e799c62349b78bc245a975315936942bdeb2eb69137da9e12a38c50b14557b750cc2e44c2d6762d3faf78a4b3b5667fcbec445713 SHA512 cb1726dd7b8b541f28864059d2d92343ba4913c806abd6b76de3f5a9dafcb527fd9ef4bed2ca82e74cacfacbb8c5cff2d231bd48c050c062d4aeaae374911eae
-DIST firefox-68.12.0esr-en-GB.xpi 478066 BLAKE2B 06ebf402223a02763080c04cfda2a9d33d94897281e69e10bc73fe3c7b639193a107ab7cbbc517242b051ca9ae98f68804d6cf479965c787cc2ad3e29492e248 SHA512 ace57aa7dec99a6ba25fb2b9ad67fa2e036e28a1b1083c923aa24cb0550aebb7d6e1ee43496c1f7dc7b2cd7aa49662142ebf5f57e61c89bb0432a96c665720ca
-DIST firefox-68.12.0esr-eo.xpi 503985 BLAKE2B 2116a5f12d6a27869af936d4230cfe3d84ba8afed2295ae642833ca97ac3ead289ca24682f42db05f3f61a1943c2527792463d4651d6338eadf7e0b388ee3ec4 SHA512 ba9a78645a570ac9b24b4003dc2db80d030bcb9ee876668782ddc39eae12efe94eb39e229183d506562ae1789016e69a495decf67a8b6895cf06f19c3d26a257
-DIST firefox-68.12.0esr-es-AR.xpi 512288 BLAKE2B a5cc259134139cb86680a5ca16516825927fc63a19726864879dbd7c0a9b67688b51ea740133f1d48586b2a7c907b7190a1ad83c02362b5fa8c257b04b02d95c SHA512 856ca754396bc3e013d7e011e648f48355919d369783010a52fb8c4deef2da41b8b02683169fdea7e09f0cd0084186f3528c02d276b0b95a07858005fcccb595
-DIST firefox-68.12.0esr-es-CL.xpi 511651 BLAKE2B bdfd0e76bae5b5feddf4a2691b9cfd3feb57cb280c277713621bcefaa32c6764ef3fc0a3f04d9dd2f00818feb4a3bf1feae72076e44954ba5fa356243e03c9c0 SHA512 24846c164612580f3a7e67acb5555117808b4d54f4fc7ad12ad9daa5865ed40674be138dac317f14beb16b49c8771efcf4a902e541c5934281575699e8240391
-DIST firefox-68.12.0esr-es-ES.xpi 481269 BLAKE2B a4aed94265ab39173f5a40cf922619af84bd279b4cf117e57e3efbfbf06bc7ff5e182c007212b0aab7d3e2e3ff1c28cf80b53eef76737be2a9d5f47b0c3aa948 SHA512 d2dbc144f7ea3161897e9429f89774e0bf61109807251a585a98c68db0eef7890a5e50121b53f18d4ddf260f8b8c123340a8d4cd544c3eca3de2f4df11db93e2
-DIST firefox-68.12.0esr-es-MX.xpi 504492 BLAKE2B dd4d8ede7da43b1d17d606077c8c4f62a33561069a85ad876957fd79791ada42d1afa4120768ff9dcf1ad98535b17cd8cf9c1db3123324460365156a9e0ede22 SHA512 97c7fee40a61d212abbcfd86df024fff834d13dddd0bf0055afd0b55e697213865c77395db31bb995274f63c2b8028aa1d68b8672205aceedd70a44c3195b030
-DIST firefox-68.12.0esr-et.xpi 488300 BLAKE2B 0fcb72882f933cf30967a6ce9c5e2246846745e140fe77bf19aa7a50cc128082917dc017cc2c432b216a58545d1415d094750bf1a5c5c99895921fa2162fdb85 SHA512 c10e0c415ffcbef4e67f9581e3aa751a43a4cf4b56da92bfcaafb19406b626b114e11e301332591f460ee66200d2ca86a42f6a3dca546283c9ab0647873e6590
-DIST firefox-68.12.0esr-eu.xpi 502322 BLAKE2B c87ed3457c9841633a42efc7c5fa9701a23315347826bfcac5e28fc6ac0eb674f2c29cd76416359a73214de1c7dfa214bb46eaef741ecc797d3163038699a203 SHA512 8117ed319fa848346419df54417f363e08200c256d9bc90af6537266f81361386b3cd1d4d7903962f226cfe975cc00275ff5d014306182eff4ee33917d1e0975
-DIST firefox-68.12.0esr-fa.xpi 547568 BLAKE2B d92057b0a913a3b4cf136da98f0db3e41e972c2e87646fc5fd749f042b30b992ba7df04114c4e170f51b50ae7ea65b5b660f0f7ed0531145970df9d4f77127a5 SHA512 5d1fba7f8f68ef9acb8efa3686a3206c91ecf3d3bfb3d6259ae1d0bc313c4585733e070141916ec4158fed4df36d149695265b0f874dc4adb1a57dc88df12cf3
-DIST firefox-68.12.0esr-ff.xpi 483757 BLAKE2B 94b1d071f1338da3e3d59c66043867974619905b0905fc96ccbb9bc893f8fd158f8bff4287f503de34404d5244d402c391e604aee1a16d30139ce1496b0a5677 SHA512 da796c8ac7a27993e3411a370c891ae54daefde05a6debd596e98b7bbc5de00f22c7997a7a5e087e4803bbeaa8f33d6006a74e53de2625e74fb1259938c47fe1
-DIST firefox-68.12.0esr-fi.xpi 494110 BLAKE2B 833b8d593301691fbbcf6b083c4d91f35b907a4b641e5f95410070822ba5544dc842499d59dc14587b119f946858c1f8d354e2b6625ac984dcb974ebffcbda9f SHA512 aa24b5c37b8a4b3694a0bfdc2aa4f014926b303596867f4c7d5403e4692c653ac8c8d7882722d39e04035ae4dad089fee794d4d1a452d6d2baae2a89133f34ac
-DIST firefox-68.12.0esr-fr.xpi 522985 BLAKE2B b18a86d9a54c41713f62eb0038440c7d6a43cd36716abbe58ffd69ac2d5de959a2ec86958be5d014fc1b8499a228301fb846403c94cf1c142fb9164264b743ad SHA512 342e8ff8424d089d4eb88e2685d8c501306375579ca871f2c85c1756bce9d1d2ecfc8986414e03e3933fca806c5d08b7c402f8bb76167867cc021a6ff2d2e7a0
-DIST firefox-68.12.0esr-fy-NL.xpi 510193 BLAKE2B 9a04d2d831c55e8d053988e46ea78c1037364b9c2290851e78a79587bdeee07a700a8849dd65462bf0196e22217adc773f40b8bbd5f82cc1584e2eff4bdcbb0e SHA512 911d39828b52c56c58098754205e3177ab68c4b127a15d6a5b9b8998236d62718b183ee4fecd51f28c864b2fa938b9247a855ce026ef08db0c7ee0b11d36df40
-DIST firefox-68.12.0esr-ga-IE.xpi 489306 BLAKE2B 93e113f57f83bf9aceec21f7ebca5a9369cb7e2eb13d35cd2fff7032724c6ce3861cfab206dd308b1ceec338e1488cc792d6c0624895c8f0bd9f80f207fdc3c1 SHA512 06562e9026fa1fd28b0c6a9670cc25d739748a1f7f1cc2e28566d12423438b7bb8ee1d7e419c5bc953193abca6424aa8c7bae50822f466285e4cf17e1bd5851f
-DIST firefox-68.12.0esr-gd.xpi 506418 BLAKE2B 46b980226b899ae42290c8a30d26d4d014838ecce4a64ece3c05591b17c1113040172238a99b42a67bda8e6648908d9293024c5137cd40ccf256ea00c532ca8b SHA512 9c04dc5d7f340e22c7190e529afef93982a2212745b008140191092e100593e0683daee5c45c7e50ea65dc4c7d054f6cdddd3d47e1553400c84513476c6f7d0d
-DIST firefox-68.12.0esr-gl.xpi 483660 BLAKE2B 6673c3544b462c6b92808f9c9c24b0e61e53aa541fc43e449b7052be90a82f2e1d0191ee165dc1c5fb8066f662f900a211f9c3ab5be1f16ecd9ae497d83c44d1 SHA512 e63022cb836a34ea4caa9e30637ca48f8c92b9afe9cf504b4f9a73e608b8dab37ae9b4a95024351d4abe4d56b664546e06b7719ac810ff58ee36955403b35c01
-DIST firefox-68.12.0esr-gn.xpi 521830 BLAKE2B 61283adb8f27b4d152b3f454799eab30d00a6ba70ed1ec21ebffca01cb69098fa8d052482ca57de0bf13cf36f772575e89d99f4bdb0733ca49fdfac249244caa SHA512 b42a5e69310705ea6bb7e1f0b690087d96bb4bb7b18b37b7a61a0de23735c62e409f9ae98aa05f9e65484e8b09d5c24a2ee8168bb8bd06eb6cb4d90639ca4cca
-DIST firefox-68.12.0esr-gu-IN.xpi 571587 BLAKE2B be2ca5f882f4c686eda40826d28204b2752b3225fcd8d9c0f51a9d91fc1e23cee3b6977d32adc6c688f1f220c86557a2f0a15e33d97d984b4d5fa1ac9f41b44d SHA512 4df28e3d096899d3fe4f606b4e7567bab4c87dd2bff1249a2c21648374b50d21dc3a99fbe146dfeb70776faa9908f4befb9b16ed472e158e7da1af539dd0abbd
-DIST firefox-68.12.0esr-he.xpi 513843 BLAKE2B 8a8753aaca78fd60f7b455e2b6efa8cbfc44f5c678c37330ae4652d5e3f4f26d652e278db2ede6c3e9cfc7bf3e2b5fd9f28d63c83803e56b0146450d3592b651 SHA512 561796750d783f774bfb220fc51cc9a8efb876946cce7a5c83f7c6db52008e192a538556d79a2048f78b44329c610b53893c7591a24215e4fe8db7aec918e811
-DIST firefox-68.12.0esr-hi-IN.xpi 555193 BLAKE2B a43b16ad2d9401dfbf2a89bb53f6b8d91e608503eab0dda2fcc72153319669fffb819cc9e7cc4a03f27ee2817410d7f3caf5fe7ba4e576962d1bf528804ca179 SHA512 4ad1f84287368e453f5c79795ec595daafb2576ce757e4b8dfbdf7020e732ce3c9ef7b5474f855278dd586063f39609503e87d412a4bfef96a01c03ce0963c4e
-DIST firefox-68.12.0esr-hr.xpi 491111 BLAKE2B 7edc7ea4ebee6c50f2733a824ff607388b5d1d0b8e215acc1ec66a62580c21cc1386084eb30ce9c6e8bd32c9c9973b828e6a9980b22768dbd017177f5079ac5b SHA512 7ec8c4e5a24532d742ec0fa039d8f99ab0883d08dc52f84a9f35fa1307701d0d7e599fcf21495758cbb3334f20ef99a22ffb32961ddf3fc03b37d6e26c3e97b8
-DIST firefox-68.12.0esr-hsb.xpi 527753 BLAKE2B 882a4b082bf720d2360c4bfd5975e516ebeabd3d3d493b59b21aac2e192a8e37da7975238d49b81b0aff690fc89c5b0d1862e0f301b3e70f7149fb937ebafe30 SHA512 2a60da62d701ae824b55e7462ebe46b3ceda692fb64a8373a0a39cd82cac3d2ab40c701ae95d4d749cff1e15a119baf0fc9891a5ce39ca2170756fadc343f7dd
-DIST firefox-68.12.0esr-hu.xpi 526047 BLAKE2B d30b2a6c12366c3ce3296385ada80255deab384e1f9d41552c6cb60a19b944148360b9cf583c368380243b64a9a7a2828e892bc6ca4eebfea4564b9023b1d0d4 SHA512 2810a1d427cbbbe176555c71f9f4ada4358c5e6920b0da79abb590d5907220b9af54e9322f73154805ec7327002663bd6430a22b2106b262c077ec09af2f2759
-DIST firefox-68.12.0esr-hy-AM.xpi 542304 BLAKE2B 84b2aaccf4825b76af33adc77fcf1449da351e1fd1557c8006db0c086a64845491f82ddc323c8d68ad1b3a5af1934420008f88e1aae1035424a26f58fff9daa4 SHA512 076d886b09f598d7fbbc7f88f5678bcf91231cfba1dcbcc8268111870255a44abec3c538c249fc35996bc973a09dce125d2f115f640b824db9e2e8affbaa5b72
-DIST firefox-68.12.0esr-ia.xpi 496301 BLAKE2B b373b43926ecaaa75ccd9d9374ea19f07f68650af6c2980bcaaa9fd87073f7fc0c80155deaa06fa01fc687c009e97d7c7ad3f4be03124811212f9e546ae740a0 SHA512 8eddbc5ce30e007aecbbd12ed75dcbaf065cf9bc0ff9132c3ed8fafc19349f35d6005f73cac9d6fe84933a675ba967cadebc2008af536a74718a0e34482cab1c
-DIST firefox-68.12.0esr-id.xpi 491735 BLAKE2B c8ef951cc6ff13c68f0e10db5704b1c8797913a1d2f9087b2876633a66de7dc34b6e3f5f5186fd6407ac8068cac846411ac489e5e3ab5621ee018818d380db83 SHA512 e34192e5b35a15820e02ab325d37acd0fb4516859a976d4717ba02d6dc165d42170a987d53655a408c89808f1df66409394f605170b316a5c4b150ddecfc4601
-DIST firefox-68.12.0esr-is.xpi 499783 BLAKE2B d8c420714bb69678bd704e75418af8a73373c7b02b6b2998ac8401a1bcb6010b9cd47015f8012eda24163e96ec9b4e96f14298ae0a19dfd78f52fd8c364ea38a SHA512 58e57565976d85f38adbcfb8aa512c5e844a759dab0c70129957a37e52a5cac18ec3a9b503fc04b913b74b9df2829f8edaaa244d17c936bc459e4ad5716867ae
-DIST firefox-68.12.0esr-it.xpi 383621 BLAKE2B cd9ede2ecf7efc93b4506cc375c945cf6395c6fa733e52b77bfa7cafc77671f786b33590028092a06066ef98d3e0213df5c4b0c8632c03021011713e44c2c7a3 SHA512 3a737e3ee7ea06581545643fe06247a1dad6b0e899164b29f2c7da2321abe54ae9ced04e1ad7594a5a4229cbb06448305694161be02501ac62bebf2575cdcaeb
-DIST firefox-68.12.0esr-ja.xpi 536927 BLAKE2B 164db33aaac57421b243cb4dc0630f32cd5341eda4c1e0ebc17696c902768a5bafcefd2bd6a2c1e49bd26f34fafb17ef399efe7456ce3f8af4acacf8605d9bf0 SHA512 2912ef751ef877a941e634cf8b5364387519dd162b4f67f86a831c2d498c6dc29e7b0a9004e8581a6b296aea1e06ef4879461fe4bb8b4b29310cecfa159cdbe1
-DIST firefox-68.12.0esr-ka.xpi 544473 BLAKE2B ece42982d7b88037af745319038de6cb276b25ed706ef9c93d72e99ce133067bd8556221e8ea74d0e283a0f9bf8fca4fd9db1bd465e0c87e7f546f1d11f950d7 SHA512 2675dd8675f130c352d49b3c5780f8a1591a954b053b335fbbd0270682402c9aad016349eb8554807236444e666fa4004008497feda1678fc594dd77ee552ffa
-DIST firefox-68.12.0esr-kab.xpi 508430 BLAKE2B 0d947a9f5aea734c72c8ed0b0d99df13f78da55391e927675f6132387a3ebd3739e627ba64e08b497f73151426dc10e07964b47a05df04158458997ec23c2110 SHA512 10b54690cd3912e7001c5a17ede7593dd1ff5dbf69469c7b84167cc8d9f89d9ae27ca56f56f48bdf8af1722810634a1e9aab5becc3101acd3e7039062281ac94
-DIST firefox-68.12.0esr-kk.xpi 578769 BLAKE2B 107a7588fcef9d53cfb9a09647912c8d727975c7671aeea44ef9ff6b0bd1d14aa882717ec3e718e5f71f7e282b1c383403882142685694f30ded7ed8c524e88a SHA512 62e9db3ea499f49c9963e38ceb593b126764363398e8725377cc5950642a5642ae7de35bc0f56249e762b26b20bab02950bbf2c58b8e597be77b72cfff68e79d
-DIST firefox-68.12.0esr-km.xpi 551161 BLAKE2B d60aab13b73ed98770bbc7455536dc833e3dad0e278b3831089424c61b80f6dbdf87410b0ac52b4140cc1011d6d4352265202e5b18c234ddb54085886badcb33 SHA512 8d2a184a693e099937f0c148ddea3a16da0b67b3b7dbf803abf665b1cf9c57de653c9680fab46c3b9365076fd2622b1e207511a0d9470154347a962982f9d91a
-DIST firefox-68.12.0esr-kn.xpi 547378 BLAKE2B fe576cc7ab355f2bd5fe8d4b4ef808e8c7886a0170bef375d04f126fc785357a88cf24e1dec103034077c171dc13340df8336329427d77cd385b2e03e27c0b36 SHA512 83f94d33073397cdb0648867306bc78bebb45963e58fa2703be5793c9ba47e9f93591212c23f9d39b10a223acf0dbe1e4735b39e9893d58d83304955da5e00ba
-DIST firefox-68.12.0esr-ko.xpi 535778 BLAKE2B 73a6ae3ee99cf729afb84344e1fcbba1c6734a62938a4f94552de59120c215161fae0385b08cc66db1bf0a1c71e0e789640190becd7c17f7ca1018d3b28c884c SHA512 914d64ca700572e157f67f8592825342f54f75cf341896ff3f52644cbf24c9cfdeb80bf11e3660efa2bda718aedf9cd0ffbb3d5ab439e1a670fa84908ee444e1
-DIST firefox-68.12.0esr-lij.xpi 481750 BLAKE2B 2a39a2c3a7de583381c05b85f0241dc14fb5b0a66ac2411069fc376368b7394abbc7af4846941ef47a6c4c58775552e08b8f2cd7d4dae9a3fc0d1a903c144a23 SHA512 5b7429511f13f0a7b53ba826329fe096fe6c5cbec02c0a4e567fc7975fc68980b28c8e63d4dfe90edd968e1bb77c0870ea892accbdf8bb67711fac35a6bed7d3
-DIST firefox-68.12.0esr-lt.xpi 527440 BLAKE2B 20beae0d80dd31ff0abc28919ef37915670698057608ae52ea631fb5c0faedf0074e68a237b08de1181dc123422ccdd20257be24c6075eaa26b1b615dd51fe89 SHA512 dd3e96e92949d1e9a4713f1c104be6f3bd1c113278b893e428caa3e13a583519509287e13dea86729b15866f5e4fbaee73957a8046ec4a40120ab6f61f19373b
-DIST firefox-68.12.0esr-lv.xpi 500116 BLAKE2B d0a7fbb6b4b1a96e91d24887eba642ca4ac870e0485421b83829912fe8bdfee8501b35c5ff856fedecef542d76daaf89d1618b8bbcb0f6f1dd9a54a16a3ab45e SHA512 3291049ce64d13dce305963a8e99c69930dff198772e0aed5a620552c930ebfc0ff4b7d2592194fa378d8b227c16757c0b835d94dab836a18bfd9ca247164e9a
-DIST firefox-68.12.0esr-mk.xpi 484995 BLAKE2B 90cf0fbf7008f103c298b9d1446f9c9235d17e4862763c8da2602e50d5e012e082b94a02f80111f5bcd985983f19ac21e6ef3c000840fb833defd6f562aedd8a SHA512 93a8a3a68aeea9d1705675233aa0c46f1aed78c762509bd0843e6605188288e2a2e19e7c040d0a3e7d49965d957c61dcb45cdd7c6385c9ab8317671404c096cf
-DIST firefox-68.12.0esr-mr.xpi 558969 BLAKE2B 86a29f499cabfe1e98fa8acb10c7014df1b4409981fd1445746f03b04843c6f01609d969140e45778c5ea744bb307ce1806545406369a01bb768305a5c3eaf9b SHA512 606e68b1ed6a71243291e8fff15243f5cb3643bc00c4505f8ad953de265d84d3d34af9fe10adda5767246b26336141f6e0548c95d942a3c13dac66736673eebf
-DIST firefox-68.12.0esr-ms.xpi 480112 BLAKE2B 09ed7b484970be293afc4aa5fadd11a9f2bfb46e09122b7f387fc7bc12d74ebbd53985520b501dbaa657184b6ab388e8c8aec161f915c2de88c09d881cc9e3ce SHA512 d425fb4592d21cc067bead827df679761171780c3c86d5230b09906f56033454b343c29e843034a2bdba4cbb06a1bc99f939ca9d65cd41be7183d53a47e716b2
-DIST firefox-68.12.0esr-my.xpi 551930 BLAKE2B c732bc84ca47245c0ab166d8442403c61c7875957bd8e6e4cfa99072a916d6ad13a6bd20c821f1031069cecf8b5c1bc81313e6056179f667e1eec9503a881141 SHA512 2567f272cbac49a83e3f3aac121201ad4d3c9cf0e99517403356848a6f7538bfe2d9b913d9b1419aaa89afeec87d088a77a7ac65938101c26047b74de429eb67
-DIST firefox-68.12.0esr-nb-NO.xpi 495874 BLAKE2B fc6f4e0e8c83f054bbac8b956463895c8170aac30768edd4b3f3e41b60e4ac0ec7c3ce2092e85e5e55341a2d01e587021948faa1f6e690bc3d100890193e1883 SHA512 4b3f536fe90f1933fe0dcb7581c44a538b2550e3b8fdbaee298f7e6eb7771038621e034cf2e58c8ec04d60de7e6cd49a398fb77946df2890c0b581356eeb23f8
-DIST firefox-68.12.0esr-nl.xpi 491980 BLAKE2B 086fdfd16a89533382c963fd9795650c5b9420faf241249ea060e8cdb35f12c32b9bd355b55d6ea122b346d06e4734e729389684bb0615e80a68c4b9f9b3dbf1 SHA512 c2ced16def73dcccb5a5ab5d4c1218f1c1bba3a0919f9282b00f1fc8569a1ba6f120ce48e339f856caa1f0b931aab6bda13fdbdc05e60a66de5868d720305c5c
-DIST firefox-68.12.0esr-nn-NO.xpi 494528 BLAKE2B 219304cee8739f1204f9f5ce3203e59b95623b249f81cc4d2265f4aa27e243a75932fecdbc23d3d298c190726fa424e56ef59979445c73b59c9aad0a18be2974 SHA512 3f85964ed967427d12992a3c7cd26c31641fc33b7d139d8b1540da8a44d87999eba6b0c69e08fbf6e5f69e241013fb990c7257fbe3ea66bdf85ff0e0c08810aa
-DIST firefox-68.12.0esr-oc.xpi 498522 BLAKE2B b8a60e6aca2138bc6f346af60e089a52e07d82ac12fc8aae8a5f413bed8de14a55beb9281ba8c77225da53a539af0a19a198e3cf1e021c842a44260e7b89360f SHA512 7a02e451078e81de5c9b7936c1ee9c222845bdeec322d0131834759f94d631e624f54263d00f8511b8cfd682884966279abf03d00da015d947086b4d8577a506
-DIST firefox-68.12.0esr-pa-IN.xpi 542372 BLAKE2B dcf6a8e62ef0755ac0d815ad5b8c54d545d4197a6fda32c5190149e869003ebf9eb9e8b1d05433d70b8f8efd8210bdc11882838b5e7bf093250056664f0d0fa7 SHA512 13c0b29db5e1728d0ed8109c2c0aef6e47d045c597df31cb0239e810e266f452d5a257be4964d5dc9a69f8c52227f749a99b17c2275dd27ee448c1fbb2edcea8
-DIST firefox-68.12.0esr-pl.xpi 495645 BLAKE2B 956ee465475b61a151a3b1d4b176f1c3f7d0c7b2e52f4b9f30a80c4c62d3106d978d018b350286ffdd052a18c22549ea832a0ccc79d916210d7f0f26b12e2bec SHA512 ec785dbb73c2558e0c3c371b328c163220c4b6bad93a407488d97e1db47c19f0ec47b2b8aa4256f1dea7b79edbd63f79dff2a66d72ed9937a287e34a963e36e9
-DIST firefox-68.12.0esr-pt-BR.xpi 497978 BLAKE2B f033b8cf2c0e3e3a332dce382378e100e1729ebe3845a0f2b5b4a136b380e2a5a748448c1ff1a40bfc19cbcaa8903b018b8310d23fcbc94824bd409be757194c SHA512 dc9e1b2212ad2792e2c28c6d3b8849bdf7ea78f7a010ae5b9b6409ea80ce2b14a10e08f74a66a4d32d7e59d28fa2b44a557d4eb7c44e69521fb633015f858fb9
-DIST firefox-68.12.0esr-pt-PT.xpi 507648 BLAKE2B 960b3f0fee279acedfc7c9700d6e70cf4c5e8f5f6ed877ae9c3d8e848b9422799be1b419e9eb94d52208f1e7978aa5c16640e864ee7777a01c47b64ca5bb6c1d SHA512 ff0358149c38209c1101a048941d10e450f049895fe54eb68639cc248c93cdd3b089f88b961fe5afbbafe4f6dfb7bcc1a68fce2f17b9ba6ea10daed61e8b1d9b
-DIST firefox-68.12.0esr-rm.xpi 495302 BLAKE2B 65f358f5ee0efc2e6dfcbbeb5e9438f19947a3fdadd8af92ea18af19b02b8b41cbed68ff3a5db08bcd43837dbf7e205f99d78b670182d199644c1f0ef400ed8d SHA512 7508baaeaa519da54df478886169ceb871458a84d6e13d68b81830de722ab650a85d541a50e9a2b396995a00bb8d7fa2a21772d0b789b1896b385dd74a195e76
-DIST firefox-68.12.0esr-ro.xpi 508616 BLAKE2B 245d72ade8ec1dbb57f8cdc399dec200a902c885114aa6a1a481fa69c541508de3e4495d78420d0af9c3999eafec11c0ea66ddbc3e34b825630b09936544c672 SHA512 71e311d00c70d5fd2e5bc08e75fc6112d95a12b4b64e613e26bb9f46a1041acf960067efa2c8e38ae472e6dcba8b2846ab40bffa690ab26e695a0698f6630595
-DIST firefox-68.12.0esr-ru.xpi 583734 BLAKE2B 7d3fee57162e61fe8e644cf8f79393bf6f4d95e20e5df806fd357e4da7c97db01ba73f160ea02beb36c7d925e16e381e30facd0ea3c2a3fee468bbfc853bd2d1 SHA512 52408b5ffd014b2a081e58a76eb55cfd5621696b69fff2d8e240aad58e069035b5cdaedcf0162e434e5e432e6f95a55c83cf9531a13f295655ee948d18457d5f
-DIST firefox-68.12.0esr-si.xpi 527985 BLAKE2B ae0410c07ee50d611994b2cf81a77aa6363fc81284017242d7d2c629c3888369af460766f2a77a406bc9a184389d4e5fc36c4a05f30b06d04fc6f61aae93ca04 SHA512 b631442552e05cdf036d6598f1bcf237228495cad18a5f58597e6d4fd04f0c5558d5466ff40e69b014edcdcb91c1c9146c734ea6f33bc905ede556a219f6c585
-DIST firefox-68.12.0esr-sk.xpi 525089 BLAKE2B a2d8eb4af76a465fc10395c16790b128161fd71ef7406a7324c8fdf72edfc188b36db97ebdf0cf8edb6dd93949ca2f0398b7ff1212e53a77b01dfae4b87495c6 SHA512 ec2b2912e16f211a75cc366b18ade3a7b164427a9cad8ca21255bf071c580e486548c5dc77c0ac890141482318a6d73386985d60c0bbe467b601953407b00474
-DIST firefox-68.12.0esr-sl.xpi 502158 BLAKE2B 8bad832e83af805f4d70959686fb9257dc24799b766eeb767efa2231cba8f9abbb8f5fc5e3e6922d183ccef8df1402e2b869912b775bb31bdeaf531420086eba SHA512 b6a766f5eb5c600d9f3de7cb8226657d6fd1fac9048823eb93b4275b65e9a650c42812c92e7d3f45d5ae5fbb5261f9d7de5f4af5d775a1bb92c27db41a3ad69b
-DIST firefox-68.12.0esr-son.xpi 458706 BLAKE2B 4daf8396d7cf9f8a931f022abbd6f6e41ba7c2cbac35f3efa141dfe37ce7183ed7ea88c5fbcbcd1ffd64c23d6dfe23010347c49682109a997440a1ee0c709698 SHA512 5ec63c0c7baab509a43091b73ee97c53bef77d3c402a9130bd85b9fa0ff5eb7e49d4e585a49e1d4912a18dbf37641b1c763f530d7f0192aac2fcde6432a9bdd1
-DIST firefox-68.12.0esr-sq.xpi 521485 BLAKE2B 00e735d347876956159c8b5449d3e81621275d7afeaa012447639bc698f0d70517a90617ee410e6b6c93b5d85c4025173c09515147eb66910ec87dc87cfc483d SHA512 d4470c47127db3c7bdbac7201e3ed3aeb5f88e7735810fbb440b44c10e44d255e3bbca2417abdc9182e9ca06824583e65c2733d8f7172440f2aa2b32b7f3163d
-DIST firefox-68.12.0esr-sr.xpi 527349 BLAKE2B 14a4f0334f5f3c518dfbeedc0791ccd76941f6a6e6ccf405de30eda996b2264eb536629a29c2ff3dd240ae5eb51d6288ea6c60ac6bf71f96318bba7aa6622d9c SHA512 5b91f661ba5cb328dea4a8269f646ba72974d0aedb84b7d92f12e988c3d9f408ab82f1bfa54664834f59dbaa77aafc414f52b43218bdea376438aa34574e5842
-DIST firefox-68.12.0esr-sv-SE.xpi 506648 BLAKE2B 938196598f54a337fce1a6784d6c98352f9fe72ef005360c3ba755357e7d4466157731b4dd55c007bbbd64a0233e04f9a1779f3f43725a5956e3b64f9dc97ec4 SHA512 2d2cb7b95010f464a46f74147cf5e52119e3fe06ffaf61b07a7de4078a109f80a7c54ef44da587449f6e677fd095bc01cab0f2158b8e4c9096bc26c5e8f3a6e6
-DIST firefox-68.12.0esr-ta.xpi 548968 BLAKE2B 6ce82d93f0ad6736f216f93612ffe1e8526e56245d824086dd39222a69afcd2e02fc425106de170b2a1ac95ae0f354ca70baee91ad2ce42a3a718c9099324bec SHA512 eb98b22fc3cc842faa5ffa10177fc0ae06e3cafd33dcd8f117836664c3f0e1bf3fcc216e2b0d312ed9906c92bd67f63210fb965db26af0c21373c57b3b32f785
-DIST firefox-68.12.0esr-te.xpi 561504 BLAKE2B 7e245fbeba50bafc180e775995ca75773edf6d505241dde4683f8b16fdc6559c5f757ddf80b73d336aeb998ed4fdc9a3e2ce2526d10a6e8ccd91832b17c776dd SHA512 666f7dd1928af74d8f720b671f89affe463776ce33068b8462b32fe25b733f316babfb3d44e00f780a192ccd4cbed615bde4dfcdec36145f65708c33e1c29c7c
-DIST firefox-68.12.0esr-th.xpi 550761 BLAKE2B 7ddb80b7af7868c2793d717009a8587352ebdeb1e3cd36cbe2d9fdbecd39430340fd1156879ec07882d965c54bd52a8d86e7be9d18852c1d4264d58a9dc34c5b SHA512 92e6e65c8c8ae941d3014b0279e678314dbf745fdbc6996a4382f609c68f12839371a85de3ed34cda2cafec3c7c6dc1a5654656fc53b976716552dfffd852739
-DIST firefox-68.12.0esr-tr.xpi 515121 BLAKE2B 9fbfd0c70b6593ec8ec40ba7b1383b634311ff33215262eff0987e2d5bd755d59c876a3b3ebf2c7de746d40fe48a936e5f1a96270e27b498c6bc6184d43ea770 SHA512 c825b77ee15cfd526afc17cbfcc4eca6a02e194c2f900e9921e03560e77adc91adf155633483866e4c06a06efd2a5f40998124910f376e9ee48bcf7e004a3877
-DIST firefox-68.12.0esr-uk.xpi 568859 BLAKE2B 6d723422f2c86537693113ead7dd8ca27788576083dd85ae1255e5f105a53e7101b8dd8784e652b32359999ce7ccdfccae69c0a081ccb31a5910e4551c2f5ae9 SHA512 27d748576478e01df0e07038a3f38aabf1accbb7e7c31fd932ac1cf53f52336f6cd90f6f08b14313a5a06702aaba8e546552c81f17e67e88eed574260abf2664
-DIST firefox-68.12.0esr-ur.xpi 542329 BLAKE2B 077c331a6a81b5f1f62dab2c6431d8b04c264a4f762321c13f116973cd09759db955989b5c4cc9965323238fdce0fa5cd2ba50e8d304014cbe10fc70ca2c6015 SHA512 98fde965d22b65093083b3e7cc6e6d72845aeab4e306c632f3453a8159979e500dd706cdcc8bc5a7186c0bfac70d28cd8845d7460e91ac5584debae16083c698
-DIST firefox-68.12.0esr-uz.xpi 482276 BLAKE2B 02eb3f6f7c416326a016a99cd8227626a8282ca917da1d3710cde48fd46088a5124d2e82ea298e7ed16233b577916749af24e1ba32d12225b49b259c13e26b5e SHA512 f2b4cb33a86d79b346fe376fb93c223c96504bd572bc3167b3125508bec47ce70bf138d1d1437a79b033c8f4e4ba539ff302d88150f6cb9c141eac394bc7b32e
-DIST firefox-68.12.0esr-vi.xpi 529122 BLAKE2B c5b2d70be97e1fe5738471e82f8cf1092bbefb3d5d1479381f0c3bee65b7349eafa5d3991257502463b6ade45604e26edb7b9f5032ac282a2bedbbe654d53e14 SHA512 a6059a0b179d70a23502cbbff5e90b48262884e47e8a0c2e66286c1a37f63295bdad49f042a0c42941efaea874445c7818b32c735295b477d9a05b448e9dfe22
-DIST firefox-68.12.0esr-xh.xpi 470243 BLAKE2B 1c1e8a6ce19687687827bc8e8ac3cf5230c8a58c78b16f140a6be64e37bbaa81291080c853c4cc57049f236944823a1e138b149ad12783f71d51dc7ba90983a3 SHA512 de08b2c78d267d7c872a8fc2b7b7c45045886f9e349a325d784ddd1c6ce4e4b21b45b1b3553fb476f84110c9c7227d5bd93dbb650702641b48762e299e3e729a
-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-78.3.1esr-ach.xpi 500661 BLAKE2B 30cd981557491e0e813182d8fe769a3f21209bb167b11977b09fcd3aa187fecb029833c1770d976b6ba8be3e4901fd4639e4768c5eb77d9082d61019c6d2f564 SHA512 b3eec643a380cf8768ae716955ed64938a18e259b7698a72ce4fa1eb1353c893785806cda73d4cd8908f3bd3f4bf640bbd4022be99291d1cc509da609541f83e
 DIST firefox-78.3.1esr-af.xpi 444078 BLAKE2B ec399291516e2d208439b088679386f97674399249f611b0d0af2db002e5067b9aa48fbbfae44ed210c1cf1205039029a2b6d665da0e011dab78c0a7297c91a3 SHA512 e46488de17fc1324c12aacb74fd9e6521a45ab5f201568379dd6e9c7aab019d7ee34b3313d27f88f33c4002ed84c1b8451a26c03878b03b1b06630e0c8ad76e1
 DIST firefox-78.3.1esr-an.xpi 511467 BLAKE2B e2683b61deef571f107add61dc770acd3adff706a01dadcc3e977cb6e515abbd5cb400296ac7dfb74b991aac5bc04384ccb3230b5a9960bd2cd4415dc603b27c SHA512 9990eb0989ec9841519157fb620e6c6cd8451657bc25a93cc127896215fa2d50a7734db7bfe2ef26890104eb97efbad8d8633e6b77a5ef15f830e2df42f7a662
@@ -196,188 +101,6 @@ DIST firefox-78.3.1esr-vi.xpi 596829 BLAKE2B 7ab70a1d81743bf66caa689b91a722f9ea5
 DIST firefox-78.3.1esr-xh.xpi 458901 BLAKE2B 1dccd49ce244797fce31c0f458b15ba1364923f9e181ad9f98826d3d145652bedc28184e60e749354b87d88ff49cfba4fe96fcd712f6fec692842323b6942ccc SHA512 cc729323a144fbafc71d5858738829fb8336dc0d721a52552a85fa1f18a46df29d9dd9c55cab4f585e42af547d240faf9df0f3cf30f89d7b8ff642fbded81cc9
 DIST firefox-78.3.1esr-zh-CN.xpi 600192 BLAKE2B 548e795a21a05d7170b6221e9525ff378e87a6dc54c4e7393ae0328ddfb4402d7eead51be8a0029248230f084fb6e84651a0860820a96b0aa1393363d1ec94a4 SHA512 4f968ee70e6ddcff684adbc69e4baf24d74a5ae51b411b5c1ebcce7df43c49f9116decba1b5965d9089daeb6d879738d6066b1cfc992a1b95b6ae2177400038a
 DIST firefox-78.3.1esr-zh-TW.xpi 599272 BLAKE2B ee9a8c002688464e55fdfdaa3c49622638eeb206a21b3462dacb6255cc282026af12adc6799ef5f0565d411c7e3b0a24b1f45fc17fe8f4f1f52a5022ca3ad9fd SHA512 486a2f36a159ed429e0544c349dd07601b785db4a7882db592d89d9a64dffa1bc85b90770e8e800f1f2f4a6c91df497b09832dd04d7d44050f38263c49bf2696
-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
-DIST firefox-80.0-ar.xpi 591968 BLAKE2B d928bf7801c3980b20385737e20d1642c55586a7b29825e9e75f74414cbe38adf0f454b38ec5e001b1e511098c5c2015da5e1221ce759a97a341885c913bfd19 SHA512 9ecdb8a4fc807d6a53c3007bd66e587556fcf11d2393d568ceb089307384ee709d9b86620a8b85b9cb53fc0d6ec34c0cdaeef279a24abde2de8229b1fd2d9f5a
-DIST firefox-80.0-ast.xpi 502295 BLAKE2B d4b10d387a0b204635b9a8edd15d676092b95f50405671846931c31dfc8a1d2851543b4414f431fd04049586be48850fe9b2aa548e3e42681b6a4f68fa61e655 SHA512 838d8965a611cb4987bf2f947cf8fda4eaa5bc65582c9e0f1c319c3cb1573f0da18c89db72d3606c588175836eafcd2e8daf0fd378553b8e26c2f35f19ed5f23
-DIST firefox-80.0-az.xpi 539500 BLAKE2B 19f4c01bd8b92e5ba3ceff935984577ebf790150fb0339a40cdb6324c5a77894f2a54e8f5be3f5007d9f1f244fbdd0cef2b69b2657e9cd117c294a25b625b1c0 SHA512 fe4fef78143fd4c0050b871e54249479344f6dce786040aa018ebe2aa9409d7e4f6085defa246cc9090c38c8c6d2c1c275feac403196d94f8dcca3c1e9ed7b25
-DIST firefox-80.0-be.xpi 652456 BLAKE2B 23d70fa63cb47d40fc99318ef73f4c2a2b5ba0e815de87132617cd9fb58423ce89a0fa9e590505637ce2796bb7c3e6c88ad2309d8f3b25edbc1a2b6585a8d583 SHA512 87d8005bda12d19a21a6a8d7bb13c2594756829a61cbba94adbe3a4d756f6d5b592ead1ea90720ac291402b7c04eef7395ab8d48ff97a921417768a2718d197c
-DIST firefox-80.0-bg.xpi 614842 BLAKE2B c9d963d5961bb7ccb150415db8c683f05d61905968f6a32d723747765de34a6c1cb75ae679e0d493d7eb7f0419c286ad9595c1048218dad17f032f54e06220ef SHA512 381a1307e119c03b5af27af701956a3c5b9f4fdbfec50fa68b932e9701608f551a78d75121263c20229d6b38f76f980ccfc43ee70ac47e7367127149c2b982ef
-DIST firefox-80.0-bn.xpi 635449 BLAKE2B 61ffc9681126b50090ad1fbfd8f6484aeb532b537689f8539fddf79f7512a7a37293a53f2b16859194b70bf6ae83e6e126240ba3ee17b0c5ba94275a51fe0274 SHA512 0a1830c46aee8440471e3d75ffc3728c2f2bf55abb31082acc8b127e2becbfb8b7e2d8e6cb7675d058e95389e72066f634dbc48402d09a0cccba303c9770ee5d
-DIST firefox-80.0-br.xpi 555980 BLAKE2B 0a76b7eeaebdf369670ff1128b2a488552dbef75d06359e20d46c7404aa69cd6af3a70a08a7b542c533cf8d4ca6b2c40c50b5634cd02168cb875bd819c57fe46 SHA512 526a6e409a4991b00f7e84367463e7168c8e884980e293bb8c10ac9c73b098eabd13606fe6e0137987cf88f474671fb782daa3a0b6a80c7c6d829a02771197c9
-DIST firefox-80.0-bs.xpi 513558 BLAKE2B 8b1615856551badeaa2a331243c944e9eea783d16fee34fbf3895e66e31d218684b58294be7011073a5d2e6c9bd0a4b773d69765bda1893b85af3eafaf3d39ab SHA512 d9b871fd4cb201f597e33c807921a93865c8591eed0ab985b1b3ffc9ef41c239a3b327cff98ebb4c9cd39e3bf5c1c79749357645bce9c09b1cd664f3463c132f
-DIST firefox-80.0-ca.xpi 564409 BLAKE2B 8edde4a068715a481e2a4968e1637b9a56c228be7fa75b36c7700eda4e9305be9eef53e859a3e96a89ab74f6cbfbeb84529f3d93355f030088c1d913af526c4c SHA512 5c229deca5b45c7bb4807f220775eb11ce34ba2b63eb168f502074958fbf60ecee851996298fef9e392ef47b45d393f7b129d7da317ed3fe064dfc9d2dac6bce
-DIST firefox-80.0-cak.xpi 589689 BLAKE2B bee590ae342c4d581ab75c6d7b5c91a366efc67bc9ce54d0ad5bc86af0c4508fa663156c330a7ef0aba2baebbdc303e16010cd7a1dd5fc6e994a224f0b27903b SHA512 7304602473f61281db8126fa03384fdb077397173564936c4c3c703c3477b276cd6ef425011b3b5d6da9795de1472abf735e271a63d70403e7f03f3b51aa1db3
-DIST firefox-80.0-cs.xpi 590458 BLAKE2B 2bd29730192843aa41b3b5a39daa3841e42a36e6212e80820cb08720ab6884be4e74186993eeb22b0c256ed1591d734e43b4c7a516430095c338fcd09f0c7604 SHA512 9f8e585a4eaca727e0ac0a7767d11fd6e795d2e041b3d86d28fad4772ea3b32634e3a5ec8b0a20f3eba5706882771544fb0b798edc1ea8b0f664a1cab2fa89aa
-DIST firefox-80.0-cy.xpi 574417 BLAKE2B 342d364fa946aad52d4902bcada88072e8cfeaf92dd7332b442e71be378ee1b2912124efaab5aaeea2a724f66c099e130b1f7f11f098e9b0076c483c136b7db8 SHA512 c25a80cbac5383f10c1c0aeb279b2a8799fed2b8074188e534d8e8177e78cbb3e1d1dc476263802f807c188311c989bca8cad99b9c9b4b4b2bb2b0d97f5c7d2d
-DIST firefox-80.0-da.xpi 564796 BLAKE2B 7a1c859722d437232675866b25e5fa7f62d6299f8c4a9ad51c5713fdaf0a2f8c521e692b8b47da1d243bfd41a3a3a0b49aeae3b15e68970537eb2e9f2e712103 SHA512 3bbcbb0c1f13d33e304a8898f70e6ce57c687bd6045e3b137914cb1d142b0a08ebb3067e1a25d1c136b0c2f2e580b4d5ba1b2fcdb9f48f468f9c079eb13a6cfb
-DIST firefox-80.0-de.xpi 588397 BLAKE2B f4fe0ac9111f851a29d290c92feba3d2e1f954e4f71ecbbae8e4e9fa16dfd67ae9f2d731c3e7d4a1544887086e34027fa4f6d288b28e756f31522cb925276f7f SHA512 e5af7c4c3240e5074e7bcc0a6165ba60cb5dc5d57063479f900570cd4361ef93308e9e3d37d9a413526c25805e8f6239ba4ab0d13c20a9931ddd75b566f5946a
-DIST firefox-80.0-dsb.xpi 598524 BLAKE2B 3080e318bad0fd9e64ccbbdd2a65cb27953eae75d04b6342c9083936ba186916f21805c2899a1732c4e294446059bd1d9fcc9e05e3febd0a1ae8ce247e8d4131 SHA512 e58640c1b7922a808536d0d785faae6dafa0d61a6b222e4e38b805443383f5782cc80f83aec6cef056207b1f6789674d0e20f57e608093ce147b4c484ef5e573
-DIST firefox-80.0-el.xpi 674078 BLAKE2B 51b8f4d3f45b030d525a4e88b9817932d68dfbb524cde4416d79712ce440ffbdf477537488b401a38afa8d9ec951f4014ce0b3652ab5de05a91982ba53d4d75c SHA512 8e4b01e8155fada8998dd4b312f542ffcb28d4c4893ee8961cd9d8a1fa2c1dfb0735c43677496c9ef3a277e16b5bdf54d7e5474b004367da61f48fee9cd321fb
-DIST firefox-80.0-en-CA.xpi 541624 BLAKE2B 9fd3eb9a714eaaa46e38d61eb79c1f619aa19929510ab4fd7ddc0c6b2789c509a74b80a459591605a1a6c431e0a3848c2d9a8943a2234752eea59f6df82d4055 SHA512 27feb3f1f8d150bbe220562bee594bb4b8a0c9d50a1641a68b21b739926d1deaffb2f56917d8c3bf3306991be5d9c2ce89a91581b1b0e836e672a94ccd8216e1
-DIST firefox-80.0-en-GB.xpi 539418 BLAKE2B 6962aa53d86894ac5d5e5e3b70c7cf567b886abd3c20805ddf6ccecfb922c5efec7ea6fcd059dfa3aedddd0cdb32c171e76924a6ce84a7e68dfa8768d7a6c66e SHA512 adb065201294e25a1e3b38294648555e8761a1dc69d04d83d1f3b4256b635a10dc17cd791b1455854caf9e56e46d117bd3101e8cdf00d920d8e599e9c6717120
-DIST firefox-80.0-eo.xpi 566779 BLAKE2B 066bfe363b812f458cf469d91e4e1915b99b094aa5a107442a752000bd97821ab4387e7abaf7309ef7427ebedfb3d9a739f1b744ba990b4a6fd34bf8c0503f8e SHA512 978d206e69089f556ac735bedb5b1c8b56752ec42064da678217cdbb00eda0d0ea92b324b260c1564d8d22f42e0d8a1c18431e895584674dcbbb6b16fef0189c
-DIST firefox-80.0-es-AR.xpi 579746 BLAKE2B 9ba5e77fe01b56fd9413255a5845388b9b8cf3b99083e07f238a0979c018e293cae431675a8fca42254c277f5159928da3e66c856bbb112ee412d0c1d4a098a0 SHA512 cc216aa4367b99c34f7c665a8f3e5e2736c1ed90e8a07e554ac5b91b570a0aed6f4c5f02625d3100f653d037e162fc7e19e968e744ddb0477942eab56c09d7f4
-DIST firefox-80.0-es-CL.xpi 577776 BLAKE2B 02170a2da7727dd3f70b52ec61b18cab7c72d4a7346ab7802e6e730cfe0a9e246f051dfb6441ff1a4a6477f065b03e11951a4e15b09c367154744462b75ff154 SHA512 6a656985d043fcbdcf44ca82fff15e98ff03698315a8c9000ebc15d7aee8aec3121a728babcef3be08918a9a5ef8f534ee14f8c2ea1139508f4537f215a324b0
-DIST firefox-80.0-es-ES.xpi 563139 BLAKE2B e5189f2e302c7d0f2a9d6135402f05097cd2bf51a5df15b57eeb248935f71d42985112611f95a5f7fdb915e343bd7dddcc12cb5bbd5aa8a6f045bd0e228a4427 SHA512 5fd3f8de7e5f696a468eb59c1bdef1ddb39b171480b5e95821bdd799f9ab814bd4bfcae3168fc223ab564e9f374372259849e440333a448d370eb19b25554ee6
-DIST firefox-80.0-es-MX.xpi 575194 BLAKE2B f6e51668701120f5d6bb09f5b43fe93e7d0edf857e20ce9134c676c15b5740525a6e6f2f959a2767a82399231f18c23f8aa4163e8784e969cd425ef215505037 SHA512 0897ebd9ceaa01c50a56eda33b5a074e7d68fa1bfb6ae0532c9c8abdc7bfc341232d1692528d44de0e337242384d7aca2b5d455d9f3638813539f77b9e2d784d
-DIST firefox-80.0-et.xpi 537739 BLAKE2B 470fa5c9065b21e0a904e5d6c057b3825612a9ce28b189d7acc22514f832da858653b01cd90091cae46077d568781d9bfafd37da96118baca217898030bdb8ab SHA512 dfb6a11512cdd36b960d92bc4533ce9d75e298e2aab90e6f18b5d4d9a57d14e60fd412093a6b14cba5a10cfeb22f03ca0a4b60d568046270c1b711aa20d708df
-DIST firefox-80.0-eu.xpi 558710 BLAKE2B ec466ad75e958674bb6e48ed95d938a9de5c877394d5f0d52f0dda7fdf65d624ab520c776f5f4475236b845de78d175aeb88663aa4599d7778b3c21ebefc0e3a SHA512 797e056b5fdb54ac844a2173fd3cd18a0c5adc656500d4eda18adf5a863b7b9d309ed87352f48e5e717419b832d7e807081cfca433918cb483ea856464afec33
-DIST firefox-80.0-fa.xpi 597295 BLAKE2B cc6e733346be6a25f497262a0b94edc105882248f6e9b3c92231c8f0a8e73b16b95e467e5ebc1b6b5c31f1a850aa9a3615f8f692916d9b3271360a0c1dd7ee1b SHA512 f1920b3b2a0b25d6c0ee204efa0421ff1dd7737ca78174fefa343b42b10f4d7fbc3269127ee951a081b13fa38ded195fc16c032f833b457f4930e0418f1f2920
-DIST firefox-80.0-ff.xpi 533670 BLAKE2B 3e931d0365d52dde9803ac5867c45dbe0df79e22a3ab036c2c65afddfd17331dbf155e54d64d14234ddb9d396330b95e81e18bc0f2274fb99b777305c6350f72 SHA512 45d83a5e3e1cc65a792748638c96412e538f02d7568036070bcb866b10e71eecc70a5f77669e277154c8e9c2e287e35a5b57357a151bccd3f86c4ce9013ea69c
-DIST firefox-80.0-fi.xpi 564428 BLAKE2B 4e13fe913f7c25a3de7e5190456ec15daff91fc3e8a7b57dd018de7f601ad9367e25d6338eb26c958aa2c01cfce7245b4f8d0064b21df30334cd5611a05071d7 SHA512 b4384519931c133e33e0d8217fdc337a9d79de43d1db8b5e18d1a2f9b7d253c4022b62efbbbb7a88647674db8b01fc5053f92ffc922a05f4455c4cdd7653e741
-DIST firefox-80.0-fr.xpi 588795 BLAKE2B 5f9b9827ecb2acecaf62d74e3822c161a09fa5837a99c4e305071d2977c7cce18c385351abc2ff38b095f70ec34b504ecd6943ed2c12f10e094ff84bfe1c01d2 SHA512 d2043279f28b1c17b5f3ec55eab4b93f073fea76ad8a9da5217c0abcaf47b286ae1ab27b61c5b29b09c9e98e33491e923c90597988cdfded2791d86d3b9ac741
-DIST firefox-80.0-fy-NL.xpi 574021 BLAKE2B 6505e12eb43bbb2f30c5fa5756cd5a2280c07ddaa90c88baf511d146d9a51717a97cf8dbf8848ce733556d61ef411cb0104ef912047b1739a39524883660cd39 SHA512 ec8d5abc481cf4a993526a89117cc335455728e15e377f2715119cbaf024c3c0e81d17e800b459d5d690d01f8bff2da00b47f08d2f9a37901d258e7c867b570f
-DIST firefox-80.0-ga-IE.xpi 516393 BLAKE2B cef98ce0c810866f1c52a836fc66c89df1548bc26f3dd2149601525be74490a46ec3cddbfad61d642f4f9d2d1df245c664bd0b826476040b84a3013e5ca6ca4b SHA512 53f581fcf35821e8059a98970456705787a00798df59af3cf62ff65fcee79bb947b07240cd365f4251b8c83f26e8b0272a89d4135b523635c55d0352cb787552
-DIST firefox-80.0-gd.xpi 546420 BLAKE2B 378ebf5b7b3c2ec9f1fcbb47a135c75b2ca243d9e9636dd39650ac1201ca956c7650f99f842ec60943f7ac5b27c16178760ed25410053a0072ccf9e828d82d8d SHA512 18bbfd8de7641c15b792597d28ee31c0f4426f50894f747498611cf4530927335fc901fee999316879a92bf8e8539ac18fc4a30ba691379bd57f1db3b6110981
-DIST firefox-80.0-gl.xpi 510330 BLAKE2B da4196910965fe075f023dfc23c5adc82b2cd1f12b7726867519e2f1b0714db99bf84050903f6f2aea2bee6ec2225074228094ee6a7f8bdeaf1d62d78c5ff503 SHA512 843f80f4f8b5b4fdc08eb3ec98e9ed25f5dc100ca5a011e1605d3904abdbc6b883a0c1d98d13e1c53f0b3e9619d67ff75747e9b63ff9c04df6a7f7e487489b36
-DIST firefox-80.0-gn.xpi 590942 BLAKE2B 3a97481ee3c2a86963379d25fd220844548c209dceb8aa31bf4b537db9a9dcff26317efc1bbc82455c95bbf1486a7ba58d5fa14bc6b77cf4fb3ef9b923492b48 SHA512 ad76a5d1e8d7638796964d178387e9786ddd2e4f8b831ec5e7d16e6377acb5f0a370796d18677cd0105b95391f482d960a4a24c13fc5b6982e05dd38de2c5934
-DIST firefox-80.0-gu-IN.xpi 604613 BLAKE2B dba5afa8f274a906fe53cbfb6e2c016a4c98ff5eaa13b0252f67e14be978c2b9beb90207793ee4870cc0ca6ab12b88868450903302972a2535770dc40e92786f SHA512 86e4b63784d7cd54136194fcc6d91d04302616d96f2a2a3d8d2ba700b20ad695c9b32ad8f0f3047400d4c04da06df634bd41b87283036f87e3f7e9ab60c1983e
-DIST firefox-80.0-he.xpi 592241 BLAKE2B 5bcc9f4b50898483536713d063a8fecaeaa4a02f631e5d1b767e415348ac4b27125b0e451a9039fa0f6b61589526d5c59c88c5f7ca68c6e6ffbd38809f4823d5 SHA512 72a0676523d115d25de173bab362b8e2f683deb7e61036dfab33784a17e95502346a4b576d511655b5ecd80bf0dea50e8331492aa581e886d40a2c5de117e79d
-DIST firefox-80.0-hi-IN.xpi 626040 BLAKE2B e0d54b35da0cf59ad7c6af7287615cff1da6c70d7b6a6d85cfd4e897f1922d9476e0439628166139ea1165906b2ba6e63f8847d000f49f220de1276e04f7e027 SHA512 c545f8cad38a281702c846982a4901b3014c7c21c9acf64264a8cbc7e9e38a7b53cc52a5199111b2595035ae4167a8fc007aa81c9ed4ed4d24e53726e5db524e
-DIST firefox-80.0-hr.xpi 570157 BLAKE2B 5adc5d7f77cb3a66f8513f0739807934b4537731291b6bd15f2b4b2b8488c9fc601c599c32e4e260bd1cafe27190f53f882884b0f00adb95c3284bfde1ac8ed5 SHA512 c2df2413d66da2ebffcbbbfb9845fd16ad34da8b02884f9955fb824b04b66b68146d190f8bc01faf358d228d9c75b9443484ba822b70a7f82d62b7e30abe228b
-DIST firefox-80.0-hsb.xpi 596070 BLAKE2B b539c32bb8e8c4d88cd8c930b6af45f8edc2b67b2dd3e0250da35a61aa69ce9c1c0e74a09c5d2785ead05a8fed9566197f085f4a84118d7ff8d545a53be59ff1 SHA512 bc99e122b9a55a2740a3ded8e1b9cda674e83632a1e16439b6acf7cc42fcc68053220fb7b053dbf8ddf8aca6db286ea50720f3b7d9d4b690a6dc7c1a98a4abb7
-DIST firefox-80.0-hu.xpi 600886 BLAKE2B 15af42cf5f330e70c5de446dbd43014f6a1e869132527a92ec0a97a9435f565c45e00135ae31c16b140a580bef139ca62451b0664afa35a96dc9ac2b706075f2 SHA512 630ced3a7e92b624ceddbb73d29f02f5b7144ab03664188fa54649ec675aadca2239c6f045414c70ab321192a64585deb7ea0589fb8cb501bfc94f2643cf8c0f
-DIST firefox-80.0-hy-AM.xpi 651933 BLAKE2B 8a57b02484fadb67a08ba7cfb5590981ce57c4558ef51a1b9e188d3fe7ab3127a1b0addb81fd0d4931dbddb12d279ab69bbdda0ffef0d90b15ede96795b7ed04 SHA512 1eb973be9d6aa104dc4f3a0fd5838081afd4794203440738d375da6b15ad73a210806c211908af88924862bd1cb8a9b9334605a97048e44b3b389e6c73501272
-DIST firefox-80.0-ia.xpi 565441 BLAKE2B f6dcabda9d21180e31b7a9c9a19731c3a7aa388be1b34aaa1e2c1671aee2b16e2b026f80195b1729cbc95a78ba8011e38391f475d59ce4015696df5a61ba5f30 SHA512 b218a2b16418e0b9bc75214939d5883eb7a0c080a863faa9f0794c8456186bae10643bee85d1e6b5906325fe37f495ba903f7d0c068d5f95d01f7929081b4651
-DIST firefox-80.0-id.xpi 558580 BLAKE2B 08545ca1926a3de19fba919ef84067bd2612b4d8b78b1610ff529c15e58a954733463c7b628f1c009ab3b7a33928505eab9c52b4038cbd43bdbe864bd821ab82 SHA512 6952e9e1a71224e00c3b811fa68328a264ed0e92ef7292a8a74ff2aafcaa020b94b7ddb69763e6b8e0fe7600bc5a639f987d097aa9413635e5e3c08326554bad
-DIST firefox-80.0-is.xpi 529650 BLAKE2B 4f5b9e15575bab77dadaf30ae2e8d217cc5222840fdf6015fbee3d7a50002b6ad183a80ac7d843f954b69a22f00e8b9f2e27ef89c8dbdd0b56a660b9966cb1e0 SHA512 b4403b4c87c5d8addb07ef40725ea2b6449f70de7cfb91d6eded5a0dd5195074f392e66b3ef2544fc2a40050b4ef58ceacc4ecea8d64308102e6b5624cf0cbc6
-DIST firefox-80.0-it.xpi 463726 BLAKE2B 1e3c935d51a96002810ca83665d85aff3812a4da3a15ed58e1486db77ad742bec2e0548f2e4ddcbfb28c8193bf5fca8c047726991254f8cabe1fa54a513ca166 SHA512 d06910e707156dff22045cbf3b2d04314039bdab998528cfc73d29bfc31fe00c69aa7b6a6da9aec74e5b75b8efecc392d039250b5a329df8f7de7d3cd2f0cf29
-DIST firefox-80.0-ja.xpi 627644 BLAKE2B 82cdde1367e3a3a782c882f6f674a4be85d239bf04970fb4ee2fdac97d22aa41e75244c760b6a979a71c47e7a2561822cb07599f63c197f01c884f4641689abb SHA512 44439db8da3925d074bf716234ebb9425d7dbe5edf6cdbf916687bdd46b16b15470683fd46fb2546e1035a8c54bcd10be3cd83249aa9059fff273c4e91ed9d54
-DIST firefox-80.0-ka.xpi 626549 BLAKE2B 8cb5de31d59284dfb03bb898debe44bec9797f569d7cab03cc860ad185e1f51ef36e1b57860d5a394fe6c4f8fab81ecaed344f2b25316cebeede607d3e15c61a SHA512 60e8b01afd76523d43c2fd1f3713c8844a51abbb6e50ee2341725d15cd4845e2624ba9ab5e8be6f611847e364d13a20da57909e64b68d2c56b714ece9d3ef5cd
-DIST firefox-80.0-kab.xpi 583779 BLAKE2B 4a06e4f97ccf2863aa359f1ead05330a9d85caae183e592d86aa93b444c0b36c9c4f7ccaae3ba399a7944d69e6035426783c45ae64d464c3cc578d0b5dd55a39 SHA512 7cdef01b2b6136a94d841b1362a06835523d9d9ee6e2e6ed9bca356248ab6bcc5166e93ceab51acf2c1472ec304da42ec657ea0978a0f7c211933d091829ffb8
-DIST firefox-80.0-kk.xpi 649823 BLAKE2B 6927402fd82a28ae2e9bea2caaa9f7841f6b5debc7098fa6bac8f90ceab470c3300af012fb75d500dd01c71f663f53637c00dc9b0072564f203935e4dddf721f SHA512 5afffc78d8dd254a895515dfc2609fdc1317e09173863717255d343605a093dd38a377e06fdf21887f11c9aca515a3c2004e42cca3f5ac9dfbefb0f2f343d489
-DIST firefox-80.0-km.xpi 568620 BLAKE2B 2510031ae8ede92ea5a667714f9d09dbb88f31229ce88f5d245c7c2dd506a2c0169eba78c6456fd437203a2070027cf4cec913842a14864d7902cccc746fcec5 SHA512 93f4ab94c10af2b12a4d627efd648399b6a35f171720221dfdfc30cc1069f95e89353977d429ef5e424fbeb72879e39483d62c82480bdcf62dd4b8fee28638a4
-DIST firefox-80.0-kn.xpi 559852 BLAKE2B 0929da059a1f2c4c54403f0bab631c8f9d5199a5553e09e888fe7cac781debfa8fd3029832d8ad49af624473d5297af4e5dd2791cd0f6912c926c9698807f2df SHA512 4eb13c48ecc55cd725a1c4566afacddc840eb362a4de5ca85ebd8bedc3c1af111de3029e525830db4a73deda8c1746f3f246b32acc0340d1e05c54790a99513e
-DIST firefox-80.0-ko.xpi 614540 BLAKE2B cbf7e4dbf957d8163b6dd616385380120819aeacf991c1de00b0865cf2f48f6033771163f1dbba2fdee6c855cd52f4e9363460bd4d079c6cf03693cd69fe70b6 SHA512 dd6060dd0f89b7d3429b9a1af14b1c27196866f8fcb12676265b1f392b8d2855d5ff649ec9d82b8a281fd55f85ea0c69a1c95ff006af60ab7a3dc7e466d46d71
-DIST firefox-80.0-lij.xpi 529109 BLAKE2B 1aaa0b985558f9d3b561a2b28eeda90c30e47e1edd8d97fef8572588427d1f95eb09eee84c70a99d38664add0bec60766f495c0c54560513e8e12d86c256514f SHA512 b22c9e80d73fa21cfbd9a9ece532d3b61d8ee1c8d65ea3394224e0b194c20f86ab3b5c953114e842a7220cb626ce046beb14b1cd9a4bcd25208bf9779f97a8b2
-DIST firefox-80.0-lt.xpi 587980 BLAKE2B 2ebf088f9674a3f3fbb0be3734b5c2e790f9a8d62b5737e1755c003491bd2d3345307a7844c21d9b603171890b9b1cac79cda226cb41286eb9d6fd4fec85e340 SHA512 31b6311f6b17868816a2fd72588dc49eac9f087b26bb00c7698bbcdfe91b7d069ac4c3507d8cf3b48f63c7b5e332e02d709caf07ca13bde0a8d3d465834bba70
-DIST firefox-80.0-lv.xpi 519967 BLAKE2B 3b57879b21536dd6bc99d1d926c68bdf449a6929a41f3b78544b1007e6f931932f174da314a3423f877361207caaed6e20d25c3d5e4721f7ae85ab54a784c35c SHA512 09bf86bca7887d26f58a80f6ca04d3ce6f71af9c484b626e345b97b66b1349557410aa496ed559252e6e3b5081564921b22cd9ae330c2824a580bfab19c99aa7
-DIST firefox-80.0-mk.xpi 482697 BLAKE2B dbceeac0bb8f22b69d9a53d585efcc0a980d191058dd79bf55e8976cae1ab01746f20c245163bd817c5dc4087b4f6b37ecdb22e29e0df3400d457c9a586fc339 SHA512 b6ead5d0368891a4ce6465798e6b736489c6b0cdef30b406dffcf74cd683aadb3a9f726b08cba321995c63d0f1e4bd3b8055a0ea16ba977144fc82e7446c2faf
-DIST firefox-80.0-mr.xpi 601406 BLAKE2B 7cac680a690be2ee66d2ba5fc8b74670ccc66815009846c0308fc82178f642d7db3f56e1f7f79df3ab988b6f1a9e41c368b5361a541b89870abab33f11dc23af SHA512 3fd8c0f9cb8fd53713aa37d86bda1e547745645a7cb87d7d84dd1af33e9256fe92435011020437bcb013ebcf30b7b5099c59f8b318b1983a8fb61add607a5a8c
-DIST firefox-80.0-ms.xpi 503046 BLAKE2B f8a18d59fe52d7ede861d461a7bfbe183159985230e37d0938802ffb977a45466d0b6f3a240aa34df729a20245b1d26d74b3ec427b05a3ff8765b8ac83c61cf8 SHA512 b41cece57f805f6e61bb3c73f23ad46d715b514622782c8e5d861a5084e1875f2d22e0c47dcf11aa899cfb4689fa74facd72a1b88e308afcec16af855c8a50d2
-DIST firefox-80.0-my.xpi 557293 BLAKE2B 11aa8d0d236220759761aa7beb262673d050100946f44845954cbc037d7993f800940436c1c93bbda28fc76561ce8ceecb1a737652b7846b71e5c986f0a90679 SHA512 717947855d5bdbca668a4d38898c3b86cd1b069d23321e98d495c62ef5d79fc6daf66ba819ff20e3e0fa9a450a560333de78917968ce7b10da8b926ac51682ac
-DIST firefox-80.0-nb-NO.xpi 559823 BLAKE2B 306d7bb615376728e997ff55e8958fe69f521237e9dedc626506ea51f969e603fd4a7e9a0be2f1bf7e1c0def6b835d74261950cff77e50361ed077e7dc0a8613 SHA512 16f04c14e83848d3a2b41c379ea3a5139ff28033c6d402c8aea6993624e43795f57cd21d88f72db8b594ecbf5bb80813fe7b270f5db30c2ed714187351df6c88
-DIST firefox-80.0-nl.xpi 567738 BLAKE2B 40a3235eebae26ffdc291052482b155cef8e9a478d21d98ead633bbbec6115215ec13e75ea270e773962067ccb7d259e5d25f5469c7eced99b14778b9c26e10f SHA512 ea592f8a91a09768ec7bdd27f2b4d54fb240ac7295c1e0384c6d5e895951b8a0f41118fcf6cb1c88c4f784c5c77dace3b89de30260f7d7e94b857602fe6e77f9
-DIST firefox-80.0-nn-NO.xpi 562633 BLAKE2B b529c4764a15a88915ec7c30711467c0741b8365100f32559eaa1851b9ac13a3085bca1b7d23a0e4e7ed733645be1c080ec91fead2c051d9cda194e1a80938f9 SHA512 acd881e26f95f723fea317f6b55a2553bba938c8c787b5611ac63e2a4eea932a9524cee2ff5515f6bbc42cbf5aa0901fd6cc91331e5d0787aebb3e0ffa87d0b7
-DIST firefox-80.0-oc.xpi 584396 BLAKE2B b279c3302fa988a8816100c575d650140b2c43a71a295a520b132bcb37df47d8cb456da2aea103bb6dcde7f310c456b357282820eb637da9f059b1082ca1f6fa SHA512 e1c7674269b1939530304dfcf707f06ecef95c31050276b713fefd554c15f2d266a8866605edd732a0cdba6477bc38dbd5109ef4e8c43aa116541ae5c685afc2
-DIST firefox-80.0-pa-IN.xpi 613993 BLAKE2B 0f543b581c0d9928b2119c4e091968542865830cbb6258999a29018cb7e4d025b8fd6bcf8c21bf6e7b760a37fed07f0bea088debdf157026188dffc02d65366b SHA512 e80d10daf882dcbe01add70105081be50feb26178ee2ab6cf576afb4c2e4fa9f9868b694016ec006e7f6134e1f6ef40d8f9875661a479f57498d3bb451f0378c
-DIST firefox-80.0-pl.xpi 588790 BLAKE2B 690ea2bce21714412ebc64fe353354efccd96041721ff4d6d73282900bd69c349a264c61923d3026ff5c39412e04a1be59a864a2b2607c6602b94dc255516824 SHA512 5f4b739b379fdb019fab043277f32b798cc317caae96b11f76228d5c2045907ad44f0b40649b42d66b5b2b1970fb6201fc47393eb4e2bbd86422d1ad4335b62c
-DIST firefox-80.0-pt-BR.xpi 569559 BLAKE2B d3964f5460e4eb24797fda4bfa4c101103634056fc5df39ea362114f27407a0f5fa1d4a4724391c8b6b8249ce2a0619c2a3fe914c111450c0b5f3860ad291afe SHA512 821aaed6238d01a583bd71dff1d014ff3fa8b2caa5c4478b12e54b011dce561b0ca88239774c8e59479b4488993c4dd2877e68c7e658b310fc490c826cf48d35
-DIST firefox-80.0-pt-PT.xpi 579329 BLAKE2B 774aab81cb5e10c053c1b383bd10941c62352af26098c742c323eeceab3a509bd8d6ae582545cc7dfd7fe5dbc9804227ba338fd004eaa0681a17be7f050ecdbe SHA512 639bf10dab4fe118ccc58c2d42b0ea4bd78be3edb9d77ce142c7a3a4a84e8ad55dd50ca56db7a7a94570186fdd2ded88bd99d727dd8d9dabfc30259f006643a0
-DIST firefox-80.0-rm.xpi 566515 BLAKE2B 1bd72dbe1df18c9f52d2e8e6ab1e137871390e77191bc68da66dcc8575dc8afc9354186d472cf1777dcce6bfdc61a3cee53cfcd17f86e1e9c04649105778bbab SHA512 4e66e37fcedda0d19801f6c4f8066601427954eb06492ca19e77c08dceddda46ee99be57d7a2056753c4a1d0e5095342993aef5c6f8d63ca9862e6f5e4c286ec
-DIST firefox-80.0-ro.xpi 587062 BLAKE2B 27317e326c15b8cbe63fde8f331c927ee827d6d0a4f3783eb2e7df488808f1af27ffbe8fdc41a81e3247066d9269ca5658a891c4848f26396cfda7cb5f2145b6 SHA512 0ad87bf7de8c1c3349c8fd20955df9c5fdf79be4cb80443b093e105b380337247f0dcbae12d1c72aa00700938d21cd0563232ea0479cca0bb9a9638d6d84bfc3
-DIST firefox-80.0-ru.xpi 666370 BLAKE2B 247bae4c23995a48dcf4db179f27f113a06505767352fcacb1435eb2e6bc6ee6dabb2776ac9ee4fa250359acb3dfda50e32486b890675235dd95fa66d397ba95 SHA512 978bd23224ebafd6764a170e6a5c1c99f242b3d9c1df765467ea8936cc9f6e36954c872399fd743de089b92a3bf965e61e4ad0c1c0088d67b04871b71d397d0e
-DIST firefox-80.0-si.xpi 534258 BLAKE2B d2d0dbb183e118954bd4ba66f98652ace43cd96b34e23d0485b255fc81c599316e563d075976c5f671ed08bbb76596e7f4bb6d2bf54bf7d9a55500ac7cc452fb SHA512 48904e0ef4dff84f128907f03b9f8b9246ff821d3a41bf7535024cced0d156edc5f88fc1a16d6a7c7bca70852b2dd77d72b6992805d0a241a78613024d4d48f6
-DIST firefox-80.0-sk.xpi 588132 BLAKE2B 64cf5f913f107294708cf91400c3084f0edd3112122bfc806a1d6388876376f776591ffd03357ffeb2eef95841c1d38001c9a9967707a5f855e40281c68d9be4 SHA512 14fc92562a8793b05410de817bfb13726db6bd635281da155b91d6f3752887f34385dab4b0aac5d85646e1a3430c6bf016124c08b301e6f132ed8f42c5742ee4
-DIST firefox-80.0-sl.xpi 569927 BLAKE2B ec978f158491a229f1b3e2265cc7305bb2a96141052e44ecd7931356f1c80c26f5aa626cfe7217287f20de4272444d6f6c9933544ef9059a87e225993a1d7665 SHA512 838de8514d1d762b01aa00fd22ae92388eee5d853c68b1068c6a68d6f3cca07c2ad90a21e18031d6eb546c73cd22527b07e6d27671277204e4ba43fa6a6183b1
-DIST firefox-80.0-son.xpi 454741 BLAKE2B be472bc1ac9a93041ed496bf3370d0e463fbd01772475dc22119449c22fd7c92fd650602d1562fcff929f56ae6a1acc0e72d83cf191f586b7bcf54ae9b5962f5 SHA512 d48e7520e9476fa2ebd9d9c6e0a2e4eb995245aa0cf7ad7ce26096c066dd2ee34a9363bb26d76ff80e26132d4523bc9a88cfc16c4b2b860782b8b4ac1ab81e3c
-DIST firefox-80.0-sq.xpi 580371 BLAKE2B 40111f7d2f97dc86463570173719360efb56b3bf41835666e64bcbbd0a803ed42acfb33062c2f0ff9e5cdacf87adbf5d3f6d5cf36b59fc76fcc821751135f780 SHA512 04588be952b543a8eb4d8d72dd9916fb3da96063e47166719a55d68d6c4b146268c0fede237c5214872e8cc4e2c0b44db5f13ccffc0113812ba3bed87a820cea
-DIST firefox-80.0-sr.xpi 614419 BLAKE2B a1f35336a0f0bd6c1e07b5c0b92e1d3ac3b10a6cd030beaac9440ca5d9cd42103c21395bd848ae7529921d5fe8cabdb06505d94306c688657a52e75efed5e58b SHA512 e752524ba848f11966ced0929cd47819fc9254428db5878103154b938ed7c8bf0fdd7b4bfef989b9f5e225a419d79656cde2e89151e7d00b029cc09255f3b508
-DIST firefox-80.0-sv-SE.xpi 573275 BLAKE2B 1d56192539141d8add3c0bc229d0b34e5d3c614ad55d5c29b40d392d55a231e67a4ca35f9b3e9cfb7eec7128f7e59f98800242914d2328cdd6feac2774d648b5 SHA512 eae9eff9525d80bb925452f1918fdd457cea447b1813c0744f09ab25094da599ba35aca8b61e6e4adb3e05cd9d24c12491c7e2cb3a414084e337e2550c2177a7
-DIST firefox-80.0-ta.xpi 574122 BLAKE2B 5a52c3787a8a7de48c7882bc5c9277c512eb371392be9a68520932f249e4497c64bb4c2747d3e698d607596adad1db3876088dbab9091117a54ecda88cdf5aa8 SHA512 a2f7b169c91eff2817cf3a577921a64b3aa26631e7815ce85d7e20d62873f6cf3d02cfd4751f90f983eafddd1aba851f24b0a5ce48e3d84a85ad09f62201eac6
-DIST firefox-80.0-te.xpi 612693 BLAKE2B 5093647a76f0106cefb5546168904fdf6be65cbb48308595377acb3bb8eec206d094ea3cd7f5f7833a47e3210a1bde41cae618152874646e749fb7cb2bd5716e SHA512 c8d85743853d9af641a3d8005f07306a8efe0dc31ead67205d683ae675ebe4600f3f5d0758baaffaf7f94f56f0a68fbc9742af016fdb9a5093450ac29ad03484
-DIST firefox-80.0-th.xpi 639190 BLAKE2B 77498bc8ec6529d0c858f604c5aff7777a3e322a1be7761735e9609863cac6a87b3f5e02d77d68cf36db14ba65fa3df651821a1ced9c0b5a0855792b8420616d SHA512 b5b2e1d6ef8ad75e4011868e48c062fac021fa92352263eebf37bf9dd9191eb39266e90647475de36384f53ebc4ef1a2faf7fff9d5cb510bbba07b57257efea2
-DIST firefox-80.0-tr.xpi 584787 BLAKE2B 09baa88c0af63f9f48b25403ec3f26b0832340abe5d8473cab0f95bda6ab23231ebf45edec010ff55bbe1792797fb7ac7a1211a56e8808474ca74e98f20be910 SHA512 95c4dc8f43c31c69e6691fa1e8f083439889e0b87c1c9642fe26509e4873f211b8819602369907b46198e366818c78e2685af6fb154e851a3c49f015ca5ef9ff
-DIST firefox-80.0-uk.xpi 659566 BLAKE2B 7835e456e2b1a51b800bf279516fe262d67b7260e3b8b5e9cdc9fae7c9411a7221e2db40059730d642e802005fb4ffe0e96d60dc04eec339e631438650acff8d SHA512 164bf2671721c452caa8b9724baf91af03fc861932f73ceaeac607b7ff5df1ee34fea0570ac04d89b9a134b85b5d3780ca7961eb5abc26941cc5120f65303489
-DIST firefox-80.0-ur.xpi 615500 BLAKE2B 7ac991d2813edffc7fff72d3072b43e643e7814288c02f54055d0c4587234136c26f0bdc3e539d0b9ea9c3a27c0aa6193322444ba0eda3b5fee85499357cef78 SHA512 ecc0ce2f772bc5e221b7dd7b5a58a9d5a9c240ef92101f148bb479c37272c71e68092ed8a8ccaa23d9cad6f81e6d35665e3d7aacc9ec090b32e2cea2c1559a0f
-DIST firefox-80.0-uz.xpi 522708 BLAKE2B 32a5a0aa8c5604ac174db873003d1891ac6682b3b3ab877cfc94ddb112063a1ab2214b488f7b44845a6e8c505590608450a5be34aa37fe05f46a3ac4c03a48dc SHA512 9b54bddb8ae92eec2840d88b5686e60b810f1a6c7bad465b42e99a0cf56dd17f474e3736a697fb583ed74c5f8c95f422abc57f2768559cd7c8a0a9ec0c0269a3
-DIST firefox-80.0-vi.xpi 609535 BLAKE2B adb15635aa7b2c42a1de3e89f784383103832bb37cffcb6f7348411484d78f1625919da240f5c74bd9752e7fc6ab268db11ec9f49a0765aaa3ab6af57bbd20e9 SHA512 6594a2b3572d409bfbd9d5a4f542b9fbddbe3f56336b9394d2ecfc972c8019fb07178e05be4b21b6951dadee8a3784bce22a76d9c51053d0dba6324854bf8da2
-DIST firefox-80.0-xh.xpi 458348 BLAKE2B 983dd5aed7d16e331240873ed36c9b73d03354d2338b9480df83e3c31b011b4c38d3a1d713cafb12782b4c1b0ca4245620a9ee05fe3c7f0085327139ab42aed3 SHA512 b7ab801f1ff042da2d5e83fe6182a2c0f348df84e9dc95059adbc9e79c3df0b0f090a0fbcbf980f8bd24322712d47e644f377cc47aa2bafeb127c8cae1d1326d
-DIST firefox-80.0-zh-CN.xpi 611773 BLAKE2B 2094fbe9ceff378fbe0d0d071eedf3e73bc725276b02aff5c364017c408017a3ed49799c28fcc9c6a8f25f26970ef2899c0524f3f2b87d8376eae0aa852b31a2 SHA512 09248fa1df87505305e65da64997295b230a0c90f82b1b6b90bdb4fa8b1dbb2fc30e314368fbb0cc8f1ef6994f13d04a0a2fdabc4bd63558fee61311cd5841a0
-DIST firefox-80.0-zh-TW.xpi 611316 BLAKE2B 4d9c031cb520ff965d7bc22d389b94dd7d43e330e8253e2bcda344863539f1c6f39be4d1eaf343dab0506efa76e439add4d286c618f4f61ac4e180fa236f2078 SHA512 79a95419904e573d3d41f746e65182343b755bf926f5777138e7993959e430058c9bc40d0349b76c0e931f7fb8c1eba2f6c21a8d854e23a9c293e33a56956289
-DIST firefox-80.0.1-ach.xpi 504583 BLAKE2B d885d46f9eafa9e4c390318b4d01a9c3bd6ffe559c5a619fa7fddd8edd17599c61162499e7ef6b24a68e067ac1e5434e428519bb2dcec1d1b288ba22b7547be4 SHA512 ac19b518cc92f39e8fe16eb86f9c1a273db0f7ba4bf9ce001c41dac2b33400ebe3131ad5205009ffe96ff1e067212f7edc2f083f8cab29f8457af77efc299335
-DIST firefox-80.0.1-af.xpi 444291 BLAKE2B c71a2cc6c6e56855ced7a4a85dacdb11265bdde39e5e0f5337f35a031cec45487a71fdc1ad35530fdb71360a38dcc81dec789a54da41f653db5dc0bb36a34b31 SHA512 29bd2b91adf1976a7d9a40ee0db8a8fb17036bfa28a2ea2eaff2f17ea91cc3ac49b4bf99259315e3ed8e38cc229a68a1c68212e4c13fa851d6e94efa01a3e410
-DIST firefox-80.0.1-an.xpi 542426 BLAKE2B 7d9d8d305c9819d2840b29876aa4074971887904e172f3d5ebc090dfc5ebf5ca9d6e7cbca490fbe0c4e53eb41952732d047e235ed18a344315bd198566a92a3e SHA512 b6e490f206b4d20e6bc652b9daa24f78f1b4447e32ea77394b92e73ec0de6f21d30e22ca3ee87f2a95e437cdf7cab6a6a81307a8ec1451e69f761671cc03a5b0
-DIST firefox-80.0.1-ar.xpi 591816 BLAKE2B 4d8aceaa4e7e44394be8961a3515dc98dab892bf3ff15a3cc93d35501db33f8764a8579fbb6196ce85d68134f3cdead11549946e2f73a986d49731594c9e762b SHA512 412181e35fc61a871076867c00133670c4b04e199ac4bf0909923f850cc60825cf8411eb42a449c0d921b5702d2463a485826731b53b76302e06702c44ca7c8b
-DIST firefox-80.0.1-ast.xpi 502149 BLAKE2B 1e196ecdf387c4769f8a5000df918679b95d83d1d06306b60a7146d4b11328e6883baf85c6ea04023cafa4e50f67301f6276dcd4e70593a9149e3f06f25dedea SHA512 1dba93dec0eafd28b13ced483d098e57b77816d9a64f6fc7089516d1adc23c8834c672fa2ba52e53ce8b1599f55779c24fac0a54151f3cf84d3ebfd0265065ea
-DIST firefox-80.0.1-az.xpi 539349 BLAKE2B fbda6488399d8dc1e9f5d9dad3be9b6ba7d32bfd826a3ec28d6b0b020ca83505b2ef5121e36636ca837d3675d1aa7dffe57f3df3b85094d91e75b24339d599bd SHA512 7a044fc2cfc7e36f0e8407e804ce29deb6441c33e69e11458f010b614edc5f01bd4d03086eb4e81c2fce970878b16b294520e3c6309d1398552dc39d5adbc106
-DIST firefox-80.0.1-be.xpi 652311 BLAKE2B 14299f1248968272127d6562a85b049e0a4da11da7f8f30169e569fcee9a6c9ead73f807a4a216622d100005b9d7af5ad8279352e8c02e9c56aa2eef69111e6d SHA512 96a02f58e3a9604342cb0b755c6ae4bc35c8e48adecaf407566cf10bf2ef5ab7dd1c83951377cc21d631912811b25cff1ca40a1dff74271c29f71c7ab0b390f3
-DIST firefox-80.0.1-bg.xpi 614701 BLAKE2B 872d0bf0598f4f942278bee24d497c846e65e8ebf9217eaab0ca2a3fdcdac43a0cac71c044e86a8fb7671a5d3c6ce630ee674ff41e7c9738d3419090ffe79e92 SHA512 974fbe862f264b98a8045e306ef09817e739f8a1d6c092b60503f73d8667702df88a090abc4f492982ce11ff3b0e138a4c615bd400622a3901b63531155c1d64
-DIST firefox-80.0.1-bn.xpi 635296 BLAKE2B 4a08afd0d38908cea8040f872d9763e19466538229168fd7c75e993c3b2b8f8eaff0dfac5e7b6fda86c34abff7795f1a9af0b2cc71c9062168d6ac9faecfd7d2 SHA512 64bdd07e317c5aa04cec65fff262982aadd7aeabdfe7ae07068807e2bc6ff62042cc051d7422b7df5904a0e3ab32697f46f4ac6f9cfa118b19fc475de2373651
-DIST firefox-80.0.1-br.xpi 555844 BLAKE2B 480f327adf194a66dab2b4c5ecbd8f3d3dee3cce7b2b83710fa9628a584e062ec210f857caedb950209fe71524242a8efe9660daf209ff27110c9cd87e8ee5ee SHA512 9f199d06d38f4dee320bd818d3c0dd570faab221beeb4f8029b1ef4a69e385c8b7d58db7926ced1fbf65c8f20bf4406c1545dd4ba42cc2a1144d2aed6e8623b2
-DIST firefox-80.0.1-bs.xpi 513421 BLAKE2B f231f7007833bf3e1d874e7b7fd95e07c5c31c8a155b4017f8b00a34bc409944922b06f05e65753984ac5fdd18177a0c190a0c5396a9866b03fe45a24e670823 SHA512 c6e0ef8fcdaca6988ebbc8fa44ca1c32489c8c6667d0e30f560eef525a813789a0b6f5c721632909a936863f29320ea0054fbbdb41328a9594cc541f5fcd5d2a
-DIST firefox-80.0.1-ca.xpi 564258 BLAKE2B 547a8d2fb678dc8eb6198f761fa45df2538dd0d6584d7734c28267a30532158e7b37702c60033724e083ddad9727bb61fc8ac1b782e3b60af601838fe3dc9ed5 SHA512 26c71d36c773dcae5dbd42af3075722a40e7e763a9a00529837f8847dd59683d7404ab6bdf90543f8fadd1aac35658a93f143051cae1c12a36bbe1ba8a95578d
-DIST firefox-80.0.1-cak.xpi 589532 BLAKE2B be2d5d21657c1bffe4538130458715c1a36c709c6452ecba8894ac47cc3cccacbe23f62195221ceede8a89a96787f46db68308ed953fba3cc6c6f90e87d17451 SHA512 bd4299a8940c187b502555955c5fd7a52b52ea785bedacfbd115f2933c4c34a0a18425cd5bb5e0861abd986e125d83ff05d277c223863a6db1b6a8bedf8a8df9
-DIST firefox-80.0.1-cs.xpi 590314 BLAKE2B fa0a9d9d8544437b1513ed0b8fc07757e5ec34bae697dfdf15ab9b44aa262635b0d1a56877181f5ab3e5dd32ac22bee0195546b32ddbac02ecc5de716c5966ae SHA512 65b1b5824424017d3819e789a8951095c0cf7dba3f0671c501a5344f3a91cab6fe0cf0c3940685156b961489fa6b65b279f33a1cb4ae59328d00ee7e393d824d
-DIST firefox-80.0.1-cy.xpi 574272 BLAKE2B 3ab8d320bf2fd48f5825d24975ca1266d726f50181a61b5cec28bcfce96d8159c24da05da83d57187c2f46ef998d914ad4c3fea9f793b26dc12dd27530009468 SHA512 81400a51bcb20feba7300b2ec8143d788e8962284852a15b1702345b344aae62b1403c8ebf4a808d2a4ff55674284b827db8ba81d0c77928f701bd7cd6287812
-DIST firefox-80.0.1-da.xpi 564645 BLAKE2B 375f10fee6b2af1cddfd145fbc7616e8289a17c6273a509cfc8c42bd94c3dac161517c536cb94763ef317df9aaf34d195db6af8d4fa950f06060f2a5f51c707d SHA512 b1e8748883ab511f7023b52846b19633e17ed49d9d5e96cc0a1062dc5eb7f60094d39b542c947190eb07d2be00e87192615a4015cac5700565a7247dcfbe0fd6
-DIST firefox-80.0.1-de.xpi 588247 BLAKE2B ba6a54fabc42338259e01a658dec8e090cdc0bae1482ff1841ddd7499ae4cb2a10c83e4dd1ab33d0101762126f454a44e4b083142deff0a44d48c0c112a17902 SHA512 a23868386debc06a8f4c1dde2625bba796c59a9898bf560ddffbcff0035b84832faca828d3b507c63437372097a818b4b51dca51304131bc8f21694a6b54adeb
-DIST firefox-80.0.1-dsb.xpi 598372 BLAKE2B fff3b0e5f2c93e9cf12781742f6b00dd4347a2ab4ef5eec05e81ca14c470a658a27b22f1c6bd3d9956716a0e0f98f8c3b8e7dd5d0247162c16b38a4f3a33feaf SHA512 615ec77f46da620ec1d4ef9fc96bf8ef43edc4a3c1476737cbf2403d73220b9224316cc6924146ed5f9ac17e40e0f6a03b90053015be74c9fcba055b05e45a85
-DIST firefox-80.0.1-el.xpi 673926 BLAKE2B 8dd6b2a74c10f711fadde537242e6de9394513853639d3766a2f88b2eb6e9bc06e195389b0813424254a9409abac80a574abdd48f2164bdad6d1544dbc57fcc5 SHA512 3ea62e7ba20503446f7231d594d84b6d81380d0614c38ba0a1a1f9f873a5860feeba791b7bcad626064bd2194b86492be182ec94fdbcb53a4cbad7650d7003c1
-DIST firefox-80.0.1-en-CA.xpi 541479 BLAKE2B cc38108b9165fced8ca6e04aa794f9ae6226b9ed7ea645650ee066e4f2054c84ab9ba386c89ecd71783ee21f837c06def205b7fc780a9273cfd8fa9843515903 SHA512 0122922c50c2254ac7d64361552d5c5c10c3492f97525857bb00f64d99ea9681f00143f8d7a521dd05ea26b6b3450bf2b8a0a9c98aea1d7535321798375f085e
-DIST firefox-80.0.1-en-GB.xpi 539266 BLAKE2B f90521d2352332c006041ed22b1d180a74c504cc1a61a9a6dde4b76e77fbc5cc9750152d409835349f508f04a2bebc39f491313a5bf770af785ada0251766e8a SHA512 4eaaeabe1a86165700c78f160d379e14df40330b17fa83c89b63fdddd65f39ea18104b9684b582357bb946dec6fdc224511874ef7167fcb9c8f5f8dbbdec2cbe
-DIST firefox-80.0.1-eo.xpi 566633 BLAKE2B fe5e6bbee2e655cfc05487809f07f532b548b43751d649ca24a1a5b285101d366c82770b3dc729364f6b11c9b805881df39e153f5c7492f17e2a1e25c876d521 SHA512 e6df7e49d3f2a85311883cca891eceaacd96a6ca8e37a4d800cabb0da846b576379a3ed1824fb35a27794696527dd421571a3982d4a6008033c41cc4ced4733a
-DIST firefox-80.0.1-es-AR.xpi 579597 BLAKE2B 3fc4229892c3faceee2e303e94cd14601f0c6132bed513e2f2b9e57b05fbbf7ac48521fc56af4048330e526d9d6b3fa506caaa54b8837f92a5c2f3c3df890b6f SHA512 202b95ccdebe79cffa5c7b911829ee819170f2ee5ea1f9a86cb11c81b392c2481c8ce6dd75a87efb7451e80bde0faeea51d2130efe863cfea10afd882ccf8632
-DIST firefox-80.0.1-es-CL.xpi 577631 BLAKE2B 8e44e19d6be3356d9a7f0d561ad07adf148b27fd57aa5f07d9f0512c2e3ffa2fe36a4f8634ab3aa4a84c6e90b8936d1a69e4e62b01adeac5a0d70171db1e6c1b SHA512 9902c486aa1950ebbca5800732da224f4d0a6c212d5a439158830d2b49d3a0cb199d336e112c5393dc28b585e5ea459d24d0628691b8f44b6e852ab3529a5ca3
-DIST firefox-80.0.1-es-ES.xpi 562989 BLAKE2B cab474e30600e0e3a8950544febf8ee3cdc8a3ed06a2dfd5d0489ecf9b6a1b742fe27933d5dc7eeae5ac2b7ee0430ebfd85cfbb0721acc33863f22eb1e8ec90d SHA512 dd895d61f68998630196c1b67827b6391faf9aa67692496ff457cdb609ecea22472598fff3a8efd969e1f7bf6917e6e87bb230cf9ea2d14dbdab033c2202020b
-DIST firefox-80.0.1-es-MX.xpi 575053 BLAKE2B 21c9ae4af67530b975a018607c1d83f12ff670a06f5f13afff4bbc79a2ef397624f6329939fbb516ba150a78c1080fa29b8443480162c0c213d5034bce916961 SHA512 c7d1750afa49e066bf991a36307f46c5207204eb1899faa52cdf9a148566270ad98fa4e392292805b7fbbc2847d7990a91fd6b5d759d18ba4d4feaac9614b089
-DIST firefox-80.0.1-et.xpi 537589 BLAKE2B 591615c642322acfc71d4c082d70977ffe5bef875dfa5423451cd6b15bebca9f0f71c725f90474f7c86b77662779f802621dc7467e4210690ba7b0ab275b2fc1 SHA512 aa1b000d1cda7c6386e433f58e818b526b4a00fb2c6cd52e314b9df73428d9b1727c36b563e8f74f3be95e269ddd683069ec977dc0418489fed262694afd5d9b
-DIST firefox-80.0.1-eu.xpi 558572 BLAKE2B 624888cb8367888a76d6d33c0ed9a72b7cbd903df5f50466c1c99af59456ab40327f630fabd16318bffab3f085f1518ab735dcc335162b3270f26774df22c382 SHA512 445129660e64aaeee890ed17817e07f1b81396e56c7825d42d820461d35431e063d52638a8e70628fc0ddcc3c95f70ce6c6147f73926cd13117d21c3e4400756
-DIST firefox-80.0.1-fa.xpi 597158 BLAKE2B 56cdef645e9ffa0985ee1d19d3a690a5e20748789272c01469609b9e557bfbcd8c765a5e894aef6e50408c5fae9b201285b326ad25b4f53096966d62c65ce198 SHA512 618edb84fe834b0a07d6f92e474a8daa6f6020131af4a650e67b53cb209dae073e41c7ecf3d3106a02c6a0a8d763ef1c7c115e3ffab8893c1fdf5c651c1c450b
-DIST firefox-80.0.1-ff.xpi 533516 BLAKE2B 04d8d9942fedf9036656aeb5e9a72122bfbb8849963b849e811b53fd20ec8f44f28bffe707f0321e3c75e102bdd88e7e83bbc46871bc76e29a5f28ef20dcb4a4 SHA512 9c88ea9c89335148ed8e4e7921c20362d1081aead5a4bf9cdf20bbfbb62de9b30e73ea4b5e7a7608617810cca02cca666293f18af2e27906c4b3663109258639
-DIST firefox-80.0.1-fi.xpi 564288 BLAKE2B 3064fd38df3fdd759679b946875b74e0095229c42772fd1669f495fed787dfb11b7bf6b7d8b7fc4bc4093c094699df7555d350d267badd1680078ab085baf567 SHA512 75cffb30b10e3a65bc1005bc07ad8d2bd2322a86979ba8076c181f4172ac24b50ef2705a50edf005baa55fbe43f20f9d3966d8efe626954a4de5cee9a4495c19
-DIST firefox-80.0.1-fr.xpi 588643 BLAKE2B c82dce22ffe0967cdb3634be383fa7be466d43593c52d5f9c8c632a41c4d59471023efe6bdfea48c7825bea7ef81e5205933ce264af66dde7052395323a0f4e1 SHA512 97c1d0630ebdda03e82bae7f05460ac01d259349168795893552e519c4cbbaee5e510c5873769a7689f65a3ea8a42e6b57e1803b6ed931efd8af4fb504744edf
-DIST firefox-80.0.1-fy-NL.xpi 573865 BLAKE2B ea8138bd570e2464526f612e9f16a83de673f4f48954f0052950ec907ac83a9e837f3351ef91dcc6f04d4b48f5f7d581086a1d2aae310de6281a8a4bef81bcc2 SHA512 7b3c109910b9430bbc5e03903af418eab74e7f6dfd190ae896814c724bcdf77717561e5afacb871280789952a4fc13f6b9358ce39ebe47f1a105ee717e4e8f55
-DIST firefox-80.0.1-ga-IE.xpi 516236 BLAKE2B 0d81cc6ece708e073c25b514451f7f555f6d24f8bcf91862e28df88881267896fb0f39a62f6281b1440cb78ce151716f460efc74d3349001ef1567f7bbcc65ee SHA512 65e5b043cdad51329c4895ab6fe8e80cf29afad58ffca585a77d827ca70f03259c86c3383e260438a47e993af93fcd05198a102dff2efe0e47d1b836c7af6e25
-DIST firefox-80.0.1-gd.xpi 546276 BLAKE2B 0031948453692579fc83cccf78ce642820fcfc7626b8063ee443bb2c45d0c41cf99521af45d4e41adce736ba65be08e4113afade05ee9cb15c900e653890c883 SHA512 017bffbc2748785a83c3068d472e53d4ca6aec335b1aaba2b25371172353463657c87a4f255e892282373c6499a38d154790a0a9db146637f71839bc2a3e6311
-DIST firefox-80.0.1-gl.xpi 510190 BLAKE2B c43f142183f552a622709a4bbebbe6c70fe5717de979713095bd5a284787a3fedef5ad361a2212bd4e269ae36ea3d9fc05503d0531041e6b20ab15c4e7ef274e SHA512 8bdef6d9a9dc93291103ecf086e54a2f1b5c825b5b16a799ed7e289c27e40afa33203cbdc06737410010bd5d63395f56762967474f19029d3fd448ce3bf01bec
-DIST firefox-80.0.1-gn.xpi 590791 BLAKE2B 1ddbce705dbe7d8376dc85572cddc622aa5b3bc0fa7558bdf4a3ed6460b4778a4917f586bf7ac9d2685dbbd807cc175331bdfe47e45d35fba4b6cc9eb1ea9ad2 SHA512 7b0ba306f99c4b1b184d691a8dbc850d3dc6163f98c0a06b702396bb4779a97fa766ead27da314e4a0e77e8bcfb62c99bac08c9f4d6c7e69479f3d4db43454e1
-DIST firefox-80.0.1-gu-IN.xpi 604461 BLAKE2B 20af1b1f004c2ca8e2fe0c253e79d2c0b74ac063d447040d5681e73f87a9eab87b30c0e6f3872ea7b3a66bd4a0ca5655dcb2de890ee6d815b395262f71676bc1 SHA512 f6ed907d915b5247becc4bdde4c0162ead1e23bb09503bf97e18f7308fe54d22436f0166618b1456ee586d72fc7fa30ed787910a21c0443881d379710e42d969
-DIST firefox-80.0.1-he.xpi 592098 BLAKE2B c68b749791ebde80692f2de63da6ce4da9a1f42025bb9d8db468c2980ff0c0a8e37d11c3cd56d0066d4aa7e95cf89ece27ecec90c68d4c7bcdf709b19266058a SHA512 35c343af1655da469a40841f47b2d55be613593ea6dc7d919e8a92cbe0397c5c6846964788f4b5352947daa804c6fa33f5d18445c10188715de9a74ed53f4027
-DIST firefox-80.0.1-hi-IN.xpi 625903 BLAKE2B 58eee14246b5bd011dd5d8b80f6e550062091c11a6ac9bd68a2e0440fd976fad9be85d1fb48dda4cf84ee77ebff5a2ae0647a976098c828154fb986f7f94d782 SHA512 910c22111eddc6cba2089876ae726b580c6883d7fdbef6cce12b41977abb8aab69447a262aa748c35de77476eb015141ead769925d1d06a10fc671290d0db493
-DIST firefox-80.0.1-hr.xpi 570021 BLAKE2B 08bbee83abbfa45bfbccb6665cee2c28c9725e0a47cda940575a552fec7d08b26161d878731ae36c3f2d6973329d342920a7e65bafc48bf6fb5fe587cff0ee8d SHA512 2be01411f887388770afc99efdc2fd77ca02327d51c8f4d1a717f13f0dbc147ba7fc39a56a686512cbf4cbef3d4b6a5ad85c0d03c878eb5b44386c47fe15eb8b
-DIST firefox-80.0.1-hsb.xpi 595914 BLAKE2B f755c918266cdf4e052729deba5d5a325878489438eeed30523eb6e3c7896df07c33172286e8313e7e4f4c6045187e6b5a615d1f7deba4a38daa63b49745a9dd SHA512 4084e9a4c65e57d6efc16d1f7927772ac6fa87c7c136ed4f7a82fa19db76d236ab06e08eec234612702d42e32968fd1699836b314c2ff7770f8cd84db209dbc5
-DIST firefox-80.0.1-hu.xpi 600741 BLAKE2B ffd3bbcbca34377f2ec0d9ef7ff183a4fd62bd99e53317806f1419b6859804b3b9d7926cf09cff7bd6e1ce2f621c307cf0142aad68cde00c1d1800e4fe6d9888 SHA512 066da2326aefcaa07433083230debc48689be0aa82701111e9b7dfc2ac45724047029a0332401d66cab53b90bba243839f28014f773cea442a5e25ea8b387e23
-DIST firefox-80.0.1-hy-AM.xpi 651784 BLAKE2B 874cd0c9c62087d131382b1be57a30536ec45e5c58886fb79ba1315dd6bf8fce68330b2046cf0d16c6e7e4390e46f6fe1e7a6dd62e6ca32007dbe58a7129f3a9 SHA512 7689b2fdccd31f057c69ef02ec2ff925cdbf02fdde70e929879ef4ce426458b51ad5576ce99af58b2aa250e1c497c333d21648effe254e8310a666cc07564718
-DIST firefox-80.0.1-ia.xpi 565290 BLAKE2B 75e6b194b15b16cf46339c48ea24775bc5dd113170a0aba9078446a9b40c4dc208f9f81045bb4ba8928d2d0f1319b6620235e2b228fa9b923b405ce93f993b81 SHA512 d14576bf7bd9c686e3e5cd9fb1b0477f95db0cc02040e00b66939e494743779ba705eeb01e1f8a6730b079e9c6a1aa40f5bc6874f3c708c2d4a0614f15fdb13c
-DIST firefox-80.0.1-id.xpi 558440 BLAKE2B 5fc4cd0ff0b7a4338be2de63a5ef45febc6a0fd203e5a4c50a622b4b6a3c82d2e244bcc80460dac87ee8049310f5dd83ef9b1be4cd9f1c27902640e5a52f26e0 SHA512 d7606b3422e6cba126dab8ebe68d3d4fc77c93eafddc118191a7dad474dafa402907388bb269f9a6654a44be06aa61f72698e893b608e944afa8ed524b2e5605
-DIST firefox-80.0.1-is.xpi 529509 BLAKE2B 8b96219b2cd711d13b23cdd1f3d3d59ae603dabcfcab31eb98961f0482b61e930ebcf074a008fed654fe958b94dc0861c8521b0094c282cbfdb4c5282efa90c1 SHA512 5fa2a46a70ad0b88ba40a495ae9c1687aef359fdab8f721185352b124f15c755af8fa0ee6fff3abb5dc79daa5b560fc12e671438280b03a5e1523460409d5a30
-DIST firefox-80.0.1-it.xpi 463581 BLAKE2B 05c9459abdbc3808fb959cfffae271868b8aa1952fe3af48ec1481f032ddd53b1e3aaa62b28ff7b4ae44dc90e15b3aafa5900dd46f1473fcb6c2dcbf16cc6ba2 SHA512 a5d20ee02f37575457af1ed9a1ddd40cee0cc1b85dc6ce79e033550abafccc85f0f8436ef04f28683fee777e391644d10b812fdd308be5f967079b13eda19e92
-DIST firefox-80.0.1-ja.xpi 601243 BLAKE2B 404e4004234e9e81665dbfa6a2014ef8e3e8b72d1f143400c3fa097c7c3ad4e66f5d3cb84e1d846a104eb041c5a10884bd25a3218081402ab97ca91d65db0f13 SHA512 073f13c1ad5287adfd3602791547a544d6cbba24720e7d7ee205bd11fcca2a458d32370a41443a46732599b8286132787a7618ab18363b20adf39b9962afab55
-DIST firefox-80.0.1-ka.xpi 626403 BLAKE2B 63217d95585b900ad6a6e13d41067f394c4d2eea5f249745c4b82ca75fc440f1f3b521b50d7c47da3d2ff332cfd5df9327206a0176c0a224d08becb4391e2fe7 SHA512 b30c64ce4272816dc9d7d88f6e0e1a6bd45b85eac63823182a85b6eb176219c74ab024394b7016961dab4516af1973de845085d1bdc5ce8c4c76e8cba4ac3bca
-DIST firefox-80.0.1-kab.xpi 583640 BLAKE2B 265db8138bff8e07f11963cda3f1b4ede8156f96bdea9709bf71fd518244f7f3be144df52e25f6ea2db7aac70fcbfafdbd1da0fcce42bce372438c456ac3dbf2 SHA512 e123117fc4dd8469e244de5f1714e2d4438413b2370dd6659e074fc6738ef558d8e0a566a028d8e87062fea8cbe153403fe4d231ead32cb7d4043ec6aad3384a
-DIST firefox-80.0.1-kk.xpi 649669 BLAKE2B 677335f9c33159810f6a73d4e0c080efd3d294e2c1bdcac8d5fec4bcfba61ddb504ca6943af83c8dc4d82ea86ab16df29eedffa326f712b1d7fa1c93da5c918e SHA512 20af3efbe6269624422f1ee7a9254528febef20c09c402152da9a86cc076fdc4fa51e730df7ef154edb1ffc048553675a3d2ad356c9e06a0e0e0107e7823a797
-DIST firefox-80.0.1-km.xpi 568463 BLAKE2B 9daa1e7bbe2ca082578b8cd9484b3574a9112f66300c198ed5c9cb6e40dfe4261ee6115c7207676646baecbe0fcb085e48cb6edbc7a6607aabb6b4e0009be7aa SHA512 b9e4c78612d2ce6d20c8628aa2fbfd0edae3e175852c14ed4489e72e0036a1627f3218425a72862b4bf2745b3299caf6e5306751fccd083211153e472dea2b45
-DIST firefox-80.0.1-kn.xpi 559704 BLAKE2B ea4c2031c7efc41556de3356e64270ae9a2f964e38f28f97138ecf26b146cc39b8a58ba2d90fca5c851139aefc443aa78921429f7a11d0e52d020efe6b80768d SHA512 526b88bfec9b1c33a120e7ec2f045d20e19704b48db87d84faeca5c8ee5ef56159e12601869b2d2233c293b599907f76333789a1d3c503ff6377a1c76caa5be5
-DIST firefox-80.0.1-ko.xpi 614390 BLAKE2B 56fd747d8eb0eb5da2b102a55e202c5d5c7f5cbfe38509ba26808240bde470d432878a3e689fe6afd67364556ca2768a3f096ec55cda5b64bade4400e037c325 SHA512 50f6484898aaf1a9bdd91eae4c5ffaf55c05a5b28aa4af825dcadc64ebe18db77ec97108648bebf87aa1273ba1855a0c2f405820643f98a31c604e7a6b04e942
-DIST firefox-80.0.1-lij.xpi 528971 BLAKE2B cbdd1aef2f7377915a7d8db05695d105c473eed6503f225b702539650488d80e61ed04abf165185802e8f661b6fda160c9cc733992b4d479809c35c641718077 SHA512 66feafb6d43fc5099083d25d8462850a575f2f43b4755e5c3e3bdcaf33c554f462a4df0b199a93486f3bf24950b0ed5415bb835df0520f5c7a62a81547ef30ee
-DIST firefox-80.0.1-lt.xpi 587840 BLAKE2B 5c51f5aa2c97e17f01ee6ab29bbbbb91afb312f2ad89c76bffe03762aaf2140ecd98bdad75333a975900dbf6759ff31f0738c5ab5aef42a1d6fc3af01492bea6 SHA512 5d38561dcb9312dc62dd4f06a7674b277d0be1317f9fb1b6e1eeaa889f0d0466a7c1ad529b2f8d58de65f51d5abd9829999f33db30fefe9a5a3b54014c60208f
-DIST firefox-80.0.1-lv.xpi 519818 BLAKE2B fe825a830cedb1b40b903be1a17031f0f52f8bb79005aedeba0691f54c6cdd02a315d0ba5d17da3abb2ef79aed52ee56828010fe0916a9c21466ca859b48a412 SHA512 789d712a7c399178f43e5c108e2727ee6be58b999df4248f2669d2837299da79d0cdd20f3dbdbccfc1656056573470633ed3f65fd1903e2e509b5645298e48ac
-DIST firefox-80.0.1-mk.xpi 482548 BLAKE2B 53d581e920ed2f790a7184f37b2bd2b4d312b45e629a8dc2753d21bae585cc2ad072e2773adcf5e96a38a669e8a04d1a5647395fcd00fed961f116fd34f06459 SHA512 a31bd6b70316f986b9c7edd3dc797103d49a193f180371dd875eb17391fe94b92103606cb06fba2378b8fe1329475c54b8296969496eaacd0f140e83038ec49d
-DIST firefox-80.0.1-mr.xpi 601274 BLAKE2B 7cf25f0a127183d79ba5bb1c4181cd0d5e799dbfc96d7dca1da2cedb7d1498a5068443df6acf2a6820c5281ad1378cc21d1fb27e734be968dc8a1980a8962ccb SHA512 4d9ccad61a868483ce700b28ace409c7907822c0c5bf261bf8f4497aecd685fc760226ebc5af08d8678a8a582ab59a282ecb73c595ffa62e404f39bf37f73c6d
-DIST firefox-80.0.1-ms.xpi 502900 BLAKE2B 904cdf465d8015a73584a98c97d4ed168f2bec898c02762a87a82f2cfc621d0d8bc25d6bdaacf0ee4803f43a3f1f0fb71655d0aef7990e0ac2b0581c3ce59253 SHA512 1c83be4e5c2b7267f8956a534596c31bedd9680539f5b93731c92c42012d987024dc1785fa647e9db9ef5554e5ea469e132906b4d41789e2d31d7539b0c698a6
-DIST firefox-80.0.1-my.xpi 557148 BLAKE2B fa611100ac7fffa5c5538493679aa7b6a257ab8300ad583928601ec8332e13f811bed34274b03a75a5ba84253dd54703dbad7f477fd82708b11fb951dfdd3ffe SHA512 bce7f873f4379d3ad12804894c0d52ef38f0f4addb43e556cc8370fbd8c5b2d8a5370a9007a6808192223d51aba6413d3596db8c262f22347d7d27d2027a41cd
-DIST firefox-80.0.1-nb-NO.xpi 559668 BLAKE2B 02bc6ca754b8402bc452789fe92f9042e9c3cb8cbd55831b9b89300765cfd92ab231aab452b2958444cc591e5b70da38a97c464d64fe9246f7f88afca463f070 SHA512 85cef35f5c975b313db2ff28c7b432957a96de41fd87fa727ed30363b72fea30926d4893d65d877b6a9f65c195ec4381cc56eceaf825afae9a95efabe8c612b5
-DIST firefox-80.0.1-nl.xpi 567581 BLAKE2B 10ed307f355c46ab738ff303b9ef7de255b22805dca76b6edb62b0831ebef44ab8d591b572e74c72483d0d2ebd02dad0e111d42529dc36ace894f5ac3e63caa8 SHA512 c83f5444ef5e10ea9f8578674bba1f1e957d93703177adb1abb13d191f202df184ec2e91ea15f559e9f350f5edd3e7ae61f0b79a3709ea9380f0c9902a8b9554
-DIST firefox-80.0.1-nn-NO.xpi 562491 BLAKE2B 06b2608a77a3f548433a504257c16abfe35634383ccc469568da9ecb28524dda1cbf4dfdfcb26812a5f43fb8d3930c422e6c77d68b4a326094f1dc2fea034ec8 SHA512 42a57f7927029864e682db3507dad6189d2518649b4520de0ffdbfb8f7ec687ce3df50630859832fb0ec2f3f0f45a5998e8cbce11999ff6b02d17276c3b1e026
-DIST firefox-80.0.1-oc.xpi 584239 BLAKE2B aae9400ba32879130cfc1b80b4d5a2a78fccf17e31d76e29ddb38d241f3adb5dcad3e36761d742560151f0916e6e897d9a31846262ac386d2802ea478a06262e SHA512 b78f228736a66e0f9378a80dfd41aa5c8bf33d80271f38ce65c41f956f7d8c06fa84e7089e3e14073966c60de6bab11dd1f0c3f9f3400f1448d792171d0f21d9
-DIST firefox-80.0.1-pa-IN.xpi 613847 BLAKE2B c8af3f2ca1d007225ccd274aff221f4a9006a9f451fa8ffcf949f8027ad82ba09e985127afb26a12bb02865d8d417a7320b2e1a537bd4d9322c5c31025921c43 SHA512 39080e2f2c4522b699cdbc4f118423e1a10d2f5ac2b18fd5e90af85cefdcb76d1ca04c31a8e1174e1b79773ebd76f0c10c08b61e328cf620f706af130b40e4b8
-DIST firefox-80.0.1-pl.xpi 588634 BLAKE2B d360327bf88a7ec2578759a7f42d015d4dad50324ca08c77bfadbe21c3524cc0e16842e3ad491a8774093f8bda8ebaece0704331871ee6dffb8dd827be32be66 SHA512 26264d3e7a26b4fd24d7e1fa36efe1989308a814a062033f9f45d6c4ed7ff2e32272eadf1382a14c04cdf83da961b6f6bfd0f5fb472bf86d2a8d2124fbfdb12d
-DIST firefox-80.0.1-pt-BR.xpi 569418 BLAKE2B e72d3bdf4bd3a9eb2c36f0adb0d623373d466cb2b2a8366fc8b85ffc8c5647a83e41d3585c108721d860b8b7c26fc127470025da634076b115ee88da4b9aa2ba SHA512 35610b0e440cf5b0ba2757eefeb4f02a1e50488e4be983c80bf09f7bf97e26b7a21143aac672277e33b784908b9f261b54fa3239f989d4130f5aa62a17da2ece
-DIST firefox-80.0.1-pt-PT.xpi 579182 BLAKE2B 798376fbe011db8102010f868127c914d0d1cc8b43dd7a860321dffac88e42140cfbf82aed048ab0b4d42d7ac7375196719930f1df72f94ef3e91dc5b857b81c SHA512 8f7681c7518299f0373db051be6ad5928148dd6b2c0032312683b114e524ef2ff8dc5501c17dbb02b7aeb5185c19d550eb8475a361006ceeb54299563fbbe87b
-DIST firefox-80.0.1-rm.xpi 566373 BLAKE2B 89d577b27425f5d11958d40b3d91005af652232d682d97fd471152e2189b6f6bebf82ebdb78f01bf22eb073dbd3c4c11f691cb0f39126b84e0df67ad4fc1d07d SHA512 0bce2deb89c88f7a65fc8690b9db5086d5d985075db69c3994f949158ac0cde7de7bba2814317ba42d60bf48d9e3f7723d7864dbabd9d9029f6f026efcd2af20
-DIST firefox-80.0.1-ro.xpi 586939 BLAKE2B e4cfb3cfd2e0c058709aa5da299725802c8297ead947715f2bd3f5e9f44ad3ed6f985721365d63f9a3876b4dae7b397c17f3ec5ec200a8f3ef1abd3038682236 SHA512 a5561578101ac24e94458b3b55e0386716b4d33da5427bc58385832bd49e033f7d4ff2c6887952e4e3004f21e4efcde6e672439c36ef7503c3099ab4730ec39f
-DIST firefox-80.0.1-ru.xpi 666218 BLAKE2B 8cfb67d44e0e9faf5d4c4ecb2a651ea89a5d75d8372360ea89663783bc0c759277b405867d53d7f5397ef31564e4bca502d2111ab5bae7b3ccd2b652cff15009 SHA512 3d425e8b742463548c97d9c268975fc58320708e17572d99adf1ed4a6f787bcdc6ad9b3722edbd2664eeae6a998dfced00b385d664749c0ce261871da987023e
-DIST firefox-80.0.1-si.xpi 534116 BLAKE2B 26f5fcc5514eddcea5666beaa8761720e833d0eddee23dba117d45eac921aa1a97ce31f9a3d70c27c30403639a88ad379d4bc63f2c21b049dd471a6980d8dab8 SHA512 4ad417d78c783a95c87bbf3deb05586a4accb204785c049c75a89f3b49bcfa1464319223e0a25cdf10c99028e5530937d199abbb5dfd87933eba1b086e60d67c
-DIST firefox-80.0.1-sk.xpi 587987 BLAKE2B a63ab967999d3acadc8f6cf6f84e4bebcecba5e94b3a89e0d0c169f36b36febd01d6ee17dd08700467dde01db780eafa3de9bd4fc3a1d8d05ea344bf6555e078 SHA512 6d2288823d4f2a254afea66b1ea8712d10f55d8b31793eb8bd29211a2ac68f31265f1e9de6ab0e20e2d60bc70584de7044a63b925bf77b9a91bf084a8e9a79e2
-DIST firefox-80.0.1-sl.xpi 569766 BLAKE2B e75cf413532d4745c52bc93dff95a7f5fcdbc695ea1752013f42cbca936a50f1f059c97ea42839e2df27414d9815863bb82500a7266659f52552ad7eb2588e72 SHA512 55e6bc7d0e3fef21b4a0f04080a87a441f6c5e064cc98cad0f43620b58a44ccd7279f7d2dd658cde1bcba760cf0883f69677161f098b2de4d190f783e1ea54ec
-DIST firefox-80.0.1-son.xpi 454608 BLAKE2B 97a9c1ab015fc47e42a6c3d0b5287fcbf0248282be45ce9818e74bb39ddda493afd2f876a18ecde61e6c804d7697baa861886081f37966a7d87d2d0c79b3df83 SHA512 c9ab1150312d4ab20f269a92d09d9fd9942382ba6aadc0d4d039c5c877b44151269314c52c5e026a0ee1005e8fcc0f2cc2972c42e8fc6863a25520e1b7f2681f
-DIST firefox-80.0.1-sq.xpi 580208 BLAKE2B 78b9c0dea75df234c4f0b6aad3c689c3e151571fc002d76946c31fd0c34392eab04ece2f4bf3aa270ff6d575c96de9178de56b40c4d5b0ce2191e8313da26717 SHA512 a9a1bfbfe224f5beec6157225b942067ebf1037349a644bfe2c2bf1b08e3c48346f620d68d70079ba309e2a6649b98dbbe3339f87d1c4a32af3ed7ac945be90e
-DIST firefox-80.0.1-sr.xpi 614268 BLAKE2B c71628dffd7c1e9c261979457dba2e33f8d3ef1b5793d9856f1eedec58322ee889418982623a197a747037e63ce1a77563b6503b045a81c7ad5a4b6ac6240349 SHA512 f87036a3c1dab96891618a940991c36302265ca7dcd2a4db387701b607ec91aca38e3f5ebd086c36b16b0326c0fdb9c03bb5b3cccf4f4d1281d9ecaca306b493
-DIST firefox-80.0.1-sv-SE.xpi 573128 BLAKE2B e29abcfd0d6726316d0eb19b3b1e97e9421f34157eb6428eb56c54fa4f7ec5edfb0af513fa2a3082cfb6aa96e0c6a84504f3f3536d8bf982e0cc011f0698edf1 SHA512 710d65786c8ed82fec8ea627e789deb6a065859c19eccbaecf9ce5012f58740b2781fbe7f2b5724dcd7be38db8f01721c7ea7d354a4409acf9b84d511bb6dc3d
-DIST firefox-80.0.1-ta.xpi 573981 BLAKE2B 379297acd4f411840c69b726e88ced981e781bb7c58460d59024b0b2b3a859c7a3226106b6e6b4411543360202a44cf1264a2957ccc5d28aecc37ed824fce5e2 SHA512 2b819f416ca0958a841977853f7179c6ed0f8377f4c6b8912cafe21179f3485ba84db48f49912d3730c31ae83ddcde84ef0e2695250f8067aeb5641677f7a2ef
-DIST firefox-80.0.1-te.xpi 612546 BLAKE2B c231b2923e2e160b37bd1b58adb63403f627729ebb8c632fc1e9a74a6022c781b576354e0e0228f386c784a70b9920f66a31b0893781c5d8d46b23fcb24a8a73 SHA512 d1302b4069a9cce98b1079f7167db9e6b80f094a33dde214bfb23ad3a19dd17f8d044e0dd0926f3570ec1d0bf19856457fb9cfe69e65cfcb162c66153ee619e8
-DIST firefox-80.0.1-th.xpi 639043 BLAKE2B 562417f922589f396a756a94606036ca460c4dd0ff2e27cd40163639f1f5c35debd2302e1c4f23d8df86d5a9b0a0e7bd0a6e79303d6b1d8e423639352b12ab46 SHA512 e051e224e9f7cb29f1a85aed2b0c4b73238c1ef01e3d7777ae47a71fbbe4f32402999a5fd918d3a486348621e48a28d21ea92b2af14f251107995e3f860a3f69
-DIST firefox-80.0.1-tr.xpi 584648 BLAKE2B a3f7c00083deb58d03179c6765083b70e70b0de472cfd600156d9c0e6a588e94a0c7d62b75dd6ada47b4f1bd2b25bff6b4b6073f167c25736033cbe5fb23b0cb SHA512 094c89edfad656766cfb03cd057dfa14bb93ecc61ae69ab7f7bdc654247f0daa08c35f1011667f7c3db27676ba92d973c1bf5b5ea4668995786f159cd428a13b
-DIST firefox-80.0.1-uk.xpi 659416 BLAKE2B 8f72b0c16dea0d6448a193c3064cb9aef5d6572055750de4f642e857702934bf21555f318f67d64665111012ce5ffacabb7e1a052d11e5059ac260fe120806ce SHA512 6e08758c438a8200b23a32c61929f9624cb208ff2501de66af5b4abc8e5c4c49507ebf0213d267803db5284724677b43d4eb662759fdf9970b3637def24c296d
-DIST firefox-80.0.1-ur.xpi 615360 BLAKE2B 0cc5e0080d42743f830bafc5606375ec624e722203586c7c6be3cbcbf50fdcdffcc9e7c14a9c78e24adaf3988b9969f987178bf839670ded7e495008435f0c82 SHA512 229ab1aa8f403250ced2d247d21f3e17b484420352a830a8bb7633228e4bac4712b5d2b8ee93c82da0974046afab104eb68cbea3d0dc03a8abef756e2c4138ab
-DIST firefox-80.0.1-uz.xpi 522574 BLAKE2B a7f23d146defbcd0b2450d3bc9f7ecbec013caa1c5f742e969ead1834a9056cefdf274837b11606a8fa590cd50437c41f32bef412dc9d14e991375b1a161cac0 SHA512 e163e411c3e3bd767144ece491ce31a422d6b30d1d457298a884fff695d011fa8450e9886c681c7a8541a704373c4cdeb73493d8e941a1e630ebb9918a43876e
-DIST firefox-80.0.1-vi.xpi 609394 BLAKE2B 080fcf58e2a1478ed2fda6aa2e19f39880534aae830a9ddc1ed892970e984d55dae5154004871b8c68d4ed46c5f709ccabcdbad8158f86a95f247398bb68cfc4 SHA512 5febff5088076d865fdeb389980472a054045d9a2b18bbd19dbff7c9bf6544934f4de87f1b7d09e8f43c8f3006df9f86823dde82e68d595474bb96ee430bf6bc
-DIST firefox-80.0.1-xh.xpi 458212 BLAKE2B 9f82a968b99bfaac375486e1f15a860433dcdda451ee8d46e80e7aeedfced39f0984f26142b46f318c6890ed917a1d92e6d44e5a084932160274167b718497d6 SHA512 454d7eb2bcdc5fda55c6376d77147e0f9e00f3b0b96c3b09521393e1a2516f97339533c35d08f456bc344a76ba72da42d99a0bae24c24f103eb9675967a23790
-DIST firefox-80.0.1-zh-CN.xpi 611635 BLAKE2B 3263f493ddc0ad7f5ae018f5dba479e9daa64ff9c119bb9e8aff13076ac55fc654519d78837c68beb89219848e134211d95c12be302b079e913ab58ff36a5ee2 SHA512 ab90e7c21368a78c3eda23325b138fd2da02be577856f4ebee59d1988a2b2799876bdbd8c54040c6c45ff45804a4659a52b276df6da1424dc2a48b295b3699db
-DIST firefox-80.0.1-zh-TW.xpi 611178 BLAKE2B e84b0defc7990b6c775a9ee9a5ba7dd54a60a41ca1e618d87b72c1033eb08a814de335a1d59b9aa84fff70d164f8755f2143b188128da5c84fd2eb4ea08b4b77 SHA512 253f80d60eb05d05d366642e2ebb78430b3b9acb36baa553b3cffa5a1d4773e1a422e770557a3ae791d7704ed22f5ded6713313886b696548bf49c91bfb7dfbf
 DIST firefox-81.0.1-ach.xpi 458702 BLAKE2B bc2bbb8174556aa91d8fe9149b5e7debedfbd8682207c62c8c1ca3ad86355bd522a2c08915094871ccb46c3c9b7a0a6dde4cc1a8dd296890176003a7eb349274 SHA512 04a2e8146fce327dfbe19a583c2d1ac45289a14dff7f29af17246d6bf8ae0c61363151cbea50da2a0ca06257c9b1ab4ef1b4d26086cea48b2121f059ca97d977
 DIST firefox-81.0.1-af.xpi 429009 BLAKE2B 529a751d6b4ff4e9e1c693cd3c409d199ba5db53f499200718f1dd17c726b4d45b9c4e9a2d4b0fa418afacfc4c2917dfec09f55e5b12db39353e0759b68a4101 SHA512 c704334d07496c5cb0fb7a9755bd53ecc9fcd447772f8d40ab1d601c5a8e7d9ef99a366f3dda287b4a0e11795b5b4b3e06e0da9cc5e09bdedab3ccb3979c32b4
 DIST firefox-81.0.1-an.xpi 506886 BLAKE2B 72b0b6d8aeabd3c0db9bdd3bd2e7015bc7245250c450a4844807c320228b3c3fd8423a0677c3b93f913e3acd2cc2d8752ab22a2fb78a5b8a62d4dc03e3e8edef SHA512 3da113ccdb5c219e1fa07b678056460687a2de57f783c5056e1572cbad0b2238fe1fbd5d36d463bebb1ec0ad2842bfd440a2995185e862ab51cb23ed5b1a8d3f
@@ -473,19 +196,10 @@ DIST firefox-81.0.1-vi.xpi 553764 BLAKE2B 5ce9ee4bac293989dd3841f429a13d4c6facba
 DIST firefox-81.0.1-xh.xpi 427852 BLAKE2B 74955a6277dde525b39e9e851ad71eec5ddf4a5809d42c09dcd5b097d36ed7d20a51e204d5f7b819c6c351a81670073f11c1517411b97d06c68b8f643222d3cd SHA512 cfa51a01577b5e06fca1784633b029333cb4fa3e53e6d2843131088d1dcfe1123c7d3ed2a54608d41fd57e4fc6924ef96a848be0e5982e557e101138d64d1e6d
 DIST firefox-81.0.1-zh-CN.xpi 554382 BLAKE2B d58a750a62ac62c3f9ffd9807e2294d6140651b4d0984ef60f768902ad3e220a8df4f5f3a62a0b5f6f669ad0bc3903b8b721121ab67a4ee19637f707a86df192 SHA512 0a19521bdaa79dcb6693c397f0a35aba38a93431f747df50a71550943ffa886ce77390de8a5e82b5404050717c749a8659e357dfb2a0e1178fd80e3978c06a02
 DIST firefox-81.0.1-zh-TW.xpi 554155 BLAKE2B 384f9b2aae9c6e15155b9cea2c8680fff3bab2b7118551b51a084e3def1d7b9c49c8c8ca990441a98dae9af1017ae3c4ab817815e9d19059f349b1d1e34aab6b SHA512 c68e1a34e2899f45d576351debac6135a46c304732ae2a1b2c02386caf52404cb10b3f5975e841299444fa92c8b1eed3aa726541bccba93a34b44c6f96dadf33
-DIST firefox-bin_i686-68.12.0.tar.bz2 66870424 BLAKE2B b74c6e2fff159c9e7cec135b8c7fb630b7d45dab57e5d5cf9d414bf55089c248f0b4921a9f8d27a37455e5c2daa6e008cbe03e2959def771266d91459869acdd SHA512 8b1e66019dd18a665c4fc6219747ed2e2f0f2070cffefdebe32b41118e60f235bdcbdb72ad5ecf58314c114bae8bdbe55399d7cfb9ad2493c47d0da2cfbe61b7
 DIST firefox-bin_i686-78.3.1.tar.bz2 72890635 BLAKE2B ea7bcabb4743838d3a4cc51d7f229995310e835b665dc5e2e99762ca19f10c39f42e4246e2e8ddd08730c641f005c27978353109ea5a00d9d00773506c157f65 SHA512 b112802b35e77e2f30772ae3042902f17156db1330be81dd8daff828ab732b5622ddc945c4c433c495412567fd8eaaaa71bc8e9709a95e30bb82c6d9e4a6bf56
-DIST firefox-bin_i686-80.0.1.tar.bz2 74198270 BLAKE2B 929794a2bd758094714b748b86f4e925065ee597e4b477170faf81aeaeb1faa044e9bcbc311b1b2611366767aca3dd724dca924dda4385cfe0a2368508758c8d SHA512 e97c1c038fb81f60fd6644e84b86438612534a2fb6f75bf2ca57e632ccdd2724eb2a23c9cdda079e764989f6e1f73bec38ef388bdc60d3d63bd89a15941a1f22
-DIST firefox-bin_i686-80.0.tar.bz2 74219981 BLAKE2B 5e80241249fd8a896551ed98e1c9a222320361dcd9073939bf4b5b9c60fbd5cd19db6315a960e0b0353ca7cb6efcbc50ae2463387685fe4094e63b12f08711d7 SHA512 ee32cef87f6e77927a21523031bbefbe8d8c69268aa0f26f24c0de685d7cf27b2cea920df7dd14eafd434e547a8e91c510ee71f947f64b605469963cdc7aec0f
 DIST firefox-bin_i686-81.0.1.tar.bz2 74187516 BLAKE2B 63d57847e44eb2408d6285016a34ea29fd688bda2cf06f0106db6acce54043fb955709fc48a4232dfe43fadb1a11fe4daaf3ded124b8022d3f73d24d0721466a SHA512 5a204caa39a2ecff2a89ad836b5e211471dd2cd060892d33e02340c5ff8052a2fb68f36b608903dc12157b330b1f1e53dc7461d80e69e3ed994464f125f1d6e5
-DIST firefox-bin_x86_64-68.12.0.tar.bz2 64977721 BLAKE2B eb81a553d1fd7af816c6ccd1f20026d75242d8ed33b048bb93ca5ec6fe4aadece6be632e601988922aebc9cd0ceb11d6a93a5c42b5dc0fe4067242d7aa5310e5 SHA512 d71d18a430c3deda64533d7330974c90355bd25fda774b4267dabeb5ce54d6a9056f236abfbe99eb66ed0290eda5e45a6772110e7d283593fd66e950fc8f2277
 DIST firefox-bin_x86_64-78.3.1.tar.bz2 70807953 BLAKE2B 4feeaabc53d9a5320b3b648e4f42a26c09045e5ea4ac7fdb318c258f3d5dfe316fba7f455a7bf42a6de46118c80ba4cd38e2b42fc1e37a01de32396e6ac91629 SHA512 46ea65a1fdb617115c91642b27a666fa5ac2e1c009c14871cb97515332d63b212f54e9f20ff6129830a06fa24954af80736a8efc5a7045398f20f3d9a0355834
-DIST firefox-bin_x86_64-80.0.1.tar.bz2 71970631 BLAKE2B f8b6325cb37e5ef690cdec8c3dbbfacc023c180a4e2f01a821a31e0f78cdd3a4092393742899a3968e476383c08cfa845864cd35421b17630db884feb2802f87 SHA512 fa4a799318a35b0131656076f4392e75281e604f0b6f37eee4f24ca5a9222ba0be7f95ea568cfc70f355216188f654aa35a443b3fd5e0fa42dfd3f8177a87bfc
-DIST firefox-bin_x86_64-80.0.tar.bz2 71857570 BLAKE2B 640b69735ec96362319764dee9ddf006804c45726b75ab8d21a12b20280ea891eb2223b5ab061c3b1d169d25a462f0d6f71d035dbfd2259cda426d7cbd5e2a34 SHA512 4aedb5e117328630a1a266d757a0f2822335db2a1fa86a5177433a81d8f500f5f24eaff39ac219a7ee843f48136be7e5f32920b4ba7f9b203fd77bc91d03fe9a
 DIST firefox-bin_x86_64-81.0.1.tar.bz2 72172407 BLAKE2B 8faa59a3510d488010338e42c79403a8eda3fda9d2b36f797beb51aeae238ad16718b990ae88ee55a63130d808a4261e814b98983fc83e676695f1201bee8bfe SHA512 4996947bf74bdf0ac183476d81baa386ad2cf9d22ad00b2107c3d5aea8a94343abed0c1282b5d4c1e190c0bd76b4d49c98e54abd383d6195145ad9814cffd4bc
-EBUILD firefox-bin-68.12.0.ebuild 8012 BLAKE2B d435f66a1983ff08caae936de02671753af778d3fc0c5e3f844b4c0c167fd9491cc132069057c7d4fbc81ab69846166b70a6652e6fb48cea5fa22d1caa729438 SHA512 f50e3192eaee35c5b6cfb16bce21b8483920b59553f39dafb706cdaae59c94797cd677849f78c8636b397275928a3c4e57f0c81da35cc4e4e612d2dccb5e18d4
-EBUILD firefox-bin-78.3.1-r1.ebuild 11141 BLAKE2B cf358263eefbef899f5828b79d9024bcec4d9905ff044abd17e7ed0e0e9623b7622129a23933f496718a759302c260a08fef30790f55d9e7f4429f8a8915d76b SHA512 54f0d5828361139fb901e3cd241d7504581c78ec6925928687189e3a568f44f360a76832c98d8b29401a63e6972f7166ac04e6723d5871caec20059dc6455c36
-EBUILD firefox-bin-80.0.1.ebuild 8717 BLAKE2B 549c54d7eedb6932ce95cde7684860031df344bd9cba43c7dd7b2541af68abd555ab78e9732355723d6743cdb6310a046c53b50e7c77de9880604c8692924dd6 SHA512 198e0b25a58c217d4f57e411979bb449ee2e0d158583c46fc296daa3437ee7150e950536c8c67414a2129cfa561f13189de110bd8e0b5466ddd2e1fa19a64b03
-EBUILD firefox-bin-80.0.ebuild 8717 BLAKE2B 549c54d7eedb6932ce95cde7684860031df344bd9cba43c7dd7b2541af68abd555ab78e9732355723d6743cdb6310a046c53b50e7c77de9880604c8692924dd6 SHA512 198e0b25a58c217d4f57e411979bb449ee2e0d158583c46fc296daa3437ee7150e950536c8c67414a2129cfa561f13189de110bd8e0b5466ddd2e1fa19a64b03
-EBUILD firefox-bin-81.0.1-r1.ebuild 11135 BLAKE2B a24e47e9a0177818480c51efa1a5aff8173305ed6d581d85fad2d0b6e198e63f39f448233ed9ea8344b2a00bdcb7c53a29e96ced1e98b82ebd882a438879b27f SHA512 a49a873622581bcb06acd5aded85a6f6e4c5170963d98c84d1fc9eb8b0d521b1f53b558c34d38f1c74a961abcd039c83a8b1875b64f067e81a6519ee983ef481
+EBUILD firefox-bin-78.3.1-r1.ebuild 11156 BLAKE2B 55cb8c56fd6ac1c0ed989a9b2ea83af40ed250044262a59864887b4a071097ea687d04a052fbc41eaff4b476ea043421aab14e46f0a8a76289ad197222e204a5 SHA512 c6f29faeaab427bb314dcbd3eaca58aba5f6e5f4c99912c9ad6665de16a884b0688be41aacd612597222650b6dae3331f44452691e065a27da1118c761be5e3a
+EBUILD firefox-bin-81.0.1-r1.ebuild 11150 BLAKE2B d5a37be5a0aeb2800bdf719c98230e5dce4230a1ec422aa3107acf9c5406300acb78a6978492c95a8f15a491d136d190b95d7080619485548652e9a463e02cf9 SHA512 230fdda2bb4514c70f327b5c145e9505889e675ef38a4975d7c0e8959eea51b23c355b4c9faee3e9a6906b5c612ec9334a3f2a61768476468b9178c55b7c917d
 MISC metadata.xml 646 BLAKE2B 1613a04e4308fe3c98902492bedf2c2393dccda3f97e3d16799192b5654e6be60637829677d4e40c0e12809dab9824e94938e43888db54ec1a5ed8cce1b7c4fe SHA512 e1082edd739fe90ff92945c81636a581a8af70fb507512ee62e222c48cd8e5840a97ca2fc390385ba90addad0a1c5a1b2574fc88416481f61ca1066d4a9d86e6
diff --git a/www-client/firefox-bin/files/10firefox-bin b/www-client/firefox-bin/files/10firefox-bin
deleted file mode 100644
index 6e0709edaf53..000000000000
--- a/www-client/firefox-bin/files/10firefox-bin
+++ /dev/null
@@ -1 +0,0 @@
-SEARCH_DIRS_MASK="/opt/firefox"
diff --git a/www-client/firefox-bin/files/all-gentoo-3.js b/www-client/firefox-bin/files/all-gentoo-3.js
deleted file mode 100644
index 867bf5e59a46..000000000000
--- a/www-client/firefox-bin/files/all-gentoo-3.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Ensure preference can't be changed by users
-lockPref("app.update.auto", false);
-lockPref("app.update.enabled", false);
-
-// Allow user to change based on needs
-defaultPref("browser.display.use_system_colors", true);
-defaultPref("spellchecker.dictionary_path", "/usr/share/myspell");
-defaultPref("browser.shell.checkDefaultBrowser", false);
-defaultPref("intl.locale.requested", "");
-
-// Preferences that should be reset every session
-pref("browser.EULA.override", true);
-
-// We believe in user choice - disable DNS-over-HTTPS by default
-defaultPref("network.trr.mode", 5);
-
-// Normandy web service allows upstream to push changes
-// like changed default preferences or even add-ons to users
-// without the need to re-release a new version. Because this
-// happens without any user prompt we believe this should be
-// disabled by default.
-defaultPref("app.normandy.enabled", false);
diff --git a/www-client/firefox-bin/files/firefox-bin-r1.desktop b/www-client/firefox-bin/files/firefox-bin-r1.desktop
deleted file mode 100644
index a000dffda124..000000000000
--- a/www-client/firefox-bin/files/firefox-bin-r1.desktop
+++ /dev/null
@@ -1,230 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=@NAME@
-GenericName=Web Browser
-Comment=Browse the Web
-Exec=@EXEC@ %u
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=application/pdf;application/vnd.mozilla.xul+xml;application/xhtml+xml;text/html;text/mml;text/xml;x-scheme-handler/ftp;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=@STARTUP_NOTIFY@
-Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
-Actions=new-window;new-private-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Name[ach]=Dirica manyen
-Name[af]=Nuwe venster
-Name[an]=Nueva finestra
-Name[ar]=نافذة جديدة
-Name[as]=নতুন উইন্ডো
-Name[ast]=Ventana nueva
-Name[az]=Yeni Pəncərə
-Name[be]=Новае акно
-Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
-Name[br]=Prenestr nevez
-Name[brx]=गोदान उइन्ड'(N)
-Name[bs]=Novi prozor
-Name[ca]=Finestra nova
-Name[cak]=K'ak'a' tzuwäch
-Name[cs]=Nové okno
-Name[cy]=Ffenestr Newydd
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[dsb]=Nowe wokno
-Name[el]=Νέο παράθυρο
-Name[en_GB]=New Window
-Name[en_US]=New Window
-Name[en_ZA]=New Window
-Name[eo]=Nova fenestro
-Name[es_AR]=Nueva ventana
-Name[es_CL]=Nueva ventana
-Name[es_ES]=Nueva ventana
-Name[es_MX]=Nueva ventana
-Name[et]=Uus aken
-Name[eu]=Leiho berria
-Name[fa]=پنجره جدید‌
-Name[ff]=Henorde Hesere
-Name[fi]=Uusi ikkuna
-Name[fr]=Nouvelle fenêtre
-Name[fy_NL]=Nij finster
-Name[ga_IE]=Fuinneog Nua
-Name[gd]=Uinneag ùr
-Name[gl]=Nova xanela
-Name[gn]=Ovetã pyahu
-Name[gu_IN]=નવી વિન્ડો
-Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
-Name[hr]=Novi prozor
-Name[hsb]=Nowe wokno
-Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
-Name[id]=Jendela Baru
-Name[is]=Nýr gluggi
-Name[it]=Nuova finestra
-Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
-Name[ka]=ახალი ფანჯარა
-Name[kk]=Жаңа терезе
-Name[km]=បង្អួច​​​ថ្មី
-Name[kn]=ಹೊಸ ಕಿಟಕಿ
-Name[ko]=새 창
-Name[kok]=नवें जनेल
-Name[ks]=نئئ وِنڈو
-Name[lij]=Neuvo barcon
-Name[lo]=ຫນ້າຕ່າງໃຫມ່
-Name[lt]=Naujas langas
-Name[ltg]=Jauns lūgs
-Name[lv]=Jauns logs
-Name[mai]=नव विंडो
-Name[mk]=Нов прозорец
-Name[ml]=പുതിയ ജാലകം
-Name[mr]=नवीन पटल
-Name[ms]=Tetingkap Baru
-Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
-Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
-Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
-Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
-Name[rm]=Nova fanestra
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sat]=नावा विंडो (N)
-Name[si]=නව කවුළුවක්
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[son]=Zanfun taaga
-Name[sq]=Dritare e Re
-Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
-Name[ta]=புதிய சாளரம்
-Name[te]=కొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni pencere
-Name[tsz]=Eraatarakua jimpani
-Name[uk]=Нове вікно
-Name[ur]=نیا دریچہ
-Name[uz]=Yangi oyna
-Name[vi]=Cửa sổ mới
-Name[wo]=Palanteer bu bees
-Name[xh]=Ifestile entsha
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=@EXEC@ --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Name[ach]=Dirica manyen me mung
-Name[af]=Nuwe privaatvenster
-Name[an]=Nueva finestra privada
-Name[ar]=نافذة خاصة جديدة
-Name[as]=নতুন ব্যক্তিগত উইন্ডো
-Name[ast]=Ventana privada nueva
-Name[az]=Yeni Məxfi Pəncərə
-Name[be]=Новае акно адасаблення
-Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr merdeiñ prevez nevez
-Name[brx]=गोदान प्राइभेट उइन्ड'
-Name[bs]=Novi privatni prozor
-Name[ca]=Finestra privada nova
-Name[cak]=K'ak'a' ichinan tzuwäch
-Name[cs]=Nové anonymní okno
-Name[cy]=Ffenestr Breifat Newydd
-Name[da]=Nyt privat vindue
-Name[de]=Neues privates Fenster
-Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
-Name[en_GB]=New Private Window
-Name[en_US]=New Private Window
-Name[en_ZA]=New Private Window
-Name[eo]=Nova privata fenestro
-Name[es_AR]=Nueva ventana privada
-Name[es_CL]=Nueva ventana privada
-Name[es_ES]=Nueva ventana privada
-Name[es_MX]=Nueva ventana privada
-Name[et]=Uus privaatne aken
-Name[eu]=Leiho pribatu berria
-Name[fa]=پنجره ناشناس جدید
-Name[ff]=Henorde Suturo Hesere
-Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[fy_NL]=Nij priveefinster
-Name[ga_IE]=Fuinneog Nua Phríobháideach
-Name[gd]=Uinneag phrìobhaideach ùr
-Name[gl]=Nova xanela privada
-Name[gn]=Ovetã ñemi pyahu
-Name[gu_IN]=નવી ખાનગી વિન્ડો
-Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
-Name[hr]=Novi privatni prozor
-Name[hsb]=Nowe priwatne wokno
-Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
-Name[id]=Jendela Mode Pribadi Baru
-Name[is]=Nýr huliðsgluggi
-Name[it]=Nuova finestra anonima
-Name[ja]=新しいプライベートウィンドウ
-Name[ja_JP-mac]=新規プライベートウインドウ
-Name[ka]=ახალი პირადი ფანჯარა
-Name[kk]=Жаңа жекелік терезе
-Name[km]=បង្អួច​ឯកជន​ថ្មី
-Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
-Name[ko]=새 사생활 보호 모드
-Name[kok]=नवो खाजगी विंडो
-Name[ks]=نْو پرایوٹ وینڈو&amp;
-Name[lij]=Neuvo barcon privou
-Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
-Name[lt]=Naujas privataus naršymo langas
-Name[ltg]=Jauns privatais lūgs
-Name[lv]=Jauns privātais logs
-Name[mai]=नया निज विंडो (W)
-Name[mk]=Нов приватен прозорец
-Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
-Name[mr]=नवीन वैयक्तिक पटल
-Name[ms]=Tetingkap Persendirian Baharu
-Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
-Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
-Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
-Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
-Name[rm]=Nova fanestra privata
-Name[ro]=Fereastră privată nouă
-Name[ru]=Новое приватное окно
-Name[sat]=नावा निजेराक् विंडो (W )
-Name[si]=නව පුද්ගලික කවුළුව (W)
-Name[sk]=Nové okno v režime Súkromné prehliadanie
-Name[sl]=Novo zasebno okno
-Name[son]=Sutura zanfun taaga
-Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватан прозор
-Name[sv_SE]=Nytt privat fönster
-Name[ta]=புதிய தனிப்பட்ட சாளரம்
-Name[te]=కొత్త ఆంతరంగిక విండో
-Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tr]=Yeni gizli pencere
-Name[tsz]=Juchiiti eraatarakua jimpani
-Name[uk]=Приватне вікно
-Name[ur]=نیا نجی دریچہ
-Name[uz]=Yangi maxfiy oyna
-Name[vi]=Cửa sổ riêng tư mới
-Name[wo]=Panlanteeru biir bu bees
-Name[xh]=Ifestile yangasese entsha
-Name[zh_CN]=新建隐私浏览窗口
-Name[zh_TW]=新增隱私視窗
-Exec=@EXEC@ --private-window %u
diff --git a/www-client/firefox-bin/files/local-settings.js b/www-client/firefox-bin/files/local-settings.js
deleted file mode 100644
index 9dac3b0eae0a..000000000000
--- a/www-client/firefox-bin/files/local-settings.js
+++ /dev/null
@@ -1,2 +0,0 @@
-pref("general.config.filename", "all-gentoo.js");
-pref("general.config.obscure_value", 0); // use this to disable the byte-shift
diff --git a/www-client/firefox-bin/firefox-bin-68.12.0.ebuild b/www-client/firefox-bin/firefox-bin-68.12.0.ebuild
deleted file mode 100644
index c02d55a75e8e..000000000000
--- a/www-client/firefox-bin/firefox-bin-68.12.0.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
-he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit mozlinguas-v2 nsplugins pax-utils xdg-utils eapi7-ver
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
-
-DEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-			media-sound/apulse
-		)
-	)"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	local MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED%/}"${MOZILLA_FIVE_HOME} || die
-	cd "${WORKDIR}" || die
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" \
-		MOZ_INSTALL_L10N_XPIFILE="1" \
-		mozlinguas_src_install
-
-	# Disable built-in auto-update because we update firefox-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-3.js all-gentoo.js
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox (bin)"
-
-	local apulselib=
-	if use alsa && ! use pulseaudio; then
-		apulselib="${EPREFIX%/}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED%/}"${MOZILLA_FIVE_HOME}/libxul.so || die
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
-
-	# Add StartupNotify=true bug 237317
-	local startup_notify="false"
-	if use startup-notification ; then
-		startup_notify="true"
-	fi
-
-	local display_protocols="auto X11" 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="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-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="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command='firefox-bin'
-				;;
-		esac
-
-		newmenu "${FILESDIR}/${PN}-r1.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm -f "${ED%/}"/usr/bin/firefox-bin || die
-	newbin "${FILESDIR}"/firefox-bin.sh firefox-bin
-
-	local wrapper
-	for wrapper in \
-		"${ED%/}"/usr/bin/firefox-bin \
-		"${ED%/}"/usr/bin/firefox-bin-x11 \
-		"${ED%/}"/usr/bin/firefox-bin-wayland \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" || die
-	done
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN}
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
-
-	local show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 68.6.0-r1 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-				break
-			fi
-		done
-	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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild
index d95da6f4e1ac..2c98494ac154 100644
--- a/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild
@@ -186,9 +186,9 @@ src_install() {
 	popd &>/dev/null || die
 
 	pax-mark m \
-		"${MOZILLA_FIVE_HOME}"/firefox \
-		"${MOZILLA_FIVE_HOME}"/firefox-bin \
-		"${MOZILLA_FIVE_HOME}"/plugin-container
+		"${ED}${MOZILLA_FIVE_HOME}"/firefox \
+		"${ED}${MOZILLA_FIVE_HOME}"/firefox-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
 
 	# Patch alsa support
 	local apulselib=
diff --git a/www-client/firefox-bin/firefox-bin-80.0.1.ebuild b/www-client/firefox-bin/firefox-bin-80.0.1.ebuild
deleted file mode 100644
index bef5c486f6e8..000000000000
--- a/www-client/firefox-bin/firefox-bin-80.0.1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=0
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
-he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit mozlinguas-v2 nsplugins pax-utils xdg-utils eapi7-ver
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
-
-DEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-			media-sound/apulse
-		)
-	)"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	local MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED%/}"${MOZILLA_FIVE_HOME} || die
-	cd "${WORKDIR}" || die
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" \
-		MOZ_INSTALL_L10N_XPIFILE="1" \
-		mozlinguas_src_install
-
-	# Disable built-in auto-update because we update firefox-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-3.js all-gentoo.js
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox (bin)"
-
-	local apulselib=
-	if use alsa && ! use pulseaudio; then
-		apulselib="${EPREFIX%/}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED%/}"${MOZILLA_FIVE_HOME}/libxul.so || die
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
-
-	# Add StartupNotify=true bug 237317
-	local startup_notify="false"
-	if use startup-notification ; then
-		startup_notify="true"
-	fi
-
-	local display_protocols="auto X11" 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="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-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="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command='firefox-bin'
-				;;
-		esac
-
-		newmenu "${FILESDIR}/${PN}-r1.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm -f "${ED%/}"/usr/bin/firefox-bin || die
-	newbin "${FILESDIR}"/firefox-bin.sh firefox-bin
-
-	local wrapper
-	for wrapper in \
-		"${ED%/}"/usr/bin/firefox-bin \
-		"${ED%/}"/usr/bin/firefox-bin-x11 \
-		"${ED%/}"/usr/bin/firefox-bin-wayland \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" || die
-	done
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN}
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	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-r1 ; 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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-80.0.ebuild b/www-client/firefox-bin/firefox-bin-80.0.ebuild
deleted file mode 100644
index bef5c486f6e8..000000000000
--- a/www-client/firefox-bin/firefox-bin-80.0.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=0
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
-he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit mozlinguas-v2 nsplugins pax-utils xdg-utils eapi7-ver
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
-
-DEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-			media-sound/apulse
-		)
-	)"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	local MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED%/}"${MOZILLA_FIVE_HOME} || die
-	cd "${WORKDIR}" || die
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" \
-		MOZ_INSTALL_L10N_XPIFILE="1" \
-		mozlinguas_src_install
-
-	# Disable built-in auto-update because we update firefox-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-3.js all-gentoo.js
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox (bin)"
-
-	local apulselib=
-	if use alsa && ! use pulseaudio; then
-		apulselib="${EPREFIX%/}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED%/}"${MOZILLA_FIVE_HOME}/libxul.so || die
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
-
-	# Add StartupNotify=true bug 237317
-	local startup_notify="false"
-	if use startup-notification ; then
-		startup_notify="true"
-	fi
-
-	local display_protocols="auto X11" 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="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-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="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command='firefox-bin'
-				;;
-		esac
-
-		newmenu "${FILESDIR}/${PN}-r1.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm -f "${ED%/}"/usr/bin/firefox-bin || die
-	newbin "${FILESDIR}"/firefox-bin.sh firefox-bin
-
-	local wrapper
-	for wrapper in \
-		"${ED%/}"/usr/bin/firefox-bin \
-		"${ED%/}"/usr/bin/firefox-bin-x11 \
-		"${ED%/}"/usr/bin/firefox-bin-wayland \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" || die
-	done
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN}
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	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-r1 ; 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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild
index 6f6355a74f05..55910de3e933 100644
--- a/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild
@@ -186,9 +186,9 @@ src_install() {
 	popd &>/dev/null || die
 
 	pax-mark m \
-		"${MOZILLA_FIVE_HOME}"/firefox \
-		"${MOZILLA_FIVE_HOME}"/firefox-bin \
-		"${MOZILLA_FIVE_HOME}"/plugin-container
+		"${ED}${MOZILLA_FIVE_HOME}"/firefox \
+		"${ED}${MOZILLA_FIVE_HOME}"/firefox-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
 
 	# Patch alsa support
 	local apulselib=
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b177e7e5bf20..b320e321415e 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,105 +3,9 @@ AUX firefox-wayland.sh 110 BLAKE2B 60875713743e7a65b0c5a7649b8a016dc5005b7236403
 AUX firefox-x11.sh 104 BLAKE2B 8d374235286fac0cfd113f851b0f48e9b23685f6890c6a959e4a071c6c2a58fd274aa7a88c750496420ce6918c06825d2c03cb159638db6567e3d773f3168cf7 SHA512 59cae56b34507f463c4480a7335ea25070beb450e3c93d3adcb782e070cb558544f05c7a784419d48f33cbdca7ed7b2c740c361da8ea081d0323677ffcef79ef
 AUX firefox.sh 3103 BLAKE2B 43066a1aa148d2162f7c6ac422dd6983d7c4504ff09271da2ccd22adab9f834b5343e7970271ca995e2a85c17455988cac0d6235cfab40eff033ac29d33efb08 SHA512 7d443dc42bae690d22437be1cd025d8b21c7d31debdde1995495e6cab8ceb94ab0bcd63513ed5f68fefd2e1991db414c7134bb621f3079772e60e4ac9876903c
 AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8ea8110d9417ea1f7efd5307568a3e099acf921ec5abad64b36075d716fa5892f4e5600f32bbad9e36a0a1c45 SHA512 5a55cd2ae13ce6ef01646c0a6188a3fd81e1eab0e547b2ba292eb42094aff0f5d5ee383686131bfed845d1e4b34bc1bd11e145e65eb151f0e342a1d49e0c688c
-AUX gentoo-default-prefs.js-3 978 BLAKE2B 54af7c32832dccc407b09402e0f549e717e60d26f61bd0cb1bb4f5afb8ccd752f501fc194639bb81f88c732d813460fae19586e33b4dfcbc32262a58f0fde71a SHA512 ae96b9cdb8bbe3d47d8fab0386d1d1c3e8286b227cbd3590b3deb15f319d3779b052526866174231c730a4bf9eca82d10bc7e5d5bc626695b1271c5498906c27
 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
-DIST firefox-68.12.0esr-af.xpi 450297 BLAKE2B 80791e09eb4ac3545193f68a2f8f5f7483d64a15c3f454d20bc91467e5eef06cd4e6cb936ad1a0b26de019bc5405ee16bb3aa82c142918d4c89ddc4502c507a5 SHA512 d0cf908cc8bdcd02cbbe59b652c6ce9de43441a1bd80d6103dd3d7defd8f60696e72dd1b0e3825df187dae859cfd4a3d62c365b33f704b58fa0a6465ee9b6178
-DIST firefox-68.12.0esr-an.xpi 482748 BLAKE2B 207d425d09ec9cf43fdd0bde38bc675a3b8c70e6e2b086b51845c73a63baa77c492f2fe824fd832ca70752f5de4f83970d794f91a0c260d3c54fd34e720e70f3 SHA512 156a9aee6306448b364cf12c45b203cc1b633d8a439fe65ea24532fc8c12b4f5ddb8ac77161cb446c30db5732227857b10725311387ee35051e44c7dd457376d
-DIST firefox-68.12.0esr-ar.xpi 538835 BLAKE2B bae640259de19cbe09e9f2082a13566f5282bbf4387e7acdaa15ee256d533a69d247d6785e1e79b78df2bf2a585c21cdab1e41a97f5092b3cbbd734079042641 SHA512 3a6f82c192a040a1ae5cea18604d716edd90832c011488a9d2971480c864c8b91374ee6759205c46fd8fcdb982074ac4cdf1c65e5dca6ce450d6815811c478da
-DIST firefox-68.12.0esr-ast.xpi 480468 BLAKE2B c29625808ddc53b754f5df19aecf8c562125e1239b35d80c41fda3c666bd51c4228d16461394bab21b5abc2d2a916af8bc7c4c5d1a433dfb8f6d0a04c13d11f0 SHA512 8b415e73abf395230fb06370efc09dd4df005ae71bde76d19744c91d17e34f3ad552c48e6452c80407fbb8ffd7422a9ec843621a859fcd4571ac9c64aff12312
-DIST firefox-68.12.0esr-az.xpi 510015 BLAKE2B 50bbc1f62b740edfdf658bc6ef0231ee94e238fc5372b022e14682cc9b641ee7c87c0fffbcd60bece8aa3fd0d12eba1e5d145db13369208db55a9ea93f4a54d8 SHA512 fc2b1823980d93365b371fdc9b6b3420fb024b24066eb85325a2639799d55366e188f0a1fd0d92fbaa9e580e836d9b13d535aa04511bf8887df68590f416369c
-DIST firefox-68.12.0esr-be.xpi 581916 BLAKE2B b96f6e5e6bac87dbd014632889445cbcb570b98b9eaf5387edd2dfc28a365ceaad04954d92b39463b2f422561af891787d426457503b701c04ca9efa67418262 SHA512 29fa74aa02435a618488a712370692178ca99a2ab0b10dc9357df7b5bcdb0aaa767abb71e75dbd4f449f0d6eac08081716d2ab4ef27ec5b2d22bb0f95cdf49f7
-DIST firefox-68.12.0esr-bg.xpi 545024 BLAKE2B 4d8d56892ade0a5bda902f4a3803fcde934fa921c624bb17f20418dac4a54a44568334d52a921f56785bca92b66a22667662679a3d55b63f7dfdea71968d4163 SHA512 6deb6df5e096e568c4d4352b85b642d807acabe92f4bc806dcfb38a00d37b51502583b3c742dd523bf12407d8138ade857ed5dd0f5366d6b70917ba2d46cc1e0
-DIST firefox-68.12.0esr-bn.xpi 566405 BLAKE2B c8a38040f14d960ff6982af401b17847f1a6f7c3919b178086d63958189cdc8fd7839fb65a88b7fb28be8092e14ec0213cc5d8a20801e57476e544a041bb6d43 SHA512 de079a47e49456abb15cf8a7525c044c741cd4f7bde2162e82158b3ea787430d3eda9c6fe352a7c693714d9b68500a788c2eef96c5035582ae3b98ae41f9bbb6
-DIST firefox-68.12.0esr-br.xpi 501491 BLAKE2B 64a826fe9952e4c2aad80f15c1e9ff7e4f5ad18752457be282eb2ad8f0dd8038881a84c846b71827c9c96033018fa9326a667c07596ce790b6d3896182b73a1f SHA512 0f6c26b51b6eefe6b73fcbf306fa50de27c3b9e805b2da30dfc4aa7ec91aae49d7e75fe2acbc1e9659d9c3bee42c8eafea6f51f4c1565d4f6580593dc3303ed4
-DIST firefox-68.12.0esr-bs.xpi 482788 BLAKE2B 082106537cef6fb0dd6cb06745d566dc28041d7a408bc61564376843611cae5b094164d5885ca2b3b229a065e0786d52b47db36bef6ae62565f8962a0643fa02 SHA512 cdbb270b460f2e8a6d0d1ed9e5fdbc3050b0f3bcc0ebf99c842328658586d3ab544801f59aafbf76c7b3fb553d0ecd79dac2b3a2d9b59618a3488d19fd7ddfdd
-DIST firefox-68.12.0esr-ca.xpi 499738 BLAKE2B ec399608d729eab2bff4fd8064a67484864adac1aa1b9a95bccac7c66a11a9b09a91fb8da2186a3a7cda6361561167e28040cb513f3981ea0f2ef0e3db8eb177 SHA512 c0db28f83a6e9e45edb6e45f5b43b1750636fa168064e360d044348059450198edb50cecfd11cbea286bcdba429523c0da22ff785dbef237c14bd9d53acf257b
-DIST firefox-68.12.0esr-cak.xpi 527178 BLAKE2B f294ffccdc3f32105a82d4011c4bc625d728aee5b3853a63c7772fc635ce6b1595ecd761f5a3df837898d758b1154c4ebab06a239aa7c1bb6f19e5dc928e4459 SHA512 503ebba0afb2ca2d95db04b631d188f45a4c6127c836eeeef452c2f7a1fc3087913d0b279e71de697317515fae2ad0b30700767608eef03e6546331e4df67c80
-DIST firefox-68.12.0esr-cs.xpi 519721 BLAKE2B 99663880b6ef212f2bdc21f42acfc2be7aef069bb1fc419df676f1dda4e7325988ef0f92453535c2316357d9362afbff00f30302796ebef8e47362bdc9b25af8 SHA512 595824388881983a9d1d66dca262d661249a2a1f035f2b44d67a2b3299810645991b4380495b9767f3158df5f08a93d5f6e378e27f551b140178312666bab73a
-DIST firefox-68.12.0esr-cy.xpi 506946 BLAKE2B 377454b0b59e7d77ae55461034c82bf0a91b64bcb8a57d2c9704aed5156965442471df2d0948a0265609018e41650955a584c5a9a67ea988d5ff0ee3706cda27 SHA512 6b03d89506117a6789336f6c9bc69e84697bb9addaa4970362e6edc6f4643f04defc00fcf748d11b96560f91bd493e577d0496dabb6eb48805f1ff8586993b9b
-DIST firefox-68.12.0esr-da.xpi 520050 BLAKE2B 328decacae2ab33f81e05123591c4c5b4595c45b5f6e0f7f52e78a5b328d17f2c5a3c5118d29e2474027067888e023cd47d74fa720f3cbd58c55461b34638b33 SHA512 03308d4158ef1642bcef17542775f217b75dabb99e06104d5a42dff76c85be583913b3f160f0c53e79bf848aa682ff6e51d002dc61ab62774adc8f1fe575d19c
-DIST firefox-68.12.0esr-de.xpi 523520 BLAKE2B 54644aed20714b213166b87087165aeaf944fe443c73a2f7b75c8e72d48bee7986c5804b94c881f3e4024b4c7015987a7d31cde86fd5f70160ff555c4b493edd SHA512 6a8d083b3def572dfbaca2f94fbbbc3904079d39c2aa5bc02239cea04a6b80d573e0089ffa36c169faae274a57e2bbe2702a3e86e8d068dfe081345c241189b7
-DIST firefox-68.12.0esr-dsb.xpi 528447 BLAKE2B 591949429f630563d543b59a6274283988dd48627c6d2729b1bbe59c64798cf7faeb533641a912a30ad9970d0c5e4dc5eb4ba79e06898957aa7e526f7e779ddc SHA512 d07abcd45fce2ceee5d18c2a406a423a07f74b5876c13bc9a38e83fefaf9ababbff560f948b82584162422c3d65d47cb7017597ad577717b17c04bb06fa8cd02
-DIST firefox-68.12.0esr-el.xpi 597168 BLAKE2B 5e32c29e024779860d2165d7c7aee27967b2b60fa9975ee7138859ee8c1e789f542ebfbff84643440d36a6aabd10df17715890e7e03188e00338f2ada4cd47e2 SHA512 a89515e2eeddfa5da5fbe1a431f9411a503614e6c31b01fffc063c028afca70d09fe77c7146a4c547a25087ec6e1924180d88b81e51dde7010445380d61aa2fd
-DIST firefox-68.12.0esr-en-CA.xpi 478281 BLAKE2B 3efcfeaaf41c2e5e2e4ae29e799c62349b78bc245a975315936942bdeb2eb69137da9e12a38c50b14557b750cc2e44c2d6762d3faf78a4b3b5667fcbec445713 SHA512 cb1726dd7b8b541f28864059d2d92343ba4913c806abd6b76de3f5a9dafcb527fd9ef4bed2ca82e74cacfacbb8c5cff2d231bd48c050c062d4aeaae374911eae
-DIST firefox-68.12.0esr-en-GB.xpi 478066 BLAKE2B 06ebf402223a02763080c04cfda2a9d33d94897281e69e10bc73fe3c7b639193a107ab7cbbc517242b051ca9ae98f68804d6cf479965c787cc2ad3e29492e248 SHA512 ace57aa7dec99a6ba25fb2b9ad67fa2e036e28a1b1083c923aa24cb0550aebb7d6e1ee43496c1f7dc7b2cd7aa49662142ebf5f57e61c89bb0432a96c665720ca
-DIST firefox-68.12.0esr-eo.xpi 503985 BLAKE2B 2116a5f12d6a27869af936d4230cfe3d84ba8afed2295ae642833ca97ac3ead289ca24682f42db05f3f61a1943c2527792463d4651d6338eadf7e0b388ee3ec4 SHA512 ba9a78645a570ac9b24b4003dc2db80d030bcb9ee876668782ddc39eae12efe94eb39e229183d506562ae1789016e69a495decf67a8b6895cf06f19c3d26a257
-DIST firefox-68.12.0esr-es-AR.xpi 512288 BLAKE2B a5cc259134139cb86680a5ca16516825927fc63a19726864879dbd7c0a9b67688b51ea740133f1d48586b2a7c907b7190a1ad83c02362b5fa8c257b04b02d95c SHA512 856ca754396bc3e013d7e011e648f48355919d369783010a52fb8c4deef2da41b8b02683169fdea7e09f0cd0084186f3528c02d276b0b95a07858005fcccb595
-DIST firefox-68.12.0esr-es-CL.xpi 511651 BLAKE2B bdfd0e76bae5b5feddf4a2691b9cfd3feb57cb280c277713621bcefaa32c6764ef3fc0a3f04d9dd2f00818feb4a3bf1feae72076e44954ba5fa356243e03c9c0 SHA512 24846c164612580f3a7e67acb5555117808b4d54f4fc7ad12ad9daa5865ed40674be138dac317f14beb16b49c8771efcf4a902e541c5934281575699e8240391
-DIST firefox-68.12.0esr-es-ES.xpi 481269 BLAKE2B a4aed94265ab39173f5a40cf922619af84bd279b4cf117e57e3efbfbf06bc7ff5e182c007212b0aab7d3e2e3ff1c28cf80b53eef76737be2a9d5f47b0c3aa948 SHA512 d2dbc144f7ea3161897e9429f89774e0bf61109807251a585a98c68db0eef7890a5e50121b53f18d4ddf260f8b8c123340a8d4cd544c3eca3de2f4df11db93e2
-DIST firefox-68.12.0esr-es-MX.xpi 504492 BLAKE2B dd4d8ede7da43b1d17d606077c8c4f62a33561069a85ad876957fd79791ada42d1afa4120768ff9dcf1ad98535b17cd8cf9c1db3123324460365156a9e0ede22 SHA512 97c7fee40a61d212abbcfd86df024fff834d13dddd0bf0055afd0b55e697213865c77395db31bb995274f63c2b8028aa1d68b8672205aceedd70a44c3195b030
-DIST firefox-68.12.0esr-et.xpi 488300 BLAKE2B 0fcb72882f933cf30967a6ce9c5e2246846745e140fe77bf19aa7a50cc128082917dc017cc2c432b216a58545d1415d094750bf1a5c5c99895921fa2162fdb85 SHA512 c10e0c415ffcbef4e67f9581e3aa751a43a4cf4b56da92bfcaafb19406b626b114e11e301332591f460ee66200d2ca86a42f6a3dca546283c9ab0647873e6590
-DIST firefox-68.12.0esr-eu.xpi 502322 BLAKE2B c87ed3457c9841633a42efc7c5fa9701a23315347826bfcac5e28fc6ac0eb674f2c29cd76416359a73214de1c7dfa214bb46eaef741ecc797d3163038699a203 SHA512 8117ed319fa848346419df54417f363e08200c256d9bc90af6537266f81361386b3cd1d4d7903962f226cfe975cc00275ff5d014306182eff4ee33917d1e0975
-DIST firefox-68.12.0esr-fa.xpi 547568 BLAKE2B d92057b0a913a3b4cf136da98f0db3e41e972c2e87646fc5fd749f042b30b992ba7df04114c4e170f51b50ae7ea65b5b660f0f7ed0531145970df9d4f77127a5 SHA512 5d1fba7f8f68ef9acb8efa3686a3206c91ecf3d3bfb3d6259ae1d0bc313c4585733e070141916ec4158fed4df36d149695265b0f874dc4adb1a57dc88df12cf3
-DIST firefox-68.12.0esr-ff.xpi 483757 BLAKE2B 94b1d071f1338da3e3d59c66043867974619905b0905fc96ccbb9bc893f8fd158f8bff4287f503de34404d5244d402c391e604aee1a16d30139ce1496b0a5677 SHA512 da796c8ac7a27993e3411a370c891ae54daefde05a6debd596e98b7bbc5de00f22c7997a7a5e087e4803bbeaa8f33d6006a74e53de2625e74fb1259938c47fe1
-DIST firefox-68.12.0esr-fi.xpi 494110 BLAKE2B 833b8d593301691fbbcf6b083c4d91f35b907a4b641e5f95410070822ba5544dc842499d59dc14587b119f946858c1f8d354e2b6625ac984dcb974ebffcbda9f SHA512 aa24b5c37b8a4b3694a0bfdc2aa4f014926b303596867f4c7d5403e4692c653ac8c8d7882722d39e04035ae4dad089fee794d4d1a452d6d2baae2a89133f34ac
-DIST firefox-68.12.0esr-fr.xpi 522985 BLAKE2B b18a86d9a54c41713f62eb0038440c7d6a43cd36716abbe58ffd69ac2d5de959a2ec86958be5d014fc1b8499a228301fb846403c94cf1c142fb9164264b743ad SHA512 342e8ff8424d089d4eb88e2685d8c501306375579ca871f2c85c1756bce9d1d2ecfc8986414e03e3933fca806c5d08b7c402f8bb76167867cc021a6ff2d2e7a0
-DIST firefox-68.12.0esr-fy-NL.xpi 510193 BLAKE2B 9a04d2d831c55e8d053988e46ea78c1037364b9c2290851e78a79587bdeee07a700a8849dd65462bf0196e22217adc773f40b8bbd5f82cc1584e2eff4bdcbb0e SHA512 911d39828b52c56c58098754205e3177ab68c4b127a15d6a5b9b8998236d62718b183ee4fecd51f28c864b2fa938b9247a855ce026ef08db0c7ee0b11d36df40
-DIST firefox-68.12.0esr-ga-IE.xpi 489306 BLAKE2B 93e113f57f83bf9aceec21f7ebca5a9369cb7e2eb13d35cd2fff7032724c6ce3861cfab206dd308b1ceec338e1488cc792d6c0624895c8f0bd9f80f207fdc3c1 SHA512 06562e9026fa1fd28b0c6a9670cc25d739748a1f7f1cc2e28566d12423438b7bb8ee1d7e419c5bc953193abca6424aa8c7bae50822f466285e4cf17e1bd5851f
-DIST firefox-68.12.0esr-gd.xpi 506418 BLAKE2B 46b980226b899ae42290c8a30d26d4d014838ecce4a64ece3c05591b17c1113040172238a99b42a67bda8e6648908d9293024c5137cd40ccf256ea00c532ca8b SHA512 9c04dc5d7f340e22c7190e529afef93982a2212745b008140191092e100593e0683daee5c45c7e50ea65dc4c7d054f6cdddd3d47e1553400c84513476c6f7d0d
-DIST firefox-68.12.0esr-gl.xpi 483660 BLAKE2B 6673c3544b462c6b92808f9c9c24b0e61e53aa541fc43e449b7052be90a82f2e1d0191ee165dc1c5fb8066f662f900a211f9c3ab5be1f16ecd9ae497d83c44d1 SHA512 e63022cb836a34ea4caa9e30637ca48f8c92b9afe9cf504b4f9a73e608b8dab37ae9b4a95024351d4abe4d56b664546e06b7719ac810ff58ee36955403b35c01
-DIST firefox-68.12.0esr-gn.xpi 521830 BLAKE2B 61283adb8f27b4d152b3f454799eab30d00a6ba70ed1ec21ebffca01cb69098fa8d052482ca57de0bf13cf36f772575e89d99f4bdb0733ca49fdfac249244caa SHA512 b42a5e69310705ea6bb7e1f0b690087d96bb4bb7b18b37b7a61a0de23735c62e409f9ae98aa05f9e65484e8b09d5c24a2ee8168bb8bd06eb6cb4d90639ca4cca
-DIST firefox-68.12.0esr-gu-IN.xpi 571587 BLAKE2B be2ca5f882f4c686eda40826d28204b2752b3225fcd8d9c0f51a9d91fc1e23cee3b6977d32adc6c688f1f220c86557a2f0a15e33d97d984b4d5fa1ac9f41b44d SHA512 4df28e3d096899d3fe4f606b4e7567bab4c87dd2bff1249a2c21648374b50d21dc3a99fbe146dfeb70776faa9908f4befb9b16ed472e158e7da1af539dd0abbd
-DIST firefox-68.12.0esr-he.xpi 513843 BLAKE2B 8a8753aaca78fd60f7b455e2b6efa8cbfc44f5c678c37330ae4652d5e3f4f26d652e278db2ede6c3e9cfc7bf3e2b5fd9f28d63c83803e56b0146450d3592b651 SHA512 561796750d783f774bfb220fc51cc9a8efb876946cce7a5c83f7c6db52008e192a538556d79a2048f78b44329c610b53893c7591a24215e4fe8db7aec918e811
-DIST firefox-68.12.0esr-hi-IN.xpi 555193 BLAKE2B a43b16ad2d9401dfbf2a89bb53f6b8d91e608503eab0dda2fcc72153319669fffb819cc9e7cc4a03f27ee2817410d7f3caf5fe7ba4e576962d1bf528804ca179 SHA512 4ad1f84287368e453f5c79795ec595daafb2576ce757e4b8dfbdf7020e732ce3c9ef7b5474f855278dd586063f39609503e87d412a4bfef96a01c03ce0963c4e
-DIST firefox-68.12.0esr-hr.xpi 491111 BLAKE2B 7edc7ea4ebee6c50f2733a824ff607388b5d1d0b8e215acc1ec66a62580c21cc1386084eb30ce9c6e8bd32c9c9973b828e6a9980b22768dbd017177f5079ac5b SHA512 7ec8c4e5a24532d742ec0fa039d8f99ab0883d08dc52f84a9f35fa1307701d0d7e599fcf21495758cbb3334f20ef99a22ffb32961ddf3fc03b37d6e26c3e97b8
-DIST firefox-68.12.0esr-hsb.xpi 527753 BLAKE2B 882a4b082bf720d2360c4bfd5975e516ebeabd3d3d493b59b21aac2e192a8e37da7975238d49b81b0aff690fc89c5b0d1862e0f301b3e70f7149fb937ebafe30 SHA512 2a60da62d701ae824b55e7462ebe46b3ceda692fb64a8373a0a39cd82cac3d2ab40c701ae95d4d749cff1e15a119baf0fc9891a5ce39ca2170756fadc343f7dd
-DIST firefox-68.12.0esr-hu.xpi 526047 BLAKE2B d30b2a6c12366c3ce3296385ada80255deab384e1f9d41552c6cb60a19b944148360b9cf583c368380243b64a9a7a2828e892bc6ca4eebfea4564b9023b1d0d4 SHA512 2810a1d427cbbbe176555c71f9f4ada4358c5e6920b0da79abb590d5907220b9af54e9322f73154805ec7327002663bd6430a22b2106b262c077ec09af2f2759
-DIST firefox-68.12.0esr-hy-AM.xpi 542304 BLAKE2B 84b2aaccf4825b76af33adc77fcf1449da351e1fd1557c8006db0c086a64845491f82ddc323c8d68ad1b3a5af1934420008f88e1aae1035424a26f58fff9daa4 SHA512 076d886b09f598d7fbbc7f88f5678bcf91231cfba1dcbcc8268111870255a44abec3c538c249fc35996bc973a09dce125d2f115f640b824db9e2e8affbaa5b72
-DIST firefox-68.12.0esr-ia.xpi 496301 BLAKE2B b373b43926ecaaa75ccd9d9374ea19f07f68650af6c2980bcaaa9fd87073f7fc0c80155deaa06fa01fc687c009e97d7c7ad3f4be03124811212f9e546ae740a0 SHA512 8eddbc5ce30e007aecbbd12ed75dcbaf065cf9bc0ff9132c3ed8fafc19349f35d6005f73cac9d6fe84933a675ba967cadebc2008af536a74718a0e34482cab1c
-DIST firefox-68.12.0esr-id.xpi 491735 BLAKE2B c8ef951cc6ff13c68f0e10db5704b1c8797913a1d2f9087b2876633a66de7dc34b6e3f5f5186fd6407ac8068cac846411ac489e5e3ab5621ee018818d380db83 SHA512 e34192e5b35a15820e02ab325d37acd0fb4516859a976d4717ba02d6dc165d42170a987d53655a408c89808f1df66409394f605170b316a5c4b150ddecfc4601
-DIST firefox-68.12.0esr-is.xpi 499783 BLAKE2B d8c420714bb69678bd704e75418af8a73373c7b02b6b2998ac8401a1bcb6010b9cd47015f8012eda24163e96ec9b4e96f14298ae0a19dfd78f52fd8c364ea38a SHA512 58e57565976d85f38adbcfb8aa512c5e844a759dab0c70129957a37e52a5cac18ec3a9b503fc04b913b74b9df2829f8edaaa244d17c936bc459e4ad5716867ae
-DIST firefox-68.12.0esr-it.xpi 383621 BLAKE2B cd9ede2ecf7efc93b4506cc375c945cf6395c6fa733e52b77bfa7cafc77671f786b33590028092a06066ef98d3e0213df5c4b0c8632c03021011713e44c2c7a3 SHA512 3a737e3ee7ea06581545643fe06247a1dad6b0e899164b29f2c7da2321abe54ae9ced04e1ad7594a5a4229cbb06448305694161be02501ac62bebf2575cdcaeb
-DIST firefox-68.12.0esr-ja.xpi 536927 BLAKE2B 164db33aaac57421b243cb4dc0630f32cd5341eda4c1e0ebc17696c902768a5bafcefd2bd6a2c1e49bd26f34fafb17ef399efe7456ce3f8af4acacf8605d9bf0 SHA512 2912ef751ef877a941e634cf8b5364387519dd162b4f67f86a831c2d498c6dc29e7b0a9004e8581a6b296aea1e06ef4879461fe4bb8b4b29310cecfa159cdbe1
-DIST firefox-68.12.0esr-ka.xpi 544473 BLAKE2B ece42982d7b88037af745319038de6cb276b25ed706ef9c93d72e99ce133067bd8556221e8ea74d0e283a0f9bf8fca4fd9db1bd465e0c87e7f546f1d11f950d7 SHA512 2675dd8675f130c352d49b3c5780f8a1591a954b053b335fbbd0270682402c9aad016349eb8554807236444e666fa4004008497feda1678fc594dd77ee552ffa
-DIST firefox-68.12.0esr-kab.xpi 508430 BLAKE2B 0d947a9f5aea734c72c8ed0b0d99df13f78da55391e927675f6132387a3ebd3739e627ba64e08b497f73151426dc10e07964b47a05df04158458997ec23c2110 SHA512 10b54690cd3912e7001c5a17ede7593dd1ff5dbf69469c7b84167cc8d9f89d9ae27ca56f56f48bdf8af1722810634a1e9aab5becc3101acd3e7039062281ac94
-DIST firefox-68.12.0esr-kk.xpi 578769 BLAKE2B 107a7588fcef9d53cfb9a09647912c8d727975c7671aeea44ef9ff6b0bd1d14aa882717ec3e718e5f71f7e282b1c383403882142685694f30ded7ed8c524e88a SHA512 62e9db3ea499f49c9963e38ceb593b126764363398e8725377cc5950642a5642ae7de35bc0f56249e762b26b20bab02950bbf2c58b8e597be77b72cfff68e79d
-DIST firefox-68.12.0esr-km.xpi 551161 BLAKE2B d60aab13b73ed98770bbc7455536dc833e3dad0e278b3831089424c61b80f6dbdf87410b0ac52b4140cc1011d6d4352265202e5b18c234ddb54085886badcb33 SHA512 8d2a184a693e099937f0c148ddea3a16da0b67b3b7dbf803abf665b1cf9c57de653c9680fab46c3b9365076fd2622b1e207511a0d9470154347a962982f9d91a
-DIST firefox-68.12.0esr-kn.xpi 547378 BLAKE2B fe576cc7ab355f2bd5fe8d4b4ef808e8c7886a0170bef375d04f126fc785357a88cf24e1dec103034077c171dc13340df8336329427d77cd385b2e03e27c0b36 SHA512 83f94d33073397cdb0648867306bc78bebb45963e58fa2703be5793c9ba47e9f93591212c23f9d39b10a223acf0dbe1e4735b39e9893d58d83304955da5e00ba
-DIST firefox-68.12.0esr-ko.xpi 535778 BLAKE2B 73a6ae3ee99cf729afb84344e1fcbba1c6734a62938a4f94552de59120c215161fae0385b08cc66db1bf0a1c71e0e789640190becd7c17f7ca1018d3b28c884c SHA512 914d64ca700572e157f67f8592825342f54f75cf341896ff3f52644cbf24c9cfdeb80bf11e3660efa2bda718aedf9cd0ffbb3d5ab439e1a670fa84908ee444e1
-DIST firefox-68.12.0esr-lij.xpi 481750 BLAKE2B 2a39a2c3a7de583381c05b85f0241dc14fb5b0a66ac2411069fc376368b7394abbc7af4846941ef47a6c4c58775552e08b8f2cd7d4dae9a3fc0d1a903c144a23 SHA512 5b7429511f13f0a7b53ba826329fe096fe6c5cbec02c0a4e567fc7975fc68980b28c8e63d4dfe90edd968e1bb77c0870ea892accbdf8bb67711fac35a6bed7d3
-DIST firefox-68.12.0esr-lt.xpi 527440 BLAKE2B 20beae0d80dd31ff0abc28919ef37915670698057608ae52ea631fb5c0faedf0074e68a237b08de1181dc123422ccdd20257be24c6075eaa26b1b615dd51fe89 SHA512 dd3e96e92949d1e9a4713f1c104be6f3bd1c113278b893e428caa3e13a583519509287e13dea86729b15866f5e4fbaee73957a8046ec4a40120ab6f61f19373b
-DIST firefox-68.12.0esr-lv.xpi 500116 BLAKE2B d0a7fbb6b4b1a96e91d24887eba642ca4ac870e0485421b83829912fe8bdfee8501b35c5ff856fedecef542d76daaf89d1618b8bbcb0f6f1dd9a54a16a3ab45e SHA512 3291049ce64d13dce305963a8e99c69930dff198772e0aed5a620552c930ebfc0ff4b7d2592194fa378d8b227c16757c0b835d94dab836a18bfd9ca247164e9a
-DIST firefox-68.12.0esr-mk.xpi 484995 BLAKE2B 90cf0fbf7008f103c298b9d1446f9c9235d17e4862763c8da2602e50d5e012e082b94a02f80111f5bcd985983f19ac21e6ef3c000840fb833defd6f562aedd8a SHA512 93a8a3a68aeea9d1705675233aa0c46f1aed78c762509bd0843e6605188288e2a2e19e7c040d0a3e7d49965d957c61dcb45cdd7c6385c9ab8317671404c096cf
-DIST firefox-68.12.0esr-mr.xpi 558969 BLAKE2B 86a29f499cabfe1e98fa8acb10c7014df1b4409981fd1445746f03b04843c6f01609d969140e45778c5ea744bb307ce1806545406369a01bb768305a5c3eaf9b SHA512 606e68b1ed6a71243291e8fff15243f5cb3643bc00c4505f8ad953de265d84d3d34af9fe10adda5767246b26336141f6e0548c95d942a3c13dac66736673eebf
-DIST firefox-68.12.0esr-ms.xpi 480112 BLAKE2B 09ed7b484970be293afc4aa5fadd11a9f2bfb46e09122b7f387fc7bc12d74ebbd53985520b501dbaa657184b6ab388e8c8aec161f915c2de88c09d881cc9e3ce SHA512 d425fb4592d21cc067bead827df679761171780c3c86d5230b09906f56033454b343c29e843034a2bdba4cbb06a1bc99f939ca9d65cd41be7183d53a47e716b2
-DIST firefox-68.12.0esr-my.xpi 551930 BLAKE2B c732bc84ca47245c0ab166d8442403c61c7875957bd8e6e4cfa99072a916d6ad13a6bd20c821f1031069cecf8b5c1bc81313e6056179f667e1eec9503a881141 SHA512 2567f272cbac49a83e3f3aac121201ad4d3c9cf0e99517403356848a6f7538bfe2d9b913d9b1419aaa89afeec87d088a77a7ac65938101c26047b74de429eb67
-DIST firefox-68.12.0esr-nb-NO.xpi 495874 BLAKE2B fc6f4e0e8c83f054bbac8b956463895c8170aac30768edd4b3f3e41b60e4ac0ec7c3ce2092e85e5e55341a2d01e587021948faa1f6e690bc3d100890193e1883 SHA512 4b3f536fe90f1933fe0dcb7581c44a538b2550e3b8fdbaee298f7e6eb7771038621e034cf2e58c8ec04d60de7e6cd49a398fb77946df2890c0b581356eeb23f8
-DIST firefox-68.12.0esr-nl.xpi 491980 BLAKE2B 086fdfd16a89533382c963fd9795650c5b9420faf241249ea060e8cdb35f12c32b9bd355b55d6ea122b346d06e4734e729389684bb0615e80a68c4b9f9b3dbf1 SHA512 c2ced16def73dcccb5a5ab5d4c1218f1c1bba3a0919f9282b00f1fc8569a1ba6f120ce48e339f856caa1f0b931aab6bda13fdbdc05e60a66de5868d720305c5c
-DIST firefox-68.12.0esr-nn-NO.xpi 494528 BLAKE2B 219304cee8739f1204f9f5ce3203e59b95623b249f81cc4d2265f4aa27e243a75932fecdbc23d3d298c190726fa424e56ef59979445c73b59c9aad0a18be2974 SHA512 3f85964ed967427d12992a3c7cd26c31641fc33b7d139d8b1540da8a44d87999eba6b0c69e08fbf6e5f69e241013fb990c7257fbe3ea66bdf85ff0e0c08810aa
-DIST firefox-68.12.0esr-oc.xpi 498522 BLAKE2B b8a60e6aca2138bc6f346af60e089a52e07d82ac12fc8aae8a5f413bed8de14a55beb9281ba8c77225da53a539af0a19a198e3cf1e021c842a44260e7b89360f SHA512 7a02e451078e81de5c9b7936c1ee9c222845bdeec322d0131834759f94d631e624f54263d00f8511b8cfd682884966279abf03d00da015d947086b4d8577a506
-DIST firefox-68.12.0esr-pa-IN.xpi 542372 BLAKE2B dcf6a8e62ef0755ac0d815ad5b8c54d545d4197a6fda32c5190149e869003ebf9eb9e8b1d05433d70b8f8efd8210bdc11882838b5e7bf093250056664f0d0fa7 SHA512 13c0b29db5e1728d0ed8109c2c0aef6e47d045c597df31cb0239e810e266f452d5a257be4964d5dc9a69f8c52227f749a99b17c2275dd27ee448c1fbb2edcea8
-DIST firefox-68.12.0esr-pl.xpi 495645 BLAKE2B 956ee465475b61a151a3b1d4b176f1c3f7d0c7b2e52f4b9f30a80c4c62d3106d978d018b350286ffdd052a18c22549ea832a0ccc79d916210d7f0f26b12e2bec SHA512 ec785dbb73c2558e0c3c371b328c163220c4b6bad93a407488d97e1db47c19f0ec47b2b8aa4256f1dea7b79edbd63f79dff2a66d72ed9937a287e34a963e36e9
-DIST firefox-68.12.0esr-pt-BR.xpi 497978 BLAKE2B f033b8cf2c0e3e3a332dce382378e100e1729ebe3845a0f2b5b4a136b380e2a5a748448c1ff1a40bfc19cbcaa8903b018b8310d23fcbc94824bd409be757194c SHA512 dc9e1b2212ad2792e2c28c6d3b8849bdf7ea78f7a010ae5b9b6409ea80ce2b14a10e08f74a66a4d32d7e59d28fa2b44a557d4eb7c44e69521fb633015f858fb9
-DIST firefox-68.12.0esr-pt-PT.xpi 507648 BLAKE2B 960b3f0fee279acedfc7c9700d6e70cf4c5e8f5f6ed877ae9c3d8e848b9422799be1b419e9eb94d52208f1e7978aa5c16640e864ee7777a01c47b64ca5bb6c1d SHA512 ff0358149c38209c1101a048941d10e450f049895fe54eb68639cc248c93cdd3b089f88b961fe5afbbafe4f6dfb7bcc1a68fce2f17b9ba6ea10daed61e8b1d9b
-DIST firefox-68.12.0esr-rm.xpi 495302 BLAKE2B 65f358f5ee0efc2e6dfcbbeb5e9438f19947a3fdadd8af92ea18af19b02b8b41cbed68ff3a5db08bcd43837dbf7e205f99d78b670182d199644c1f0ef400ed8d SHA512 7508baaeaa519da54df478886169ceb871458a84d6e13d68b81830de722ab650a85d541a50e9a2b396995a00bb8d7fa2a21772d0b789b1896b385dd74a195e76
-DIST firefox-68.12.0esr-ro.xpi 508616 BLAKE2B 245d72ade8ec1dbb57f8cdc399dec200a902c885114aa6a1a481fa69c541508de3e4495d78420d0af9c3999eafec11c0ea66ddbc3e34b825630b09936544c672 SHA512 71e311d00c70d5fd2e5bc08e75fc6112d95a12b4b64e613e26bb9f46a1041acf960067efa2c8e38ae472e6dcba8b2846ab40bffa690ab26e695a0698f6630595
-DIST firefox-68.12.0esr-ru.xpi 583734 BLAKE2B 7d3fee57162e61fe8e644cf8f79393bf6f4d95e20e5df806fd357e4da7c97db01ba73f160ea02beb36c7d925e16e381e30facd0ea3c2a3fee468bbfc853bd2d1 SHA512 52408b5ffd014b2a081e58a76eb55cfd5621696b69fff2d8e240aad58e069035b5cdaedcf0162e434e5e432e6f95a55c83cf9531a13f295655ee948d18457d5f
-DIST firefox-68.12.0esr-si.xpi 527985 BLAKE2B ae0410c07ee50d611994b2cf81a77aa6363fc81284017242d7d2c629c3888369af460766f2a77a406bc9a184389d4e5fc36c4a05f30b06d04fc6f61aae93ca04 SHA512 b631442552e05cdf036d6598f1bcf237228495cad18a5f58597e6d4fd04f0c5558d5466ff40e69b014edcdcb91c1c9146c734ea6f33bc905ede556a219f6c585
-DIST firefox-68.12.0esr-sk.xpi 525089 BLAKE2B a2d8eb4af76a465fc10395c16790b128161fd71ef7406a7324c8fdf72edfc188b36db97ebdf0cf8edb6dd93949ca2f0398b7ff1212e53a77b01dfae4b87495c6 SHA512 ec2b2912e16f211a75cc366b18ade3a7b164427a9cad8ca21255bf071c580e486548c5dc77c0ac890141482318a6d73386985d60c0bbe467b601953407b00474
-DIST firefox-68.12.0esr-sl.xpi 502158 BLAKE2B 8bad832e83af805f4d70959686fb9257dc24799b766eeb767efa2231cba8f9abbb8f5fc5e3e6922d183ccef8df1402e2b869912b775bb31bdeaf531420086eba SHA512 b6a766f5eb5c600d9f3de7cb8226657d6fd1fac9048823eb93b4275b65e9a650c42812c92e7d3f45d5ae5fbb5261f9d7de5f4af5d775a1bb92c27db41a3ad69b
-DIST firefox-68.12.0esr-son.xpi 458706 BLAKE2B 4daf8396d7cf9f8a931f022abbd6f6e41ba7c2cbac35f3efa141dfe37ce7183ed7ea88c5fbcbcd1ffd64c23d6dfe23010347c49682109a997440a1ee0c709698 SHA512 5ec63c0c7baab509a43091b73ee97c53bef77d3c402a9130bd85b9fa0ff5eb7e49d4e585a49e1d4912a18dbf37641b1c763f530d7f0192aac2fcde6432a9bdd1
-DIST firefox-68.12.0esr-sq.xpi 521485 BLAKE2B 00e735d347876956159c8b5449d3e81621275d7afeaa012447639bc698f0d70517a90617ee410e6b6c93b5d85c4025173c09515147eb66910ec87dc87cfc483d SHA512 d4470c47127db3c7bdbac7201e3ed3aeb5f88e7735810fbb440b44c10e44d255e3bbca2417abdc9182e9ca06824583e65c2733d8f7172440f2aa2b32b7f3163d
-DIST firefox-68.12.0esr-sr.xpi 527349 BLAKE2B 14a4f0334f5f3c518dfbeedc0791ccd76941f6a6e6ccf405de30eda996b2264eb536629a29c2ff3dd240ae5eb51d6288ea6c60ac6bf71f96318bba7aa6622d9c SHA512 5b91f661ba5cb328dea4a8269f646ba72974d0aedb84b7d92f12e988c3d9f408ab82f1bfa54664834f59dbaa77aafc414f52b43218bdea376438aa34574e5842
-DIST firefox-68.12.0esr-sv-SE.xpi 506648 BLAKE2B 938196598f54a337fce1a6784d6c98352f9fe72ef005360c3ba755357e7d4466157731b4dd55c007bbbd64a0233e04f9a1779f3f43725a5956e3b64f9dc97ec4 SHA512 2d2cb7b95010f464a46f74147cf5e52119e3fe06ffaf61b07a7de4078a109f80a7c54ef44da587449f6e677fd095bc01cab0f2158b8e4c9096bc26c5e8f3a6e6
-DIST firefox-68.12.0esr-ta.xpi 548968 BLAKE2B 6ce82d93f0ad6736f216f93612ffe1e8526e56245d824086dd39222a69afcd2e02fc425106de170b2a1ac95ae0f354ca70baee91ad2ce42a3a718c9099324bec SHA512 eb98b22fc3cc842faa5ffa10177fc0ae06e3cafd33dcd8f117836664c3f0e1bf3fcc216e2b0d312ed9906c92bd67f63210fb965db26af0c21373c57b3b32f785
-DIST firefox-68.12.0esr-te.xpi 561504 BLAKE2B 7e245fbeba50bafc180e775995ca75773edf6d505241dde4683f8b16fdc6559c5f757ddf80b73d336aeb998ed4fdc9a3e2ce2526d10a6e8ccd91832b17c776dd SHA512 666f7dd1928af74d8f720b671f89affe463776ce33068b8462b32fe25b733f316babfb3d44e00f780a192ccd4cbed615bde4dfcdec36145f65708c33e1c29c7c
-DIST firefox-68.12.0esr-th.xpi 550761 BLAKE2B 7ddb80b7af7868c2793d717009a8587352ebdeb1e3cd36cbe2d9fdbecd39430340fd1156879ec07882d965c54bd52a8d86e7be9d18852c1d4264d58a9dc34c5b SHA512 92e6e65c8c8ae941d3014b0279e678314dbf745fdbc6996a4382f609c68f12839371a85de3ed34cda2cafec3c7c6dc1a5654656fc53b976716552dfffd852739
-DIST firefox-68.12.0esr-tr.xpi 515121 BLAKE2B 9fbfd0c70b6593ec8ec40ba7b1383b634311ff33215262eff0987e2d5bd755d59c876a3b3ebf2c7de746d40fe48a936e5f1a96270e27b498c6bc6184d43ea770 SHA512 c825b77ee15cfd526afc17cbfcc4eca6a02e194c2f900e9921e03560e77adc91adf155633483866e4c06a06efd2a5f40998124910f376e9ee48bcf7e004a3877
-DIST firefox-68.12.0esr-uk.xpi 568859 BLAKE2B 6d723422f2c86537693113ead7dd8ca27788576083dd85ae1255e5f105a53e7101b8dd8784e652b32359999ce7ccdfccae69c0a081ccb31a5910e4551c2f5ae9 SHA512 27d748576478e01df0e07038a3f38aabf1accbb7e7c31fd932ac1cf53f52336f6cd90f6f08b14313a5a06702aaba8e546552c81f17e67e88eed574260abf2664
-DIST firefox-68.12.0esr-ur.xpi 542329 BLAKE2B 077c331a6a81b5f1f62dab2c6431d8b04c264a4f762321c13f116973cd09759db955989b5c4cc9965323238fdce0fa5cd2ba50e8d304014cbe10fc70ca2c6015 SHA512 98fde965d22b65093083b3e7cc6e6d72845aeab4e306c632f3453a8159979e500dd706cdcc8bc5a7186c0bfac70d28cd8845d7460e91ac5584debae16083c698
-DIST firefox-68.12.0esr-uz.xpi 482276 BLAKE2B 02eb3f6f7c416326a016a99cd8227626a8282ca917da1d3710cde48fd46088a5124d2e82ea298e7ed16233b577916749af24e1ba32d12225b49b259c13e26b5e SHA512 f2b4cb33a86d79b346fe376fb93c223c96504bd572bc3167b3125508bec47ce70bf138d1d1437a79b033c8f4e4ba539ff302d88150f6cb9c141eac394bc7b32e
-DIST firefox-68.12.0esr-vi.xpi 529122 BLAKE2B c5b2d70be97e1fe5738471e82f8cf1092bbefb3d5d1479381f0c3bee65b7349eafa5d3991257502463b6ade45604e26edb7b9f5032ac282a2bedbbe654d53e14 SHA512 a6059a0b179d70a23502cbbff5e90b48262884e47e8a0c2e66286c1a37f63295bdad49f042a0c42941efaea874445c7818b32c735295b477d9a05b448e9dfe22
-DIST firefox-68.12.0esr-xh.xpi 470243 BLAKE2B 1c1e8a6ce19687687827bc8e8ac3cf5230c8a58c78b16f140a6be64e37bbaa81291080c853c4cc57049f236944823a1e138b149ad12783f71d51dc7ba90983a3 SHA512 de08b2c78d267d7c872a8fc2b7b7c45045886f9e349a325d784ddd1c6ce4e4b21b45b1b3553fb476f84110c9c7227d5bd93dbb650702641b48762e299e3e729a
-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.1esr-ach.xpi 500661 BLAKE2B 30cd981557491e0e813182d8fe769a3f21209bb167b11977b09fcd3aa187fecb029833c1770d976b6ba8be3e4901fd4639e4768c5eb77d9082d61019c6d2f564 SHA512 b3eec643a380cf8768ae716955ed64938a18e259b7698a72ce4fa1eb1353c893785806cda73d4cd8908f3bd3f4bf640bbd4022be99291d1cc509da609541f83e
 DIST firefox-78.3.1esr-af.xpi 444078 BLAKE2B ec399291516e2d208439b088679386f97674399249f611b0d0af2db002e5067b9aa48fbbfae44ed210c1cf1205039029a2b6d665da0e011dab78c0a7297c91a3 SHA512 e46488de17fc1324c12aacb74fd9e6521a45ab5f201568379dd6e9c7aab019d7ee34b3313d27f88f33c4002ed84c1b8451a26c03878b03b1b06630e0c8ad76e1
 DIST firefox-78.3.1esr-an.xpi 511467 BLAKE2B e2683b61deef571f107add61dc770acd3adff706a01dadcc3e977cb6e515abbd5cb400296ac7dfb74b991aac5bc04384ccb3230b5a9960bd2cd4415dc603b27c SHA512 9990eb0989ec9841519157fb620e6c6cd8451657bc25a93cc127896215fa2d50a7734db7bfe2ef26890104eb97efbad8d8633e6b77a5ef15f830e2df42f7a662
@@ -198,193 +102,8 @@ DIST firefox-78.3.1esr-xh.xpi 458901 BLAKE2B 1dccd49ce244797fce31c0f458b15ba1364
 DIST firefox-78.3.1esr-zh-CN.xpi 600192 BLAKE2B 548e795a21a05d7170b6221e9525ff378e87a6dc54c4e7393ae0328ddfb4402d7eead51be8a0029248230f084fb6e84651a0860820a96b0aa1393363d1ec94a4 SHA512 4f968ee70e6ddcff684adbc69e4baf24d74a5ae51b411b5c1ebcce7df43c49f9116decba1b5965d9089daeb6d879738d6066b1cfc992a1b95b6ae2177400038a
 DIST firefox-78.3.1esr-zh-TW.xpi 599272 BLAKE2B ee9a8c002688464e55fdfdaa3c49622638eeb206a21b3462dacb6255cc282026af12adc6799ef5f0565d411c7e3b0a24b1f45fc17fe8f4f1f52a5022ca3ad9fd SHA512 486a2f36a159ed429e0544c349dd07601b785db4a7882db592d89d9a64dffa1bc85b90770e8e800f1f2f4a6c91df497b09832dd04d7d44050f38263c49bf2696
 DIST firefox-78.3.1esr.source.tar.xz 339088596 BLAKE2B 27e594a23b111b937ed277ddafa99c07fa9ee003cbd6b7c6cbdc4428e54769ec9ec1961653c1ec127d7adf159ff8b3be08ebbdefb0d11f1ac21717ffde9461b3 SHA512 162860df8e4ef7322e91924bd4aae731a49dbd9829f02b306e4e5acc69c611f4a1e5727c3857b2f98e951745a3b1d8f550966105badc095205644d1ad7f5a340
-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
-DIST firefox-80.0-ar.xpi 591968 BLAKE2B d928bf7801c3980b20385737e20d1642c55586a7b29825e9e75f74414cbe38adf0f454b38ec5e001b1e511098c5c2015da5e1221ce759a97a341885c913bfd19 SHA512 9ecdb8a4fc807d6a53c3007bd66e587556fcf11d2393d568ceb089307384ee709d9b86620a8b85b9cb53fc0d6ec34c0cdaeef279a24abde2de8229b1fd2d9f5a
-DIST firefox-80.0-ast.xpi 502295 BLAKE2B d4b10d387a0b204635b9a8edd15d676092b95f50405671846931c31dfc8a1d2851543b4414f431fd04049586be48850fe9b2aa548e3e42681b6a4f68fa61e655 SHA512 838d8965a611cb4987bf2f947cf8fda4eaa5bc65582c9e0f1c319c3cb1573f0da18c89db72d3606c588175836eafcd2e8daf0fd378553b8e26c2f35f19ed5f23
-DIST firefox-80.0-az.xpi 539500 BLAKE2B 19f4c01bd8b92e5ba3ceff935984577ebf790150fb0339a40cdb6324c5a77894f2a54e8f5be3f5007d9f1f244fbdd0cef2b69b2657e9cd117c294a25b625b1c0 SHA512 fe4fef78143fd4c0050b871e54249479344f6dce786040aa018ebe2aa9409d7e4f6085defa246cc9090c38c8c6d2c1c275feac403196d94f8dcca3c1e9ed7b25
-DIST firefox-80.0-be.xpi 652456 BLAKE2B 23d70fa63cb47d40fc99318ef73f4c2a2b5ba0e815de87132617cd9fb58423ce89a0fa9e590505637ce2796bb7c3e6c88ad2309d8f3b25edbc1a2b6585a8d583 SHA512 87d8005bda12d19a21a6a8d7bb13c2594756829a61cbba94adbe3a4d756f6d5b592ead1ea90720ac291402b7c04eef7395ab8d48ff97a921417768a2718d197c
-DIST firefox-80.0-bg.xpi 614842 BLAKE2B c9d963d5961bb7ccb150415db8c683f05d61905968f6a32d723747765de34a6c1cb75ae679e0d493d7eb7f0419c286ad9595c1048218dad17f032f54e06220ef SHA512 381a1307e119c03b5af27af701956a3c5b9f4fdbfec50fa68b932e9701608f551a78d75121263c20229d6b38f76f980ccfc43ee70ac47e7367127149c2b982ef
-DIST firefox-80.0-bn.xpi 635449 BLAKE2B 61ffc9681126b50090ad1fbfd8f6484aeb532b537689f8539fddf79f7512a7a37293a53f2b16859194b70bf6ae83e6e126240ba3ee17b0c5ba94275a51fe0274 SHA512 0a1830c46aee8440471e3d75ffc3728c2f2bf55abb31082acc8b127e2becbfb8b7e2d8e6cb7675d058e95389e72066f634dbc48402d09a0cccba303c9770ee5d
-DIST firefox-80.0-br.xpi 555980 BLAKE2B 0a76b7eeaebdf369670ff1128b2a488552dbef75d06359e20d46c7404aa69cd6af3a70a08a7b542c533cf8d4ca6b2c40c50b5634cd02168cb875bd819c57fe46 SHA512 526a6e409a4991b00f7e84367463e7168c8e884980e293bb8c10ac9c73b098eabd13606fe6e0137987cf88f474671fb782daa3a0b6a80c7c6d829a02771197c9
-DIST firefox-80.0-bs.xpi 513558 BLAKE2B 8b1615856551badeaa2a331243c944e9eea783d16fee34fbf3895e66e31d218684b58294be7011073a5d2e6c9bd0a4b773d69765bda1893b85af3eafaf3d39ab SHA512 d9b871fd4cb201f597e33c807921a93865c8591eed0ab985b1b3ffc9ef41c239a3b327cff98ebb4c9cd39e3bf5c1c79749357645bce9c09b1cd664f3463c132f
-DIST firefox-80.0-ca.xpi 564409 BLAKE2B 8edde4a068715a481e2a4968e1637b9a56c228be7fa75b36c7700eda4e9305be9eef53e859a3e96a89ab74f6cbfbeb84529f3d93355f030088c1d913af526c4c SHA512 5c229deca5b45c7bb4807f220775eb11ce34ba2b63eb168f502074958fbf60ecee851996298fef9e392ef47b45d393f7b129d7da317ed3fe064dfc9d2dac6bce
-DIST firefox-80.0-cak.xpi 589689 BLAKE2B bee590ae342c4d581ab75c6d7b5c91a366efc67bc9ce54d0ad5bc86af0c4508fa663156c330a7ef0aba2baebbdc303e16010cd7a1dd5fc6e994a224f0b27903b SHA512 7304602473f61281db8126fa03384fdb077397173564936c4c3c703c3477b276cd6ef425011b3b5d6da9795de1472abf735e271a63d70403e7f03f3b51aa1db3
-DIST firefox-80.0-cs.xpi 590458 BLAKE2B 2bd29730192843aa41b3b5a39daa3841e42a36e6212e80820cb08720ab6884be4e74186993eeb22b0c256ed1591d734e43b4c7a516430095c338fcd09f0c7604 SHA512 9f8e585a4eaca727e0ac0a7767d11fd6e795d2e041b3d86d28fad4772ea3b32634e3a5ec8b0a20f3eba5706882771544fb0b798edc1ea8b0f664a1cab2fa89aa
-DIST firefox-80.0-cy.xpi 574417 BLAKE2B 342d364fa946aad52d4902bcada88072e8cfeaf92dd7332b442e71be378ee1b2912124efaab5aaeea2a724f66c099e130b1f7f11f098e9b0076c483c136b7db8 SHA512 c25a80cbac5383f10c1c0aeb279b2a8799fed2b8074188e534d8e8177e78cbb3e1d1dc476263802f807c188311c989bca8cad99b9c9b4b4b2bb2b0d97f5c7d2d
-DIST firefox-80.0-da.xpi 564796 BLAKE2B 7a1c859722d437232675866b25e5fa7f62d6299f8c4a9ad51c5713fdaf0a2f8c521e692b8b47da1d243bfd41a3a3a0b49aeae3b15e68970537eb2e9f2e712103 SHA512 3bbcbb0c1f13d33e304a8898f70e6ce57c687bd6045e3b137914cb1d142b0a08ebb3067e1a25d1c136b0c2f2e580b4d5ba1b2fcdb9f48f468f9c079eb13a6cfb
-DIST firefox-80.0-de.xpi 588397 BLAKE2B f4fe0ac9111f851a29d290c92feba3d2e1f954e4f71ecbbae8e4e9fa16dfd67ae9f2d731c3e7d4a1544887086e34027fa4f6d288b28e756f31522cb925276f7f SHA512 e5af7c4c3240e5074e7bcc0a6165ba60cb5dc5d57063479f900570cd4361ef93308e9e3d37d9a413526c25805e8f6239ba4ab0d13c20a9931ddd75b566f5946a
-DIST firefox-80.0-dsb.xpi 598524 BLAKE2B 3080e318bad0fd9e64ccbbdd2a65cb27953eae75d04b6342c9083936ba186916f21805c2899a1732c4e294446059bd1d9fcc9e05e3febd0a1ae8ce247e8d4131 SHA512 e58640c1b7922a808536d0d785faae6dafa0d61a6b222e4e38b805443383f5782cc80f83aec6cef056207b1f6789674d0e20f57e608093ce147b4c484ef5e573
-DIST firefox-80.0-el.xpi 674078 BLAKE2B 51b8f4d3f45b030d525a4e88b9817932d68dfbb524cde4416d79712ce440ffbdf477537488b401a38afa8d9ec951f4014ce0b3652ab5de05a91982ba53d4d75c SHA512 8e4b01e8155fada8998dd4b312f542ffcb28d4c4893ee8961cd9d8a1fa2c1dfb0735c43677496c9ef3a277e16b5bdf54d7e5474b004367da61f48fee9cd321fb
-DIST firefox-80.0-en-CA.xpi 541624 BLAKE2B 9fd3eb9a714eaaa46e38d61eb79c1f619aa19929510ab4fd7ddc0c6b2789c509a74b80a459591605a1a6c431e0a3848c2d9a8943a2234752eea59f6df82d4055 SHA512 27feb3f1f8d150bbe220562bee594bb4b8a0c9d50a1641a68b21b739926d1deaffb2f56917d8c3bf3306991be5d9c2ce89a91581b1b0e836e672a94ccd8216e1
-DIST firefox-80.0-en-GB.xpi 539418 BLAKE2B 6962aa53d86894ac5d5e5e3b70c7cf567b886abd3c20805ddf6ccecfb922c5efec7ea6fcd059dfa3aedddd0cdb32c171e76924a6ce84a7e68dfa8768d7a6c66e SHA512 adb065201294e25a1e3b38294648555e8761a1dc69d04d83d1f3b4256b635a10dc17cd791b1455854caf9e56e46d117bd3101e8cdf00d920d8e599e9c6717120
-DIST firefox-80.0-eo.xpi 566779 BLAKE2B 066bfe363b812f458cf469d91e4e1915b99b094aa5a107442a752000bd97821ab4387e7abaf7309ef7427ebedfb3d9a739f1b744ba990b4a6fd34bf8c0503f8e SHA512 978d206e69089f556ac735bedb5b1c8b56752ec42064da678217cdbb00eda0d0ea92b324b260c1564d8d22f42e0d8a1c18431e895584674dcbbb6b16fef0189c
-DIST firefox-80.0-es-AR.xpi 579746 BLAKE2B 9ba5e77fe01b56fd9413255a5845388b9b8cf3b99083e07f238a0979c018e293cae431675a8fca42254c277f5159928da3e66c856bbb112ee412d0c1d4a098a0 SHA512 cc216aa4367b99c34f7c665a8f3e5e2736c1ed90e8a07e554ac5b91b570a0aed6f4c5f02625d3100f653d037e162fc7e19e968e744ddb0477942eab56c09d7f4
-DIST firefox-80.0-es-CL.xpi 577776 BLAKE2B 02170a2da7727dd3f70b52ec61b18cab7c72d4a7346ab7802e6e730cfe0a9e246f051dfb6441ff1a4a6477f065b03e11951a4e15b09c367154744462b75ff154 SHA512 6a656985d043fcbdcf44ca82fff15e98ff03698315a8c9000ebc15d7aee8aec3121a728babcef3be08918a9a5ef8f534ee14f8c2ea1139508f4537f215a324b0
-DIST firefox-80.0-es-ES.xpi 563139 BLAKE2B e5189f2e302c7d0f2a9d6135402f05097cd2bf51a5df15b57eeb248935f71d42985112611f95a5f7fdb915e343bd7dddcc12cb5bbd5aa8a6f045bd0e228a4427 SHA512 5fd3f8de7e5f696a468eb59c1bdef1ddb39b171480b5e95821bdd799f9ab814bd4bfcae3168fc223ab564e9f374372259849e440333a448d370eb19b25554ee6
-DIST firefox-80.0-es-MX.xpi 575194 BLAKE2B f6e51668701120f5d6bb09f5b43fe93e7d0edf857e20ce9134c676c15b5740525a6e6f2f959a2767a82399231f18c23f8aa4163e8784e969cd425ef215505037 SHA512 0897ebd9ceaa01c50a56eda33b5a074e7d68fa1bfb6ae0532c9c8abdc7bfc341232d1692528d44de0e337242384d7aca2b5d455d9f3638813539f77b9e2d784d
-DIST firefox-80.0-et.xpi 537739 BLAKE2B 470fa5c9065b21e0a904e5d6c057b3825612a9ce28b189d7acc22514f832da858653b01cd90091cae46077d568781d9bfafd37da96118baca217898030bdb8ab SHA512 dfb6a11512cdd36b960d92bc4533ce9d75e298e2aab90e6f18b5d4d9a57d14e60fd412093a6b14cba5a10cfeb22f03ca0a4b60d568046270c1b711aa20d708df
-DIST firefox-80.0-eu.xpi 558710 BLAKE2B ec466ad75e958674bb6e48ed95d938a9de5c877394d5f0d52f0dda7fdf65d624ab520c776f5f4475236b845de78d175aeb88663aa4599d7778b3c21ebefc0e3a SHA512 797e056b5fdb54ac844a2173fd3cd18a0c5adc656500d4eda18adf5a863b7b9d309ed87352f48e5e717419b832d7e807081cfca433918cb483ea856464afec33
-DIST firefox-80.0-fa.xpi 597295 BLAKE2B cc6e733346be6a25f497262a0b94edc105882248f6e9b3c92231c8f0a8e73b16b95e467e5ebc1b6b5c31f1a850aa9a3615f8f692916d9b3271360a0c1dd7ee1b SHA512 f1920b3b2a0b25d6c0ee204efa0421ff1dd7737ca78174fefa343b42b10f4d7fbc3269127ee951a081b13fa38ded195fc16c032f833b457f4930e0418f1f2920
-DIST firefox-80.0-ff.xpi 533670 BLAKE2B 3e931d0365d52dde9803ac5867c45dbe0df79e22a3ab036c2c65afddfd17331dbf155e54d64d14234ddb9d396330b95e81e18bc0f2274fb99b777305c6350f72 SHA512 45d83a5e3e1cc65a792748638c96412e538f02d7568036070bcb866b10e71eecc70a5f77669e277154c8e9c2e287e35a5b57357a151bccd3f86c4ce9013ea69c
-DIST firefox-80.0-fi.xpi 564428 BLAKE2B 4e13fe913f7c25a3de7e5190456ec15daff91fc3e8a7b57dd018de7f601ad9367e25d6338eb26c958aa2c01cfce7245b4f8d0064b21df30334cd5611a05071d7 SHA512 b4384519931c133e33e0d8217fdc337a9d79de43d1db8b5e18d1a2f9b7d253c4022b62efbbbb7a88647674db8b01fc5053f92ffc922a05f4455c4cdd7653e741
-DIST firefox-80.0-fr.xpi 588795 BLAKE2B 5f9b9827ecb2acecaf62d74e3822c161a09fa5837a99c4e305071d2977c7cce18c385351abc2ff38b095f70ec34b504ecd6943ed2c12f10e094ff84bfe1c01d2 SHA512 d2043279f28b1c17b5f3ec55eab4b93f073fea76ad8a9da5217c0abcaf47b286ae1ab27b61c5b29b09c9e98e33491e923c90597988cdfded2791d86d3b9ac741
-DIST firefox-80.0-fy-NL.xpi 574021 BLAKE2B 6505e12eb43bbb2f30c5fa5756cd5a2280c07ddaa90c88baf511d146d9a51717a97cf8dbf8848ce733556d61ef411cb0104ef912047b1739a39524883660cd39 SHA512 ec8d5abc481cf4a993526a89117cc335455728e15e377f2715119cbaf024c3c0e81d17e800b459d5d690d01f8bff2da00b47f08d2f9a37901d258e7c867b570f
-DIST firefox-80.0-ga-IE.xpi 516393 BLAKE2B cef98ce0c810866f1c52a836fc66c89df1548bc26f3dd2149601525be74490a46ec3cddbfad61d642f4f9d2d1df245c664bd0b826476040b84a3013e5ca6ca4b SHA512 53f581fcf35821e8059a98970456705787a00798df59af3cf62ff65fcee79bb947b07240cd365f4251b8c83f26e8b0272a89d4135b523635c55d0352cb787552
-DIST firefox-80.0-gd.xpi 546420 BLAKE2B 378ebf5b7b3c2ec9f1fcbb47a135c75b2ca243d9e9636dd39650ac1201ca956c7650f99f842ec60943f7ac5b27c16178760ed25410053a0072ccf9e828d82d8d SHA512 18bbfd8de7641c15b792597d28ee31c0f4426f50894f747498611cf4530927335fc901fee999316879a92bf8e8539ac18fc4a30ba691379bd57f1db3b6110981
-DIST firefox-80.0-gl.xpi 510330 BLAKE2B da4196910965fe075f023dfc23c5adc82b2cd1f12b7726867519e2f1b0714db99bf84050903f6f2aea2bee6ec2225074228094ee6a7f8bdeaf1d62d78c5ff503 SHA512 843f80f4f8b5b4fdc08eb3ec98e9ed25f5dc100ca5a011e1605d3904abdbc6b883a0c1d98d13e1c53f0b3e9619d67ff75747e9b63ff9c04df6a7f7e487489b36
-DIST firefox-80.0-gn.xpi 590942 BLAKE2B 3a97481ee3c2a86963379d25fd220844548c209dceb8aa31bf4b537db9a9dcff26317efc1bbc82455c95bbf1486a7ba58d5fa14bc6b77cf4fb3ef9b923492b48 SHA512 ad76a5d1e8d7638796964d178387e9786ddd2e4f8b831ec5e7d16e6377acb5f0a370796d18677cd0105b95391f482d960a4a24c13fc5b6982e05dd38de2c5934
-DIST firefox-80.0-gu-IN.xpi 604613 BLAKE2B dba5afa8f274a906fe53cbfb6e2c016a4c98ff5eaa13b0252f67e14be978c2b9beb90207793ee4870cc0ca6ab12b88868450903302972a2535770dc40e92786f SHA512 86e4b63784d7cd54136194fcc6d91d04302616d96f2a2a3d8d2ba700b20ad695c9b32ad8f0f3047400d4c04da06df634bd41b87283036f87e3f7e9ab60c1983e
-DIST firefox-80.0-he.xpi 592241 BLAKE2B 5bcc9f4b50898483536713d063a8fecaeaa4a02f631e5d1b767e415348ac4b27125b0e451a9039fa0f6b61589526d5c59c88c5f7ca68c6e6ffbd38809f4823d5 SHA512 72a0676523d115d25de173bab362b8e2f683deb7e61036dfab33784a17e95502346a4b576d511655b5ecd80bf0dea50e8331492aa581e886d40a2c5de117e79d
-DIST firefox-80.0-hi-IN.xpi 626040 BLAKE2B e0d54b35da0cf59ad7c6af7287615cff1da6c70d7b6a6d85cfd4e897f1922d9476e0439628166139ea1165906b2ba6e63f8847d000f49f220de1276e04f7e027 SHA512 c545f8cad38a281702c846982a4901b3014c7c21c9acf64264a8cbc7e9e38a7b53cc52a5199111b2595035ae4167a8fc007aa81c9ed4ed4d24e53726e5db524e
-DIST firefox-80.0-hr.xpi 570157 BLAKE2B 5adc5d7f77cb3a66f8513f0739807934b4537731291b6bd15f2b4b2b8488c9fc601c599c32e4e260bd1cafe27190f53f882884b0f00adb95c3284bfde1ac8ed5 SHA512 c2df2413d66da2ebffcbbbfb9845fd16ad34da8b02884f9955fb824b04b66b68146d190f8bc01faf358d228d9c75b9443484ba822b70a7f82d62b7e30abe228b
-DIST firefox-80.0-hsb.xpi 596070 BLAKE2B b539c32bb8e8c4d88cd8c930b6af45f8edc2b67b2dd3e0250da35a61aa69ce9c1c0e74a09c5d2785ead05a8fed9566197f085f4a84118d7ff8d545a53be59ff1 SHA512 bc99e122b9a55a2740a3ded8e1b9cda674e83632a1e16439b6acf7cc42fcc68053220fb7b053dbf8ddf8aca6db286ea50720f3b7d9d4b690a6dc7c1a98a4abb7
-DIST firefox-80.0-hu.xpi 600886 BLAKE2B 15af42cf5f330e70c5de446dbd43014f6a1e869132527a92ec0a97a9435f565c45e00135ae31c16b140a580bef139ca62451b0664afa35a96dc9ac2b706075f2 SHA512 630ced3a7e92b624ceddbb73d29f02f5b7144ab03664188fa54649ec675aadca2239c6f045414c70ab321192a64585deb7ea0589fb8cb501bfc94f2643cf8c0f
-DIST firefox-80.0-hy-AM.xpi 651933 BLAKE2B 8a57b02484fadb67a08ba7cfb5590981ce57c4558ef51a1b9e188d3fe7ab3127a1b0addb81fd0d4931dbddb12d279ab69bbdda0ffef0d90b15ede96795b7ed04 SHA512 1eb973be9d6aa104dc4f3a0fd5838081afd4794203440738d375da6b15ad73a210806c211908af88924862bd1cb8a9b9334605a97048e44b3b389e6c73501272
-DIST firefox-80.0-ia.xpi 565441 BLAKE2B f6dcabda9d21180e31b7a9c9a19731c3a7aa388be1b34aaa1e2c1671aee2b16e2b026f80195b1729cbc95a78ba8011e38391f475d59ce4015696df5a61ba5f30 SHA512 b218a2b16418e0b9bc75214939d5883eb7a0c080a863faa9f0794c8456186bae10643bee85d1e6b5906325fe37f495ba903f7d0c068d5f95d01f7929081b4651
-DIST firefox-80.0-id.xpi 558580 BLAKE2B 08545ca1926a3de19fba919ef84067bd2612b4d8b78b1610ff529c15e58a954733463c7b628f1c009ab3b7a33928505eab9c52b4038cbd43bdbe864bd821ab82 SHA512 6952e9e1a71224e00c3b811fa68328a264ed0e92ef7292a8a74ff2aafcaa020b94b7ddb69763e6b8e0fe7600bc5a639f987d097aa9413635e5e3c08326554bad
-DIST firefox-80.0-is.xpi 529650 BLAKE2B 4f5b9e15575bab77dadaf30ae2e8d217cc5222840fdf6015fbee3d7a50002b6ad183a80ac7d843f954b69a22f00e8b9f2e27ef89c8dbdd0b56a660b9966cb1e0 SHA512 b4403b4c87c5d8addb07ef40725ea2b6449f70de7cfb91d6eded5a0dd5195074f392e66b3ef2544fc2a40050b4ef58ceacc4ecea8d64308102e6b5624cf0cbc6
-DIST firefox-80.0-it.xpi 463726 BLAKE2B 1e3c935d51a96002810ca83665d85aff3812a4da3a15ed58e1486db77ad742bec2e0548f2e4ddcbfb28c8193bf5fca8c047726991254f8cabe1fa54a513ca166 SHA512 d06910e707156dff22045cbf3b2d04314039bdab998528cfc73d29bfc31fe00c69aa7b6a6da9aec74e5b75b8efecc392d039250b5a329df8f7de7d3cd2f0cf29
-DIST firefox-80.0-ja.xpi 627644 BLAKE2B 82cdde1367e3a3a782c882f6f674a4be85d239bf04970fb4ee2fdac97d22aa41e75244c760b6a979a71c47e7a2561822cb07599f63c197f01c884f4641689abb SHA512 44439db8da3925d074bf716234ebb9425d7dbe5edf6cdbf916687bdd46b16b15470683fd46fb2546e1035a8c54bcd10be3cd83249aa9059fff273c4e91ed9d54
-DIST firefox-80.0-ka.xpi 626549 BLAKE2B 8cb5de31d59284dfb03bb898debe44bec9797f569d7cab03cc860ad185e1f51ef36e1b57860d5a394fe6c4f8fab81ecaed344f2b25316cebeede607d3e15c61a SHA512 60e8b01afd76523d43c2fd1f3713c8844a51abbb6e50ee2341725d15cd4845e2624ba9ab5e8be6f611847e364d13a20da57909e64b68d2c56b714ece9d3ef5cd
-DIST firefox-80.0-kab.xpi 583779 BLAKE2B 4a06e4f97ccf2863aa359f1ead05330a9d85caae183e592d86aa93b444c0b36c9c4f7ccaae3ba399a7944d69e6035426783c45ae64d464c3cc578d0b5dd55a39 SHA512 7cdef01b2b6136a94d841b1362a06835523d9d9ee6e2e6ed9bca356248ab6bcc5166e93ceab51acf2c1472ec304da42ec657ea0978a0f7c211933d091829ffb8
-DIST firefox-80.0-kk.xpi 649823 BLAKE2B 6927402fd82a28ae2e9bea2caaa9f7841f6b5debc7098fa6bac8f90ceab470c3300af012fb75d500dd01c71f663f53637c00dc9b0072564f203935e4dddf721f SHA512 5afffc78d8dd254a895515dfc2609fdc1317e09173863717255d343605a093dd38a377e06fdf21887f11c9aca515a3c2004e42cca3f5ac9dfbefb0f2f343d489
-DIST firefox-80.0-km.xpi 568620 BLAKE2B 2510031ae8ede92ea5a667714f9d09dbb88f31229ce88f5d245c7c2dd506a2c0169eba78c6456fd437203a2070027cf4cec913842a14864d7902cccc746fcec5 SHA512 93f4ab94c10af2b12a4d627efd648399b6a35f171720221dfdfc30cc1069f95e89353977d429ef5e424fbeb72879e39483d62c82480bdcf62dd4b8fee28638a4
-DIST firefox-80.0-kn.xpi 559852 BLAKE2B 0929da059a1f2c4c54403f0bab631c8f9d5199a5553e09e888fe7cac781debfa8fd3029832d8ad49af624473d5297af4e5dd2791cd0f6912c926c9698807f2df SHA512 4eb13c48ecc55cd725a1c4566afacddc840eb362a4de5ca85ebd8bedc3c1af111de3029e525830db4a73deda8c1746f3f246b32acc0340d1e05c54790a99513e
-DIST firefox-80.0-ko.xpi 614540 BLAKE2B cbf7e4dbf957d8163b6dd616385380120819aeacf991c1de00b0865cf2f48f6033771163f1dbba2fdee6c855cd52f4e9363460bd4d079c6cf03693cd69fe70b6 SHA512 dd6060dd0f89b7d3429b9a1af14b1c27196866f8fcb12676265b1f392b8d2855d5ff649ec9d82b8a281fd55f85ea0c69a1c95ff006af60ab7a3dc7e466d46d71
-DIST firefox-80.0-lij.xpi 529109 BLAKE2B 1aaa0b985558f9d3b561a2b28eeda90c30e47e1edd8d97fef8572588427d1f95eb09eee84c70a99d38664add0bec60766f495c0c54560513e8e12d86c256514f SHA512 b22c9e80d73fa21cfbd9a9ece532d3b61d8ee1c8d65ea3394224e0b194c20f86ab3b5c953114e842a7220cb626ce046beb14b1cd9a4bcd25208bf9779f97a8b2
-DIST firefox-80.0-lt.xpi 587980 BLAKE2B 2ebf088f9674a3f3fbb0be3734b5c2e790f9a8d62b5737e1755c003491bd2d3345307a7844c21d9b603171890b9b1cac79cda226cb41286eb9d6fd4fec85e340 SHA512 31b6311f6b17868816a2fd72588dc49eac9f087b26bb00c7698bbcdfe91b7d069ac4c3507d8cf3b48f63c7b5e332e02d709caf07ca13bde0a8d3d465834bba70
-DIST firefox-80.0-lv.xpi 519967 BLAKE2B 3b57879b21536dd6bc99d1d926c68bdf449a6929a41f3b78544b1007e6f931932f174da314a3423f877361207caaed6e20d25c3d5e4721f7ae85ab54a784c35c SHA512 09bf86bca7887d26f58a80f6ca04d3ce6f71af9c484b626e345b97b66b1349557410aa496ed559252e6e3b5081564921b22cd9ae330c2824a580bfab19c99aa7
-DIST firefox-80.0-mk.xpi 482697 BLAKE2B dbceeac0bb8f22b69d9a53d585efcc0a980d191058dd79bf55e8976cae1ab01746f20c245163bd817c5dc4087b4f6b37ecdb22e29e0df3400d457c9a586fc339 SHA512 b6ead5d0368891a4ce6465798e6b736489c6b0cdef30b406dffcf74cd683aadb3a9f726b08cba321995c63d0f1e4bd3b8055a0ea16ba977144fc82e7446c2faf
-DIST firefox-80.0-mr.xpi 601406 BLAKE2B 7cac680a690be2ee66d2ba5fc8b74670ccc66815009846c0308fc82178f642d7db3f56e1f7f79df3ab988b6f1a9e41c368b5361a541b89870abab33f11dc23af SHA512 3fd8c0f9cb8fd53713aa37d86bda1e547745645a7cb87d7d84dd1af33e9256fe92435011020437bcb013ebcf30b7b5099c59f8b318b1983a8fb61add607a5a8c
-DIST firefox-80.0-ms.xpi 503046 BLAKE2B f8a18d59fe52d7ede861d461a7bfbe183159985230e37d0938802ffb977a45466d0b6f3a240aa34df729a20245b1d26d74b3ec427b05a3ff8765b8ac83c61cf8 SHA512 b41cece57f805f6e61bb3c73f23ad46d715b514622782c8e5d861a5084e1875f2d22e0c47dcf11aa899cfb4689fa74facd72a1b88e308afcec16af855c8a50d2
-DIST firefox-80.0-my.xpi 557293 BLAKE2B 11aa8d0d236220759761aa7beb262673d050100946f44845954cbc037d7993f800940436c1c93bbda28fc76561ce8ceecb1a737652b7846b71e5c986f0a90679 SHA512 717947855d5bdbca668a4d38898c3b86cd1b069d23321e98d495c62ef5d79fc6daf66ba819ff20e3e0fa9a450a560333de78917968ce7b10da8b926ac51682ac
-DIST firefox-80.0-nb-NO.xpi 559823 BLAKE2B 306d7bb615376728e997ff55e8958fe69f521237e9dedc626506ea51f969e603fd4a7e9a0be2f1bf7e1c0def6b835d74261950cff77e50361ed077e7dc0a8613 SHA512 16f04c14e83848d3a2b41c379ea3a5139ff28033c6d402c8aea6993624e43795f57cd21d88f72db8b594ecbf5bb80813fe7b270f5db30c2ed714187351df6c88
-DIST firefox-80.0-nl.xpi 567738 BLAKE2B 40a3235eebae26ffdc291052482b155cef8e9a478d21d98ead633bbbec6115215ec13e75ea270e773962067ccb7d259e5d25f5469c7eced99b14778b9c26e10f SHA512 ea592f8a91a09768ec7bdd27f2b4d54fb240ac7295c1e0384c6d5e895951b8a0f41118fcf6cb1c88c4f784c5c77dace3b89de30260f7d7e94b857602fe6e77f9
-DIST firefox-80.0-nn-NO.xpi 562633 BLAKE2B b529c4764a15a88915ec7c30711467c0741b8365100f32559eaa1851b9ac13a3085bca1b7d23a0e4e7ed733645be1c080ec91fead2c051d9cda194e1a80938f9 SHA512 acd881e26f95f723fea317f6b55a2553bba938c8c787b5611ac63e2a4eea932a9524cee2ff5515f6bbc42cbf5aa0901fd6cc91331e5d0787aebb3e0ffa87d0b7
-DIST firefox-80.0-oc.xpi 584396 BLAKE2B b279c3302fa988a8816100c575d650140b2c43a71a295a520b132bcb37df47d8cb456da2aea103bb6dcde7f310c456b357282820eb637da9f059b1082ca1f6fa SHA512 e1c7674269b1939530304dfcf707f06ecef95c31050276b713fefd554c15f2d266a8866605edd732a0cdba6477bc38dbd5109ef4e8c43aa116541ae5c685afc2
-DIST firefox-80.0-pa-IN.xpi 613993 BLAKE2B 0f543b581c0d9928b2119c4e091968542865830cbb6258999a29018cb7e4d025b8fd6bcf8c21bf6e7b760a37fed07f0bea088debdf157026188dffc02d65366b SHA512 e80d10daf882dcbe01add70105081be50feb26178ee2ab6cf576afb4c2e4fa9f9868b694016ec006e7f6134e1f6ef40d8f9875661a479f57498d3bb451f0378c
-DIST firefox-80.0-patches-02.tar.xz 26280 BLAKE2B 11445bae206ed9e8cbadb7f9c2a2ca143c50d4924e663e3b83533f5b6b2aab4e1c760c9c21e1c7ed7d324443ce5df50d1f6b1284184ddaaacbe6c040c5835dee SHA512 51ea389c14757636eea87d9cdb64015072b85ca79e86c68a299568b2a02a8225116c40f0b6306bb15cb73ea9ba18e1767d5e0c21e0aa6dd202cf6ae3d74c304a
-DIST firefox-80.0-patches-03.tar.xz 26756 BLAKE2B c15615123acc531b99cfdfb3211e22f268afa416b0bd0da7a0e6a1411245d46175051cbb548d37503903f136a013b308e6c839424060124900f2c5e39d641c90 SHA512 1db6abf91dc1a51892c74452ad703193aba6dfbbce05b631dd030af6d0952f91578658fd865557d78bff157464bd64a71d16c23562720803da567cc24f9285fc
-DIST firefox-80.0-pl.xpi 588790 BLAKE2B 690ea2bce21714412ebc64fe353354efccd96041721ff4d6d73282900bd69c349a264c61923d3026ff5c39412e04a1be59a864a2b2607c6602b94dc255516824 SHA512 5f4b739b379fdb019fab043277f32b798cc317caae96b11f76228d5c2045907ad44f0b40649b42d66b5b2b1970fb6201fc47393eb4e2bbd86422d1ad4335b62c
-DIST firefox-80.0-pt-BR.xpi 569559 BLAKE2B d3964f5460e4eb24797fda4bfa4c101103634056fc5df39ea362114f27407a0f5fa1d4a4724391c8b6b8249ce2a0619c2a3fe914c111450c0b5f3860ad291afe SHA512 821aaed6238d01a583bd71dff1d014ff3fa8b2caa5c4478b12e54b011dce561b0ca88239774c8e59479b4488993c4dd2877e68c7e658b310fc490c826cf48d35
-DIST firefox-80.0-pt-PT.xpi 579329 BLAKE2B 774aab81cb5e10c053c1b383bd10941c62352af26098c742c323eeceab3a509bd8d6ae582545cc7dfd7fe5dbc9804227ba338fd004eaa0681a17be7f050ecdbe SHA512 639bf10dab4fe118ccc58c2d42b0ea4bd78be3edb9d77ce142c7a3a4a84e8ad55dd50ca56db7a7a94570186fdd2ded88bd99d727dd8d9dabfc30259f006643a0
-DIST firefox-80.0-rm.xpi 566515 BLAKE2B 1bd72dbe1df18c9f52d2e8e6ab1e137871390e77191bc68da66dcc8575dc8afc9354186d472cf1777dcce6bfdc61a3cee53cfcd17f86e1e9c04649105778bbab SHA512 4e66e37fcedda0d19801f6c4f8066601427954eb06492ca19e77c08dceddda46ee99be57d7a2056753c4a1d0e5095342993aef5c6f8d63ca9862e6f5e4c286ec
-DIST firefox-80.0-ro.xpi 587062 BLAKE2B 27317e326c15b8cbe63fde8f331c927ee827d6d0a4f3783eb2e7df488808f1af27ffbe8fdc41a81e3247066d9269ca5658a891c4848f26396cfda7cb5f2145b6 SHA512 0ad87bf7de8c1c3349c8fd20955df9c5fdf79be4cb80443b093e105b380337247f0dcbae12d1c72aa00700938d21cd0563232ea0479cca0bb9a9638d6d84bfc3
-DIST firefox-80.0-ru.xpi 666370 BLAKE2B 247bae4c23995a48dcf4db179f27f113a06505767352fcacb1435eb2e6bc6ee6dabb2776ac9ee4fa250359acb3dfda50e32486b890675235dd95fa66d397ba95 SHA512 978bd23224ebafd6764a170e6a5c1c99f242b3d9c1df765467ea8936cc9f6e36954c872399fd743de089b92a3bf965e61e4ad0c1c0088d67b04871b71d397d0e
-DIST firefox-80.0-si.xpi 534258 BLAKE2B d2d0dbb183e118954bd4ba66f98652ace43cd96b34e23d0485b255fc81c599316e563d075976c5f671ed08bbb76596e7f4bb6d2bf54bf7d9a55500ac7cc452fb SHA512 48904e0ef4dff84f128907f03b9f8b9246ff821d3a41bf7535024cced0d156edc5f88fc1a16d6a7c7bca70852b2dd77d72b6992805d0a241a78613024d4d48f6
-DIST firefox-80.0-sk.xpi 588132 BLAKE2B 64cf5f913f107294708cf91400c3084f0edd3112122bfc806a1d6388876376f776591ffd03357ffeb2eef95841c1d38001c9a9967707a5f855e40281c68d9be4 SHA512 14fc92562a8793b05410de817bfb13726db6bd635281da155b91d6f3752887f34385dab4b0aac5d85646e1a3430c6bf016124c08b301e6f132ed8f42c5742ee4
-DIST firefox-80.0-sl.xpi 569927 BLAKE2B ec978f158491a229f1b3e2265cc7305bb2a96141052e44ecd7931356f1c80c26f5aa626cfe7217287f20de4272444d6f6c9933544ef9059a87e225993a1d7665 SHA512 838de8514d1d762b01aa00fd22ae92388eee5d853c68b1068c6a68d6f3cca07c2ad90a21e18031d6eb546c73cd22527b07e6d27671277204e4ba43fa6a6183b1
-DIST firefox-80.0-son.xpi 454741 BLAKE2B be472bc1ac9a93041ed496bf3370d0e463fbd01772475dc22119449c22fd7c92fd650602d1562fcff929f56ae6a1acc0e72d83cf191f586b7bcf54ae9b5962f5 SHA512 d48e7520e9476fa2ebd9d9c6e0a2e4eb995245aa0cf7ad7ce26096c066dd2ee34a9363bb26d76ff80e26132d4523bc9a88cfc16c4b2b860782b8b4ac1ab81e3c
-DIST firefox-80.0-sq.xpi 580371 BLAKE2B 40111f7d2f97dc86463570173719360efb56b3bf41835666e64bcbbd0a803ed42acfb33062c2f0ff9e5cdacf87adbf5d3f6d5cf36b59fc76fcc821751135f780 SHA512 04588be952b543a8eb4d8d72dd9916fb3da96063e47166719a55d68d6c4b146268c0fede237c5214872e8cc4e2c0b44db5f13ccffc0113812ba3bed87a820cea
-DIST firefox-80.0-sr.xpi 614419 BLAKE2B a1f35336a0f0bd6c1e07b5c0b92e1d3ac3b10a6cd030beaac9440ca5d9cd42103c21395bd848ae7529921d5fe8cabdb06505d94306c688657a52e75efed5e58b SHA512 e752524ba848f11966ced0929cd47819fc9254428db5878103154b938ed7c8bf0fdd7b4bfef989b9f5e225a419d79656cde2e89151e7d00b029cc09255f3b508
-DIST firefox-80.0-sv-SE.xpi 573275 BLAKE2B 1d56192539141d8add3c0bc229d0b34e5d3c614ad55d5c29b40d392d55a231e67a4ca35f9b3e9cfb7eec7128f7e59f98800242914d2328cdd6feac2774d648b5 SHA512 eae9eff9525d80bb925452f1918fdd457cea447b1813c0744f09ab25094da599ba35aca8b61e6e4adb3e05cd9d24c12491c7e2cb3a414084e337e2550c2177a7
-DIST firefox-80.0-ta.xpi 574122 BLAKE2B 5a52c3787a8a7de48c7882bc5c9277c512eb371392be9a68520932f249e4497c64bb4c2747d3e698d607596adad1db3876088dbab9091117a54ecda88cdf5aa8 SHA512 a2f7b169c91eff2817cf3a577921a64b3aa26631e7815ce85d7e20d62873f6cf3d02cfd4751f90f983eafddd1aba851f24b0a5ce48e3d84a85ad09f62201eac6
-DIST firefox-80.0-te.xpi 612693 BLAKE2B 5093647a76f0106cefb5546168904fdf6be65cbb48308595377acb3bb8eec206d094ea3cd7f5f7833a47e3210a1bde41cae618152874646e749fb7cb2bd5716e SHA512 c8d85743853d9af641a3d8005f07306a8efe0dc31ead67205d683ae675ebe4600f3f5d0758baaffaf7f94f56f0a68fbc9742af016fdb9a5093450ac29ad03484
-DIST firefox-80.0-th.xpi 639190 BLAKE2B 77498bc8ec6529d0c858f604c5aff7777a3e322a1be7761735e9609863cac6a87b3f5e02d77d68cf36db14ba65fa3df651821a1ced9c0b5a0855792b8420616d SHA512 b5b2e1d6ef8ad75e4011868e48c062fac021fa92352263eebf37bf9dd9191eb39266e90647475de36384f53ebc4ef1a2faf7fff9d5cb510bbba07b57257efea2
-DIST firefox-80.0-tr.xpi 584787 BLAKE2B 09baa88c0af63f9f48b25403ec3f26b0832340abe5d8473cab0f95bda6ab23231ebf45edec010ff55bbe1792797fb7ac7a1211a56e8808474ca74e98f20be910 SHA512 95c4dc8f43c31c69e6691fa1e8f083439889e0b87c1c9642fe26509e4873f211b8819602369907b46198e366818c78e2685af6fb154e851a3c49f015ca5ef9ff
-DIST firefox-80.0-uk.xpi 659566 BLAKE2B 7835e456e2b1a51b800bf279516fe262d67b7260e3b8b5e9cdc9fae7c9411a7221e2db40059730d642e802005fb4ffe0e96d60dc04eec339e631438650acff8d SHA512 164bf2671721c452caa8b9724baf91af03fc861932f73ceaeac607b7ff5df1ee34fea0570ac04d89b9a134b85b5d3780ca7961eb5abc26941cc5120f65303489
-DIST firefox-80.0-ur.xpi 615500 BLAKE2B 7ac991d2813edffc7fff72d3072b43e643e7814288c02f54055d0c4587234136c26f0bdc3e539d0b9ea9c3a27c0aa6193322444ba0eda3b5fee85499357cef78 SHA512 ecc0ce2f772bc5e221b7dd7b5a58a9d5a9c240ef92101f148bb479c37272c71e68092ed8a8ccaa23d9cad6f81e6d35665e3d7aacc9ec090b32e2cea2c1559a0f
-DIST firefox-80.0-uz.xpi 522708 BLAKE2B 32a5a0aa8c5604ac174db873003d1891ac6682b3b3ab877cfc94ddb112063a1ab2214b488f7b44845a6e8c505590608450a5be34aa37fe05f46a3ac4c03a48dc SHA512 9b54bddb8ae92eec2840d88b5686e60b810f1a6c7bad465b42e99a0cf56dd17f474e3736a697fb583ed74c5f8c95f422abc57f2768559cd7c8a0a9ec0c0269a3
-DIST firefox-80.0-vi.xpi 609535 BLAKE2B adb15635aa7b2c42a1de3e89f784383103832bb37cffcb6f7348411484d78f1625919da240f5c74bd9752e7fc6ab268db11ec9f49a0765aaa3ab6af57bbd20e9 SHA512 6594a2b3572d409bfbd9d5a4f542b9fbddbe3f56336b9394d2ecfc972c8019fb07178e05be4b21b6951dadee8a3784bce22a76d9c51053d0dba6324854bf8da2
-DIST firefox-80.0-xh.xpi 458348 BLAKE2B 983dd5aed7d16e331240873ed36c9b73d03354d2338b9480df83e3c31b011b4c38d3a1d713cafb12782b4c1b0ca4245620a9ee05fe3c7f0085327139ab42aed3 SHA512 b7ab801f1ff042da2d5e83fe6182a2c0f348df84e9dc95059adbc9e79c3df0b0f090a0fbcbf980f8bd24322712d47e644f377cc47aa2bafeb127c8cae1d1326d
-DIST firefox-80.0-zh-CN.xpi 611773 BLAKE2B 2094fbe9ceff378fbe0d0d071eedf3e73bc725276b02aff5c364017c408017a3ed49799c28fcc9c6a8f25f26970ef2899c0524f3f2b87d8376eae0aa852b31a2 SHA512 09248fa1df87505305e65da64997295b230a0c90f82b1b6b90bdb4fa8b1dbb2fc30e314368fbb0cc8f1ef6994f13d04a0a2fdabc4bd63558fee61311cd5841a0
-DIST firefox-80.0-zh-TW.xpi 611316 BLAKE2B 4d9c031cb520ff965d7bc22d389b94dd7d43e330e8253e2bcda344863539f1c6f39be4d1eaf343dab0506efa76e439add4d286c618f4f61ac4e180fa236f2078 SHA512 79a95419904e573d3d41f746e65182343b755bf926f5777138e7993959e430058c9bc40d0349b76c0e931f7fb8c1eba2f6c21a8d854e23a9c293e33a56956289
-DIST firefox-80.0.1-ach.xpi 504583 BLAKE2B d885d46f9eafa9e4c390318b4d01a9c3bd6ffe559c5a619fa7fddd8edd17599c61162499e7ef6b24a68e067ac1e5434e428519bb2dcec1d1b288ba22b7547be4 SHA512 ac19b518cc92f39e8fe16eb86f9c1a273db0f7ba4bf9ce001c41dac2b33400ebe3131ad5205009ffe96ff1e067212f7edc2f083f8cab29f8457af77efc299335
-DIST firefox-80.0.1-af.xpi 444291 BLAKE2B c71a2cc6c6e56855ced7a4a85dacdb11265bdde39e5e0f5337f35a031cec45487a71fdc1ad35530fdb71360a38dcc81dec789a54da41f653db5dc0bb36a34b31 SHA512 29bd2b91adf1976a7d9a40ee0db8a8fb17036bfa28a2ea2eaff2f17ea91cc3ac49b4bf99259315e3ed8e38cc229a68a1c68212e4c13fa851d6e94efa01a3e410
-DIST firefox-80.0.1-an.xpi 542426 BLAKE2B 7d9d8d305c9819d2840b29876aa4074971887904e172f3d5ebc090dfc5ebf5ca9d6e7cbca490fbe0c4e53eb41952732d047e235ed18a344315bd198566a92a3e SHA512 b6e490f206b4d20e6bc652b9daa24f78f1b4447e32ea77394b92e73ec0de6f21d30e22ca3ee87f2a95e437cdf7cab6a6a81307a8ec1451e69f761671cc03a5b0
-DIST firefox-80.0.1-ar.xpi 591816 BLAKE2B 4d8aceaa4e7e44394be8961a3515dc98dab892bf3ff15a3cc93d35501db33f8764a8579fbb6196ce85d68134f3cdead11549946e2f73a986d49731594c9e762b SHA512 412181e35fc61a871076867c00133670c4b04e199ac4bf0909923f850cc60825cf8411eb42a449c0d921b5702d2463a485826731b53b76302e06702c44ca7c8b
-DIST firefox-80.0.1-ast.xpi 502149 BLAKE2B 1e196ecdf387c4769f8a5000df918679b95d83d1d06306b60a7146d4b11328e6883baf85c6ea04023cafa4e50f67301f6276dcd4e70593a9149e3f06f25dedea SHA512 1dba93dec0eafd28b13ced483d098e57b77816d9a64f6fc7089516d1adc23c8834c672fa2ba52e53ce8b1599f55779c24fac0a54151f3cf84d3ebfd0265065ea
-DIST firefox-80.0.1-az.xpi 539349 BLAKE2B fbda6488399d8dc1e9f5d9dad3be9b6ba7d32bfd826a3ec28d6b0b020ca83505b2ef5121e36636ca837d3675d1aa7dffe57f3df3b85094d91e75b24339d599bd SHA512 7a044fc2cfc7e36f0e8407e804ce29deb6441c33e69e11458f010b614edc5f01bd4d03086eb4e81c2fce970878b16b294520e3c6309d1398552dc39d5adbc106
-DIST firefox-80.0.1-be.xpi 652311 BLAKE2B 14299f1248968272127d6562a85b049e0a4da11da7f8f30169e569fcee9a6c9ead73f807a4a216622d100005b9d7af5ad8279352e8c02e9c56aa2eef69111e6d SHA512 96a02f58e3a9604342cb0b755c6ae4bc35c8e48adecaf407566cf10bf2ef5ab7dd1c83951377cc21d631912811b25cff1ca40a1dff74271c29f71c7ab0b390f3
-DIST firefox-80.0.1-bg.xpi 614701 BLAKE2B 872d0bf0598f4f942278bee24d497c846e65e8ebf9217eaab0ca2a3fdcdac43a0cac71c044e86a8fb7671a5d3c6ce630ee674ff41e7c9738d3419090ffe79e92 SHA512 974fbe862f264b98a8045e306ef09817e739f8a1d6c092b60503f73d8667702df88a090abc4f492982ce11ff3b0e138a4c615bd400622a3901b63531155c1d64
-DIST firefox-80.0.1-bn.xpi 635296 BLAKE2B 4a08afd0d38908cea8040f872d9763e19466538229168fd7c75e993c3b2b8f8eaff0dfac5e7b6fda86c34abff7795f1a9af0b2cc71c9062168d6ac9faecfd7d2 SHA512 64bdd07e317c5aa04cec65fff262982aadd7aeabdfe7ae07068807e2bc6ff62042cc051d7422b7df5904a0e3ab32697f46f4ac6f9cfa118b19fc475de2373651
-DIST firefox-80.0.1-br.xpi 555844 BLAKE2B 480f327adf194a66dab2b4c5ecbd8f3d3dee3cce7b2b83710fa9628a584e062ec210f857caedb950209fe71524242a8efe9660daf209ff27110c9cd87e8ee5ee SHA512 9f199d06d38f4dee320bd818d3c0dd570faab221beeb4f8029b1ef4a69e385c8b7d58db7926ced1fbf65c8f20bf4406c1545dd4ba42cc2a1144d2aed6e8623b2
-DIST firefox-80.0.1-bs.xpi 513421 BLAKE2B f231f7007833bf3e1d874e7b7fd95e07c5c31c8a155b4017f8b00a34bc409944922b06f05e65753984ac5fdd18177a0c190a0c5396a9866b03fe45a24e670823 SHA512 c6e0ef8fcdaca6988ebbc8fa44ca1c32489c8c6667d0e30f560eef525a813789a0b6f5c721632909a936863f29320ea0054fbbdb41328a9594cc541f5fcd5d2a
-DIST firefox-80.0.1-ca.xpi 564258 BLAKE2B 547a8d2fb678dc8eb6198f761fa45df2538dd0d6584d7734c28267a30532158e7b37702c60033724e083ddad9727bb61fc8ac1b782e3b60af601838fe3dc9ed5 SHA512 26c71d36c773dcae5dbd42af3075722a40e7e763a9a00529837f8847dd59683d7404ab6bdf90543f8fadd1aac35658a93f143051cae1c12a36bbe1ba8a95578d
-DIST firefox-80.0.1-cak.xpi 589532 BLAKE2B be2d5d21657c1bffe4538130458715c1a36c709c6452ecba8894ac47cc3cccacbe23f62195221ceede8a89a96787f46db68308ed953fba3cc6c6f90e87d17451 SHA512 bd4299a8940c187b502555955c5fd7a52b52ea785bedacfbd115f2933c4c34a0a18425cd5bb5e0861abd986e125d83ff05d277c223863a6db1b6a8bedf8a8df9
-DIST firefox-80.0.1-cs.xpi 590314 BLAKE2B fa0a9d9d8544437b1513ed0b8fc07757e5ec34bae697dfdf15ab9b44aa262635b0d1a56877181f5ab3e5dd32ac22bee0195546b32ddbac02ecc5de716c5966ae SHA512 65b1b5824424017d3819e789a8951095c0cf7dba3f0671c501a5344f3a91cab6fe0cf0c3940685156b961489fa6b65b279f33a1cb4ae59328d00ee7e393d824d
-DIST firefox-80.0.1-cy.xpi 574272 BLAKE2B 3ab8d320bf2fd48f5825d24975ca1266d726f50181a61b5cec28bcfce96d8159c24da05da83d57187c2f46ef998d914ad4c3fea9f793b26dc12dd27530009468 SHA512 81400a51bcb20feba7300b2ec8143d788e8962284852a15b1702345b344aae62b1403c8ebf4a808d2a4ff55674284b827db8ba81d0c77928f701bd7cd6287812
-DIST firefox-80.0.1-da.xpi 564645 BLAKE2B 375f10fee6b2af1cddfd145fbc7616e8289a17c6273a509cfc8c42bd94c3dac161517c536cb94763ef317df9aaf34d195db6af8d4fa950f06060f2a5f51c707d SHA512 b1e8748883ab511f7023b52846b19633e17ed49d9d5e96cc0a1062dc5eb7f60094d39b542c947190eb07d2be00e87192615a4015cac5700565a7247dcfbe0fd6
-DIST firefox-80.0.1-de.xpi 588247 BLAKE2B ba6a54fabc42338259e01a658dec8e090cdc0bae1482ff1841ddd7499ae4cb2a10c83e4dd1ab33d0101762126f454a44e4b083142deff0a44d48c0c112a17902 SHA512 a23868386debc06a8f4c1dde2625bba796c59a9898bf560ddffbcff0035b84832faca828d3b507c63437372097a818b4b51dca51304131bc8f21694a6b54adeb
-DIST firefox-80.0.1-dsb.xpi 598372 BLAKE2B fff3b0e5f2c93e9cf12781742f6b00dd4347a2ab4ef5eec05e81ca14c470a658a27b22f1c6bd3d9956716a0e0f98f8c3b8e7dd5d0247162c16b38a4f3a33feaf SHA512 615ec77f46da620ec1d4ef9fc96bf8ef43edc4a3c1476737cbf2403d73220b9224316cc6924146ed5f9ac17e40e0f6a03b90053015be74c9fcba055b05e45a85
-DIST firefox-80.0.1-el.xpi 673926 BLAKE2B 8dd6b2a74c10f711fadde537242e6de9394513853639d3766a2f88b2eb6e9bc06e195389b0813424254a9409abac80a574abdd48f2164bdad6d1544dbc57fcc5 SHA512 3ea62e7ba20503446f7231d594d84b6d81380d0614c38ba0a1a1f9f873a5860feeba791b7bcad626064bd2194b86492be182ec94fdbcb53a4cbad7650d7003c1
-DIST firefox-80.0.1-en-CA.xpi 541479 BLAKE2B cc38108b9165fced8ca6e04aa794f9ae6226b9ed7ea645650ee066e4f2054c84ab9ba386c89ecd71783ee21f837c06def205b7fc780a9273cfd8fa9843515903 SHA512 0122922c50c2254ac7d64361552d5c5c10c3492f97525857bb00f64d99ea9681f00143f8d7a521dd05ea26b6b3450bf2b8a0a9c98aea1d7535321798375f085e
-DIST firefox-80.0.1-en-GB.xpi 539266 BLAKE2B f90521d2352332c006041ed22b1d180a74c504cc1a61a9a6dde4b76e77fbc5cc9750152d409835349f508f04a2bebc39f491313a5bf770af785ada0251766e8a SHA512 4eaaeabe1a86165700c78f160d379e14df40330b17fa83c89b63fdddd65f39ea18104b9684b582357bb946dec6fdc224511874ef7167fcb9c8f5f8dbbdec2cbe
-DIST firefox-80.0.1-eo.xpi 566633 BLAKE2B fe5e6bbee2e655cfc05487809f07f532b548b43751d649ca24a1a5b285101d366c82770b3dc729364f6b11c9b805881df39e153f5c7492f17e2a1e25c876d521 SHA512 e6df7e49d3f2a85311883cca891eceaacd96a6ca8e37a4d800cabb0da846b576379a3ed1824fb35a27794696527dd421571a3982d4a6008033c41cc4ced4733a
-DIST firefox-80.0.1-es-AR.xpi 579597 BLAKE2B 3fc4229892c3faceee2e303e94cd14601f0c6132bed513e2f2b9e57b05fbbf7ac48521fc56af4048330e526d9d6b3fa506caaa54b8837f92a5c2f3c3df890b6f SHA512 202b95ccdebe79cffa5c7b911829ee819170f2ee5ea1f9a86cb11c81b392c2481c8ce6dd75a87efb7451e80bde0faeea51d2130efe863cfea10afd882ccf8632
-DIST firefox-80.0.1-es-CL.xpi 577631 BLAKE2B 8e44e19d6be3356d9a7f0d561ad07adf148b27fd57aa5f07d9f0512c2e3ffa2fe36a4f8634ab3aa4a84c6e90b8936d1a69e4e62b01adeac5a0d70171db1e6c1b SHA512 9902c486aa1950ebbca5800732da224f4d0a6c212d5a439158830d2b49d3a0cb199d336e112c5393dc28b585e5ea459d24d0628691b8f44b6e852ab3529a5ca3
-DIST firefox-80.0.1-es-ES.xpi 562989 BLAKE2B cab474e30600e0e3a8950544febf8ee3cdc8a3ed06a2dfd5d0489ecf9b6a1b742fe27933d5dc7eeae5ac2b7ee0430ebfd85cfbb0721acc33863f22eb1e8ec90d SHA512 dd895d61f68998630196c1b67827b6391faf9aa67692496ff457cdb609ecea22472598fff3a8efd969e1f7bf6917e6e87bb230cf9ea2d14dbdab033c2202020b
-DIST firefox-80.0.1-es-MX.xpi 575053 BLAKE2B 21c9ae4af67530b975a018607c1d83f12ff670a06f5f13afff4bbc79a2ef397624f6329939fbb516ba150a78c1080fa29b8443480162c0c213d5034bce916961 SHA512 c7d1750afa49e066bf991a36307f46c5207204eb1899faa52cdf9a148566270ad98fa4e392292805b7fbbc2847d7990a91fd6b5d759d18ba4d4feaac9614b089
-DIST firefox-80.0.1-et.xpi 537589 BLAKE2B 591615c642322acfc71d4c082d70977ffe5bef875dfa5423451cd6b15bebca9f0f71c725f90474f7c86b77662779f802621dc7467e4210690ba7b0ab275b2fc1 SHA512 aa1b000d1cda7c6386e433f58e818b526b4a00fb2c6cd52e314b9df73428d9b1727c36b563e8f74f3be95e269ddd683069ec977dc0418489fed262694afd5d9b
-DIST firefox-80.0.1-eu.xpi 558572 BLAKE2B 624888cb8367888a76d6d33c0ed9a72b7cbd903df5f50466c1c99af59456ab40327f630fabd16318bffab3f085f1518ab735dcc335162b3270f26774df22c382 SHA512 445129660e64aaeee890ed17817e07f1b81396e56c7825d42d820461d35431e063d52638a8e70628fc0ddcc3c95f70ce6c6147f73926cd13117d21c3e4400756
-DIST firefox-80.0.1-fa.xpi 597158 BLAKE2B 56cdef645e9ffa0985ee1d19d3a690a5e20748789272c01469609b9e557bfbcd8c765a5e894aef6e50408c5fae9b201285b326ad25b4f53096966d62c65ce198 SHA512 618edb84fe834b0a07d6f92e474a8daa6f6020131af4a650e67b53cb209dae073e41c7ecf3d3106a02c6a0a8d763ef1c7c115e3ffab8893c1fdf5c651c1c450b
-DIST firefox-80.0.1-ff.xpi 533516 BLAKE2B 04d8d9942fedf9036656aeb5e9a72122bfbb8849963b849e811b53fd20ec8f44f28bffe707f0321e3c75e102bdd88e7e83bbc46871bc76e29a5f28ef20dcb4a4 SHA512 9c88ea9c89335148ed8e4e7921c20362d1081aead5a4bf9cdf20bbfbb62de9b30e73ea4b5e7a7608617810cca02cca666293f18af2e27906c4b3663109258639
-DIST firefox-80.0.1-fi.xpi 564288 BLAKE2B 3064fd38df3fdd759679b946875b74e0095229c42772fd1669f495fed787dfb11b7bf6b7d8b7fc4bc4093c094699df7555d350d267badd1680078ab085baf567 SHA512 75cffb30b10e3a65bc1005bc07ad8d2bd2322a86979ba8076c181f4172ac24b50ef2705a50edf005baa55fbe43f20f9d3966d8efe626954a4de5cee9a4495c19
-DIST firefox-80.0.1-fr.xpi 588643 BLAKE2B c82dce22ffe0967cdb3634be383fa7be466d43593c52d5f9c8c632a41c4d59471023efe6bdfea48c7825bea7ef81e5205933ce264af66dde7052395323a0f4e1 SHA512 97c1d0630ebdda03e82bae7f05460ac01d259349168795893552e519c4cbbaee5e510c5873769a7689f65a3ea8a42e6b57e1803b6ed931efd8af4fb504744edf
-DIST firefox-80.0.1-fy-NL.xpi 573865 BLAKE2B ea8138bd570e2464526f612e9f16a83de673f4f48954f0052950ec907ac83a9e837f3351ef91dcc6f04d4b48f5f7d581086a1d2aae310de6281a8a4bef81bcc2 SHA512 7b3c109910b9430bbc5e03903af418eab74e7f6dfd190ae896814c724bcdf77717561e5afacb871280789952a4fc13f6b9358ce39ebe47f1a105ee717e4e8f55
-DIST firefox-80.0.1-ga-IE.xpi 516236 BLAKE2B 0d81cc6ece708e073c25b514451f7f555f6d24f8bcf91862e28df88881267896fb0f39a62f6281b1440cb78ce151716f460efc74d3349001ef1567f7bbcc65ee SHA512 65e5b043cdad51329c4895ab6fe8e80cf29afad58ffca585a77d827ca70f03259c86c3383e260438a47e993af93fcd05198a102dff2efe0e47d1b836c7af6e25
-DIST firefox-80.0.1-gd.xpi 546276 BLAKE2B 0031948453692579fc83cccf78ce642820fcfc7626b8063ee443bb2c45d0c41cf99521af45d4e41adce736ba65be08e4113afade05ee9cb15c900e653890c883 SHA512 017bffbc2748785a83c3068d472e53d4ca6aec335b1aaba2b25371172353463657c87a4f255e892282373c6499a38d154790a0a9db146637f71839bc2a3e6311
-DIST firefox-80.0.1-gl.xpi 510190 BLAKE2B c43f142183f552a622709a4bbebbe6c70fe5717de979713095bd5a284787a3fedef5ad361a2212bd4e269ae36ea3d9fc05503d0531041e6b20ab15c4e7ef274e SHA512 8bdef6d9a9dc93291103ecf086e54a2f1b5c825b5b16a799ed7e289c27e40afa33203cbdc06737410010bd5d63395f56762967474f19029d3fd448ce3bf01bec
-DIST firefox-80.0.1-gn.xpi 590791 BLAKE2B 1ddbce705dbe7d8376dc85572cddc622aa5b3bc0fa7558bdf4a3ed6460b4778a4917f586bf7ac9d2685dbbd807cc175331bdfe47e45d35fba4b6cc9eb1ea9ad2 SHA512 7b0ba306f99c4b1b184d691a8dbc850d3dc6163f98c0a06b702396bb4779a97fa766ead27da314e4a0e77e8bcfb62c99bac08c9f4d6c7e69479f3d4db43454e1
-DIST firefox-80.0.1-gu-IN.xpi 604461 BLAKE2B 20af1b1f004c2ca8e2fe0c253e79d2c0b74ac063d447040d5681e73f87a9eab87b30c0e6f3872ea7b3a66bd4a0ca5655dcb2de890ee6d815b395262f71676bc1 SHA512 f6ed907d915b5247becc4bdde4c0162ead1e23bb09503bf97e18f7308fe54d22436f0166618b1456ee586d72fc7fa30ed787910a21c0443881d379710e42d969
-DIST firefox-80.0.1-he.xpi 592098 BLAKE2B c68b749791ebde80692f2de63da6ce4da9a1f42025bb9d8db468c2980ff0c0a8e37d11c3cd56d0066d4aa7e95cf89ece27ecec90c68d4c7bcdf709b19266058a SHA512 35c343af1655da469a40841f47b2d55be613593ea6dc7d919e8a92cbe0397c5c6846964788f4b5352947daa804c6fa33f5d18445c10188715de9a74ed53f4027
-DIST firefox-80.0.1-hi-IN.xpi 625903 BLAKE2B 58eee14246b5bd011dd5d8b80f6e550062091c11a6ac9bd68a2e0440fd976fad9be85d1fb48dda4cf84ee77ebff5a2ae0647a976098c828154fb986f7f94d782 SHA512 910c22111eddc6cba2089876ae726b580c6883d7fdbef6cce12b41977abb8aab69447a262aa748c35de77476eb015141ead769925d1d06a10fc671290d0db493
-DIST firefox-80.0.1-hr.xpi 570021 BLAKE2B 08bbee83abbfa45bfbccb6665cee2c28c9725e0a47cda940575a552fec7d08b26161d878731ae36c3f2d6973329d342920a7e65bafc48bf6fb5fe587cff0ee8d SHA512 2be01411f887388770afc99efdc2fd77ca02327d51c8f4d1a717f13f0dbc147ba7fc39a56a686512cbf4cbef3d4b6a5ad85c0d03c878eb5b44386c47fe15eb8b
-DIST firefox-80.0.1-hsb.xpi 595914 BLAKE2B f755c918266cdf4e052729deba5d5a325878489438eeed30523eb6e3c7896df07c33172286e8313e7e4f4c6045187e6b5a615d1f7deba4a38daa63b49745a9dd SHA512 4084e9a4c65e57d6efc16d1f7927772ac6fa87c7c136ed4f7a82fa19db76d236ab06e08eec234612702d42e32968fd1699836b314c2ff7770f8cd84db209dbc5
-DIST firefox-80.0.1-hu.xpi 600741 BLAKE2B ffd3bbcbca34377f2ec0d9ef7ff183a4fd62bd99e53317806f1419b6859804b3b9d7926cf09cff7bd6e1ce2f621c307cf0142aad68cde00c1d1800e4fe6d9888 SHA512 066da2326aefcaa07433083230debc48689be0aa82701111e9b7dfc2ac45724047029a0332401d66cab53b90bba243839f28014f773cea442a5e25ea8b387e23
-DIST firefox-80.0.1-hy-AM.xpi 651784 BLAKE2B 874cd0c9c62087d131382b1be57a30536ec45e5c58886fb79ba1315dd6bf8fce68330b2046cf0d16c6e7e4390e46f6fe1e7a6dd62e6ca32007dbe58a7129f3a9 SHA512 7689b2fdccd31f057c69ef02ec2ff925cdbf02fdde70e929879ef4ce426458b51ad5576ce99af58b2aa250e1c497c333d21648effe254e8310a666cc07564718
-DIST firefox-80.0.1-ia.xpi 565290 BLAKE2B 75e6b194b15b16cf46339c48ea24775bc5dd113170a0aba9078446a9b40c4dc208f9f81045bb4ba8928d2d0f1319b6620235e2b228fa9b923b405ce93f993b81 SHA512 d14576bf7bd9c686e3e5cd9fb1b0477f95db0cc02040e00b66939e494743779ba705eeb01e1f8a6730b079e9c6a1aa40f5bc6874f3c708c2d4a0614f15fdb13c
-DIST firefox-80.0.1-id.xpi 558440 BLAKE2B 5fc4cd0ff0b7a4338be2de63a5ef45febc6a0fd203e5a4c50a622b4b6a3c82d2e244bcc80460dac87ee8049310f5dd83ef9b1be4cd9f1c27902640e5a52f26e0 SHA512 d7606b3422e6cba126dab8ebe68d3d4fc77c93eafddc118191a7dad474dafa402907388bb269f9a6654a44be06aa61f72698e893b608e944afa8ed524b2e5605
-DIST firefox-80.0.1-is.xpi 529509 BLAKE2B 8b96219b2cd711d13b23cdd1f3d3d59ae603dabcfcab31eb98961f0482b61e930ebcf074a008fed654fe958b94dc0861c8521b0094c282cbfdb4c5282efa90c1 SHA512 5fa2a46a70ad0b88ba40a495ae9c1687aef359fdab8f721185352b124f15c755af8fa0ee6fff3abb5dc79daa5b560fc12e671438280b03a5e1523460409d5a30
-DIST firefox-80.0.1-it.xpi 463581 BLAKE2B 05c9459abdbc3808fb959cfffae271868b8aa1952fe3af48ec1481f032ddd53b1e3aaa62b28ff7b4ae44dc90e15b3aafa5900dd46f1473fcb6c2dcbf16cc6ba2 SHA512 a5d20ee02f37575457af1ed9a1ddd40cee0cc1b85dc6ce79e033550abafccc85f0f8436ef04f28683fee777e391644d10b812fdd308be5f967079b13eda19e92
-DIST firefox-80.0.1-ja.xpi 601243 BLAKE2B 404e4004234e9e81665dbfa6a2014ef8e3e8b72d1f143400c3fa097c7c3ad4e66f5d3cb84e1d846a104eb041c5a10884bd25a3218081402ab97ca91d65db0f13 SHA512 073f13c1ad5287adfd3602791547a544d6cbba24720e7d7ee205bd11fcca2a458d32370a41443a46732599b8286132787a7618ab18363b20adf39b9962afab55
-DIST firefox-80.0.1-ka.xpi 626403 BLAKE2B 63217d95585b900ad6a6e13d41067f394c4d2eea5f249745c4b82ca75fc440f1f3b521b50d7c47da3d2ff332cfd5df9327206a0176c0a224d08becb4391e2fe7 SHA512 b30c64ce4272816dc9d7d88f6e0e1a6bd45b85eac63823182a85b6eb176219c74ab024394b7016961dab4516af1973de845085d1bdc5ce8c4c76e8cba4ac3bca
-DIST firefox-80.0.1-kab.xpi 583640 BLAKE2B 265db8138bff8e07f11963cda3f1b4ede8156f96bdea9709bf71fd518244f7f3be144df52e25f6ea2db7aac70fcbfafdbd1da0fcce42bce372438c456ac3dbf2 SHA512 e123117fc4dd8469e244de5f1714e2d4438413b2370dd6659e074fc6738ef558d8e0a566a028d8e87062fea8cbe153403fe4d231ead32cb7d4043ec6aad3384a
-DIST firefox-80.0.1-kk.xpi 649669 BLAKE2B 677335f9c33159810f6a73d4e0c080efd3d294e2c1bdcac8d5fec4bcfba61ddb504ca6943af83c8dc4d82ea86ab16df29eedffa326f712b1d7fa1c93da5c918e SHA512 20af3efbe6269624422f1ee7a9254528febef20c09c402152da9a86cc076fdc4fa51e730df7ef154edb1ffc048553675a3d2ad356c9e06a0e0e0107e7823a797
-DIST firefox-80.0.1-km.xpi 568463 BLAKE2B 9daa1e7bbe2ca082578b8cd9484b3574a9112f66300c198ed5c9cb6e40dfe4261ee6115c7207676646baecbe0fcb085e48cb6edbc7a6607aabb6b4e0009be7aa SHA512 b9e4c78612d2ce6d20c8628aa2fbfd0edae3e175852c14ed4489e72e0036a1627f3218425a72862b4bf2745b3299caf6e5306751fccd083211153e472dea2b45
-DIST firefox-80.0.1-kn.xpi 559704 BLAKE2B ea4c2031c7efc41556de3356e64270ae9a2f964e38f28f97138ecf26b146cc39b8a58ba2d90fca5c851139aefc443aa78921429f7a11d0e52d020efe6b80768d SHA512 526b88bfec9b1c33a120e7ec2f045d20e19704b48db87d84faeca5c8ee5ef56159e12601869b2d2233c293b599907f76333789a1d3c503ff6377a1c76caa5be5
-DIST firefox-80.0.1-ko.xpi 614390 BLAKE2B 56fd747d8eb0eb5da2b102a55e202c5d5c7f5cbfe38509ba26808240bde470d432878a3e689fe6afd67364556ca2768a3f096ec55cda5b64bade4400e037c325 SHA512 50f6484898aaf1a9bdd91eae4c5ffaf55c05a5b28aa4af825dcadc64ebe18db77ec97108648bebf87aa1273ba1855a0c2f405820643f98a31c604e7a6b04e942
-DIST firefox-80.0.1-lij.xpi 528971 BLAKE2B cbdd1aef2f7377915a7d8db05695d105c473eed6503f225b702539650488d80e61ed04abf165185802e8f661b6fda160c9cc733992b4d479809c35c641718077 SHA512 66feafb6d43fc5099083d25d8462850a575f2f43b4755e5c3e3bdcaf33c554f462a4df0b199a93486f3bf24950b0ed5415bb835df0520f5c7a62a81547ef30ee
-DIST firefox-80.0.1-lt.xpi 587840 BLAKE2B 5c51f5aa2c97e17f01ee6ab29bbbbb91afb312f2ad89c76bffe03762aaf2140ecd98bdad75333a975900dbf6759ff31f0738c5ab5aef42a1d6fc3af01492bea6 SHA512 5d38561dcb9312dc62dd4f06a7674b277d0be1317f9fb1b6e1eeaa889f0d0466a7c1ad529b2f8d58de65f51d5abd9829999f33db30fefe9a5a3b54014c60208f
-DIST firefox-80.0.1-lv.xpi 519818 BLAKE2B fe825a830cedb1b40b903be1a17031f0f52f8bb79005aedeba0691f54c6cdd02a315d0ba5d17da3abb2ef79aed52ee56828010fe0916a9c21466ca859b48a412 SHA512 789d712a7c399178f43e5c108e2727ee6be58b999df4248f2669d2837299da79d0cdd20f3dbdbccfc1656056573470633ed3f65fd1903e2e509b5645298e48ac
-DIST firefox-80.0.1-mk.xpi 482548 BLAKE2B 53d581e920ed2f790a7184f37b2bd2b4d312b45e629a8dc2753d21bae585cc2ad072e2773adcf5e96a38a669e8a04d1a5647395fcd00fed961f116fd34f06459 SHA512 a31bd6b70316f986b9c7edd3dc797103d49a193f180371dd875eb17391fe94b92103606cb06fba2378b8fe1329475c54b8296969496eaacd0f140e83038ec49d
-DIST firefox-80.0.1-mr.xpi 601274 BLAKE2B 7cf25f0a127183d79ba5bb1c4181cd0d5e799dbfc96d7dca1da2cedb7d1498a5068443df6acf2a6820c5281ad1378cc21d1fb27e734be968dc8a1980a8962ccb SHA512 4d9ccad61a868483ce700b28ace409c7907822c0c5bf261bf8f4497aecd685fc760226ebc5af08d8678a8a582ab59a282ecb73c595ffa62e404f39bf37f73c6d
-DIST firefox-80.0.1-ms.xpi 502900 BLAKE2B 904cdf465d8015a73584a98c97d4ed168f2bec898c02762a87a82f2cfc621d0d8bc25d6bdaacf0ee4803f43a3f1f0fb71655d0aef7990e0ac2b0581c3ce59253 SHA512 1c83be4e5c2b7267f8956a534596c31bedd9680539f5b93731c92c42012d987024dc1785fa647e9db9ef5554e5ea469e132906b4d41789e2d31d7539b0c698a6
-DIST firefox-80.0.1-my.xpi 557148 BLAKE2B fa611100ac7fffa5c5538493679aa7b6a257ab8300ad583928601ec8332e13f811bed34274b03a75a5ba84253dd54703dbad7f477fd82708b11fb951dfdd3ffe SHA512 bce7f873f4379d3ad12804894c0d52ef38f0f4addb43e556cc8370fbd8c5b2d8a5370a9007a6808192223d51aba6413d3596db8c262f22347d7d27d2027a41cd
-DIST firefox-80.0.1-nb-NO.xpi 559668 BLAKE2B 02bc6ca754b8402bc452789fe92f9042e9c3cb8cbd55831b9b89300765cfd92ab231aab452b2958444cc591e5b70da38a97c464d64fe9246f7f88afca463f070 SHA512 85cef35f5c975b313db2ff28c7b432957a96de41fd87fa727ed30363b72fea30926d4893d65d877b6a9f65c195ec4381cc56eceaf825afae9a95efabe8c612b5
-DIST firefox-80.0.1-nl.xpi 567581 BLAKE2B 10ed307f355c46ab738ff303b9ef7de255b22805dca76b6edb62b0831ebef44ab8d591b572e74c72483d0d2ebd02dad0e111d42529dc36ace894f5ac3e63caa8 SHA512 c83f5444ef5e10ea9f8578674bba1f1e957d93703177adb1abb13d191f202df184ec2e91ea15f559e9f350f5edd3e7ae61f0b79a3709ea9380f0c9902a8b9554
-DIST firefox-80.0.1-nn-NO.xpi 562491 BLAKE2B 06b2608a77a3f548433a504257c16abfe35634383ccc469568da9ecb28524dda1cbf4dfdfcb26812a5f43fb8d3930c422e6c77d68b4a326094f1dc2fea034ec8 SHA512 42a57f7927029864e682db3507dad6189d2518649b4520de0ffdbfb8f7ec687ce3df50630859832fb0ec2f3f0f45a5998e8cbce11999ff6b02d17276c3b1e026
-DIST firefox-80.0.1-oc.xpi 584239 BLAKE2B aae9400ba32879130cfc1b80b4d5a2a78fccf17e31d76e29ddb38d241f3adb5dcad3e36761d742560151f0916e6e897d9a31846262ac386d2802ea478a06262e SHA512 b78f228736a66e0f9378a80dfd41aa5c8bf33d80271f38ce65c41f956f7d8c06fa84e7089e3e14073966c60de6bab11dd1f0c3f9f3400f1448d792171d0f21d9
-DIST firefox-80.0.1-pa-IN.xpi 613847 BLAKE2B c8af3f2ca1d007225ccd274aff221f4a9006a9f451fa8ffcf949f8027ad82ba09e985127afb26a12bb02865d8d417a7320b2e1a537bd4d9322c5c31025921c43 SHA512 39080e2f2c4522b699cdbc4f118423e1a10d2f5ac2b18fd5e90af85cefdcb76d1ca04c31a8e1174e1b79773ebd76f0c10c08b61e328cf620f706af130b40e4b8
-DIST firefox-80.0.1-pl.xpi 588634 BLAKE2B d360327bf88a7ec2578759a7f42d015d4dad50324ca08c77bfadbe21c3524cc0e16842e3ad491a8774093f8bda8ebaece0704331871ee6dffb8dd827be32be66 SHA512 26264d3e7a26b4fd24d7e1fa36efe1989308a814a062033f9f45d6c4ed7ff2e32272eadf1382a14c04cdf83da961b6f6bfd0f5fb472bf86d2a8d2124fbfdb12d
-DIST firefox-80.0.1-pt-BR.xpi 569418 BLAKE2B e72d3bdf4bd3a9eb2c36f0adb0d623373d466cb2b2a8366fc8b85ffc8c5647a83e41d3585c108721d860b8b7c26fc127470025da634076b115ee88da4b9aa2ba SHA512 35610b0e440cf5b0ba2757eefeb4f02a1e50488e4be983c80bf09f7bf97e26b7a21143aac672277e33b784908b9f261b54fa3239f989d4130f5aa62a17da2ece
-DIST firefox-80.0.1-pt-PT.xpi 579182 BLAKE2B 798376fbe011db8102010f868127c914d0d1cc8b43dd7a860321dffac88e42140cfbf82aed048ab0b4d42d7ac7375196719930f1df72f94ef3e91dc5b857b81c SHA512 8f7681c7518299f0373db051be6ad5928148dd6b2c0032312683b114e524ef2ff8dc5501c17dbb02b7aeb5185c19d550eb8475a361006ceeb54299563fbbe87b
-DIST firefox-80.0.1-rm.xpi 566373 BLAKE2B 89d577b27425f5d11958d40b3d91005af652232d682d97fd471152e2189b6f6bebf82ebdb78f01bf22eb073dbd3c4c11f691cb0f39126b84e0df67ad4fc1d07d SHA512 0bce2deb89c88f7a65fc8690b9db5086d5d985075db69c3994f949158ac0cde7de7bba2814317ba42d60bf48d9e3f7723d7864dbabd9d9029f6f026efcd2af20
-DIST firefox-80.0.1-ro.xpi 586939 BLAKE2B e4cfb3cfd2e0c058709aa5da299725802c8297ead947715f2bd3f5e9f44ad3ed6f985721365d63f9a3876b4dae7b397c17f3ec5ec200a8f3ef1abd3038682236 SHA512 a5561578101ac24e94458b3b55e0386716b4d33da5427bc58385832bd49e033f7d4ff2c6887952e4e3004f21e4efcde6e672439c36ef7503c3099ab4730ec39f
-DIST firefox-80.0.1-ru.xpi 666218 BLAKE2B 8cfb67d44e0e9faf5d4c4ecb2a651ea89a5d75d8372360ea89663783bc0c759277b405867d53d7f5397ef31564e4bca502d2111ab5bae7b3ccd2b652cff15009 SHA512 3d425e8b742463548c97d9c268975fc58320708e17572d99adf1ed4a6f787bcdc6ad9b3722edbd2664eeae6a998dfced00b385d664749c0ce261871da987023e
-DIST firefox-80.0.1-si.xpi 534116 BLAKE2B 26f5fcc5514eddcea5666beaa8761720e833d0eddee23dba117d45eac921aa1a97ce31f9a3d70c27c30403639a88ad379d4bc63f2c21b049dd471a6980d8dab8 SHA512 4ad417d78c783a95c87bbf3deb05586a4accb204785c049c75a89f3b49bcfa1464319223e0a25cdf10c99028e5530937d199abbb5dfd87933eba1b086e60d67c
-DIST firefox-80.0.1-sk.xpi 587987 BLAKE2B a63ab967999d3acadc8f6cf6f84e4bebcecba5e94b3a89e0d0c169f36b36febd01d6ee17dd08700467dde01db780eafa3de9bd4fc3a1d8d05ea344bf6555e078 SHA512 6d2288823d4f2a254afea66b1ea8712d10f55d8b31793eb8bd29211a2ac68f31265f1e9de6ab0e20e2d60bc70584de7044a63b925bf77b9a91bf084a8e9a79e2
-DIST firefox-80.0.1-sl.xpi 569766 BLAKE2B e75cf413532d4745c52bc93dff95a7f5fcdbc695ea1752013f42cbca936a50f1f059c97ea42839e2df27414d9815863bb82500a7266659f52552ad7eb2588e72 SHA512 55e6bc7d0e3fef21b4a0f04080a87a441f6c5e064cc98cad0f43620b58a44ccd7279f7d2dd658cde1bcba760cf0883f69677161f098b2de4d190f783e1ea54ec
-DIST firefox-80.0.1-son.xpi 454608 BLAKE2B 97a9c1ab015fc47e42a6c3d0b5287fcbf0248282be45ce9818e74bb39ddda493afd2f876a18ecde61e6c804d7697baa861886081f37966a7d87d2d0c79b3df83 SHA512 c9ab1150312d4ab20f269a92d09d9fd9942382ba6aadc0d4d039c5c877b44151269314c52c5e026a0ee1005e8fcc0f2cc2972c42e8fc6863a25520e1b7f2681f
-DIST firefox-80.0.1-sq.xpi 580208 BLAKE2B 78b9c0dea75df234c4f0b6aad3c689c3e151571fc002d76946c31fd0c34392eab04ece2f4bf3aa270ff6d575c96de9178de56b40c4d5b0ce2191e8313da26717 SHA512 a9a1bfbfe224f5beec6157225b942067ebf1037349a644bfe2c2bf1b08e3c48346f620d68d70079ba309e2a6649b98dbbe3339f87d1c4a32af3ed7ac945be90e
-DIST firefox-80.0.1-sr.xpi 614268 BLAKE2B c71628dffd7c1e9c261979457dba2e33f8d3ef1b5793d9856f1eedec58322ee889418982623a197a747037e63ce1a77563b6503b045a81c7ad5a4b6ac6240349 SHA512 f87036a3c1dab96891618a940991c36302265ca7dcd2a4db387701b607ec91aca38e3f5ebd086c36b16b0326c0fdb9c03bb5b3cccf4f4d1281d9ecaca306b493
-DIST firefox-80.0.1-sv-SE.xpi 573128 BLAKE2B e29abcfd0d6726316d0eb19b3b1e97e9421f34157eb6428eb56c54fa4f7ec5edfb0af513fa2a3082cfb6aa96e0c6a84504f3f3536d8bf982e0cc011f0698edf1 SHA512 710d65786c8ed82fec8ea627e789deb6a065859c19eccbaecf9ce5012f58740b2781fbe7f2b5724dcd7be38db8f01721c7ea7d354a4409acf9b84d511bb6dc3d
-DIST firefox-80.0.1-ta.xpi 573981 BLAKE2B 379297acd4f411840c69b726e88ced981e781bb7c58460d59024b0b2b3a859c7a3226106b6e6b4411543360202a44cf1264a2957ccc5d28aecc37ed824fce5e2 SHA512 2b819f416ca0958a841977853f7179c6ed0f8377f4c6b8912cafe21179f3485ba84db48f49912d3730c31ae83ddcde84ef0e2695250f8067aeb5641677f7a2ef
-DIST firefox-80.0.1-te.xpi 612546 BLAKE2B c231b2923e2e160b37bd1b58adb63403f627729ebb8c632fc1e9a74a6022c781b576354e0e0228f386c784a70b9920f66a31b0893781c5d8d46b23fcb24a8a73 SHA512 d1302b4069a9cce98b1079f7167db9e6b80f094a33dde214bfb23ad3a19dd17f8d044e0dd0926f3570ec1d0bf19856457fb9cfe69e65cfcb162c66153ee619e8
-DIST firefox-80.0.1-th.xpi 639043 BLAKE2B 562417f922589f396a756a94606036ca460c4dd0ff2e27cd40163639f1f5c35debd2302e1c4f23d8df86d5a9b0a0e7bd0a6e79303d6b1d8e423639352b12ab46 SHA512 e051e224e9f7cb29f1a85aed2b0c4b73238c1ef01e3d7777ae47a71fbbe4f32402999a5fd918d3a486348621e48a28d21ea92b2af14f251107995e3f860a3f69
-DIST firefox-80.0.1-tr.xpi 584648 BLAKE2B a3f7c00083deb58d03179c6765083b70e70b0de472cfd600156d9c0e6a588e94a0c7d62b75dd6ada47b4f1bd2b25bff6b4b6073f167c25736033cbe5fb23b0cb SHA512 094c89edfad656766cfb03cd057dfa14bb93ecc61ae69ab7f7bdc654247f0daa08c35f1011667f7c3db27676ba92d973c1bf5b5ea4668995786f159cd428a13b
-DIST firefox-80.0.1-uk.xpi 659416 BLAKE2B 8f72b0c16dea0d6448a193c3064cb9aef5d6572055750de4f642e857702934bf21555f318f67d64665111012ce5ffacabb7e1a052d11e5059ac260fe120806ce SHA512 6e08758c438a8200b23a32c61929f9624cb208ff2501de66af5b4abc8e5c4c49507ebf0213d267803db5284724677b43d4eb662759fdf9970b3637def24c296d
-DIST firefox-80.0.1-ur.xpi 615360 BLAKE2B 0cc5e0080d42743f830bafc5606375ec624e722203586c7c6be3cbcbf50fdcdffcc9e7c14a9c78e24adaf3988b9969f987178bf839670ded7e495008435f0c82 SHA512 229ab1aa8f403250ced2d247d21f3e17b484420352a830a8bb7633228e4bac4712b5d2b8ee93c82da0974046afab104eb68cbea3d0dc03a8abef756e2c4138ab
-DIST firefox-80.0.1-uz.xpi 522574 BLAKE2B a7f23d146defbcd0b2450d3bc9f7ecbec013caa1c5f742e969ead1834a9056cefdf274837b11606a8fa590cd50437c41f32bef412dc9d14e991375b1a161cac0 SHA512 e163e411c3e3bd767144ece491ce31a422d6b30d1d457298a884fff695d011fa8450e9886c681c7a8541a704373c4cdeb73493d8e941a1e630ebb9918a43876e
-DIST firefox-80.0.1-vi.xpi 609394 BLAKE2B 080fcf58e2a1478ed2fda6aa2e19f39880534aae830a9ddc1ed892970e984d55dae5154004871b8c68d4ed46c5f709ccabcdbad8158f86a95f247398bb68cfc4 SHA512 5febff5088076d865fdeb389980472a054045d9a2b18bbd19dbff7c9bf6544934f4de87f1b7d09e8f43c8f3006df9f86823dde82e68d595474bb96ee430bf6bc
-DIST firefox-80.0.1-xh.xpi 458212 BLAKE2B 9f82a968b99bfaac375486e1f15a860433dcdda451ee8d46e80e7aeedfced39f0984f26142b46f318c6890ed917a1d92e6d44e5a084932160274167b718497d6 SHA512 454d7eb2bcdc5fda55c6376d77147e0f9e00f3b0b96c3b09521393e1a2516f97339533c35d08f456bc344a76ba72da42d99a0bae24c24f103eb9675967a23790
-DIST firefox-80.0.1-zh-CN.xpi 611635 BLAKE2B 3263f493ddc0ad7f5ae018f5dba479e9daa64ff9c119bb9e8aff13076ac55fc654519d78837c68beb89219848e134211d95c12be302b079e913ab58ff36a5ee2 SHA512 ab90e7c21368a78c3eda23325b138fd2da02be577856f4ebee59d1988a2b2799876bdbd8c54040c6c45ff45804a4659a52b276df6da1424dc2a48b295b3699db
-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-patches-02.tar.xz 167760 BLAKE2B b6b3e55057b8533614597f2284d0caf88dede2a3580dc3f4ed375449ff3d776248dc37256678d416d605f69498468a63ef662e500f11523def67ff8c7f71ad1b SHA512 2229553934163ba4d017a3da23526f4577383e6c4c434e73a17c4eeec5aa4bd612f3523e0de567369a94dc23ac273fa5f77a4cbbb2ff43af3ba4f960a48bcc47
 DIST firefox-81.0.1-ach.xpi 458702 BLAKE2B bc2bbb8174556aa91d8fe9149b5e7debedfbd8682207c62c8c1ca3ad86355bd522a2c08915094871ccb46c3c9b7a0a6dde4cc1a8dd296890176003a7eb349274 SHA512 04a2e8146fce327dfbe19a583c2d1ac45289a14dff7f29af17246d6bf8ae0c61363151cbea50da2a0ca06257c9b1ab4ef1b4d26086cea48b2121f059ca97d977
 DIST firefox-81.0.1-af.xpi 429009 BLAKE2B 529a751d6b4ff4e9e1c693cd3c409d199ba5db53f499200718f1dd17c726b4d45b9c4e9a2d4b0fa418afacfc4c2917dfec09f55e5b12db39353e0759b68a4101 SHA512 c704334d07496c5cb0fb7a9755bd53ecc9fcd447772f8d40ab1d601c5a8e7d9ef99a366f3dda287b4a0e11795b5b4b3e06e0da9cc5e09bdedab3ccb3979c32b4
 DIST firefox-81.0.1-an.xpi 506886 BLAKE2B 72b0b6d8aeabd3c0db9bdd3bd2e7015bc7245250c450a4844807c320228b3c3fd8423a0677c3b93f913e3acd2cc2d8752ab22a2fb78a5b8a62d4dc03e3e8edef SHA512 3da113ccdb5c219e1fa07b678056460687a2de57f783c5056e1572cbad0b2238fe1fbd5d36d463bebb1ec0ad2842bfd440a2995185e862ab51cb23ed5b1a8d3f
@@ -481,11 +200,8 @@ DIST firefox-81.0.1-xh.xpi 427852 BLAKE2B 74955a6277dde525b39e9e851ad71eec5ddf4a
 DIST firefox-81.0.1-zh-CN.xpi 554382 BLAKE2B d58a750a62ac62c3f9ffd9807e2294d6140651b4d0984ef60f768902ad3e220a8df4f5f3a62a0b5f6f669ad0bc3903b8b721121ab67a4ee19637f707a86df192 SHA512 0a19521bdaa79dcb6693c397f0a35aba38a93431f747df50a71550943ffa886ce77390de8a5e82b5404050717c749a8659e357dfb2a0e1178fd80e3978c06a02
 DIST firefox-81.0.1-zh-TW.xpi 554155 BLAKE2B 384f9b2aae9c6e15155b9cea2c8680fff3bab2b7118551b51a084e3def1d7b9c49c8c8ca990441a98dae9af1017ae3c4ab817815e9d19059f349b1d1e34aab6b SHA512 c68e1a34e2899f45d576351debac6135a46c304732ae2a1b2c02386caf52404cb10b3f5975e841299444fa92c8b1eed3aa726541bccba93a34b44c6f96dadf33
 DIST firefox-81.0.1.source.tar.xz 338268036 BLAKE2B 47b4bcd59c90d28df89afb168c4cf2376b12ba020dc2ec6c3a899e9f8627eec2312ff5eb9ac07193c5487674e03c21a67f4a6927de9533da58a25ecc3a9b84f5 SHA512 3e7c4b95872d46fc21f4c55691a159fd2c245537e4e59072f7699da10eacd44fa4bbbab08a028e421bee46356bd02d157620ea040900305a93d6c21bbd695608
-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.1.ebuild 29347 BLAKE2B 7f858e3d1410f5c27ffb14237b82b2154b0ddd339837a2c0fe4af8dc4282144ed50c3020e603e17624e15c0090ad3556dfd095baa1cfafc7be08f33666240793 SHA512 24f1f0a3b8fb47a8834e491ac9d1c15f35723540cd75ed6a7e426e96ddb9e356fb2f1b330c170171c70a6f0ea616a9a0e4fca02d9670ffce28850e2e4d5b30f8
-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
+DIST firefox-esr-78-patches-03.tar.xz 172416 BLAKE2B 2d67e793e4f4bde447a3a3f3296d1c5ea6c92843439f87e0ab08b51d2f0dd74f0d37762807a1f24853e56f7987e18af65f010027602e32d40a3444c7e418ef47 SHA512 86f35b89ad573c10b839b1631149c6fce3374943d101a6496c40a69a813525826cb2bac4926fc7813dca334c9dcca534e0a963b0725ac3f95fbd3a1c2bf8dc3e
+EBUILD firefox-78.3.1.ebuild 30953 BLAKE2B b6ea96494109686cf5e687a5cae6414941365a04d65b4aa27eea25b48f644572abfe8b844d2c70e06dcf2601f43621cb4b84121bba4560a38b4fa992db173714 SHA512 a0d9627d0193a57cd72500ba062387ee4399b68e40e9748862ec39dd5746a1e5b340143fd3979a41f857b13a89fd605029e7e8df7ab596cd37a6d0dc60fd55d0
+EBUILD firefox-81.0.1-r1.ebuild 30944 BLAKE2B 88ee860d7b44585be2653bd8878493f84c21c0e4f11201ebb7abe34f5d16f323dc22f0fa07c902749abce3f81f30562816b4d4f0823f975b0aabf3f20fee60f3 SHA512 0c2ee770bdb36f6c3d83c68388e18906bd3c567d7fba60758e6526e276602445cdfce4af50af03b6c330f52297230b6e38afd38e3fd8708b71a0763e8b21bb16
 EBUILD firefox-81.0.1.ebuild 29338 BLAKE2B 325c2968c1b555d1ece6491e2031996f17ac8d440092fa9e27377a488b74da8bf1951e77226c449d3a65be81865e435f5d1a56267366a0f98ac083f9e10d937f SHA512 ae22698be0215086c3c14a32fd39eb0df074b7e75339ac7d65c6199d6bdf44d265369e195c81f95cd6387e81c1101cffd36f13f81c989343e58d1cbe77047426
-MISC metadata.xml 2559 BLAKE2B d1b21789a936805597548ce0636dfac52084ab4df2086dc5823fb00a3bb4cef802c2c3810690a29263b58b0d10179cf24ec9f149e18161301ea1f8e253c72253 SHA512 cadffe14e56530ae0e1f107e254b95e5dfb2f5d06cf676f65c34703e1e7700843553a51e3ecd1bf93bcfcd3b62b4960db53929361d52758b59bf1ec393a18167
+MISC metadata.xml 2063 BLAKE2B 4c632fd591403d8045cbf3448fd459d82b0433351305fb12322b6a1157c279311ad1a9fcba9af4576f336035f841a95b82ee7a5602d62f1b741748df7443a861 SHA512 75bb3db236d0941e6632def252cb0b90cb374fc4f1dd66e499522e446c5fe8186f57a9898cdade933da205c12b0e70d4e1bdec0d8bfd9689d37d03667eb92f5f
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-3 b/www-client/firefox/files/gentoo-default-prefs.js-3
deleted file mode 100644
index 073ea77e5117..000000000000
--- a/www-client/firefox/files/gentoo-default-prefs.js-3
+++ /dev/null
@@ -1,19 +0,0 @@
-pref("app.update.enabled",                 false);
-pref("app.update.autoInstallEnabled",      false);
-pref("browser.display.use_system_colors",  true);
-pref("browser.link.open_external",         3);
-pref("general.smoothScroll",               true);
-pref("general.autoScroll",                 false);
-pref("browser.tabs.tabMinWidth",           15);
-pref("browser.backspace_action",           0);
-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",              "");
-pref("extensions.autoDisableScopes",       0);
-pref("layout.css.dpi",                     0);
-pref("network.trr.mode",                   5);
-pref("app.normandy.enabled",               false);
diff --git a/www-client/firefox/files/icon/firefox-r1.desktop b/www-client/firefox/files/icon/firefox-r1.desktop
deleted file mode 100644
index a000dffda124..000000000000
--- a/www-client/firefox/files/icon/firefox-r1.desktop
+++ /dev/null
@@ -1,230 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=@NAME@
-GenericName=Web Browser
-Comment=Browse the Web
-Exec=@EXEC@ %u
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=application/pdf;application/vnd.mozilla.xul+xml;application/xhtml+xml;text/html;text/mml;text/xml;x-scheme-handler/ftp;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=@STARTUP_NOTIFY@
-Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
-Actions=new-window;new-private-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Name[ach]=Dirica manyen
-Name[af]=Nuwe venster
-Name[an]=Nueva finestra
-Name[ar]=نافذة جديدة
-Name[as]=নতুন উইন্ডো
-Name[ast]=Ventana nueva
-Name[az]=Yeni Pəncərə
-Name[be]=Новае акно
-Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
-Name[br]=Prenestr nevez
-Name[brx]=गोदान उइन्ड'(N)
-Name[bs]=Novi prozor
-Name[ca]=Finestra nova
-Name[cak]=K'ak'a' tzuwäch
-Name[cs]=Nové okno
-Name[cy]=Ffenestr Newydd
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[dsb]=Nowe wokno
-Name[el]=Νέο παράθυρο
-Name[en_GB]=New Window
-Name[en_US]=New Window
-Name[en_ZA]=New Window
-Name[eo]=Nova fenestro
-Name[es_AR]=Nueva ventana
-Name[es_CL]=Nueva ventana
-Name[es_ES]=Nueva ventana
-Name[es_MX]=Nueva ventana
-Name[et]=Uus aken
-Name[eu]=Leiho berria
-Name[fa]=پنجره جدید‌
-Name[ff]=Henorde Hesere
-Name[fi]=Uusi ikkuna
-Name[fr]=Nouvelle fenêtre
-Name[fy_NL]=Nij finster
-Name[ga_IE]=Fuinneog Nua
-Name[gd]=Uinneag ùr
-Name[gl]=Nova xanela
-Name[gn]=Ovetã pyahu
-Name[gu_IN]=નવી વિન્ડો
-Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
-Name[hr]=Novi prozor
-Name[hsb]=Nowe wokno
-Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
-Name[id]=Jendela Baru
-Name[is]=Nýr gluggi
-Name[it]=Nuova finestra
-Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
-Name[ka]=ახალი ფანჯარა
-Name[kk]=Жаңа терезе
-Name[km]=បង្អួច​​​ថ្មី
-Name[kn]=ಹೊಸ ಕಿಟಕಿ
-Name[ko]=새 창
-Name[kok]=नवें जनेल
-Name[ks]=نئئ وِنڈو
-Name[lij]=Neuvo barcon
-Name[lo]=ຫນ້າຕ່າງໃຫມ່
-Name[lt]=Naujas langas
-Name[ltg]=Jauns lūgs
-Name[lv]=Jauns logs
-Name[mai]=नव विंडो
-Name[mk]=Нов прозорец
-Name[ml]=പുതിയ ജാലകം
-Name[mr]=नवीन पटल
-Name[ms]=Tetingkap Baru
-Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
-Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
-Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
-Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
-Name[rm]=Nova fanestra
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sat]=नावा विंडो (N)
-Name[si]=නව කවුළුවක්
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[son]=Zanfun taaga
-Name[sq]=Dritare e Re
-Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
-Name[ta]=புதிய சாளரம்
-Name[te]=కొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni pencere
-Name[tsz]=Eraatarakua jimpani
-Name[uk]=Нове вікно
-Name[ur]=نیا دریچہ
-Name[uz]=Yangi oyna
-Name[vi]=Cửa sổ mới
-Name[wo]=Palanteer bu bees
-Name[xh]=Ifestile entsha
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=@EXEC@ --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Name[ach]=Dirica manyen me mung
-Name[af]=Nuwe privaatvenster
-Name[an]=Nueva finestra privada
-Name[ar]=نافذة خاصة جديدة
-Name[as]=নতুন ব্যক্তিগত উইন্ডো
-Name[ast]=Ventana privada nueva
-Name[az]=Yeni Məxfi Pəncərə
-Name[be]=Новае акно адасаблення
-Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr merdeiñ prevez nevez
-Name[brx]=गोदान प्राइभेट उइन्ड'
-Name[bs]=Novi privatni prozor
-Name[ca]=Finestra privada nova
-Name[cak]=K'ak'a' ichinan tzuwäch
-Name[cs]=Nové anonymní okno
-Name[cy]=Ffenestr Breifat Newydd
-Name[da]=Nyt privat vindue
-Name[de]=Neues privates Fenster
-Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
-Name[en_GB]=New Private Window
-Name[en_US]=New Private Window
-Name[en_ZA]=New Private Window
-Name[eo]=Nova privata fenestro
-Name[es_AR]=Nueva ventana privada
-Name[es_CL]=Nueva ventana privada
-Name[es_ES]=Nueva ventana privada
-Name[es_MX]=Nueva ventana privada
-Name[et]=Uus privaatne aken
-Name[eu]=Leiho pribatu berria
-Name[fa]=پنجره ناشناس جدید
-Name[ff]=Henorde Suturo Hesere
-Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[fy_NL]=Nij priveefinster
-Name[ga_IE]=Fuinneog Nua Phríobháideach
-Name[gd]=Uinneag phrìobhaideach ùr
-Name[gl]=Nova xanela privada
-Name[gn]=Ovetã ñemi pyahu
-Name[gu_IN]=નવી ખાનગી વિન્ડો
-Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
-Name[hr]=Novi privatni prozor
-Name[hsb]=Nowe priwatne wokno
-Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
-Name[id]=Jendela Mode Pribadi Baru
-Name[is]=Nýr huliðsgluggi
-Name[it]=Nuova finestra anonima
-Name[ja]=新しいプライベートウィンドウ
-Name[ja_JP-mac]=新規プライベートウインドウ
-Name[ka]=ახალი პირადი ფანჯარა
-Name[kk]=Жаңа жекелік терезе
-Name[km]=បង្អួច​ឯកជន​ថ្មី
-Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
-Name[ko]=새 사생활 보호 모드
-Name[kok]=नवो खाजगी विंडो
-Name[ks]=نْو پرایوٹ وینڈو&amp;
-Name[lij]=Neuvo barcon privou
-Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
-Name[lt]=Naujas privataus naršymo langas
-Name[ltg]=Jauns privatais lūgs
-Name[lv]=Jauns privātais logs
-Name[mai]=नया निज विंडो (W)
-Name[mk]=Нов приватен прозорец
-Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
-Name[mr]=नवीन वैयक्तिक पटल
-Name[ms]=Tetingkap Persendirian Baharu
-Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
-Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
-Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
-Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
-Name[rm]=Nova fanestra privata
-Name[ro]=Fereastră privată nouă
-Name[ru]=Новое приватное окно
-Name[sat]=नावा निजेराक् विंडो (W )
-Name[si]=නව පුද්ගලික කවුළුව (W)
-Name[sk]=Nové okno v režime Súkromné prehliadanie
-Name[sl]=Novo zasebno okno
-Name[son]=Sutura zanfun taaga
-Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватан прозор
-Name[sv_SE]=Nytt privat fönster
-Name[ta]=புதிய தனிப்பட்ட சாளரம்
-Name[te]=కొత్త ఆంతరంగిక విండో
-Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tr]=Yeni gizli pencere
-Name[tsz]=Juchiiti eraatarakua jimpani
-Name[uk]=Приватне вікно
-Name[ur]=نیا نجی دریچہ
-Name[uz]=Yangi maxfiy oyna
-Name[vi]=Cửa sổ riêng tư mới
-Name[wo]=Panlanteeru biir bu bees
-Name[xh]=Ifestile yangasese entsha
-Name[zh_CN]=新建隐私浏览窗口
-Name[zh_TW]=新增隱私視窗
-Exec=@EXEC@ --private-window %u
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
deleted file mode 100644
index 1affce8f5703..000000000000
--- a/www-client/firefox/files/icon/firefox.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=@NAME@
-Comment=Web Browser
-Exec=firefox %u
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-Categories=Network;WebBrowser;
-
diff --git a/www-client/firefox/firefox-68.12.0.ebuild b/www-client/firefox/firefox-68.12.0.ebuild
deleted file mode 100644
index 4a58bb474976..000000000000
--- a/www-client/firefox/firefox-68.12.0.ebuild
+++ /dev/null
@@ -1,935 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR="1"
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb
-el en en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr
-fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka
-kab kk km kn ko lij lt lv mk mr ms my nb-NO nl nn-NO oc pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh
-zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-68.0-patches-15"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=10
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 multiprocessing virtualx
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon
-	+openh264 pgo pulseaudio +screenshot selinux startup-notification +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-sqlite +system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )
-	wifi? ( dbus )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.44.4
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72
-	)
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=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
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.4.0:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-63.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? (
-		kernel_linux? (
-			>=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.9
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-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 || use test ; then
-			CHECKREQS_DISK_BUILD="8G"
-		else
-			CHECKREQS_DISK_BUILD="4G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug || use test ; then
-			CHECKREQS_DISK_BUILD="8G"
-		else
-			CHECKREQS_DISK_BUILD="4G"
-		fi
-
-		check-reqs_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 \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE \
-			XAUTHORITY
-
-		addpredict /proc/self/oom_score_adj
-
-		llvm_pkg_setup
-	fi
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	rm "${WORKDIR}"/firefox/2016_set_CARGO_PROFILE_RELEASE_LTO.patch
-	eapply "${WORKDIR}/firefox"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/toolchain.configure \
-		|| 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"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Bug 689358
-			append-cxxflags -flto
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot ; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| die
-		done
-	fi
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist ; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-
-	# Add StartupNotify=true bug 237317
-	local startup_notify="false"
-	if use startup-notification ; then
-		startup_notify="true"
-	fi
-
-	local display_protocols="auto X11" 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
-
-		newmenu "${FILESDIR}/icon/${PN}-r1.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm "${ED%/}"/usr/bin/firefox || die
-	newbin "${FILESDIR}"/firefox.sh firefox
-
-	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
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	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 68.6.0-r3 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 68.6.0-r3 ; 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
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/firefox/firefox-78.3.1.ebuild b/www-client/firefox/firefox-78.3.1.ebuild
index 1b519dbf1181..b5ee32cf3f73 100644
--- a/www-client/firefox/firefox-78.3.1.ebuild
+++ b/www-client/firefox/firefox-78.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-esr-78-patches-03.tar.xz"
 
 LLVM_MAX_SLOT=11
 
@@ -209,7 +209,7 @@ llvm_check_deps() {
 		fi
 	fi
 
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
 }
 
 MOZ_LANGS=(
@@ -393,6 +393,25 @@ pkg_setup() {
 
 		llvm_pkg_setup
 
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
 		python-any-r1_pkg_setup
 
 		# Avoid PGO profiling problems due to enviroment leakage
@@ -491,6 +510,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
 	local have_switched_compiler=
 	if use clang && ! tc-is-clang ; then
 		# Force clang
@@ -747,6 +771,9 @@ src_configure() {
 	# when they would normally be larger than 2GiB.
 	append-ldflags "-Wl,--compress-debug-sections=zlib"
 
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
 	# Pass $MAKEOPTS to build system
 	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
 
@@ -762,6 +789,11 @@ src_configure() {
 	# Set build dir
 	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
 
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
 	# Handle EXTRA_CONF and show summary
 	local ac opt hash reason
 
diff --git a/www-client/firefox/firefox-80.0.1-r1.ebuild b/www-client/firefox/firefox-80.0.1-r1.ebuild
deleted file mode 100644
index 1c590e9cadcd..000000000000
--- a/www-client/firefox/firefox-80.0.1-r1.ebuild
+++ /dev/null
@@ -1,933 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb
-el en en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr
-fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka
-kab kk km kn ko lij lt lv mk mr ms my nb-NO nl nn-NO oc pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh
-zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-80.0-patches-03"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=10
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 multiprocessing virtualx
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon
-	+openh264 pgo pulseaudio screencast +screenshot selinux +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )
-	screencast? ( wayland )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.55
-	>=dev-libs/nspr-4.26
-	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}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=virtual/rust-1.43.0
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-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 || use test ; then
-			CHECKREQS_DISK_BUILD="11G"
-		else
-			CHECKREQS_DISK_BUILD="5G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug || use test ; then
-			CHECKREQS_DISK_BUILD="11G"
-		else
-			CHECKREQS_DISK_BUILD="5G"
-		fi
-
-		check-reqs_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 \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE \
-			XAUTHORITY
-
-		addpredict /proc/self/oom_score_adj
-
-		llvm_pkg_setup
-	fi
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	use pgo && rm "${WORKDIR}"/firefox/0032-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
-	eapply "${WORKDIR}/firefox"
-
-	# 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"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-
-	# Clear checksums that present a problem
-	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json || die
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# libclang.so is not properly detected work around issue
-	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,now"
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable screencast pipewire
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot ; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| die
-		done
-	fi
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist ; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-
-	local display_protocols="auto X11" 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
-
-		newmenu "${FILESDIR}/icon/${PN}-r2.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm "${ED%/}"/usr/bin/firefox || die
-	newbin "${FILESDIR}"/firefox.sh firefox
-
-	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
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.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_desktop_database_update
-	xdg_icon_cache_update
-
-	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 "${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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-80.0.1.ebuild b/www-client/firefox/firefox-80.0.1.ebuild
deleted file mode 100644
index 47cde60ff863..000000000000
--- a/www-client/firefox/firefox-80.0.1.ebuild
+++ /dev/null
@@ -1,933 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb
-el en en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr
-fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka
-kab kk km kn ko lij lt lv mk mr ms my nb-NO nl nn-NO oc pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh
-zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-80.0-patches-02"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=10
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 multiprocessing virtualx
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon
-	+openh264 pgo pulseaudio screencast +screenshot selinux +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )
-	screencast? ( wayland )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.55
-	>=dev-libs/nspr-4.26
-	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}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=virtual/rust-1.43.0
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-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 || use test ; then
-			CHECKREQS_DISK_BUILD="11G"
-		else
-			CHECKREQS_DISK_BUILD="5G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug || use test ; then
-			CHECKREQS_DISK_BUILD="11G"
-		else
-			CHECKREQS_DISK_BUILD="5G"
-		fi
-
-		check-reqs_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 \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE \
-			XAUTHORITY
-
-		addpredict /proc/self/oom_score_adj
-
-		llvm_pkg_setup
-	fi
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	use pgo && rm "${WORKDIR}"/firefox/0032-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
-	eapply "${WORKDIR}/firefox"
-
-	# 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"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-
-	# Clear checksums that present a problem
-	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json || die
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# libclang.so is not properly detected work around issue
-	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,now"
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable screencast pipewire
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot ; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| die
-		done
-	fi
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist ; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-
-	local display_protocols="auto X11" 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
-
-		newmenu "${FILESDIR}/icon/${PN}-r2.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm "${ED%/}"/usr/bin/firefox || die
-	newbin "${FILESDIR}"/firefox.sh firefox
-
-	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
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.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_desktop_database_update
-	xdg_icon_cache_update
-
-	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 "${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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-80.0.ebuild b/www-client/firefox/firefox-80.0.ebuild
deleted file mode 100644
index 22579467fbed..000000000000
--- a/www-client/firefox/firefox-80.0.ebuild
+++ /dev/null
@@ -1,927 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb
-el en en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr
-fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka
-kab kk km kn ko lij lt lv mk mr ms my nb-NO nl nn-NO oc pa-IN pl pt-BR
-pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh
-zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-80.0-patches-02"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=10
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 multiprocessing virtualx
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon
-	+openh264 pgo pulseaudio screencast +screenshot selinux +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )
-	screencast? ( wayland )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.55
-	>=dev-libs/nspr-4.26
-	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
-	sys-apps/dbus
-	dev-libs/dbus-glib
-	>=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
-	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? (
-			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}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=virtual/rust-1.43.0
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-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 || use test ; then
-			CHECKREQS_DISK_BUILD="11G"
-		else
-			CHECKREQS_DISK_BUILD="5G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug || use test ; then
-			CHECKREQS_DISK_BUILD="11G"
-		else
-			CHECKREQS_DISK_BUILD="5G"
-		fi
-
-		check-reqs_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 \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE \
-			XAUTHORITY
-
-		addpredict /proc/self/oom_score_adj
-
-		llvm_pkg_setup
-	fi
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	use pgo && rm "${WORKDIR}"/firefox/0032-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
-	eapply "${WORKDIR}/firefox"
-
-	# 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"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-
-	# Clear checksums that present a problem
-	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json || die
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# libclang.so is not properly detected work around issue
-	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,now"
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable screencast pipewire
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot ; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| die
-		done
-	fi
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist ; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes} ; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-
-	local display_protocols="auto X11" 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
-
-		newmenu "${FILESDIR}/icon/${PN}-r2.desktop" "${desktop_filename}"
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${ED%/}/usr/share/applications/${desktop_filename}" || die
-	done
-
-	rm "${ED%/}"/usr/bin/firefox || die
-	newbin "${FILESDIR}"/firefox.sh firefox
-
-	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
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.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_desktop_database_update
-	xdg_icon_cache_update
-
-	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 "${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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-81.0.1-r1.ebuild b/www-client/firefox/firefox-81.0.1-r1.ebuild
new file mode 100644
index 000000000000..c16727cd8a07
--- /dev/null
+++ b/www-client/firefox/firefox-81.0.1-r1.ebuild
@@ -0,0 +1,1098 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-81-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{7..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 [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+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/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.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
+	app-arch/zip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.19.0
+	virtual/pkgconfig
+	>=virtual/rust-1.43.0
+	|| (
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			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}/${PN}-${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 "Using LLVM slot ${LLVM_SLOT} to build" >&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-x86_64/xpi/${lang}.xpi -> ${MOZ_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
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	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 lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.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
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	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}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	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
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		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
+	[[ -n ${MOZ_ESR} ]] && 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_add_options_ac '+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
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		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
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# 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}"
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# 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}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-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
+
+	# 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
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/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 wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_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="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-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="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${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
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-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/metadata.xml b/www-client/firefox/metadata.xml
index a9185f31e6c3..cf156f6bb8eb 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -6,11 +6,7 @@
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
 <use>
-	<flag name="bindist">Disable official Firefox branding (icons, name) which 
-		are not binary-redistributable according to upstream.</flag>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="custom-optimization">Build with user-specified compiler optimizations
-		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
 	<flag name="geckodriver">Enable WebDriver support</flag>
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
@@ -23,7 +19,6 @@
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
 		for faster binaries. This option will double the compile time.</flag>
 	<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
-	<flag name="screenshot">Allow to disable screenshot extension in global profile</flag>
 	<flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
 		and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
@@ -36,11 +31,7 @@
 		instead of bundled.</flag>
 	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
 		instead of bundled.</flag>
-	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-		installation with secure-delete enabled</flag>
 	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
 		instead of bundled.</flag>
-
-
 </use>
 </pkgmetadata>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index cdfe0dd8eb68..0238df5dcf5c 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,5 @@
 DIST opera-beta_72.0.3815.49_amd64.deb 72273100 BLAKE2B 55349662ab55f2954baaff2357cd19a31e6c39403655e01cabffa7b185f99caf8252fb3fe016b7a1660b6f9712e8f8cffa3f69c0b6f96069664742f3fa79f35a SHA512 6c8c13d2906155f8b348afab0acc72c9b4e76f2f4580e74638a3ad8125dac4ac26970be14cffc543cd51ca332b53a943c0bb8983f762c7f288b1285c2fb4f641
+DIST opera-beta_72.0.3815.86_amd64.deb 72260088 BLAKE2B 2e5446ae0ebc1c71a5d1191cbedf40125b204e400f470d990ccf54d2d869665666ae23a63890d4f7d90480d11e302d3f365f8cf983b96c5596f67af7de498792 SHA512 85860416e3159a209ea9d3d02fe994a664785fc28a1ddc412b638653a816a64d997c26af8ad9614b456fe309ba8d648c303428866f9af1b2d2ba968088b40347
 EBUILD opera-beta-72.0.3815.49.ebuild 2085 BLAKE2B 5ae88144348847cfa68fe4d042e2c1ac003ae6ee7eab6775388e5451f497ffc0c6d1ce148c00ec35ff9fee518c2ba01f6fd85e4596c6e9a7b07f669b8f6fa8d2 SHA512 73cdd76545535234fe7ee685c54bdcd114a668d67be5d9c39245b4cae4253c9f9cf9d080b46f5fa76a4f658e145adf4868a8bbe32387ae5f37487f7d59dcbcef
+EBUILD opera-beta-72.0.3815.86.ebuild 2085 BLAKE2B 5ae88144348847cfa68fe4d042e2c1ac003ae6ee7eab6775388e5451f497ffc0c6d1ce148c00ec35ff9fee518c2ba01f6fd85e4596c6e9a7b07f669b8f6fa8d2 SHA512 73cdd76545535234fe7ee685c54bdcd114a668d67be5d9c39245b4cae4253c9f9cf9d080b46f5fa76a4f658e145adf4868a8bbe32387ae5f37487f7d59dcbcef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-72.0.3815.86.ebuild b/www-client/opera-beta/opera-beta-72.0.3815.86.ebuild
new file mode 100644
index 000000000000..dff5217c967f
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-72.0.3815.86.ebuild
@@ -0,0 +1,103 @@
+# 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
+	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
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index e13f8630e274..9a49e213a270 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -26,6 +26,10 @@ DIST vivaldi-snapshot-3.4.2064.6_p1-amd64.deb 73503100 BLAKE2B 770ec75afc7f69d4d
 DIST vivaldi-snapshot-3.4.2064.6_p1-arm64.deb 65889028 BLAKE2B e53e7826a14efdcfbebca48f71a98c1bf9d08cc9d4748b7cc3094c7a5f3d41cf4e7206272ba6d3978d5f1257165493cbe8b2cc01021e62f129a217c16f8589cc SHA512 5ba83030cdff8fc402d8dd02a77f6e03ef2113d1844ee6b71271d08c0b910d9e61bcc79688619908a5931159e78fb5e56aceb4e05f7f2c5e849f895c49bc703b
 DIST vivaldi-snapshot-3.4.2064.6_p1-armhf.deb 64878048 BLAKE2B 6546116ef81c8f1b8d3b91f0da6b94e5fa96226d3b2528711cfed32fab836faa286138090772ddc86fbc17bd3e9372fa95a88ee04566500abf56c84b510aaa81 SHA512 3ca42a8825a6f57ea7b585e86cfc4426108713525f4ccf6b065cd658a3f9c918aa927d7d826f8f36c98b43cdfcded52b304b47df9ff0e12114b13e80398e4fa8
 DIST vivaldi-snapshot-3.4.2064.6_p1-i386.deb 70652860 BLAKE2B 9a648b7510c06cb24cff8e490327503d63c14fafcf777600fa0d5dbeb2f72f0f68d505658642789fb9257c6ed5a5d2f72a507644264fe2c6eb9946bc9e64954d SHA512 ed2b0407a2f746c0b446f3b231e81942085e82c03bc2e274c83332c5c46f175e6d736f3a367ad8be405ce4becfd6978508ebe42cb256f56b6c8dc002f67e192c
+DIST vivaldi-snapshot-3.4.2066.37_p1-amd64.deb 73492652 BLAKE2B 18f9fd12f5007ead66fee3054414757759e3efeb3170523e90acf97001537bd693e73f21625a3f4b8d4f909ab8bce8283eaa7bb0e78fee6522d1608f2d0335f2 SHA512 dfbd9f1efc1992de8ec41a52037db26bc3ab2b84caf18c547955202aff8fdf329a6ad9cd760fc482c51e7c424f09830148f095d1aa0039ab06db56b2dc216755
+DIST vivaldi-snapshot-3.4.2066.37_p1-arm64.deb 65907828 BLAKE2B b5e4bab513741193b6e06364c77054fe412e5d023f307386d3dfdadbf1a88a55c2cf448882c176bc685b967ab91bfde126f276c9c8c0d146480a153c1f4d016c SHA512 973da5627c0b63aab59a93692c095b307ec4a3a992533b9468b8287b26c1da3dbed320978523f50b53ceea94153e7e2993ab2e92760f0e6856bc6b8b95bfdb4c
+DIST vivaldi-snapshot-3.4.2066.37_p1-armhf.deb 64869076 BLAKE2B e98116b85b697bc72266d40d4844b5c0ac9371e09f2a47114ca705297c6bb71ebe331ae300ecf9da78ac86168e82bfcfcf3aa63638c8e844602d353bc88f30f1 SHA512 d5e9b573e3087f073e4ebf3d0c6de84aee225725f88b3830de4189aa3960f694488a8a2c2b142bf81ef357b113d5abd83ca8f21ff486e0c51ea0fcbbee9b7bd8
+DIST vivaldi-snapshot-3.4.2066.37_p1-i386.deb 70671712 BLAKE2B 55ea6949a3083762c23a7d7a357ac95464d14d0166f7d6b8332d9d88027cdf90361ba657654403d3221ae57f371a0b812dd8ebc3dd1e11f3a42fb7d4eb24bed3 SHA512 46c8b5b78a8dd0ed88d45de67833e4195a9fb5a75abfbd2ca5659c7c4a137fa4d4a1b529e0ea7f4a035d9a9348d215fe28ab834126277ff0deaedce4013b2a3a
 DIST vivaldi-snapshot-3.4.2066.7_p1-amd64.deb 73464860 BLAKE2B d1739427773ddc899de3db290e4790f6766048eddbaa50b39e529cfcb4cfd34ff458da0fb0f610f923d29cbcf5d08f50c6c682370482ad174a2b13dd73baab75 SHA512 2829da513d85d29965813281fd36ddca2793b6cbb6a107fe1e0058ba5ad7ef29141c3e327edc6b776c5ac30077236adeda0d1bc5e5b8a2edbfdc33ddeb6ba6a1
 DIST vivaldi-snapshot-3.4.2066.7_p1-arm64.deb 65925004 BLAKE2B 93da59c7829042f48893279c26278bc96fb4c55d66949f74439ad19f3eae9084c25373cc501087b180fdac9d958ed0840deb839d5c92374c221509dc232fbc74 SHA512 9736f058106e2c7db772eba109644044d6e2838880bc13da61892dfb4b2827efbb701cd4490d3ffe750684a9b19d3286fa791014eaa2b990ac83fcc5a946d79c
 DIST vivaldi-snapshot-3.4.2066.7_p1-armhf.deb 64924616 BLAKE2B 4efc6da89b75c97d9fd6f7f35808c2a39a208a94d3da573ed1bb0c5c81577349e4fde126d2e924d6a3df9c08515d2770e0cb80cb8f309851c21b28cb15dcc002 SHA512 ea8175e6e49049a4770d8c90da0b86695653b4d392adc6dd9cbaf2331ceb418d9faa65c9ce20d6605b5eb130e9d8bd89b39051d0360b4591a1c15c172dd25fd7
@@ -37,5 +41,6 @@ EBUILD vivaldi-snapshot-3.4.2049.2_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6
 EBUILD vivaldi-snapshot-3.4.2056.19_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6401395b5ff6aa8011cd07e5938e82e4d233be43095788e9826487f90be8f2beb3d931332ac08d687c84f34b20639e279a2655d5dc3 SHA512 c24c5b42d05501ba7518f746ff202349fc3831148534a73a22dc955f53eb04c66caa66a0c0dd643cf1ad1714324671c043295d393774c757db0118a5ed876be6
 EBUILD vivaldi-snapshot-3.4.2059.2_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6401395b5ff6aa8011cd07e5938e82e4d233be43095788e9826487f90be8f2beb3d931332ac08d687c84f34b20639e279a2655d5dc3 SHA512 c24c5b42d05501ba7518f746ff202349fc3831148534a73a22dc955f53eb04c66caa66a0c0dd643cf1ad1714324671c043295d393774c757db0118a5ed876be6
 EBUILD vivaldi-snapshot-3.4.2064.6_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6401395b5ff6aa8011cd07e5938e82e4d233be43095788e9826487f90be8f2beb3d931332ac08d687c84f34b20639e279a2655d5dc3 SHA512 c24c5b42d05501ba7518f746ff202349fc3831148534a73a22dc955f53eb04c66caa66a0c0dd643cf1ad1714324671c043295d393774c757db0118a5ed876be6
+EBUILD vivaldi-snapshot-3.4.2066.37_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6401395b5ff6aa8011cd07e5938e82e4d233be43095788e9826487f90be8f2beb3d931332ac08d687c84f34b20639e279a2655d5dc3 SHA512 c24c5b42d05501ba7518f746ff202349fc3831148534a73a22dc955f53eb04c66caa66a0c0dd643cf1ad1714324671c043295d393774c757db0118a5ed876be6
 EBUILD vivaldi-snapshot-3.4.2066.7_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.2066.37_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.37_p1.ebuild
new file mode 100644
index 000000000000..0178e0245253
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.37_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-servers/Manifest.gz b/www-servers/Manifest.gz
index bda6a18f81ab..83e875abd953 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
deleted file mode 100644
index 187cc4a26f46..000000000000
--- a/www-servers/cherokee/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX cherokee-1.2.99-gentoo.patch 1763 BLAKE2B d4ab785332c60fcac0c22b1b0aefabe44db710a7a0973114e8ddbe0423dd1331c64493b4e862ce944f5afa6da30b307cbd27eead278ea9a080309d4bf1d08cc9 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b
-AUX cherokee-confd-1.2.98 144 BLAKE2B 9462724ac4500ed501a005e2b001eefa53f2e71e48181a39f497c492cf69cdce1d5d325227535bfdb465b5bb6940cb89aedafb6420a7c14074b15f36b93866e1 SHA512 e010ec9e6d6bd6862c486c494e968cf93ff5f7eeaa523f1bc1fb9db72dc878c17fbc04443e74aef0bbfef1e2ba64ba00a7dc8bbd1b58f6759d2e000c76e88f84
-AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4f9d9375c26f6af04c120bccc49c6259aaf33749b071c151b80a096766cc98dee44bfc65af10208b9a43c936 SHA512 595e37b6cf70d4fbd466be918db6c17c37766f5e39a9ee4384a21025f1ce04367aeca495217b1e2c74ed2bce9ff8cfd9a58523b59d1181ce9f470eca97445641
-AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad
-AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec
-DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d
-EBUILD cherokee-1.2.104-r2.ebuild 4961 BLAKE2B ee1c0dfb98e9415edc6ab190c9c3883add22ee1f1c2a1ba17dcf3dbe4dcfab7c8c099cdde380b585079ba37186cbfb8e23e656f977e57f6ad019d72346044f32 SHA512 bafe857b2591c00df5adfe4ae7e90f2bf1806effa949675867e8e9e27ede7af7ce0adf87be323c9e0ad6d661580b8963a5ccfb4eea3d051ea6e2f0b5159db04d
-MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d
diff --git a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
deleted file mode 100644
index 431f42db0e99..000000000000
--- a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.11"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 pam systemd user
-
-DESCRIPTION="An extremely fast and tiny web server"
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
-HOMEPAGE="https://www.cherokee-project.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
-RDEPEND=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libpcre
-	>=sys-libs/zlib-1.1.4-r1
-	ffmpeg? ( media-video/ffmpeg )
-	geoip? ( dev-libs/geoip )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam )
-	php? ( || (
-		dev-lang/php:*[fpm]
-		dev-lang/php:*[cgi]
-	) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	rrdtool? ( net-analyzer/rrdtool )"
-BDEPEND="app-arch/unzip"
-
-RESTRICT="test"
-
-WEBROOT="/var/www/localhost"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.99-gentoo.patch" )
-S="${WORKDIR}/webserver-${PV}"
-
-pkg_setup() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www cherokee
-}
-
-src_prepare() {
-	python_setup
-	default
-
-	"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use admin ; then
-		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
-	else
-		myconf="${myconf} --disable-admin"
-	fi
-
-	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.
-	if ! use php ; then
-		myconf="${myconf} --without-php"
-	fi
-
-	if use static ; then
-		myconf="${myconf} --enable-static-module=all"
-	fi
-
-	local os="Unknown"
-	case "${CHOST}" in
-		*-freebsd*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			os="Linux" ;;
-	esac
-
-	econf \
-		$(use_enable debug trace) \
-		$(use_enable debug backtraces) \
-		$(use_enable ipv6) \
-		$(use_enable kernel_linux epoll) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_with ffmpeg) \
-		$(use_with geoip) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with ssl libssl) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-os-string="Gentoo ${os}" \
-		--enable-tmpdir="${EPREFIX}/var/tmp" \
-		--localstatedir="${EPREFIX}/var" \
-		--with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \
-		--with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \
-		--with-wwwuser=cherokee \
-		--with-wwwgroup=cherokee \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	elif ! use static ; then
-		find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
-	fi
-
-	dodoc AUTHORS NEWS README.rst
-
-	if use pam ; then
-		pamd_mimic system-auth cherokee auth account session || die
-	fi
-
-	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
-	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
-
-	if ! use admin ; then
-		rm -r \
-			"${ED}"/usr/bin/cherokee-admin-launcher \
-			"${ED}"/usr/bin/CTK-run \
-			"${ED}"/usr/sbin/cherokee-admin \
-			"${ED}"/usr/share/cherokee/admin || die
-	fi
-
-	exeinto /usr/share/doc/${PF}/contrib
-	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
-
-	#move the htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${ED}"${WEBROOT}/htdocs
-
-	keepdir \
-		"${WEBROOT}"/htdocs \
-		/var/log/cherokee \
-		/var/lib/cherokee/graphs/images
-	fowners cherokee:cherokee \
-		/var/log/cherokee \
-		/var/lib/cherokee/graphs \
-		/var/lib/cherokee/graphs/images
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
-
-	systemd_dounit "${FILESDIR}"/cherokee.service
-
-	# Fix QA error - not important if it fails
-	rmdir "${ED}"/var/run
-}
-
-pkg_postinst() {
-	elog
-	if use admin ; then
-		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
-		elog
-		elog "Cherokee currently supports configuration versioning, so from now on,"
-		elog "whenever a change is made to the configuration file format,"
-		elog "Cherokee-Admin will be able to automatically convert yours to the new"
-		elog "release. You simply have to load Cherokee-Admin and it will be converted"
-		elog "once you proceed to saving it."
-		elog
-		elog "There is also a command line utility that you can use to do the exact"
-		elog "same thing. Config format can change in different versions. It is"
-		elog "provided under:"
-		elog "	${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
-	else
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-	fi
-	elog
-	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
-	elog
-}
diff --git a/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch b/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch
deleted file mode 100644
index d55a5a2a82cf..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur cherokee-1.2.99.orig/admin/configured.py.pre cherokee-1.2.99/admin/configured.py.pre
---- cherokee-1.2.99.orig/admin/configured.py.pre	2011-03-31 17:30:04.000000000 +0900
-+++ cherokee-1.2.99/admin/configured.py.pre	2011-09-16 19:37:15.893487362 +0900
-@@ -22,7 +22,7 @@
- CHEROKEE_DATADIR      = join (DATADIR, "cherokee")
- CHEROKEE_DEPSDIR      = join (DATADIR, "cherokee/deps")
- CHEROKEE_CONFDIR      = join (SYSCONFDIR, "cherokee")
--CHEROKEE_VAR_LOG      = join (LOCALSTATE, "log")
-+CHEROKEE_VAR_LOG      = join (LOCALSTATE, "log/cherokee")
- CHEROKEE_VAR_RUN      = join (LOCALSTATE, "run")
- CHEROKEE_VAR_LIB      = join (LOCALSTATE, "lib/cherokee")
- CHEROKEE_RRD_DIR      = join (LOCALSTATE, "lib/cherokee/graphs")
-diff -Naur cherokee-1.2.99.orig/cherokee.conf.sample.pre cherokee-1.2.99/cherokee.conf.sample.pre
---- cherokee-1.2.99.orig/cherokee.conf.sample.pre	2011-05-03 18:01:42.000000000 +0900
-+++ cherokee-1.2.99/cherokee.conf.sample.pre	2011-09-16 19:37:15.894487368 +0900
-@@ -18,6 +18,8 @@
- server!server_tokens = full
- server!panic_action = %prefix%/bin/cherokee-panic
- server!pid_file = %localstatedir%/run/cherokee.pid
-+server!user = cherokee
-+server!group = cherokee
- 
- # Default virtual server
- #
-@@ -27,11 +29,11 @@
- 
- vserver!1!logger = combined
- vserver!1!logger!access!type = file
--vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access
-+vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access
- vserver!1!logger!access!buffsize = 16384
- 
- vserver!1!error_writer!type = file
--vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error
-+vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error
- 
- vserver!1!rule!1!match = default
- vserver!1!rule!1!handler = common
diff --git a/www-servers/cherokee/files/cherokee-confd-1.2.98 b/www-servers/cherokee/files/cherokee-confd-1.2.98
deleted file mode 100644
index 62e7fd64f787..000000000000
--- a/www-servers/cherokee/files/cherokee-confd-1.2.98
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/cherokee: config file for /etc/init.d/cherokee
-
-#CHEROKEE_OPTS="--config=/etc/cherokee/cherokee.conf --valgrind"
-CHEROKEE_OPTS=""
diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.99 b/www-servers/cherokee/files/cherokee-initd-1.2.99
deleted file mode 100644
index 488cc819d0df..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-1.2.99
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/cherokee"
-extra_commands="configtest"
-extra_started_commands="graceful reload"
-
-
-depend() {
-	need net
-	use dns ldap logger mysql netmount
-}
-
-checkconfig() {
-	${command} -t 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your config:"
-		${command} -t ${CHEROKEE_OPTS}
-	fi
-	return $?
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet \
-		--exec ${command} -- -d ${CHEROKEE_OPTS}
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet \
-		--exec ${command}
-	eend $?
-}
-
-graceful() {
-	checkconfig || return 1
-
-	ebegin "Restarting ${SVCNAME} and closing all the opened connections"
-	start-stop-daemon \
-		--exec ${command} \
-		--signal USR1
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading ${SVCNAME} configuration"
-	start-stop-daemon \
-		--exec ${command} \
-		--signal HUP
-	eend $?
-}
diff --git a/www-servers/cherokee/files/cherokee.logrotate-r1 b/www-servers/cherokee/files/cherokee.logrotate-r1
deleted file mode 100644
index 49b68364bc24..000000000000
--- a/www-servers/cherokee/files/cherokee.logrotate-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-# lighttpd logrotate script for Gentoo
-
-/var/log/cherokee/cherokee.access /var/log/cherokee/cherokee.error {
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-  [ -f /var/run/cherokee.pid ] && /bin/kill -USR2 `cat /var/run/cherokee.pid`
-  endscript
-}
diff --git a/www-servers/cherokee/files/cherokee.service b/www-servers/cherokee/files/cherokee.service
deleted file mode 100644
index a2d703185d37..000000000000
--- a/www-servers/cherokee/files/cherokee.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Cherokee web server
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/cherokee/metadata.xml b/www-servers/cherokee/metadata.xml
deleted file mode 100644
index bb0494e0acc6..000000000000
--- a/www-servers/cherokee/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="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<use>
-		<flag name="admin">Install web based cherokee conf tool</flag>
-		<flag name="rrdtool">Enable rrdtool support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">cherokee/webserver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index a0b953ef0a54..38331c9817cb 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,6 +1,8 @@
 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
 DIST nginx-unit-1.17.0.tar.gz 726928 BLAKE2B d171f2f818302cb0f491ccc3ca93596ee52817647cf1f2f176ebed075cb1dd5772f133d9e925075fe72d826a63b4c4debddace8784612196ebe6b6655d70571b SHA512 4175fc6dd84ad8a3bbdc117d3ce0c7a11c708a7a204ade0bb40f5606f6923e351bb1a8f1f8394c09cdf12fdc20bc927920412dc4b41d3141f76482db047c4bed
 DIST nginx-unit-1.18.0.tar.gz 742273 BLAKE2B d856aadb07286acb944a7bd486fc8c548db0412f8e4e2bec0382aa719d743ee22208c20ccf50466e3d592e29690abfacbfd6d4c44b1369bdc5a61ca2765bd3d2 SHA512 2beac69caeb09278a6c2cdafe20a8040e589f9ad6e302c896cd396ae7d576f563dd6a480f815b4a26d22e15592b5abcd927a8ba436517bd9b9bbb78bff3176ff
+DIST nginx-unit-1.20.0.tar.gz 787607 BLAKE2B 7ef0ea98b0fa2b5af591763ed67c1a92c7309c8ea91b29bfb3d3e309149f9d563ff8a3cb0f19f52d9d53f05a56c2a6f0e3c07e7b8315106911a87bc01f9d3af3 SHA512 dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
 EBUILD nginx-unit-1.17.0.ebuild 1953 BLAKE2B 8942de82799f70fae7997d63d34a9fe2f5ea056d288c3b07ca83e1dc36b68604959fd847bb291838a8bcffbd0bef0e084ec097c70e6c9368859437f79dcda3a7 SHA512 27ca570d72ebabaa53584dfcb66757692aa49b13133dde98a60dda1ec67b9cfb0d3ce78e3ea884e7355d3f55510179d5bb509d73ad793a03a6939aed4d14ffe4
 EBUILD nginx-unit-1.18.0.ebuild 1954 BLAKE2B a889f8b1f34ea66df35e682bf26f7e22462076efad22cc6f6cb41c182ee80bd4c7687c8742b5364ecfac3dd5a04d148fedbef3b6ad70ba123aa7697060603f87 SHA512 21ec634694b9761493395d4ca72193840e152e16888f777ca382e96a6e3743583a0368854081373b6730e0ceea212a6100ab7c5c8938285afc617a206788cd67
+EBUILD nginx-unit-1.20.0.ebuild 1954 BLAKE2B a889f8b1f34ea66df35e682bf26f7e22462076efad22cc6f6cb41c182ee80bd4c7687c8742b5364ecfac3dd5a04d148fedbef3b6ad70ba123aa7697060603f87 SHA512 21ec634694b9761493395d4ca72193840e152e16888f777ca382e96a6e3743583a0368854081373b6730e0ceea212a6100ab7c5c8938285afc617a206788cd67
 MISC metadata.xml 949 BLAKE2B 47faacf65d957c617419ef5183d99b77421bd45dd4499263eda7097fecc73633a085c05833e5b375e70865c4b12e6e02e224fdded5fed0e9eee19d44eb525e26 SHA512 c8073b3eea6233733ac01329aab48e51dd43fc6deb9c8ca8b482dbcb3df781069d750d0002f203309cebf64890d517b1ed900a9cda62e4a028fd2fd721a7f5c7
diff --git a/www-servers/nginx-unit/nginx-unit-1.20.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.20.0.ebuild
new file mode 100644
index 000000000000..ac0c6c8fc956
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.20.0.ebuild
@@ -0,0 +1,79 @@
+# 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 python-single-r1 toolchain-funcs
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-2 php7-3 php7-4"
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-2? ( dev-lang/php:7.2[embed] )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index e375c87ad77f..2821635f1cfd 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 7c1791ea2b50..d3b8ae8e2c99 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,5 +2,5 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7
 AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7
 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
-EBUILD xdm-1.1.12.ebuild 1774 BLAKE2B 17c6230ab42d7d3c054abdc9027582c31a12a49127970a108b8230f00c0342e927068d7d3b29ae03462edb413e04935f30a63c29c403710eeab8201c49903736 SHA512 b21c76a667ed310702e45ff8b413d46b54a69c7a18d9e41b5e23b9083efc81025ec6a520f5279fa6d09c412d7039e19523cb0e221dfa77b487b345366b161027
+EBUILD xdm-1.1.12.ebuild 1825 BLAKE2B 35d722f087beb4ba32fa7093406adc866c88e4a90699c046f252d7037bd4c3b1048468aeaa3e59c068a73b1d8b59c27a011a3d1bc4aa65673193c642e5e7d0be SHA512 dc8255b4b8058ffe4836d15f3411d370b7302e30710fa8b536263c264e948a7936476077fe650cd1747245ce44d8c322cad23e29f7ff050bcf31727c5707075a
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index e84d025f2a9f..f3006984c8e0 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	PATCHES=(
+		"${FILESDIR}"/${P}-consolekit.patch # bug 747124
 		"${FILESDIR}"/${P}-make-xinerama-optional.patch
 	)
 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ac0a5362bd98..cc01cb020a09 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf-loader-webp/Manifest b/x11-libs/gdk-pixbuf-loader-webp/Manifest
index f06cec098aa7..db22a2a739c8 100644
--- a/x11-libs/gdk-pixbuf-loader-webp/Manifest
+++ b/x11-libs/gdk-pixbuf-loader-webp/Manifest
@@ -1,2 +1,2 @@
 EBUILD gdk-pixbuf-loader-webp-20160328234507.ebuild 767 BLAKE2B 478f4903194f44aef8fb8ea2bb75cff166c440eb27f9386579a762b715c1ad7adde770d408ffc359fb8d7dd931529e47b81dc302317a714073891ae410034532 SHA512 0232872cbbf2b1faa1adca1b4a562aee13d16bd637013ff271b49bfaa05afd99bfa8ebca99d08010d72c32a0a86d364e6ccd84e7208d6ebcfd80b9bd0c38e23b
-MISC metadata.xml 256 BLAKE2B 148acc60ba5999bd340afe793cd756b1f5bb5d7b7767f8e7a51bbe54b226394c504c721d38ce634ac012be3928e07057b8062b34e5eebdf3cb5e618fd3eb400e SHA512 bb9ddc448dcf7af4d62c19e5522cfccbd052b6e1bb939a32d7b7576b088c9c3b46dc706504617444842b6cf0b1ef91341548b71cf930ea36a10b248719fbd2aa
+MISC metadata.xml 342 BLAKE2B 3036cc963c273eb086246302156ff0dd4ebefa7e97bd9a46096a9c73944064b8b2daad8cefccbce2501d5b430d2d450bfe1c94de6464ef26bc095985a3ccd955 SHA512 b41ff0807862bd1305a98f53193cae55b62c66c2c8400d2e42f46dc44f5e7cf053f591dcf3a965aeda43c57c6239b3a559f0c234a43c96ee60977489d1f5b4cc
diff --git a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
index bad62cee6a19..4c2fa98245b3 100644
--- a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
+++ b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">aruiz/webp-pixbuf-loader</remote-id>
 	</upstream>
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 20b5792851fb..111ca40eda8f 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -3,6 +3,6 @@ DIST intel-vaapi-driver-2.4.0.pre1.tar.bz2 2888363 BLAKE2B fc7861e5d7625ed598fea
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.3.0.ebuild 1308 BLAKE2B 2aed9e5ffb8b4c557fbe3fe405025a987653f308a9e87435b69270a0b3269d00341c4eb6087a3c118dc8027de17ff0516d90fc698948eaf8f8ea7b586e2e92ef SHA512 284c598bd7933a807ee0e63e782cb5a0e03c0a2e863e2df559605434e1679779774f636d9f963fa58cb492483853d49d70012b5ce29e66dcace78cf686b41736
 EBUILD libva-intel-driver-2.4.0_pre1.ebuild 1326 BLAKE2B 99e4ae3fa927ec988c9526d161464f256f88d71624cc760616d6e7e13c94c3096ec1a4a3f9a402680cd6778741e8e67314392a495ece792ca1a05b8e010ca213 SHA512 5d9e98f4565911b00ac59fa672f968eab8695dc9a9826314110107104d762286353e6fb0e65548692d83c7ca28f8e3b23adefa3b6d138943dfd6d08d0139ee7b
-EBUILD libva-intel-driver-2.4.1.ebuild 1313 BLAKE2B c82a7543be9f1f2e6712553c1283bf43a74da647444da5324bba132f7f7639f7f8194d108d321d222b441c78f0840b7dc781985977f88aee3f74b8cdc008763f SHA512 ceff253303fbdedeac5dab732d313a10ec400eab6e8b8fed44c468f5b091a8eac73874dee2afdf775318b7fb09781da08fa92c46d4cecb3517a3c1572ed3e09a
+EBUILD libva-intel-driver-2.4.1.ebuild 1312 BLAKE2B 2631a8b68421c285c1718c381b58f88367893b72894033f75230e7627a36a027af5fc4ab10088e5f91eb2f5e837b52e90b8f2fe272f895b97d30e603b3181238 SHA512 d1e5af4a00a0adf6c1bb04473d6bcf72144697e14f5e59c7b82cb5da855083084a3144e4974633c4d8ce2630fbf110a496e296ef82c8f78b035bf550772c7993
 EBUILD libva-intel-driver-9999.ebuild 1314 BLAKE2B 10eaf18d44d1e5a583e665c7e423caaede7909748fc62dfc270affcb3b0e9db3ce7ee8e9c00cfca3d5aa936857e50a019ec7295a28489281e28a80915393ec66 SHA512 225cacaa64b8a4dbdf2d1c7ea29e45d90422fd15fdf938d8957de1e3ccf2d60951e52663f9f5bee9a08e267ff60ca7595816f74d2829f29f5693e389b310ae84
 MISC metadata.xml 348 BLAKE2B dcf3a9c208ab7377f3e6e8fdb8e790f894cff749b32f5cd2840a2bb25aaa74ddb5a6260c8fa7cc332b8d49d3ab51277658d8a7d7814200839f9bd64f0d09ffc2 SHA512 438300201f9bef74270eff620b64bde08d4ad5952acd18adae4e73c20ee364e133f19fa885332aa1e14ae9a874669057c6fed8a10536ce5f9b2bc6c949da5ee0
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
index 39ae0290f49d..b7af94433ccf 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index be5bcf23dc94..a786e0988804 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/dsx/Manifest b/x11-misc/dsx/Manifest
deleted file mode 100644
index 3e67e5a410fb..000000000000
--- a/x11-misc/dsx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX dsx-0.1 2218 BLAKE2B dc20fbd18c0fe455a704cd0384e9d310e5f3b378842a196de5d0969b844117a1444fbe0bb04c2f2a6e698216a0eff838a95052333601befcbbf755bb825cedc6 SHA512 918d05297dc39166fe1684b306441c519bdf41e56a94d4a5f090698f69fdebb1f4d077d07be4e6d5a22614f163eb4ff8645c8751397ba52e265daece840178a9
-EBUILD dsx-0.1-r1.ebuild 530 BLAKE2B a1d3d2e332cb106552287ff6629a209f1b39e1647cb66b5b6bd01783f11cc536b40bd654b7a24a2ff6e2093fd524d38e9cd24d36b60b8d014b552548dcbc51b9 SHA512 f8a6a0d2cb016052524823385c6d6238fe648525ec8efb71a952942b1716676effab5f0a09c2a4409c25c1da7d374d6b86af996043f653303cf05bc2be3b06e5
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/dsx/dsx-0.1-r1.ebuild b/x11-misc/dsx/dsx-0.1-r1.ebuild
deleted file mode 100644
index 6b49cac790e8..000000000000
--- a/x11-misc/dsx/dsx-0.1-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="Command line selection of your X desktop environment"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	x11-apps/xinit"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_newscript "${FILESDIR}/${P}" "${PN}"
-}
diff --git a/x11-misc/dsx/files/dsx-0.1 b/x11-misc/dsx/files/dsx-0.1
deleted file mode 100644
index d8f5e7192928..000000000000
--- a/x11-misc/dsx/files/dsx-0.1
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-# dsx is Mandrakesoft's Xtart modified to work with a Gentoo Linux system.
-# Gentoo doesn't use a wmsession.d directory, so we're going to accept the
-# /etc/X11/Sessions executables as our menu and our command parameters.
-# I also tried to increase the robustness of the entry checking and make the
-# error messages less condescending.
-# The 0 option for "no wm" was removed.  I altered it to run option 1 instead.
-
-### Original copyright / license message from Xtart... ###
-#  This is an official linux-mandrake extension of the X windowing system for
-#  the benefit of Declan Moriarty  Copyright 2001 by civileme@mandrakesoft all
-#  rights reserved.  Use is hereby granted under the GNU General Publoic
-#  License version 2 or any future version of said license at the user's option
-#
-#  No Warranty of course.
-#  This program is designed for those who want to work in concole and   
-#  occasionally boot into window managers or who want to avoid theme
-#  persistence from one WM to another.
-################
-import sys
-import os
-import popen2
-import string
-import math
-def complain():
-    print 'X initiation aborted on invalid selection.'
-    sys.exit(0)
-    return
-print
-print 'Welcome to the Desktop Selector for X'
-print
-fspc=os.path.expanduser('~')+'/'
-io=popen2.Popen3('ls /etc/X11/Sessions',1)
-L=io.fromchild.readlines()
-Sessions={}
-Sessionkeys=[]
-primekey=0
-for k in L:
-    primekey+=1
-    name=k[:-1]
-    command='/etc/X11/Sessions/'+k[:-1]
-    Sessions[primekey]=(name, command)
-Sessionkeys=Sessions.keys()
-Sessionkeys.sort()
-for j in Sessionkeys:
-    if os.system('[ -x '+Sessions[j][1]+' ]') == 0:
-        print j, Sessions[j][0]
-    pass
-print
-sys.stdin.flush()
-s=raw_input('Enter the number of your desired desktop environment [1]: ')
-if len(s)==0:
-    s='1'
-if s=='0':
-    s='1'
-for j in range(len(s)):
-    if string.find(string.digits,s[j]) == -1:
-        print "'" + s[j] + "' isn't a digit."
-	complain()
-if len(s)>int(math.log10(primekey))+1:
-    print "That number is too big."
-    complain()
-well=int(s)
-wellformed=Sessions.has_key(well)
-if wellformed:
-    os.execvp('xinit',Sessions[well])
-else:
-    print
-    print 'Your selection was invalid.'
-    print
-    complain()
-
diff --git a/x11-misc/dsx/metadata.xml b/x11-misc/dsx/metadata.xml
deleted file mode 100644
index 49c86a887b6a..000000000000
--- a/x11-misc/dsx/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>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
index fda795ad437d..745b98c74218 100644
--- a/x11-misc/e16menuedit2/Manifest
+++ b/x11-misc/e16menuedit2/Manifest
@@ -1,4 +1,5 @@
+AUX e16menuedit2-no-common.patch 725 BLAKE2B 48a150bc33e3baac1a8bbc2f18d560ffe0a67a5a65a57633e7255c554fa9eed9f4201e775742416163ae0af4a805d0a113b6c0be2730091376d61cb9916da1ef SHA512 d99db1bd84c47369f98f2caff216cbdd9c2e10d35eed243ed0971c2f533ed26aa3a93d09a01f4fdce4c15a80416892f74f94d5168d74fa5183aacb6ddb8cea1a
 AUX e16menuedit2-no-default-docs.patch 461 BLAKE2B 87453feb85cff012e821ca86c477bd413e416dffc5893fe1f98121e6090ac73f28d47a8fe1bfb8d93388fc39373433544f988bfa52f62e322a2b261a90d9f717 SHA512 64b115434428a5632f9a2d0c28159a65136cbb106060275e57401018d9c574e68a461dca4f31e4949d089a92c86bca37433c5c0e660b085a495f8baa0f001088
 DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99
-EBUILD e16menuedit2-0.0.3.ebuild 705 BLAKE2B a6571e4fda94fc85de53823fb2104306f75195d5f7e621b446c1e1927f8b549358af0db3b7145dee9d6cd8ebcc13978eda820f08eb0cb016e26b486f1e748931 SHA512 1dc4104b494c3291512c91ad562ad2dbd1f37022707805115c4cbfcb75256ce0c764d2e0ec11b1512197ce6373c232a738261c80feefceecd1a5eef5b7b065d1
+EBUILD e16menuedit2-0.0.3.ebuild 743 BLAKE2B 7e65d1af263553478aeb2e29e4588bcad58a10c69a1388580b980671627cc5392d03ae0bff989fe288a37d4d511d7ab01337fde2afb4222b99ad1b118dabfdb7 SHA512 2449d10ba1aed5e85c1568b25afd29641acc6bf72c88584533b4ca27561a9a19694a082b25ba25afde1d424b183f288d2103add7a51d837c6d5143df6bc6844f
 MISC metadata.xml 343 BLAKE2B 295618490636872ce0aff5266028733087db75ec585d604a9908afe1cfa49e4101778badbc3dded2717e733fa76b879a4fbb58070b3e2e1e09268a871eb7bb8c SHA512 200efaf51e5c6746fa854a10d1d63348695db4da86091cd50ef01a9fd4b7d46cda9c79f257fdf337911d276fc2f95ca17dc05070a252f7eaa1fc3bb9eb2c1071
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
index e0d251548c59..9c379752fcbb 100644
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.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
@@ -24,7 +24,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-no-default-docs.patch"
+	"${FILESDIR}/${PN}-no-common.patch"
+)
 
 src_prepare() {
 	sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c || die
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
new file mode 100644
index 000000000000..4ac213b101f9
--- /dev/null
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
@@ -0,0 +1,20 @@
+--- e16menuedit2-0.0.3/src/e16menu.h.orig	2020-10-11 10:41:36.827021380 +0300
++++ e16menuedit2-0.0.3/src/e16menu.h	2020-10-11 10:51:27.043070842 +0300
+@@ -45,6 +45,6 @@
+ gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path,
+                           GtkTreeIter *iter, gpointer user_data);			  
+ 
+-gchar *menu_file[MAX_RECURSION];
++extern gchar *menu_file[MAX_RECURSION];
+ 
+ #endif /* _E16MENU_H */
+--- e16menuedit2-0.0.3/src/e16menu.c.orig	2005-02-18 15:09:55.000000000 +0300
++++ e16menuedit2-0.0.3/src/e16menu.c	2020-10-11 10:51:52.615152314 +0300
+@@ -34,6 +34,7 @@
+ #include "treeview.h"
+ 
+ extern struct global_variables gv;
++gchar *menu_file[MAX_RECURSION];
+ 
+ GtkTreeModel *load_menus_from_disk (void)
+ {
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index a27e7f1b1e0f..d725b9799b6b 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
-AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
+AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c11192e766d6f3c1020fe0dc4227da0eb8e404c8d67d6a5bcfe9b55075820fb911f1611347e99cd5c99493f SHA512 35bfeee42d2e4e34a42f5cd645c2b7aac801d8a8396b42ec7725179827ec8a52b3db106dcddaa100c3d5d6d19a2df5e462f121a18c848bd898dcce3e43fa791f
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0-r1.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
+EBUILD lightdm-1.30.0-r2.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
index decfba3438b7..9063a82f2819 100644
--- a/x11-misc/lightdm/files/lightdm-autologin
+++ b/x11-misc/lightdm/files/lightdm-autologin
@@ -2,5 +2,5 @@ auth	optional	pam_env.so
 auth	required	pam_nologin.so
 auth	required	pam_permit.so
 
-account	include		system-local-login
-session	include		system-local-login
+account	substack		system-local-login
+session	substack		system-local-login
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
similarity index 100%
rename from x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
rename to x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index d8c4251cbb22..5b32494b5c8b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,6 +9,5 @@ AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1447 BLAKE2B ecfaaf8fa96e9c56de20454a3c177ad89669d1d9488637962a0312db3a103437dd4eb378c9ce7106ff7eb63e39bf2a056fdc6d215da04d0f609864972bb2557e SHA512 73c4f3218f0bea8a34f25f190e0e97cf40dc912ab7b32722c8036e80c0ed2136db7cdb0b265568a270ce64304c1df4668a3873d97b69f242d8ae2475a66ecd7b
-EBUILD sddm-0.18.1-r1.ebuild 3083 BLAKE2B 5ca463ec6ed88501205fa0ea1c1a29fc5cb206f501dea5051d4117049f7717f9c24c77f97fdd9e9b3b9459ad5388b9e2b98fafe8f0fc5ca92fb8b442de10d14a SHA512 a77c5d8b8e13ceb83791424fa1e05666d1e2c9105b3e67202a624c127cf565017f3e6a702edc0d5f0638df4188d11592b8f183a9af43c587e0e4b989fee6229e
 EBUILD sddm-0.18.1-r3.ebuild 3100 BLAKE2B f10a62a85e35bfd3208ed675107ea4ec0e5575e0bf6ea7936b26245758d3c3dbbdd048ede463e3dd6975f389f403f8a1f12ff7f684c68ca62113c148314609e8 SHA512 aa8ab7302ca98f345c99770fe3c06c18df4f7ce116496fc75a0a6d176e30b2d9d89a71f34bab0024204d5b4c422f25a89ce54a54f0dcde4b9a38340ae3a931a2
 MISC metadata.xml 818 BLAKE2B 2be9c3e50193b2c6117a5447ecc9e718d74a44997f8cbeea66905115ced465ea371cf596b5b366cbc4ebb46ecb41015668b96e44e23e7b3dba583e388e78b85a SHA512 c6910844830c10a5602afa3269ffd8eeb4a1a0b2ae345fea5ca0de11f3856cbbcec86cc95930070274d8e5025b4111f1ec0c7af1721c7ed71ce5ebc428adc0d7
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
deleted file mode 100644
index a413e69e420e..000000000000
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="elogind +pam systemd test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.9.4:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-qt/qtcore-5.9.4:5
-	>=dev-qt/qtdbus-5.9.4:5
-	>=dev-qt/qtdeclarative-5.9.4:5
-	>=dev-qt/qtgui-5.9.4:5
-	>=dev-qt/qtnetwork-5.9.4:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb]
-	elogind? ( sys-auth/elogind )
-	pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-5.9.4:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
-	"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-	# fix for groups: https://github.com/sddm/sddm/issues/1159
-	"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
-	"${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
-	# fix for ReuseSession=true
-	"${FILESDIR}/${P}-only-reuse-online-sessions.patch"
-	# TODO: fix properly
-	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	disable_locale() {
-		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-	}
-	l10n_find_plocales_changes "data/translations" "" ".ts"
-	l10n_for_each_disabled_locale_do disable_locale
-
-	if ! use test; then
-		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory test
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
-	local confd="/usr/share/sddm/sddm.conf.d"
-	dodir ${confd}
-	"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-		|| die "Failed to create 00default.conf"
-
-	sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-		-e "/^ReuseSession/s/false/true/" \
-		-e "/^EnableHiDPI/s/false/true/" \
-		-i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-	elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-	elog "Use it to override specific options. SDDM defaults are now"
-	elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 6a7ea7b5f39e..6164575bacf7 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,6 +14,6 @@ AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc
 AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-EBUILD slim-1.3.6-r5.ebuild 4180 BLAKE2B 1854668d624da2ceaf421f5cced0e11aa90a1e3dbbab2f1fb7f0527c82eb5ff0eb11bac630834f5d197d82c364dc8b1af85fc8b386d245618feb76b8c3f8ed05 SHA512 9356aab8785b8c6aa63e729772ba129bf828bcabe4df3e709e90c7e48f32330b95746de8551ce722afc357691bb474d3a026ed0bb8db1651be4b9e06ff0f3a69
-EBUILD slim-9999.ebuild 4008 BLAKE2B 2c3fa21ec5c16e4ecf5d46837d67799456f50d02ff919d4b2b39dd33a9c712b77a1e0a9ad2ea54bd9a6aed84959f233ff0473269bf3c5eaf93a27f77787f960c SHA512 68520716656b6f19d112bce9afed4f764b5d26fe200dbd763cad5f64af76a925375e88ca7da1d02f1a3a552d46add95bc723f3308171157413a59afdd82f23b9
-MISC metadata.xml 514 BLAKE2B 30f0fae6144c9bed109df03b4b77c25ddc0b2e8a69b8cecf08eb14ac3ecfa364d206d2b6832892e74986b28e293d51f51f6ae7102348d81f8a0f5594f8f95c94 SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950
+EBUILD slim-1.3.6-r5.ebuild 3827 BLAKE2B d945b687a7c1a18210f355afbfc0d8451b4b6da431c55827cc6a1d994e16236943ebb1b74cdbdb11d3bec47483958e9bd01573e591cef3daed9605c6e8c8b935 SHA512 807d4b74101b27495a0d930f8176fa091b008e9118d028bc4f471115bc33f2933ff8d8599a1f21d2884a68e832bda217b295d5a3f1613ce8df0bccd70ace09f6
+EBUILD slim-9999.ebuild 3664 BLAKE2B 9fe1f1efae07054d5b6a8be8fb95074d3979eac95b202c7c7ace7e3ee9d299ee3366fb2185014b50c509022073b8d909e00768232d402d248ccad51c43bd910b SHA512 4836465fd45a3bbf864890a4a35a8eb1d314a24bccd638d1e8162f9f2d68002401703f99c2773ace13459d0f5200892d510f0bb70bb792f6b9fbbf517f21752a
+MISC metadata.xml 433 BLAKE2B cf362a211844ad9b4bd066f72afb18171fce6bb8c794eb4fe5d2e680e3adae414fb287274bf360c1de9597672d72b4a7783f65012e3b3e3d6fa3d74c1ae22cbf SHA512 e8ad87f6a2d8667f50d1ae933778aa1ec9ed62360236bc17cf38de1c289fbb37aa12b959a2d7d45649e59bf39737007fdce4c0de77003240bcf616a67d1ca76a
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 8f38f154c1b0..0d0cf35b3407 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -8,9 +8,6 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
-	<use>
-		<flag name="consolekit">Enable native consolekit support</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">slim.berlios</remote-id>
 	</upstream>
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 8b894dd5a563..49e2ecab88c2 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
@@ -23,8 +22,6 @@ RDEPEND="x11-libs/libXmu
 	media-libs/libpng:0=
 	virtual/jpeg:=
 	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? (	sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
@@ -64,7 +61,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use pam USE_PAM)
-		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+		-DUSE_CONSOLEKIT=OFF
 	)
 
 	cmake-utils_src_configure
@@ -128,10 +125,6 @@ pkg_postinst() {
 		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
 		elog "accordingly."
 		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
 	fi
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 90753c4f0d6f..2a9801204240 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-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
@@ -17,8 +17,7 @@ DESCRIPTION="Simple Login Manager"
 HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
@@ -28,8 +27,6 @@ RDEPEND="x11-libs/libXmu
 	media-libs/libpng:0=
 	virtual/jpeg:=
 	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
@@ -59,7 +56,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_PAM=$(usex pam)
-		-DUSE_CONSOLEKIT=$(usex consolekit)
+		-DUSE_CONSOLEKIT=OFF
 	)
 
 	cmake-utils_src_configure
@@ -126,10 +123,6 @@ pkg_postinst() {
 		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
 		elog "accordingly."
 		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
 	fi
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 0f420192d4aa..80b40578e01a 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,5 @@
+AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 EBUILD util-macros-1.19.2-r1.ebuild 717 BLAKE2B fe4f82c7c5583455f25b286236c0a77ca1cc9f96636a566b39a0a1fb3441aee054ee66125ca250e21ecdc06a0f17afd682ef25bdc4c1f2fae78f2d7936ccdcbe SHA512 ddd5dddec1ab2dcd226b6dd43423c83e4c763c99b79ec661fd11d750daa08374eb701a7b949edc9e410a433dd857dc7234f507ab0e16216f36bdfc8cd433737f
+EBUILD util-macros-1.19.2-r2.ebuild 769 BLAKE2B 75db7e2be2fab2090a6e55735da71ba248644d291775e05dfbc84f5cbb4fb99ef29d918c95d7534cd5d378e9d73149cc83afe5c1b32c55e4ab3f120d7dda83d8 SHA512 8f605dcfb235c133a127fe0a07b0e5661da0d654a44e3eb944f65b9933861a95a728c6300e60ecc8c47fefca3fc21a3393c9c95db360debcf66ab03b54069143
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
new file mode 100644
index 000000000000..e6cbee98d11c
--- /dev/null
+++ b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/726130
+
+From bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Fri, 27 May 2016 15:13:56 +0200
+Subject: [PATCH util/macros] XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find
+ preprocessor
+
+On some distributions tools like cpp are prefixed with the host-triple,
+to check for this prefixed version first AC_PATH_TOOL should be used. If
+no prefixed cpp, it will fallback to the unprefixed name.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96257
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ xorg-macros.m4.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/xorg-macros.m4.in
++++ b/xorg-macros.m4.in
+@@ -57,7 +57,7 @@ m4_undefine([maj_needed])
+ # such as man pages and config files
+ AC_DEFUN([XORG_PROG_RAWCPP],[
+ AC_REQUIRE([AC_PROG_CPP])
+-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
++AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
+    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+ 
+ # Check for flag to avoid builtin definitions - assumes unix is predefined,
+-- 
+2.27.0
+
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
new file mode 100644
index 000000000000..5a5659f8bc37
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org autotools utility macros"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CPP.patch
+)
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index e7283ae4ac88..2d5fe771b71a 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -4,12 +4,10 @@ AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b8732
 AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
-DIST xlockmore-5.66ALPHA08.tar.xz 1947004 BLAKE2B 44ad1f877d214a8b719db57df8f502391f635a4a9cd12bd470610c27543c4523acd6824cf01cb9bf6ca73628d4bc59bc25dafc436d4ee818d5590ae058a7b02d SHA512 a7bc5ffe09be91a5a903067c1e9cbdd5808207fc2ff0507e9bdfeb4156c187ee00da2a8d790a539b97e26985adb51326e1dcde9cdaa194bab4b8705117dc97ce
-DIST xlockmore-5.66ALPHA09.tar.xz 1946744 BLAKE2B 98d30a00e9e770e4bf1def27000a51b3cf0bc9ccfcb5b5cebf5af97727ff5b896c11dafee8350c96ef05b7a1d698a7badbbd6e62239e86ee5575a257b9c5415d SHA512 530e7da94cb6d21fb26b2904859e5c33e55f1e32a3cadb6f649cab39590bfc6512d2fcd2167fc8aa22120601129a0a3e459c61ed7b30d8ea417abeb609442c11
 DIST xlockmore-5.66ALPHA10.tar.xz 1943664 BLAKE2B 2beecacb2e1f041b7a239b083191812ae3480475b97d2d74718515e692b42cc356bd70bdae5ae85858dedb678e0f1c696d3d339d705097d66ea13f3e2948c270 SHA512 734c33c17f0698210ac4bfe36535f1cfeb87fa0e3ce5aa93f7aa22558da22b067e3c347524d7301751725a702cacb0e1517ccd88ccc1a43cf317552fe4bd1cf0
+DIST xlockmore-5.66ALPHA11.tar.xz 2080280 BLAKE2B c6e5df805429f62979355304c28389ebca837791ce6bf4a4bc9193135cf0c0f520a4776404c62a75afb57a30c187084f2b81d783ec93d5c0896b4d88edc9ef23 SHA512 c69d6414dc5dd708b5f5cd2bcab7405d7779eb8c6dbaaef07ccb9ba74be805d32c07184b19893d95567fde05aa7bfd66c626c10f2085867905f3632a5b4edb3f
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
-EBUILD xlockmore-5.66_alpha08.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
-EBUILD xlockmore-5.66_alpha09.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 EBUILD xlockmore-5.66_alpha10.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
+EBUILD xlockmore-5.66_alpha11.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha09.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha09.ebuild
deleted file mode 100644
index 2bb52c63b8ed..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha09.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_alpha08.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild
similarity index 100%
rename from x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild
rename to x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3a5ea94b75cf..305b541b02f3 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 667e14c97836..954314d5266c 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -2,6 +2,6 @@ AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ed
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 EBUILD rxvt-unicode-9.22-r1.ebuild 2061 BLAKE2B 56b2bb1406c412205c25688f15ab9bfe526b2f6ac1e936ef577e126d742711d0a8c37dce61852d15a0e7495179ad83a5252b8b5ade0b23daf1d448013a53f1e8 SHA512 5e77c132295150fb58c5c95cd1c1893131d8a6cd59fe7f9fcd72f645f7ea48ef8bc50bc7cfd49b3d0452b09099d5f7432a38e235e32c2b02097088205f5486cd
-EBUILD rxvt-unicode-9.22-r3.ebuild 2131 BLAKE2B a2b63654c2c983ae159923d5683bd00902206dfbf25de1d01eb1728fa8416e7626e3657251cc4faa32150bedf57a44de6c3b4ed8eabc8e494315d2d5f45c96c9 SHA512 cd7b3ca4384906a863a172df692ed4f174a436a8b66f4ab765493508ca3ea676af50bef70fba17d06445507450c4ec1a06f47bd6d24bbd75c4e0b1b2190c69ff
+EBUILD rxvt-unicode-9.22-r3.ebuild 2129 BLAKE2B 524228f8da4c3fc5c2d3431133c75878fad2ac4f3a6384310042b168fd03cfbf183f37e4e1525354bf3d769b2b6544622f9c8add093cb450d345cbcb8d575810 SHA512 63da891e8bea66fc17c4cb7b1f8488ae906b2222d3f4ddbe9bd77267c7fbf16847e24853f95a7e9b76d0d7a1c15e2d1532e641c13e64dffc9f2ffdda1be1904c
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1099 BLAKE2B f30d8fc667246ab2e113f8e9356941f0e7cd40aad88ed578cece7e5cba1622aa2c8ea0b5918d239b994483fb171f8c1fcc03ae6e2d5204f0c2d09a2b22819be1 SHA512 bbd5ec950a1a14975ba50860a0ee924e6a736890dd3bbf7add4b001d164cab6ddc8bebc94c71cb855524b5006c29c3176dbcb489817afad54de1dabaa0410978
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
index e075d7a655bd..dcc135c6e6ab 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl startup-notification unicode3 +utmp +wtmp xft
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c54c70b4b827..ba94d2a60234 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 9f86c628e0e3..d702fd235217 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,6 +1,4 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
-DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
 DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
-EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
-EBUILD e16-1.0.21.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
+EBUILD e16-1.0.21.ebuild 2950 BLAKE2B 00b05e34b768c23243ac70c45f400774cdef60bf4c4d6216b0a7610848e7a7f3aa5b9279c4c3a48594d2c44e8032310931b633d0c06723820eae0d372b29bcea SHA512 c4ba5ec55668f2623047d5352ee59971a86ff14cf01d516d9228c4869c46a943ecdcdd820fc1fcae6c757313ae77dd9885ed08feeb3ef2f5ecf44fe019879cf6
 MISC metadata.xml 1636 BLAKE2B 10638b577feb461fedc925dee696ba44bdd2cc3e781c37150bfb50d252777cb33bebbc16b2fbf7c27fa7cd194d1de7871d9037bef690b653c3e197e58af86f52 SHA512 06fc94f51d8ce392cd1dfb3c1ebe96167e9e792c5a707109d3a58779bbd054ea6a13b18351823875d408befb5dac1dcae85ea4bcc7a8d73c7243a72f643da955
diff --git a/x11-wm/e16/e16-1.0.20.ebuild b/x11-wm/e16/e16-1.0.20.ebuild
deleted file mode 100644
index 5d940a12f3f6..000000000000
--- a/x11-wm/e16/e16-1.0.20.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Enlightenment Window Manager (E16)"
-HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audiofile container dbus debug +dialogs doc examples gnome
-libhack modules nls opengl +pango sndfile sound +themes xcomposite
-+xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
-
-REQUIRED_USE="
-	audiofile? ( sound )
-	opengl? ( xcomposite )
-	sndfile? ( sound )
-	sound? ( ^^ ( sndfile audiofile ) )
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	media-libs/freetype:2
-	media-libs/imlib2[X]
-	virtual/libiconv
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-misc/xbitmaps
-	dbus? ( sys-apps/dbus )
-	opengl? (
-		media-libs/glu
-		media-libs/mesa
-	)
-	pango? (
-		dev-libs/glib:2
-		x11-libs/pango[X]
-	)
-	sound? (
-		|| (
-			media-sound/apulse[sdk]
-			media-sound/pulseaudio
-		)
-		sndfile? ( media-libs/libsndfile )
-		audiofile? ( media-libs/audiofile:= )
-	)
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-	)
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpresent? ( x11-libs/libXpresent )
-	xrandr? ( x11-libs/libXrandr )
-	xrender? ( x11-libs/libXrender )
-	xsm? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	zoom? ( x11-libs/libXxf86vm )
-"
-RDEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/e16-docs )
-	nls? ( virtual/libintl )
-	themes? ( x11-themes/e16-themes )
-	!x11-wm/enlightenment:0
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
-
-src_configure() {
-	local myconf=(
-		$(use_enable container)
-		$(use_enable dbus)
-		$(use_enable debug libtrip)
-		$(use_enable dialogs)
-		$(use_enable doc docs)
-		$(use_enable libhack)
-		$(use_enable modules)
-		$(use_enable nls)
-		$(use_enable opengl glx)
-		$(use_enable pango)
-		$(use_enable sound sound pulseaudio)
-		$(use_enable xcomposite composite)
-		$(use_enable xft)
-		$(use_enable xi2)
-		$(use_enable xinerama)
-		$(use_enable xpresent)
-		$(use_enable xrandr)
-		$(use_enable xrender)
-		$(use_enable xsm sm)
-		$(use_enable xsync)
-		$(use_enable zoom)
-		$(use_with audiofile sndldr audiofile)
-		$(use_with gnome gnome gnome3)
-		$(use_with sndfile sndldr sndfile)
-		--enable-mans
-		--disable-docs
-		--disable-esdtest
-		--disable-gcc-cpp
-		--disable-hints-gnome
-		--disable-werror
-		--disable-xscrnsaver
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	docompress -x /usr/share/doc/${PF}/e16.html
-	dodoc COMPLIANCE docs/e16.html
-	use examples && dodoc -r sample-scripts
-}
-
-pkg_postinst() {
-	einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use"
-	einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\""
-	einfo "in the Theme setting should be disabled for this to work."
-}
diff --git a/x11-wm/e16/e16-1.0.21.ebuild b/x11-wm/e16/e16-1.0.21.ebuild
index 5d940a12f3f6..735f01c76d2c 100644
--- a/x11-wm/e16/e16-1.0.21.ebuild
+++ b/x11-wm/e16/e16-1.0.21.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
@@ -17,6 +17,7 @@ libhack modules nls opengl +pango sndfile sound +themes xcomposite
 REQUIRED_USE="
 	audiofile? ( sound )
 	opengl? ( xcomposite )
+	pango? ( xft )
 	sndfile? ( sound )
 	sound? ( ^^ ( sndfile audiofile ) )
 "
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 20872c09e4d7..084921447f44 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,4 +1,5 @@
 AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9cd74e8dba2890bd20d91714c03834286a8f6fe962e793ba5815a7ef1215c09c276cc6eb219851655f19f8402a5 SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1
+AUX fluxbox-1.3.7-c++17.patch 899 BLAKE2B a1821355da598474bc7745dc4d96811c77580f35b95debcf37a07a4c1622e86b3bfc7105e7e50dfe22c26f6c5873531f6de2cc04f6c94f87cbf4a08da14b4e85 SHA512 6944ccd734de426c90f4374f8bb5ce64b0c8fe46076577cee80195949f364e3f59a3c72bcb4844f8766794e42c47345587da06cda68deb4e22a8715efa2364af
 AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0
 AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72
 AUX gentoo_style_location-1.1.x.patch 735 BLAKE2B bd441ccd5c2819770543effd6fcbc1b33adf52352cfd0a4802140b32083302e665cfa9fed9c1417698f706fa36d8ae0d9b7e2fa19a983aa8f61292dbca27b9d0 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220
@@ -7,5 +8,5 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e
 AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.7-r4.ebuild 3027 BLAKE2B ddc8b03283a87a3eb6fdda43f1bbf2ac78d3d484cb99787a38fe495a404011ba42d6665edee5bc3a1bcc2bdea4407f02649bb0838146a381312ef1d409a800fc SHA512 f815a98348ce4e5e6fc52b612448d23ad1d1953c92d853d241aef4ea3d2ebcc78a9bd0e21f76859f7393dafad403466e6e70068724ab575b30c1e31488b67681
+EBUILD fluxbox-1.3.7-r4.ebuild 3072 BLAKE2B ce100de155dd674c1fa6a4fd601c70255f1312571f441c24541793acc6074e4b5c8e3c8a10596db0876e8783eb9655387655413b8cceed79ecb53931d2682f67 SHA512 98ed088be26539220579a8f13405df71937a1d8b5a7e5fe330334bc08c02028fbff7ada4855bd3cc72bc208d6a65bb2babe645981609caaa7e45e9f31a968add
 MISC metadata.xml 892 BLAKE2B 83aa00ca67e0a6239d9086b9550969068155e9dee4a6dcca0340e553bd43097e9700bd68637bb0a94d0051b8b19a2a5abc2147ac16e0ae7b28836d7a9b79ae4d SHA512 fd8410c6214cf63d781b148ee2add0c46cfbd050cc22412afef43f3b2cfb6eca9a97f66518f138db0d5f695dcca522fccf44c422e481589718ab14394b8d741a
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch
new file mode 100644
index 000000000000..37e450b08f16
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch
@@ -0,0 +1,28 @@
+http://git.fluxbox.org/fluxbox.git/patch/?id=22866c4d30f5b289c429c5ca88d800200db4fc4f
+https://bugs.gentoo.org/732782
+
+From 22866c4d30f5b289c429c5ca88d800200db4fc4f Mon Sep 17 00:00:00 2001
+From: John Sennesael <john@aminking.com>
+Date: Mon, 2 Nov 2015 15:14:32 -0600
+Subject: fixes bug #1138
+
+---
+ util/fluxbox-remote.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc
+index 59852e6..504015b 100644
+--- a/util/fluxbox-remote.cc
++++ b/util/fluxbox-remote.cc
+@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
+     if (strcmp(cmd, "result") == 0) {
+         XTextProperty text_prop;
+         if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0
+-            && text_prop.value > 0
++            && text_prop.value != 0
+             && text_prop.nitems > 0) {
+ 
+             printf("%s", text_prop.value);
+-- 
+cgit v0.11.2
+
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index 762963c89327..1acca6751070 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -34,6 +34,10 @@ BDEPEND="bidi? ( virtual/pkgconfig )
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-c++17.patch
+)
+
 src_prepare() {
 	default
 	# We need to be able to include directories rather than just plain
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 40496049f568..3c090bd238d1 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 463ce8608c13..1fec379cf0b0 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-power-manager-1.6.6.tar.bz2 1227814 BLAKE2B c5f9ca3ff1f7bbed8c534cbba43355a62734b6e1553f852740fe332545df910ecba07be249365f9815b2467226d67a41cdb740e99d4f547ee86abf2d014211f6 SHA512 c9377619df9ebab64ed234659e5798f47448e26fae5b19eb15bcbc9416df1afec6b4de32bc272b81531d2643a215ea46892523077017dc6b232bfe802dba6cd9
 DIST xfce4-power-manager-1.7.0.tar.bz2 1235629 BLAKE2B bf6bd6c3ebfc86d199362168788b3d9b1ca2cd691a93a2cbab04415d7e68e11a3b1cb36328e8a974e504eb00282e584cc497ea4f7dcddb20e6854d06bef5ec7d SHA512 30c6c37ce278d869b73880bc33d04115086646850c8fc9129e4fbeb71b36d4bb7ce7ee1758ea804b42b3736ec6632f7bcd8e7806a00421e0e24ac8433e34ac24
-EBUILD xfce4-power-manager-1.6.6.ebuild 1399 BLAKE2B f88ea3eaddb102895859ce512eb394597e1728736fa80204a273bee13fa0a6743de02fa322ce5010223d80eef6123d79554c85423933eab4ccf311372c578494 SHA512 09da812510afe6af3f2281334a4906d59d1032c7421b2dff082a09bdc644003f454847b16b0e0f6d21720a366c68cc435831106fd51ef6b9708fe29f015a471c
-EBUILD xfce4-power-manager-1.7.0.ebuild 1404 BLAKE2B f7a9e297c9aa03bb85a0d75ce59417e49b61dee8d5d2c1b0cf81f2ddda06e29df051c6fd61848819520a41a3f7e6a74286870960a57fbaeaa31e68d1eecb8bcf SHA512 b9179e69a7e80dd730cc9039c7e08992a4aa200669b00eb939320ac6b650f76fde531d3ab6a1a5d2f0d01e096b11adeb7dde93f2e4510dce9ce99a836c037eb9
+EBUILD xfce4-power-manager-1.6.6-r1.ebuild 1579 BLAKE2B a5099e14f0e92f9259dea685d0b7bb8bc36a802ad80affb9581245bac71e47891fb9b10646ebffa75cc17215df05005ab3b5477f04be3a63bdb28fd7e3259efd SHA512 8e72c72ad54e73b2a83cee5a95257f6272611b90ad2a1ecd801fdb5f8d9ae4b97ab3d53a7e42e2f44f3e96c7e106fa913d7bad58e728f8ed46d74ef18981b082
+EBUILD xfce4-power-manager-1.7.0-r1.ebuild 1584 BLAKE2B de945f7d84c0f0fdf52b06a6f062ea269d9cbd9b007ad7f4d741f5d547a4a57289806bb18b9dd5c44b10b6f11e102aab436d60c4c1e72f098c3b094b25eba9a9 SHA512 c8d3416d122a44cff9dbfe5cc3ec37c3470189bfffcb3e281045eb8b11a75dd507fd79ff4abcc03909962c24d517abd7938df2fa28e246f62816e417c7dab405
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..641b2904d0af
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-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 xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
+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 x86"
+IUSE="kernel_linux networkmanager +panel-plugin policykit"
+
+COMMON_DEPEND=">=dev-libs/glib-2.42
+	>=sys-power/upower-0.99.0
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	x11-libs/libXtst
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
+	policykit? ( >=sys-auth/polkit-0.112 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable panel-plugin xfce4panel)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
+	then
+		elog "Suspend/hibernate support requires a logind provider installed"
+		elog "(sys-apps/systemd or sys-auth/elogind)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
deleted file mode 100644
index 4b9aa22bbe90..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.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 xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-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 x86"
-IUSE="kernel_linux networkmanager +panel-plugin policykit"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42
-	>=sys-power/upower-0.99.0
-	sys-power/pm-utils
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )"
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..3cc989ee9369
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-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 xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
+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 ~x86"
+IUSE="kernel_linux networkmanager +panel-plugin policykit"
+
+COMMON_DEPEND=">=dev-libs/glib-2.42
+	>=sys-power/upower-0.99.0
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	x11-libs/libXtst
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
+	policykit? ( >=sys-auth/polkit-0.112 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable panel-plugin xfce4panel)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
+	then
+		elog "Suspend/hibernate support requires a logind provider installed"
+		elog "(sys-apps/systemd or sys-auth/elogind)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild
deleted file mode 100644
index 9df144416fc2..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.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 xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-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 ~x86"
-IUSE="kernel_linux networkmanager +panel-plugin policykit"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42
-	>=sys-power/upower-0.99.0
-	sys-power/pm-utils
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )"
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}